Fix USE=examples

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog
index 609f9fffeafcde629c5b0869d0081fe667f3cce0..2f6b02458e38a3625af274a64ef1b5dfe4346651 100644 (file)
--- a/dev-java/oracle-jdk-bin/ChangeLog
+++ b/dev-java/oracle-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.9 2011/12/18 09:42:39 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.10 2011/12/18 19:23:13 sera Exp $
+
+  18 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
+  oracle-jdk-bin-1.7.0.2.ebuild:
+  Fix USE=examples
 
 *oracle-jdk-bin-1.7.0.2 (18 Dec 2011)
 

diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 796af28e067fe0e4e40a3d8092fd8c339a612416..801dcb93c740a8125b2d5a8a87090c1bef8c0c88 100644 (file)
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX oracle-jdk-bin-1.7.env 1000 RMD160 9067112ce8a31b450755ce6bbcdd1b24d5307e12 SHA1 66d5a3df445baded9d2b16fc7f24d8fcb1c340bd SHA256 a2422630fc1dd9851b580e42b065d44460d9ec818b203836687e67b2ab4f1c0f
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
@@ -7,14 +10,31 @@ DIST jdk-7u1-solaris-i586.tar.gz 99355541 RMD160 7754cb0429596ac2aaae8b1d837eba0
 DIST jdk-7u1-solaris-sparc.tar.gz 104316010 RMD160 b767cb297e1105f6c197c799397ca155cc1ce422 SHA1 882527c5c14cf80676308cafed517a737a20c328 SHA256 b6d6e4a5c0b958c6c82464999efae0c067406d8cb8f21c01de12e44761e90c4c
 DIST jdk-7u1-solaris-sparcv9.tar.gz 12975640 RMD160 680e1235216b5748b3e0039b91a1735a9747c02b SHA1 bd7a6dadbca2f8250d4a64a6e8f265eed68c063f SHA256 a8758bcfa940d38b2053b9069d2b1f0febd2753804f61ac9cd58206b63327494
 DIST jdk-7u1-solaris-x64.tar.gz 9839985 RMD160 7608dd4fd2776b5d9158d53dbdf4a89d154f62f8 SHA1 b9ed10d8c2130350267943829b9a145aba87c577 SHA256 3e4adda9b8f6af1d59ed475bdf86f4a6db67fed82858574e4c74999c1167a3a1
+DIST jdk-7u2-linux-i586-demos.tar.gz 13992138 RMD160 673d40f2b2ca78898884c8e4c3c1b6c7422ab73c SHA1 c83796c21b1b5a904976f071f2a4d36c2baae934 SHA256 44ccdff8692c400620763b628eef95d9513c90cddc85f9cfc4b1fe88033a8c1a
 DIST jdk-7u2-linux-i586.tar.gz 82444118 RMD160 e8aae676b31e18e221d86dbe9b7fd1d3ae37a94c SHA1 adcd78670ca075e245f998232b7cc4447f7453a2 SHA256 74faad48fef2c368276dbd1fd6c02520b0e9ebdcb1621916c1af345fc3ba65d1
+DIST jdk-7u2-linux-x64-demos.tar.gz 14006484 RMD160 90ae393a286c89db16635079c0440f9c27da8d54 SHA1 ed9e73215437d6d571c686a7f32c6f3947297526 SHA256 075acfb466bf76fed783ea24948e76b9006526ba13218c3b465138fdd611a45b
 DIST jdk-7u2-linux-x64.tar.gz 81225513 RMD160 99e37d1a3b83bbce3c70abf5f9e2e9fa87c13c67 SHA1 bae2b56d2f371fc41dab437de55596c40f1bb8bf SHA256 411a204122c5e45876d6edae1a031b718c01e6175833740b406e8aafc37bc82d
+DIST jdk-7u2-solaris-i586-demos.tar.gz 13986615 RMD160 faf5b5683e7576593e9d08ead8f45f1ae59f2993 SHA1 ac0faf5b894a72fda80b2258e80ae013793d1249 SHA256 b597f08ff81584914802396bef7fd5a5757696ba0392297b6869d4dea12148f1
 DIST jdk-7u2-solaris-i586.tar.gz 85324089 RMD160 5e2fa014d705d4fcf63928aeb0a50c61226a1ade SHA1 3ff3aab44ec4c6116729f216acbe314277bbdb02 SHA256 948d707215f517662a7413e6307cab42845fd8e70c388914e3314bedc57ccba8
