From: Fabian Groffen Date: Thu, 15 Dec 2011 21:02:02 +0000 (+0000) Subject: Add support for Solaris, transferred Prefix keywords X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=01e4d06f5e66434d7718287b0636693c7200491a;p=gentoo.git Add support for Solaris, transferred Prefix keywords Package-Manager: portage-2.2.01.19572-prefix/cvs/SunOS i386 --- diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 1c34c460fca9..e6266e961504 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -1,9 +1,23 @@ +-----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 DIST jdk-7u1-linux-i586.tar.gz 96648208 RMD160 7a48b5ed92c34f3253e8a87e5ee53580a8e83736 SHA1 e581d977bdb8f2f7608d48b307ab3174a55f8f48 SHA256 acbfb8912a287facbee02ff138d94457aabab409b2f1d15855714ec9608a6cd4 DIST jdk-7u1-linux-x64.tar.gz 94972183 RMD160 fc2efecd251ec552530ad57888cbdce163e009e6 SHA1 21ef2964df4575f1e5e935205700d06ee70f33b3 SHA256 f88070cfe7fe5ed60dfda7729cf9dd110b77840e2ca8cd14a86d5d2274b09c9c +DIST jdk-7u1-solaris-i586.tar.gz 99355541 RMD160 7754cb0429596ac2aaae8b1d837eba010a628bd5 SHA1 c8b65d96904c565c4e81c23c496054d8bc22fcb7 SHA256 1cd4d59889c51f1317ba25968c8fcc601b19fb6402877bd267b5dc2981cf4a49 +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 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 4707 RMD160 e8dad331b7cbae838d8c0dc312bec13dc7f16722 SHA1 bf9228d934acfa167363ccf2344d44ca46698857 SHA256 72f6750b94200d87ef2677e78786d6d3234956df6527fd165f1c489af0677d57 -MISC ChangeLog 1673 RMD160 df4beb2bfc5e6978757550866d9c784aaedb86ce SHA1 832759edca6f21a54969e9b0a97bffc4c87f2fbf SHA256 7d112d62b5576a4de093b739ff06753cbb1ff3aa3c826629fb42803f46632721 +EBUILD oracle-jdk-bin-1.7.0.1-r2.ebuild 5403 RMD160 feae6a543f873a5696780f661573840682807c5d SHA1 9c02dcb4b8104a4978dbbb8c695d0b34525ac7e8 SHA256 289ddd63edde45bb3713dced11f128819aca0c0176f6d899fbeff4274fd1acf8 +MISC ChangeLog 1813 RMD160 82d704d8ce058355b0413450d608973030353d04 SHA1 fc9a36faad3ffc5f620eb56af94a82ddd4ef1f51 SHA256 4e60adea3326043963fee710fe074e43ecefaa85d9494fc2c4a02969796b223a MISC metadata.xml 447 RMD160 7d545e68fa24d3775c670d42dc2fae9a125f64a0 SHA1 be889d874ad2ab4f6a4be68ed2a33909c03ed1a2 SHA256 7f8266bbb1afdd6dcd6361bca86fc8178ce623c042a3eac3835bcbf03b6b9232 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (SunOS) + +iEYEARECAAYFAk7qYL8ACgkQX3X2B8XHTokqZACghywHNy549Toru7fi3x3q132t +CzAAniEXlYB9tVU3PuwUVteB75DtcPSr +=hcEv +-----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index c698e0cb4bba..d0f702a41789 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/sun-jdk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.313 2011/11/21 13:32:59 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.314 2011/12/15 21:02:02 grobian Exp $ + + 15 Dec 2011; Fabian Groffen sun-jdk-1.6.0.29-r1.ebuild: + Add support for Solaris, transferred Prefix keywords 21 Nov 2011; Ralph Sennhauser -sun-jdk-1.6.0.26.ebuild, -sun-jdk-1.6.0.27.ebuild: diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index 1f6b6251d1aa..5f0045f5ba49 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -1,10 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 AUX fontconfig.Gentoo.properties-r1 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c AUX sun-jdk-1.6.env 940 RMD160 2061347f8137915ed421c7592a6909b51bb2110d SHA1 3520843a513f53f8a04782d9a6b373736c24f624 SHA256 f8669f72a512ca892dbe2f4b153ac39e92b6f4e33d3693e969d670134c5b15b8 AUX sun-jdk-1.6.env-r1 1015 RMD160 07a5d39da299dd2d6e7165e9b32fe00c30e5b4c3 SHA1 2f1426a0d5a18fbbd53b81a8df94c7b64d05d911 SHA256 31302b5ed417a294ecc9c475a08aca331a07c59d2c095978a574a7347aa12f6a DIST jdk-6u29-linux-i586.bin 85146345 RMD160 fca7a51bf14486a81a684c91152493e8af621647 SHA1 a73580ed8ac42040f1bbcab62617719a31c6f487 SHA256 1117f4dfc45632b68ec0f4d5e61e5cafc1d85dc655ee3df5fa6f50128b8c3faf DIST jdk-6u29-linux-x64.bin 85411605 RMD160 7bb1433728c9d263bfe9d968595aac7d73e6c2f3 SHA1 45286e11864285c0d9d5cafd0355dbe04d272951 SHA256 a8603fa62045ce2164b26f7c04859cd548ffe0e33bfc979d9fa73df42e3b3365 -EBUILD sun-jdk-1.6.0.29-r1.ebuild 4471 RMD160 22aa825ed3ecd5481564a13dfee6cf564c063362 SHA1 9058c378c5926ae3ff30b225ba90f355350c51fa SHA256 a527d713a64b2f1cbe7c49d03816d43fa092107d8bedf9369f0a705737aecd06 +DIST jdk-6u29-solaris-i586.sh 85022791 RMD160 88595026cad4f10156c90e3df03771218ebdd4b3 SHA1 5691e34e4d26ca53f80f775359c1bced3fe9d60d SHA256 95472eb265685bfacb9cbf6a5503fc00caed7f24ef133755b74c4da109d8cede +DIST jdk-6u29-solaris-sparc.sh 90224612 RMD160 998ec8a2bd8f2606e45f21cb7d08ab0fa4feff12 SHA1 887dc14e330832c80083c16b6550abd3304486bb SHA256 975976e41c7f92cc2945398c780282ede345a44eb079a244892dd440e601df06 +DIST jdk-6u29-solaris-sparcv9.sh 12832683 RMD160 6df1203c8b92ac0d652afe4e7bf6556bbfbf0562 SHA1 d73f3858dbf3076f8151a46c1b065e613e9f0e11 SHA256 de42908a88e0dfcda66bb2c66e1e82feeb278a5d5a74e8a71b634883c6ad7379 +DIST jdk-6u29-solaris-x64.sh 8909539 RMD160 a7ecfac24fee9139a9c5113d928625933f63ec82 SHA1 a6332aead99377f2492c8330fdc9daf923a93054 SHA256 37595a803e571056350f7c0b326cf8005e5c6e1eb9d8726d6afac46f9d140973 +EBUILD sun-jdk-1.6.0.29-r1.ebuild 5495 RMD160 1ea28d8967273cf12be35d29a16eadd3cae7b595 SHA1 bdd09d4a7f72fc8614c5eaf3831005a79307a98c SHA256 1f2379fe11f355f432276b1c01c68ae8943d90e0d925058ba11b51e8bf42dffb EBUILD sun-jdk-1.6.0.29.ebuild 4645 RMD160 1d22065eeef6f8b1a9824c056badd9621acec098 SHA1 1099e676a61847bc4a9d8458ab7378f6cdc1ee11 SHA256 2992ec2784417e44ed67100b56de9bdd73e759b1cab63dfe24cf265fb9077e5f -MISC ChangeLog 57644 RMD160 9a660e1a817df0c39f1c2e5f6f4ac58ea790b905 SHA1 d4228f2a86ac607db279f62a0fa787deb254167e SHA256 4e3a21ff9afc55fc7ff46632b19a9174466c50366fa9f8cf5932bc9a19f08e28 +MISC ChangeLog 57782 RMD160 63ce6d3d5fae5903cff47b4a810983bd195f619e SHA1 cac8733e80caac0c36f9eda08b44a5968bf723c1 SHA256 93303ddcc6b37b00c08e850a29e1f301d1f9444cb3525587fe8484dc2531a120 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (SunOS) + +iEYEARECAAYFAk7qYFgACgkQX3X2B8XHTolW0ACgnYibAYrDKL1QjW2Vn8yV0jH+ +1rkAnifVXMaDIkf+gsvBUVePelnBuJRU +=SuJa +-----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild index 2de98c333d39..9b48f5611218 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild,v 1.1 2011/11/21 13:26:03 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.29-r1.ebuild,v 1.2 2011/12/15 21:02:02 grobian Exp $ EAPI="4" @@ -11,6 +11,10 @@ S_PV="$(replace_version_separator 3 '_')" X86_AT="jdk-${MY_PV}-linux-i586.bin" AMD64_AT="jdk-${MY_PV}-linux-x64.bin" +SOL_X86_AT="jdk-${MY_PV}-solaris-i586.sh" +SOL_AMD64_AT="jdk-${MY_PV}-solaris-x64.sh" +SOL_SPARC_AT="jdk-${MY_PV}-solaris-sparc.sh" +SOL_SPARCv9_AT="jdk-${MY_PV}-solaris-sparcv9.sh" # check the URIs when bumping, no idea about their stability yet JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-${MY_PV}-download-513648.html" @@ -18,10 +22,14 @@ JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-${MY_PV}-do DESCRIPTION="Oracle's Java SE Development Kit" HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" SRC_URI="x86? ( ${X86_AT} ) - amd64? ( ${AMD64_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} )" LICENSE="Oracle-BCLA-JavaSE" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" SLOT="1.6" IUSE="X alsa derby doc examples jce nsplugin" @@ -34,6 +42,7 @@ QA_TEXTRELS_x86=" RDEPEND="${DEPEND} doc? ( dev-java/java-sdk-docs:1.6.0 ) !prefix? ( sys-libs/glibc ) + kernel_Solaris? ( app-arch/unzip ) alsa? ( media-libs/alsa-lib ) X? ( x11-libs/libXext @@ -51,6 +60,14 @@ pkg_nofetch() { AT=${X86_AT} elif use amd64; then AT=${AMD64_AT} + elif use x86-solaris; then + AT=${SOL_X86_AT} + elif use x64-solaris; then + AT="${SOL_X86_AT} and ${SOL_AMD64_AT}" + elif use sparc-solaris; then + AT=${SOL_SPARC_AT} + elif use sparc64-solaris; then + AT="${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}" fi einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." @@ -62,7 +79,19 @@ pkg_nofetch() { } src_unpack() { - sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" + if [[ ${CHOST} == *-solaris* ]] ; then + for i in ${A}; do + rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE + # don't die on unzip, it always "fails" + unzip "${DISTDIR}"/${i} + done + for f in $(find "${S}" -name "*.pack") ; do + "${S}"/bin/unpack200 ${f} ${f%.pack}.jar + rm ${f} + done + else + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" + fi } src_compile() {