diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-05-08 18:38:54 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-05-08 18:38:54 +0000 |
| commit | 9cb31dc9428e2fa277e4eee90b0d865d8cc5d0e9 (patch) | |
| tree | 0688350227443d662a6a282f80231b559fbf3acb /dev-java | |
| parent | fix header (diff) | |
| download | historical-9cb31dc9428e2fa277e4eee90b0d865d8cc5d0e9.tar.gz historical-9cb31dc9428e2fa277e4eee90b0d865d8cc5d0e9.tar.bz2 historical-9cb31dc9428e2fa277e4eee90b0d865d8cc5d0e9.zip | |
Fix unpack on Solaris, rekeyword, bug #414795
Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/sun-jdk/Manifest | 16 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0.32.ebuild | 19 |
3 files changed, 24 insertions, 16 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 7d9ecfcb2340..952553916a54 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.322 2012/05/05 21:29:30 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.323 2012/05/08 18:38:54 grobian Exp $ + + 08 May 2012; Fabian Groffen <grobian@gentoo.org> sun-jdk-1.6.0.32.ebuild: + Fix unpack on Solaris, rekeyword, bug #414795 *sun-jdk-1.6.0.32 (05 May 2012) diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index 14c354c1025c..8b155d798e9d 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -25,17 +25,13 @@ DIST jdk-6u32-solaris-sparcv9.sh 12774004 RMD160 b2d2fdf06b1212c90d6dc23e1389ed2 DIST jdk-6u32-solaris-x64-demos.tar.Z 72693 RMD160 11814c204170c7df0d453d76e8d6730a4b27066f SHA1 48655684d76528f227d12516381154feb733bc13 SHA256 b139ac8b8a03d6e7652b11643883ce69fe365c61d3e9fa3c06d4ca9a003aa35b DIST jdk-6u32-solaris-x64.sh 8846042 RMD160 1a59a0537b17a1a2e145c48b832cc5500a2a8e2e SHA1 a55f94a26619228b6dadb6c25eb8c5fff29ffcfb SHA256 10f13c08e0571472dc0fb99ec10314c0083ae675ce6bc041c7a5a653d63522f0 EBUILD sun-jdk-1.6.0.31.ebuild 9582 RMD160 37c5e182f31913f97e0863160e682c94eb4d9774 SHA1 c0a2b72135fec3fc7cd3473315b104e34b221550 SHA256 91985d25d2d9aedf385af30a95ae376ef3c6f1363ffbaa1e3c7cb7989688a070 -EBUILD sun-jdk-1.6.0.32.ebuild 11340 RMD160 9a43e217ebae060d12e9681361aaa9e7c9128065 SHA1 6cfed141841ec757781e79913891c972a471b99b SHA256 eea8b4d7b5880e8a966323ac32738a00f52d57ab2fe4bd2b842602be3fe280cf -MISC ChangeLog 59350 RMD160 077df2b663ce29f67800276194b2b65a09633cd0 SHA1 2509a2aafaabed41291e964ccaa748f5b3706e51 SHA256 cb8d165a6efd487158b06f7ba2c5f6dbaa84f3edc8eac81935da34a5a94c2682 +EBUILD sun-jdk-1.6.0.32.ebuild 11650 RMD160 941edc2fca80b92516fc35df8ff53d2592ce58f9 SHA1 e340fa40b625ef97252551b95952b532441c4a3d SHA256 99074dbe6750488c313029c6959e2b6d71fad711dbb3a2d47446f071a4e91341 +MISC ChangeLog 59478 RMD160 54e11661a466a4febb61cfd70bbe82f11603de72 SHA1 69a18ae220ac7dda60faa6eb7940b0f322a9bf62 SHA256 c9b7e190af24b28451db2f01808e4ec8b854dbc6a9bea37f90090c4ad34114d5 MISC metadata.xml 429 RMD160 e6edae84d0d56c48e9d6e631d1f0612535f26f2d SHA1 4b6faf61f3869bbbccc405c7c07932dd630737ea SHA256 2fef8162216b2e78806cdc6ba5b0ff2619a482aa3ce0ecf909ffa17ba309428c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (SunOS) -iQEcBAEBAgAGBQJPpZvOAAoJEIUJ+svaV163dOoH/1FH8PSV8ucEynMFdbyPFtQK -92el3dcejWj2jq/9TtfJ7YbnFiFM1eC9vb/dflML6FErJbRd9G3b7SeIqPiHiwTL -5bln0pbUK3DmE758+0dwNibF4I2Z7KCeZjKXV3yoQH9vGtWQiFnPIjTQrEm3UEQ0 -tSO54WvYTJEiebBBD10zTemQ4LTBLP5lk2m7pjZlS8q2C2hcd3FqaNZ+GuSzsk1g -79f0y7lxPiuIn9DB8UiD2Lu+2l8GeatNpRXRqKus/NzFuMNuhDoDms4ltxnif4vh -eZcfE1X3KBex4YonJrxmj6C/Qc9v6U1xHqJs8LFLYpF1etKSgGi1jhMWbUJYGaY= -=wFcu +iEYEARECAAYFAk+paEUACgkQX3X2B8XHTokbsgCfYAZ7Wqz7wAicX8lA3+piALEh +1vAAn2hwlurFaA++J93+2/rkRinSVZ1F +=/23F -----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.32.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.32.ebuild index 3ba8f6a114a2..452ab2f0020a 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0.32.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.32.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.32.ebuild,v 1.1 2012/05/05 21:29:30 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.32.ebuild,v 1.2 2012/05/08 18:38:54 grobian Exp $ EAPI="4" @@ -49,7 +49,7 @@ SRC_URI=" LICENSE="Oracle-BCLA-JavaSE" SLOT="1.6" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="X alsa derby doc examples jce kernel_SunOS nsplugin +source" @@ -128,7 +128,8 @@ pkg_nofetch() { } _sol_src_unpack() { - for i in ${A}; do + for i in ${AT}; do + [[ ${i} == "and" ]] && continue rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE # don't die on unzip, it always "fails" unzip "${DISTDIR}"/${i} @@ -137,14 +138,22 @@ _sol_src_unpack() { "${S}"/bin/unpack200 ${f} ${f%.pack}.jar rm ${f} done + if use examples ; then + for i in ${DEMOS}; do + [[ ${i} == "and" ]] && continue + use examples && unpack ${i} + done + mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \ + "${S}"/ || die + fi } src_unpack() { + _set_at + _set_demos if use kernel_SunOS; then _sol_src_unpack else - _set_at - _set_demos sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack" use examples && unpack ${DEMOS} fi |