+DIST jdk-7u2-solaris-sparc-demos.tar.gz 14028492 RMD160 0ab1a347ad754c62fa8b6d5f1576805d884899ae SHA1 b100979b10dc2828b1bf83e8f491ed77825b4166 SHA256 a7e4493279abfd287df4f80ea59bccf9514af03e25c9d99f5afd77c89fe7fe40
 DIST jdk-7u2-solaris-sparc.tar.gz 90226316 RMD160 4d49fb48f51af35f466d53f6dbaedccba8604f78 SHA1 1c73591793e32e2a703707d6ccda3caa685ebc9f SHA256 fc5e7529819c0a18df6c282c331a547e62812b75198445a457024f5232b59abf
+DIST jdk-7u2-solaris-sparcv9-demos.tar.gz 199196 RMD160 3883993ef87b4a22497b37fffeb682d1c14d1c23 SHA1 c7e289cede87da587f138801c04cf349c2160465 SHA256 6ce24aeef80b9f65da823d5d19e67bbc3d628505463bca6235d69443283d92f4
 DIST jdk-7u2-solaris-sparcv9.tar.gz 12904127 RMD160 c9694a5a139e4d3138e0b209bd407d8e467fe620 SHA1 720ded33fa746538a62e075f12c09fc9c3052f5b SHA256 9f1a50a8221193d5f7f70314ea09ead11830632043d4b389111874f759e7e7ab
+DIST jdk-7u2-solaris-x64-demos.tar.gz 186053 RMD160 b5b87b16fb930c1b6bd163e3cbf425fee55a4c95 SHA1 fc7f4d59b6a933d81f24c76a67f634f260fc0a41 SHA256 09eef91c3319d2682ccee32d5df51dacc8ae021678731dd7725d9c5e29e4a66c
 DIST jdk-7u2-solaris-x64.tar.gz 9702243 RMD160 a280030b3b9988978b086ea2130e59f1eaa8d9d7 SHA1 4778e25b1b7df6d5d3ef0862186c7c1d9d5707f9 SHA256 2c5567c2be431a74f3bf1b19af71efa5434451880503218466dd7109523913a8
 EBUILD oracle-jdk-bin-1.7.0.1-r1.ebuild 4707 RMD160 c214537b1297d66ac07da8f16df556e8082ffcda SHA1 f3d03ffce05847d8f70f94a33287d2fc8bd30089 SHA256 f62be3481cee5bbc83df49f61c52f46820edd52de410d37ea7386857b699d138
 EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 5403 RMD160 feae6a543f873a5696780f661573840682807c5d SHA1 9c02dcb4b8104a4978dbbb8c695d0b34525ac7e8 SHA256 289ddd63edde45bb3713dced11f128819aca0c0176f6d899fbeff4274fd1acf8
-EBUILD oracle-jdk-bin-1.7.0.2.ebuild 5379 RMD160 1bb9b01896fb06a71a571ef52ff82e9b3d15832a SHA1 0169443394c7827c1c79dcbc9050b94386450bc7 SHA256 b9e54de277799abc10ce3b22a34eec0b1ce64d72ebb7bc29e15e356a4285ebdb
-MISC ChangeLog 1958 RMD160 70a90cd5ba9c968dea854d4e2ce57e8575243651 SHA1 ead3c0a61570a3ee6e19640b49795bfe954635fd SHA256 f21a38e95dd70f44ba0836d9dfdd3387da6ed3b187f07bddd7852fa535355b47
+EBUILD oracle-jdk-bin-1.7.0.2.ebuild 6481 RMD160 ce0a7c00cbba2d2d67c2b3c2af10ece139244233 SHA1 bee48af18586d16c25b568ee788984c26789d46c SHA256 f6351de597833d68c71e46fd25042996fba253905f6ef1f5d96aea8730aeaded
+MISC ChangeLog 2062 RMD160 a8d1898aff96ff5049a55706251fdf0520effb52 SHA1 755e080820e6c8add7bd992d7a8d8f4629734bcd SHA256 477d57d0ff3e8ef937991dda0924bcb223b086ae26938d538d9857ea87490b9b
 MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJO7j21AAoJEIUJ+svaV163+BcIAKPveSYvp8DhyOY4W8ZOC7Qh
