Add doc package. Improve license files.

3 files changed, 288 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b32f15ef8d64..1fd79620d8fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,30 @@
 pkgbase = jdk
 	pkgdesc = Oracle Java
 	pkgver = 16.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.oracle.com/java/
 	arch = x86_64
 	license = custom
+	makedepends = python-html2text
+	noextract = jdk-16.0.2_doc-all.zip
 	source = https://download.oracle.com/otn-pub/java/jdk/16.0.2+7/d4a915d82b4c4fbb9bde534da945d746/jdk-16.0.2_linux-x64_bin.tar.gz
+	source = https://download.oracle.com/otn-pub/java/jdk/16.0.2+7/d4a915d82b4c4fbb9bde534da945d746/jdk-16.0.2_doc-all.zip
+	source = java-16-jdk-license.html::https://download.oracle.com/otndocs/jcp/java_se-16-final-spec/license.html
 	source = java.desktop
 	source = jconsole.desktop
 	source = jshell.desktop
 	source = java_16.png
 	source = java_48.png
+	source = LICENSE
 	sha256sums = 630e3e56c58f45db3788343ce842756d5a5a401a63884242cc6a141071285a62
+	sha256sums = 7cd96f9aa11d9e1a1adbee3e941a78e899bc9079370e4c12c106761d3df80f82
+	sha256sums = 2f14da815e019b3f5558e5176c969227a2530bac1cfdfd42dbd6ccc2ee618346
 	sha256sums = 9fc4cd168fd3e0d654093c1b2dd070f627ffae9b7f5c2c0741bac0b5c1ed0635
 	sha256sums = 12b6e632e38e2c2ef54d6b03976290ca649380a89f78b5dae8827423eae52a1b
 	sha256sums = b2fd5a8f273a103569bf03af6f4ff4d3a5448472abc79b8649cecd0ee9313fc7
 	sha256sums = d27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed
 	sha256sums = 7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176
+	sha256sums = ef331c118f613261f06771161e9aebf8d26ab6cc131edd51358b01cc20fc759d
 
 pkgname = jre
 	pkgdesc = Oracle Java Runtime Environment
@@ -57,3 +65,7 @@ pkgname = jdk
 	depends = hicolor-icon-theme
 	provides = java-environment=16
 	provides = java-environment-jdk=16
