Upgpkg: 9b175

3 files changed, 27 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0561688e393c..fd8002579da5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,16 @@
 pkgbase = jdk-devel-docs
-	pkgver = 9b174
+	pkgdesc = Documentation for Oracle Java 9 Development Kit Snapshot
+	pkgver = 9b175
 	pkgrel = 1
 	url = http://jdk.java.net/9/
 	arch = any
-	license = custom:Oracle BSD
+	license = custom
 	optdepends = java-environment>=9: Compile and run examples
 	options = !strip
-	source = http://download.java.net/java/jdk9/archive/174/binaries/jdk-9_doc-api-spec.tar.gz
-	source = http://download.java.net/java/jdk9/archive/174/binaries/javafx-9_doc.zip
-	source = LICENSE
-	sha256sums = aacda9d3f97c097e919f5e57976f4ec3b23e233e0d84c915d57e94b9e2f92084
-	sha256sums = dade998764183750157aefd4a6821c65defaaa4a0b5877ab9a545c66d7f55115
-	sha256sums = 5f00ffce28036cf79da41c7fe0e29801e3148597a164ecc69f49e718ae370370
+	source = http://download.java.net/java/jdk9/archive/175/binaries/jdk-9_doc-api-spec.tar.gz
+	source = LICENSE-Early-Adopter-Terms.txt
+	sha256sums = 56eacc940c3e8421e8e491725e9fb6eb780838fbf9dc1aab184d8bb195bef4bd
+	sha256sums = a8b0ecff3221f39c53092d910dfd903ff243a185835ad6d121abbbe82225d335
 
 pkgname = jdk-devel-docs
-	pkgdesc = Documentation for Oracle Java 9 Development Kit Snapshot
-
-pkgname = javafx-devel-docs
-	pkgdesc = Documentation for Oracle JavaFX 9 Development Kit Snapshot
 
diff --git a/LICENSE b/LICENSE-Early-Adopter-Terms.txt
index 7a8371c2df03..2c76bf88bf66 100644
--- a/LICENSE
+++ b/LICENSE-Early-Adopter-Terms.txt
@@ -1,13 +1,13 @@
 Oracle Technology Network Early Adopter Development License Agreement

 

 EXPORT CONTROLS

-Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology.  You agree that such export control laws govern your use of the Oracle Technology (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 services (or direct product 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.

+Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology.  You agree that such export control laws govern Your use of the Oracle Technology (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 services (or direct product 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:

+Accordingly, You confirm:

 

 -You will not download, provide, make available or otherwise export or re-export the Oracle Technology, 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 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 Oracle Technology, directly or indirectly, to persons on the above mentioned lists.

 

@@ -15,17 +15,15 @@ Accordingly, you confirm:
 

 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 employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination.

 

- 

-

 Note: You are bound by the Oracle Technology Network ("OTN") Early Adopter Development License Agreement (“OTN License Agreement”) terms. The OTN License Agreement terms also apply to all updates You receive under Your Technology Track subscription.

 

 The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate).

 

-PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE .

+PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE.

 

 Oracle Technology Network Early Adopter Development License Agreement

 

-"Oracle,” We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which you are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. “Supplemental Programs” refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively “Oracle Technology”. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. “Oracle Confidential Information” includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other party’s lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle’s Confidential Information in confidence. You agree not to make Oracle’s Confidential Information available in any form to any unauthorized third parties. Company agrees to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by its employees or agents in violation of the provisions of this Agreement.

+"Oracle,” We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which You are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. “Supplemental Programs” refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively “Oracle Technology”. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. “Oracle Confidential Information” includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other party’s lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle Confidential Information in confidence. You agree not to make Oracle’s Confidential Information available in any form to any unauthorized third parties. You agree to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by Your employees or agents in violation of the provisions of this Agreement.

 

 This agreement is governed by California law, except for that body of laws related to the conflict of laws. You agree to submit to the exclusive jurisdiction of, and venue in, the courts located in San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this agreement or the Oracle Technology.

 

@@ -41,11 +39,10 @@ You acknowledge that (1) the Programs are not generally available and may have d
 The Oracle Technology will either be hosted by Oracle or provided to You. In the event that the Oracle Technology are provided to You in a hosted environment, Oracle may provide certain passwords and/or other access information to enable You to access the Oracle Technology. These passwords and/or access information shall be and are Oracle Confidential Information under the terms of this agreement and shall be used solely for the purpose of accessing the Oracle Technology for the evaluation and testing purposes described above. Any hosted instance of the Oracle Technology is provided as is and without warranty. Oracle makes no assurances that any data loaded into the hosted instance will be secured or that such data will remain confidential. Further, Oracle, at its discretion, (a) may access, monitor, and/or review Your activity and data in the hosted instance, and (b) may delete Your files within the hosted instance. Accordingly, Oracle advises You not to place any personal information or other production data into the hosted instance. You agree to take all reasonable steps to prevent improper or unauthorized access to or use of the Oracle Technology.

 

 Collection of Information

-

-The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html.

+The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html .

 

 Ownership and Restrictions

-We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes.

+We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees or agents in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes.

 

 The license grant set forth above is subject to the following additional specific agreements and covenants:

 

@@ -57,9 +54,8 @@ The license grant set forth above is subject to the following additional specifi
 

 (iv) You shall not remove any product identification, copyright notices, or other notices or proprietary restrictions from the Oracle Technology.

 

-Feedback

-

-”Feedback” shall mean any input provided to Us, in any manner, regarding Oracle’s products, documentation and/or services, including changes or suggested changes to Oracle’s current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. Company shall not be identified with Feedback if Oracle provides it to a third party.

+Feedback 

+”Feedback” shall mean any input provided to Us, in any manner, regarding Oracle’s products, documentation and/or services, including changes or suggested changes to Oracle’s current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. You shall not be identified with Feedback if Oracle provides it to a third party.

 

 Export

 You agree to comply fully with export laws and regulations of the United States and any other applicable export laws ("Export Laws") to assure that neither the Software, Confidential Information nor any direct product thereof are:  (1) exported, directly or indirectly, in violation of this Agreement or Export Laws; or (2) used for any purposes prohibited by the Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology.  

@@ -79,10 +75,9 @@ End of Agreement
 This agreement, and Your right to use the Programs, will be terminated: (i) automatically upon the general commercial availability of the Programs, or six months from the date You download the Programs, whichever is first to occur, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control; (ii) by You, by ceasing to use and destroying all copies of the Oracle Technology in Your possession or control; or, (iii) by Us if You fail to comply with any of the terms of this agreement, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control.

 

 Relationship Between the Parties

-The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. 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.  

-

-Third-Party Technology

+The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. 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.

 

+Third-Party Technology 

 The Oracle Technology may be distributed to You with third party technology or derivatives of third party technology (“Third Party Technology”).  Oracle may provide certain notices to You in Oracle Technology documentation, readmes or otherwise 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 Oracle Technology documentation, readme files or otherwise, under separate license terms (“Separate Terms”) and not under the terms of this agreement (“Separately Licensed Third Party Technology”).   Your rights to use such Separately Licensed Third Party Technology under the Separate Terms are not restricted or modified in any way by this agreement.

@@ -90,7 +85,7 @@ Third Party Technology will be licensed to You either under the terms of this ag
 Entire Agreement

 You agree that this agreement is the complete agreement for the Oracle Technology and licenses, and, except as may be expressly set forth in Exhibit A, this agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses. If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective.

 

-Last updated: 19 April 2013

+Last updated: 24 February 2015

 

 Should You have any questions concerning this License Agreement, or if You desire to contact Oracle for any reason, please write: 

 Oracle America, Inc. 

diff --git a/PKGBUILD b/PKGBUILD
index 2b0e2af7a368..166e87935df8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,26 @@
 # Maintainer: Det <nimetonmaili g-mail>
 
-pkgname=('jdk-devel-docs' 'javafx-devel-docs')
+pkgname=jdk-devel-docs
 _major=9
 #_minor=1
-_build=174
+_build=175
 _pkgver=$_major
 pkgver=${_major}b${_build}
 #_pkgver=${_major}u${_minor}
 #pkgver=${_major}u${_minor}.b${_build}
 pkgrel=1
+pkgdesc="Documentation for Oracle Java $_major Development Kit Snapshot"
 arch=('any')
 url="http://jdk.java.net/$_major/"
-license=('custom:Oracle BSD')
+license=('custom')
 optdepends=("java-environment>=$_major: Compile and run examples")
 options=('!strip')
 source=("http://download.java.net/java/jdk${_major}/archive/${_build}/binaries/jdk-${_pkgver}_doc-api-spec.tar.gz"
-        "http://download.java.net/java/jdk${_major}/archive/${_build}/binaries/javafx-${_pkgver}_doc.zip"
-        'LICENSE')
-sha256sums=('aacda9d3f97c097e919f5e57976f4ec3b23e233e0d84c915d57e94b9e2f92084'
-            'dade998764183750157aefd4a6821c65defaaa4a0b5877ab9a545c66d7f55115'
-            '5f00ffce28036cf79da41c7fe0e29801e3148597a164ecc69f49e718ae370370')
-
-package_jdk-devel-docs() {
-  pkgdesc="Documentation for Oracle Java $_major Development Kit Snapshot"
+        'LICENSE-Early-Adopter-Terms.txt')
+sha256sums=('56eacc940c3e8421e8e491725e9fb6eb780838fbf9dc1aab184d8bb195bef4bd'
+            'a8b0ecff3221f39c53092d910dfd903ff243a185835ad6d121abbbe82225d335')
 
+package() {
   # Install
   install -d "$pkgdir"/usr/share/doc/java$_major/
   mv docs/* "$pkgdir"/usr/share/doc/java$_major/
@@ -31,15 +28,3 @@ package_jdk-devel-docs() {
   # License
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-
-package_javafx-devel-docs() {
-  pkgdesc="Documentation for Oracle JavaFX $_major Development Kit Snapshot"
-
-  # Install
-  install -d "$pkgdir"/usr/share/doc/java$_major/
-  mv api "$pkgdir"/usr/share/doc/java$_major/javafx/
-
-  # License
-  install -d "$pkgdir"/usr/share/licenses/
-  ln -s /usr/share/licenses/jdk-devel-docs/ "$pkgdir"/usr/share/licenses/$pkgname
-}