+JhZTUb8GAxCp+BDOYVel0WGVGkVaUquk1Iihj1rrKioNjvIwrzGBOFXQMnS7gK+l
+OdWBruP5l/fLjTQRoLOOZ6EcJ5Gi21pd+hQic7DATkmhYqyH7Ic2/s3gqcE3TztE
+6xEg1domuBg2BauVRw6PE89HNvGyhuG0vfgDl7Hi1fSfNv3M/j1OyWJfUeNwtQK6
+Ygo0Gz/ZzVafMQrtjauqgsAiJin9ULqGUKqM2LGJd7BNK2ornpZXwyGuoPivCrZl
+X73NEGlhDz9Bnpoy+p5aqrZOOBXm586hW8WxakZeuQGb8eXNaWUUrYf6xE6pr3I=
+=Rbcm
+-----END PGP SIGNATURE-----

diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
index 7bb3798d2b9737bde0336a28f467a99bcd389fe5..8b00570faf6c89f38649537ed7ebf31670141b8f 100644 (file)
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild
@@ -1,11 +1,15 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild,v 1.1 2011/12/18 09:42:39 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.2.ebuild,v 1.2 2011/12/18 19:23:13 sera Exp $
 
 EAPI="4"
 
 inherit java-vm-2 eutils prefix versionator
 
+# This URIs need to be updated when bumping!
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u2-download-1377129.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
 UPDATE="$(get_version_component_range 4)"
 UPDATE="${UPDATE#0}"
 MY_PV="$(get_version_component_range 2)u${UPDATE}"
@@ -18,21 +22,55 @@ SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.tar.gz"
 SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.tar.gz"
 SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.tar.gz"
 
-# This URIs need to be updated when bumping!
-JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u2-download-1377129.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+X86_DEMOS="jdk-${MY_PV}-linux-i586-demos.tar.gz"
+AMD64_DEMOS="jdk-${MY_PV}-linux-x64-demos.tar.gz"
+SOL_X86_DEMOS="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
+SOL_AMD64_DEMOS="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
+SOL_SPARC_DEMOS="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
+SOL_SPARCv9_DEMOS="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
 
 JCE_DIR="UnlimitedJCEPolicy"
 JCE_FILE="${JCE_DIR}JDK7.zip"
 
 DESCRIPTION="Oracle's Java SE Development Kit"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
-SRC_URI="x86? ( ${X86_AT} )
-       amd64? ( ${AMD64_AT} )
-       x86-solaris? ( ${SOL_X86_AT} )
-       x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} )
-       sparc-solaris? ( ${SOL_SPARC_AT} )
-       sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} )
+SRC_URI="
+       x86? (
+               ${X86_AT}
+               examples? (
+                       ${X86_DEMOS}
+               )
+       )
+       amd64? (
+               ${AMD64_AT}
+               examples? (
+                       ${AMD64_DEMOS}
+               )
+       )
+       x86-solaris? (
+               ${SOL_X86_AT}
+               examples? (
+                       ${SOL_X86_DEMOS}
+               )
+       )
+       x64-solaris? (
+               ${SOL_X86_AT} ${SOL_AMD64_AT}
+               examples? (
+                       ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS}
+               )
+       )
+       sparc-solaris? (
+               ${SOL_SPARC_AT}
+               examples? (
+                       ${SOL_SPARC_DEMOS}
+               )
+       )
+       sparc64-solaris? (
+               ${SOL_SPARC_AT} ${SOL_SPARCv9_AT}
+               examples? (
+                       ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS}
+               )
+       )
        jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE"
@@ -75,10 +113,30 @@ pkg_nofetch() {
                AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}"
        fi
 
+       if use x86; then
+               DEMOS=${X86_DEMOS}
+       elif use amd64; then
+               DEMOS=${AMD64_DEMOS}
+       elif use x86-solaris; then
+               DEMOS=${SOL_X86_DEMOS}
+       elif use x64-solaris; then
+               DEMOS="${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}"
+       elif use sparc-solaris; then
+               DEMOS=${SOL_SPARC_AT}
+       elif use sparc64-solaris; then
+               DEMOS="${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}"
+       fi
+
        einfo "Please download ${AT} from:"
        einfo "${JDK_URI}"
        einfo "and move it to ${DISTDIR}"
 
+       if use examples; then
+               einfo "Also download ${DEMOS} from:"
+               einfo ${JDK_URI}
+               einfo "and move it to ${DISTDIR}"
+       fi
+
        if use jce; then
                einfo "Also download ${JCE_FILE} from:"
                einfo ${JCE_URI}