+
+pkgname = jdk-doc
+	pkgdesc = Oracle Java documentation
+	arch = any
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..145c9957d958
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,242 @@
+### Oracle Technology Network License Agreement for Oracle Java SE
+
+ **Oracle is willing to authorize Your access to software associated with this
+License Agreement ( "Agreement") only upon the condition that You accept that
+this Agreement governs Your use of the software. By selecting the "Accept
+License Agreement" button or box (or the equivalent) or installing or using
+the Programs, You indicate Your acceptance of this Agreement and Your
+agreement, as an authorized representative of Your company or organization (if
+being acquired for use by an entity) or as an individual, to comply with the
+license terms that apply to the software that You wish to download and access.
+If You are not willing to be bound by this Agreement, do not select the
+"Accept License Agreement" button or box (or the equivalent) and do not
+download or access the software.**
+
+**Definitions** " **Oracle** " refers to Oracle America, Inc.
+
+" **You** " and " **Your** " refers to (a) a company or organization ("
+**Entity** ") accessing the Programs, if use of the Programs will be on behalf
+of such Entity; or (b) an individual accessing the Programs (" **Individual**
+"), if use of the Programs will not be on behalf of an Entity.
+
+" **Contractors** " refers to Your agents and contractors (including, without
+limitation, outsourcers).
+
+" **Development Use** " refers to Your internal use of the Programs to
+develop, test, prototype and demonstrate Your Applications. For purposes of
+clarity, the "to develop" grant includes using the Programs to run profilers,
+debuggers and Integrated Development Environments (IDE Tools) where the
+primary purpose of the IDE Tools is profiling, debugging and source code
+editing Applications.
+
+" **Program(s)** " refers to Oracle software provided by Oracle pursuant to
+this Agreement and any updates, error corrections, and/or Program
+Documentation provided by Oracle.
+
+" **Program Documentation** " refers to the Licensing Information User Manual
+for Oracle Java SE for the applicable version accessible at
+[https://www.oracle.com/java/technologies/javase-
+documentation.html](/java/technologies/javase-documentation.html) and other
+documentation provided by Oracle with the Programs or accessible at
+<https://docs.oracle.com/en/java>.
+
+" **Separate Terms** " refers to separate license terms that are specified in
+the Program Documentation, readmes or notice files and that apply to
+Separately Licensed Third Party Technology.
+
+" **Separately Licensed Third Party Technology** " refers to third party
+technology that is licensed under Separate Terms and not under the terms of
+this Agreement.
+
+" **Application** " refers to applications intended to run on the Java
+Platform, Standard Edition.
+
+" **Personal Use** " refers to an Individual's use of the Programs solely on a
+desktop or laptop computer under such Individual's control only to run
+Personal Applications.
+
+" **Personal Applications** " refers to Applications designed for individual
+personal use only, such as games or personal productivity tools.
+
+" **Oracle Approved Product Use** " refers to Your internal use of the
+Programs only to run: (a) the product(s) identified as Schedule A Products at
+<https://java.com/oaa>; and/or (b) software Applications developed using the
+products identified as Schedule B Products at java.com/oaa by an Oracle
+authorized licensee of such Schedule B Products. If You are unsure whether the
+Application You intend to run using the Programs is developed using a Schedule
+B Product, please contact your Application provider.
+
+" **Oracle Cloud Infrastructure Use ( "OCI Use")**" refers to Your use of the
+Programs on Oracle's Cloud Infrastructure with the Oracle Cloud Infrastructure
+products identified in the Oracle PaaS and IaaS Universal Credits Service
+Descriptions available at <http://oracle.com/contracts> during the period in
+which You maintain a subscription for such Oracle Cloud Infrastructure
+products.
+
+**License Rights and Restrictions** Oracle grants You a nonexclusive,
+nontransferable, limited license to use the Programs, subject to the
+restrictions stated in this Agreement and Program Documentation, only for:
+
+(i)     Personal Use,  
+(ii)    Development Use,  
+(iii)   Oracle Approved Product Use, and/or  
+(iv)   Oracle Cloud Infrastructure Use.
+
+You may allow Your Contractor(s) to use the Programs, provided they are acting
+on Your behalf to exercise license rights granted in this Agreement and
+further provided that You are responsible for their compliance with this
+Agreement in such use. You will have a written agreement with Your
+Contractor(s) that strictly limits their right to use the Programs and that
+otherwise protects Oracle's intellectual property rights to the same extent as
+this Agreement. You may make copies of the Programs to the extent reasonably
+necessary to exercise the license rights granted in this Agreement.
+
+You may not:
+
+  * remove or modify any Program markings or any notice of Oracle's or a
+    licensor's proprietary rights;
+  * make the Programs available in any manner to any third party (other than
+    Contractors acting on Your behalf as set forth in this Agreement);
+  * assign this Agreement or distribute, give, or transfer the Programs or an
+    interest in them to any third party, except as expressly permitted in this
+    Agreement for Contractors (the foregoing shall not be construed to limit
+    the rights You may otherwise have with respect to Separately Licensed Third
+    Party Technology);
+  * cause or permit reverse engineering (unless required by law for
+    interoperability), disassembly or decompilation of the Programs; and
+  * create, modify, or change the behavior of, classes, interfaces, or
+    subpackages that are in any way identified as "java", "javax", "sun",
+    "oracle" or similar convention as specified by Oracle in any naming
+    convention designation.
+
+The Programs may contain source code that, unless expressly licensed in this
+Agreement for other purposes (for example, licensed under an open source
+license), is provided solely for reference purposes pursuant to the terms of
+this Agreement and may not be modified.
+
+All rights not expressly granted in this Agreement are reserved by Oracle. If
+You want to use the Programs for any purpose other than as expressly permitted
+under this Agreement, You must obtain from Oracle or an Oracle reseller a
+valid Program license under a separate agreement permitting such use.
+
+**Ownership** Oracle or its licensors retain all ownership and intellectual
+property rights to the Programs.
+
+**Third-Party Technology** The Programs may contain or require the use of
+third party technology that is provided with the Programs. Oracle may provide
+certain notices to You in Program Documentation, readmes or notice files in
+connection with such third party technology. Third party technology will be
+licensed to You either under the terms of this Agreement or, if specified in
+the Program Documentation, readmes or notice files, under Separate Terms. Your
+rights to use Separately Licensed Third Party Technology under Separate Terms
+are not restricted in any way by this Agreement. However, for clarity,
+notwithstanding the existence of a notice, third party technology that is not
+Separately Licensed Third Party Technology shall be deemed part of the
+Programs and is licensed to You under the terms of this Agreement.
+
+**Source Code for Open Source Software** For software that You receive from
+Oracle in binary form that is licensed under an open source license that gives
+You the right to receive the source code for that binary, You can obtain a
+copy of the applicable source code from https://oss.oracle.com/sources/ or
+http://www.oracle.com/goto/opensourcecode. If the source code for such
+software was not provided to You with the binary, You can also receive a copy
+of the source code on physical media by submitting a written request pursuant
+to the instructions in the "Written Offer for Source Code" section of the
+latter website.
+
+**Export Controls** Export laws and regulations of the United States and any
+other relevant local export laws and regulations apply to the Programs. You
+agree that such export control laws govern Your use of the Programs (including
+technical data) and any services deliverables provided under this agreement,
+and You agree to comply with all such export laws and regulations (including
+"deemed export" and "deemed re-export" regulations). You agree that no data,
+information, program and/or materials resulting from Programs or services (or
+direct products thereof) will be exported, directly or indirectly, in
+violation of these laws, or will be used for any purpose prohibited by these
+laws including, without limitation, nuclear, chemical, or biological weapons
+proliferation, or development of missile technology. Accordingly, You confirm:
+
+  * You will not download, provide, make available or otherwise export or
+    re-export the Programs, directly or indirectly, to countries prohibited by
+    applicable laws and regulations nor to citizens, nationals or residents of
+    those countries.
+  * You are not listed on the United States Department of Treasury lists of
+    Specially Designated Nationals and Blocked Persons, Specially Designated
+    Terrorists, and Specially Designated Narcotic Traffickers, nor are You
+    listed on the United States Department of Commerce Table of Denial Orders.
+  * You will not download or otherwise export or re-export the Programs,
+    directly or indirectly, to persons on the above mentioned lists.
+  * You will not use the Programs for, and will not allow the Programs to be
+    used for, any purposes prohibited by applicable law, including, without
+    limitation, for the development, design, manufacture or production of
+    nuclear, chemical or biological weapons of mass destruction.
+
+**Information Collection** The Programs' installation and/or update processes,
+if any, may transmit a limited amount of data to Oracle or its service
+provider about those processes to help Oracle understand and optimize them.
+Oracle does not associate the data with personally identifiable information.
+Refer to Oracle's Privacy Policy at
+[www.oracle.com/privacy](/legal/privacy/privacy-policy.html).
+
+**Disclaimer of Warranties; Limitation of Liability THE PROGRAMS ARE PROVIDED
+"AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE FURTHER DISCLAIMS ALL WARRANTIES,
+EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NONINFRINGEMENT.**
+
+**IN NO EVENT WILL ORACLE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL,
+PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE,
+DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN
+CONTRACT OR TORT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES. ORACLE'S ENTIRE LIABILITY FOR DAMAGES UNDER THIS AGREEMENT SHALL IN
+NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000).**
+
+**No Technical Support** Oracle does not provide technical support, phone
+support, or updates under this Agreement.
+
+**Audit; Termination** Oracle may audit an Entity's use of the Programs. You
+may terminate this Agreement by destroying all copies of the Programs. This
+Agreement shall automatically terminate without notice if You fail to comply
+with any of the terms of this Agreement, in which case You shall promptly
+destroy all copies of the Programs.
+
+**Relationship Between the Parties** Oracle is an independent contractor and
+we agree that no partnership, joint venture, or agency relationship exists
+between us. We each will be responsible for paying our own employees,
+including employment related taxes and insurance. Nothing in this Agreement
+shall be construed to limit either party's right to independently develop or
+distribute software that is functionally similar to the other party's
+products, so long as proprietary information of the other party is not
+included in such software.
+
+**Entire Agreement; Governing Law** You agree that this Agreement is the
+complete agreement for the Programs and this Agreement supersedes all prior or
+contemporaneous agreements or representations, including any clickwrap,
+shrinkwrap or similar licenses, or license agreements for prior versions of
+the Programs. This Agreement may not be modified and the rights and
+restrictions may not be altered or waived except in a writing signed by
+authorized representatives of You and of Oracle. If any term of this Agreement
+is found to be invalid or unenforceable, the remaining provisions will remain
+effective.
+
+This Agreement is governed by the substantive and procedural laws of the State
+of California, USA, and You and Oracle agree to submit to the exclusive
+jurisdiction of, and venue in, the courts of San Francisco or Santa Clara
+counties in California in any dispute arising out of or relating to this
+Agreement.
+
+**Notices** Should You have any questions concerning this Agreement, or if You
+desire to contact Oracle for any reason, please write:
+
+Oracle America, Inc.  
+500 Oracle Parkway  
+Redwood City, CA 94065
+
+**Oracle Employees** : Under no circumstances are Oracle employees authorized
+to download software for the purpose of distributing it to customers. Oracle
+products are available to Oracle employees for internal use or demonstration
+purposes only. In keeping with Oracle's trade compliance obligations under
+U.S. and applicable multilateral law, an Oracle employee's failure to comply
+with this policy could result in disciplinary action up to and including
+termination.
+
+Last updated: April 10, 2019
diff --git a/PKGBUILD b/PKGBUILD
index e06c642fe25d..02f04ddda15e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,33 +2,47 @@
 # Contributor: Det <nimetonmaili g-mail>
 
 pkgbase=jdk
-pkgname=('jre' 'jdk')
+pkgname=('jre' 'jdk' 'jdk-doc')
 pkgver=16.0.2
 _build=7
 _hash=d4a915d82b4c4fbb9bde534da945d746
 _majver="${pkgver%%.*}"
-pkgrel=1
+pkgrel=2
 pkgdesc='Oracle Java'
 arch=('x86_64')
 url='https://www.oracle.com/java/'
 license=('custom')
+makedepends=('python-html2text')
 source=("https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_linux-x64_bin.tar.gz"
+        "https://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/jdk-${pkgver}_doc-all.zip"
+        "java-${_majver}-jdk-license.html"::"https://download.oracle.com/otndocs/jcp/java_se-${_majver}-final-spec/license.html"
         'java.desktop'
         'jconsole.desktop'
         'jshell.desktop'
         'java_16.png'
-        'java_48.png')
+        'java_48.png'
+        'LICENSE')
+noextract=("jdk-${pkgver}_doc-all.zip")
 sha256sums=('630e3e56c58f45db3788343ce842756d5a5a401a63884242cc6a141071285a62'
+            '7cd96f9aa11d9e1a1adbee3e941a78e899bc9079370e4c12c106761d3df80f82'
+            '2f14da815e019b3f5558e5176c969227a2530bac1cfdfd42dbd6ccc2ee618346'
             '9fc4cd168fd3e0d654093c1b2dd070f627ffae9b7f5c2c0741bac0b5c1ed0635'
             '12b6e632e38e2c2ef54d6b03976290ca649380a89f78b5dae8827423eae52a1b'
             'b2fd5a8f273a103569bf03af6f4ff4d3a5448472abc79b8649cecd0ee9313fc7'
             'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed'
-            '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176')
+            '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176'
+            'ef331c118f613261f06771161e9aebf8d26ab6cc131edd51358b01cc20fc759d')
 
 DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u')
 
+prepare() {
+    mkdir -p "jdk-doc-${pkgver}"
+    bsdtar -x -f "jdk-${pkgver}_doc-all.zip" -C "jdk-doc-${pkgver}" --strip-components='1'
+    html2text "java-${_majver}-jdk-license.html" > LICENSE-doc
+}
+
 package_jre() {
-    pkgdesc='Oracle Java Runtime Environment'
+    pkgdesc+=' Runtime Environment'
     depends=('java-runtime-common' 'ca-certificates-utils' 'freetype2' 'libxtst'
              'libxrender' 'libnet')
     optdepends=('alsa-lib: for basic sound support')
@@ -87,10 +101,11 @@ package_jre() {
     cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
     ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java-${pkgname}"
     ln -s "../../../share/licenses/${pkgname}" "${pkgdir}/${_jvmdir}/legal"
+    install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_jdk() {
-    pkgdesc='Oracle Java Development Kit'
+    pkgdesc+=' Development Kit'
     depends=('java-environment-common' "jre>=${_majver}" "jre<$((_majver + 1))" 'zlib' 'hicolor-icon-theme')
     provides=("java-environment=${_majver}" "java-environment-jdk=${_majver}")
     install=jdk.install
@@ -134,4 +149,16 @@ package_jdk() {
     # legal/licenses
     cp -a legal/* "${pkgdir}/usr/share/licenses/${pkgname}"
     ln -s "$pkgname" "${pkgdir}/usr/share/licenses/java-${pkgname}"
+    install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk-doc() {
+    pkgdesc+=' documentation'
+    arch=('any')
+    
+    install -d -m755 "${pkgdir}/usr/share"/{doc,licenses}
+    cp -dr --no-preserve='ownership' "jdk-doc-${pkgver}" "${pkgdir}/usr/share/doc/java-jdk"
+    mv "${pkgdir}/usr/share/doc/java-jdk/legal" "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -D -m644 LICENSE-doc "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    ln -s "../../licenses/${pkgname}" "${pkgdir}/usr/share/doc/java-jdk/legal"
 }