commit: a1195c3582541b1f462139b5b5f53af9849b45ae
Author: Vlastimil Babka <caster <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 5 22:29:09 2014 +0000
Commit: Vlastimil Babka <caster <AT> gentoo <DOT> org>
CommitDate: Sun Oct 5 22:29:09 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=a1195c35
Support icedtea-web:0 like the in-tree versions, bug #500264.
Package-Manager: portage-2.2.14_rc1
Manifest-Sign-Key: 4E61DE84
---
dev-java/icedtea/ChangeLog | 5 +++++
dev-java/icedtea/Manifest | 30 ++++++++++--------------------
dev-java/icedtea/icedtea-6.1.13.4.ebuild | 10 ++++++++--
dev-java/icedtea/icedtea-6.9999.ebuild | 10 ++++++++--
dev-java/icedtea/icedtea-7.2.4.8.ebuild | 10 ++++++++--
dev-java/icedtea/icedtea-7.2.5.2.ebuild | 12 +++++++++---
dev-java/icedtea/icedtea-7.9999.ebuild | 12 +++++++++---
7 files changed, 57 insertions(+), 32 deletions(-)
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index f657687..a14ea96 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Oct 2014; Vlastimil Babka <cas...@gentoo.org> icedtea-6.1.13.4.ebuild,
+ icedtea-6.9999.ebuild, icedtea-7.2.4.8.ebuild, icedtea-7.2.5.2.ebuild,
+ icedtea-7.9999.ebuild:
+ Support icedtea-web:0 like the in-tree versions, bug #500264.
+
*icedtea-7.2.5.2 (02 Sep 2014)
02 Sep 2014; Andrew John Hughes <gnu_and...@member.fsf.org>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 7dc6fde..0ffef0e 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
AUX fontconfig.Gentoo.properties.src 15602 SHA256
d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512
eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39
WHIRLPOOL
f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
AUX generate-cacerts.pl 11051 SHA256
6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512
22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
WHIRLPOOL
ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
@@ -50,27 +50,17 @@ DIST icedtea7-openjdk-b07e2aed0a26.tar.bz2 124937 SHA256
7583c81af29e727d6234fcf
DIST openjdk-6-src-b30-21_jan_2014.tar.xz 33106516 SHA256
ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 SHA512
3d040f9dc99b38babda3dce3a0dbc0de0dd91c5a2a0bb4bad7caa5acbb42923d0b26926aca836157d50124811f6c4c743f48ae996481d216c6158c21686e1c55
WHIRLPOOL
4a07dca91ad6bbf004fe40f12225a836c8cb634ce05b5974c51c389d235a6aca6a2532b3818fd975b1dd83ee117e08e17e22fcbb1bedff4caaabf50f941afd6f
DIST openjdk-6-src-b32-15_jul_2014.tar.xz 33267124 SHA256
9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871 SHA512
dc565c31dd0320fc3fb9f051fe69ed078d2533311fb5d32d69b6cb081f872a08a704a88ce889382da1362c70db37ec90c1336ba901ae4a4461a0a13b560948f9
WHIRLPOOL
16feed91a6d629d1cf3c3adb07f1e384698e61dab9606846edee85a48a9fa93f8966b237fe9cb3267dd3ecec3a72ad3c57e756f368e40c3dd71be574e6fd7aad
EBUILD icedtea-3.9999.ebuild 10772 SHA256
068ef02285056d03fb0b93a1e9bea908fb79981e08373b43820196ac77e12754 SHA512
f46da59c39c64d5490979acf113f0d3b8b9018763b084c22571bf36ae8383b15a343e501f080472bd43e0ab12db5882419ccdb2564fe244f9195b80105d2e369
WHIRLPOOL
e930ba9b68471023c00c4d46cc57aec4f3b8304c843f480c550d2c1fc38224cc20459709e7abd68a5cbe28fa908a3873580ccddf702b7b7ac03a8b9765451d6f
-EBUILD icedtea-6.1.13.4.ebuild 9865 SHA256
65e850d433d5d3352fe21f624a7a75fa1133356a212ce37d6e45bbd253a6c8af SHA512
c7bc3e15a2384e6a0457b8655c22361ab238e384b3206c85920267048a9981b63c1fd3e77cb872691af52c4115d1cdce8039eeedf4148c7d481ffaf7f6582083
WHIRLPOOL
d053acf7fef6ba9f99842b6918b684be31b7e328042a31627800c00ef613baa7217ccb4ec520f57be30fe62029b78acd221b0117d4a9a72f7965eccaf7268e2c
-EBUILD icedtea-6.9999.ebuild 9582 SHA256
91685c78a9230ecf35898683d947d45c507c598a984a7d01fdcfca23deac0d13 SHA512
2e20e9b1483f561eda15b59801e560825f020714e1e4bb158bc8eb8f86e24084852596e2df2ded19f8922de1cde32050d709b00b4eedd35a18a23e5418cf3337
WHIRLPOOL
1944102731dacd521f41cd50f82efc0761cb7f694f8a71a76b756af9c248e252943da4cce7bef73846e518d73f3ffef562b5df9cde0dd266f357a2a0c0957cbc
-EBUILD icedtea-7.2.4.8.ebuild 12061 SHA256
12c53adf97f45f293ff05cfff3b4ff23b7475a59a1a11c927459cafd14fd66f2 SHA512
f10e4e373b37cb27badce23bd9e98e4205f8f6f9118e4d43ec9fa8c1ce4d39d783037b1eff91649f1f7496efdf1a440256987e48fa40c00915f6b8bb350b5679
WHIRLPOOL
b17270ef45baaa0e1beae27021361560b3e275fafe0cf03968f086a9f723349f20a5a25c1d46e945760d97ad03f0c7477ce38e493542b6de857871dd71f0354f
-EBUILD icedtea-7.2.5.2.ebuild 11853 SHA256
3fd8d29450e7d1bdf7a90f3e69479f811d3ade3a5c18b87eaae98f791b761e6c SHA512
10c2ac4fad0b13f46f9e729e2fbc3d23e7a24b240a5dac54c559aff888a9fefbd5802974fd56146bc415d67d4200ab9a12998a77e937e3f25543330021e9915f
WHIRLPOOL
37ed4b79e30a329e612134bbc50ffa398d5bc02b4790f4bc02aaf1130c42f3f3c2b52b1d84c706b4bca97fc3e3eb47a64d6a83469765e4325e3c32179f536a78
-EBUILD icedtea-7.9999.ebuild 11655 SHA256
9293dbb2ce38e345b8584c13524b5b3e907bd93b0b705a9bb7e5a52e6b016868 SHA512
62564aa6fa16af6b8c80630212798d15cc264282046c170ae8f362d8186c2e06ba6262d1ceed8ed9cf62ccc962fc5e7c4fb3da17cc0f0c0acbb68144b4f159a9
WHIRLPOOL
e7a6243a33e3770fbb6b03b64967bb5fb3c048ee8500a4a561dd9ac5146f24cf4bc4b4e968bca55f0c11d520e83452eb2b89fa4ec396ed27d56df7c48e03a4cb
-MISC ChangeLog 83368 SHA256
47f12efb63afeea61386a830fceab43f602606f2edc50830fb4af05f8c70a0ac SHA512
5299983b398acc6ed449e72da74cc894a7ec81a436e49fdd7b6ca54f13b4bf7b2200e57c4ce1955ac7078b241a178e1acc2f889056aeb61dc064dd41acc84863
WHIRLPOOL
27ed1be7633e6d182e759bca1b0d352b7854b7084422ea095f02474932c5a36fce0982be66ae6f1a214818eed759d60fa291e1d1de4c4990849a6334b4ad5256
+EBUILD icedtea-6.1.13.4.ebuild 9968 SHA256
352ab2dd08693123d2b9a4f5c401977c37873c5ec133928f1bb33083d27b7c4a SHA512
fd1fc192c95fcfa856246e9f9f39c811d3cdf65cee09aa6439a3f06ecc80a4da2f523c9909b0a0434f9055c8c9beec2e3c99712b1e158dd9c284556d17deb3c9
WHIRLPOOL
1abe16dd20df082918116f4703d632505e76dfb2507a6bdb90c910b3a83bd037819ef45772e9d9e16428c28fbfcb12c9328ec7ca6e3b4dd147414f9ba69008a9
+EBUILD icedtea-6.9999.ebuild 9685 SHA256
b88d7af1437442564525617fda6cb389818c12a799748bb4dc1f8b16bb1f081a SHA512
f7d3a6648ea05685a0bd3b4348424028b590b976097d9b632ccf5f3784507e04a6a91402b94e192818a24f9d1453f3e616fc8a47c77aa68fa0473568bbf81766
WHIRLPOOL
f5466545e7cd29f074989223f5fe0185caec3f017c7832f6ac11c2f18c47e01bfe6c8d7e33a5ba2244e9423655dba3d64ad7d8628204d3d827d72eeea6778427
+EBUILD icedtea-7.2.4.8.ebuild 12173 SHA256
d4bd850c4654f063441d6d1338fdbc4e929147efdb5f21717314ccaeec9954f3 SHA512
731f47a079874a40fa0af7d9566676dae9ca8800a61842a4f8b9f1f4e9511adfaa05bc936feb3ce15a0d6f9c9e3fc56e6c20ba16f07dcdf5f5a4288f9f49332a
WHIRLPOOL
c0c3d6938dd3251786d6391c98dee7bc61323568708786168bbf8722862a78ced2e474bf14a609d8cbe1d79df97ad4ec3fae2332cba7e4eb8461adfd7e974f2c
+EBUILD icedtea-7.2.5.2.ebuild 11966 SHA256
00617bc80bae9b4f17b99eece5680a3efe392b6884b8a34e9c72195e23e116d7 SHA512
b2c8309df1e796070b95b2c1c9515af2129486c56c4dfe41ab2ee7864817b0bc5945315824f2eee33520724aa113e5bfd24776a6e4366b35a096f8af8bde734a
WHIRLPOOL
f0d80511fdb07dd2a4ff3b4977482ce4cc31662d4312b1d6a7b8db383c46e68922cdf5229ecb5d1141fa21e3ee7b394229f5db284e494b38cc25d7910b5e30e3
+EBUILD icedtea-7.9999.ebuild 11768 SHA256
b3bb8410bfb9b855c05675f7ad33c0b9d682e0fed40032e265fd24f4674264c9 SHA512
fb21de905a1ebd0701ed0b57bbc2d3f55d8183118880f80b355c8f3d65a5f3b68f64c71da5621621854374847f07290058e7fffcbc2d58fbb44273cd2eb7bb8c
WHIRLPOOL
37fd965f1dfe140f35feda1a6a2c5f09273cc5b4429dbae55e8ece4fe0a4e358742f2a152b0bde49f30f20fa3c80cafb6641784f0206967613c7b610467757b4
+MISC ChangeLog 83607 SHA256
7f546ebef7903b85829010643689f3ce41c0daf5f0d318f6e648d04e091ebc5c SHA512
0bbf69ec66773d650a4b7d632c16ccffe2bb81df756509c6418614c1a860cd2433ab5f78579d83f9be01fd3daca729c3787f094a3ce61c60a840190166dd6363
WHIRLPOOL
094a10a68edbf0b4763246e0ae55ff035942e589dae178548418c55fd5e22ff308af7e69b9e9f8f3ac7ac06774fa0be2336a17d9a990f069679e206a7526f9be
MISC metadata.xml 1680 SHA256
41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512
5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c
WHIRLPOOL
5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJUBUdMAAoJEDuWpXgki9wHQhUQALNTun6x+pHcr7EYNhmvmm3M
-i2JxlmYkPTxC5zGcKJ/RVXdos99GPCeIfDiN2ZbpYlotRbLT9ZPKWiUpP/W48vWq
-FUHr6NMlDqKkCxN3KaMimGCDTr2hridiv/wY0Y5bILd+0TXtW3iWRDjvGk0AHGFF
-05Q/F6A9P3hR+o47kf31PnypTPLNKXC7FQ80Q7NjQDUfEg17YkCpPzmTMXpzASAc
-u5Cl7yFcIWsnP79CDV7FbkbX0W4CwnawwSLRKusMecBQ1inwe66QR3ZuaomKrLn3
-UX6cdmuUjMv1K3/lO+aIF6r7GL8JttT/I1H3xGru2N6n0OpXAAhQZsO7K12R1IAK
-P1fVsuMG5trjxaQB4GKYYMgiQ/CIi2bNUtzhC6kG4zShzqBZWzTJvyAj4yvEHrSO
-/0RWy/7rzZpqYTwqX6pJZwD+nPo/IGRNGIfwHcGFvpt4YVdFM+LpiBmG7CYoY1xm
-d7xjQl9wXIfArV5vUnS19bdasFL3R+dYJ8gRejWBeZpx2vrYBFTfrhJ9tmmjPPIh
-tqYeOI2337GzZrw2mFg8bg6EiFTjGvT6G9GZSrIslimHayPBqDcMb1x2qblmDl+O
-+PF7XEIYmYt8kePQ8gyNav0UnEZlefMKB+bj5ibS/Gr0JMNbAFvo9WXVbYHCP5k0
-T5gbHkYhWxPzo04zyPcc
-=Mp/q
+iEYEAREKAAYFAlQxxjQACgkQtbrAj05h3oTGLACbBvCDPMYaW5d93eYpn56SZc8O
+tdcAn1Ov5lu1oKf8oigoqyU7vrpq8+w9
+=Fg3W
-----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.13.4.ebuild
b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
index f51db86..5a41abe 100644
--- a/dev-java/icedtea/icedtea-6.1.13.4.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.4.ebuild
@@ -116,8 +116,14 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
- nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:6
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[nsplugin]
+ >=dev-java/icedtea-web-1.3.2:6[nsplugin]
+ ) )"
S="${WORKDIR}"/${ICEDTEA_PKG}
diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild
b/dev-java/icedtea/icedtea-6.9999.ebuild
index 8ecf6fd..e633410 100644
--- a/dev-java/icedtea/icedtea-6.9999.ebuild
+++ b/dev-java/icedtea/icedtea-6.9999.ebuild
@@ -114,8 +114,14 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/paxctl )"
-PDEPEND="webstart? ( dev-java/icedtea-web:6 )
- nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:6
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[nsplugin]
+ >=dev-java/icedtea-web-1.3.2:6[nsplugin]
+ ) )"
S="${WORKDIR}"/${ICEDTEA_PKG}
diff --git a/dev-java/icedtea/icedtea-7.2.4.8.ebuild
b/dev-java/icedtea/icedtea-7.2.4.8.ebuild
index 7647403..504c6f6 100644
--- a/dev-java/icedtea/icedtea-7.2.4.8.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.4.8.ebuild
@@ -149,8 +149,14 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
- nsplugin? ( dev-java/icedtea-web:7[nsplugin] )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:7
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[icedtea7,nsplugin]
+ >=dev-java/icedtea-web-1.3.2:7[nsplugin]
+ ) )"
S="${WORKDIR}"/${ICEDTEA_PKG}
diff --git a/dev-java/icedtea/icedtea-7.2.5.2.ebuild
b/dev-java/icedtea/icedtea-7.2.5.2.ebuild
index c05328e..7e9245f 100644
--- a/dev-java/icedtea/icedtea-7.2.5.2.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.5.2.ebuild
@@ -146,9 +146,15 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
- nsplugin? ( dev-java/icedtea-web:7[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:7
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[icedtea7,nsplugin]
+ >=dev-java/icedtea-web-1.3.2:7[nsplugin]
+ ) )
+ pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
diff --git a/dev-java/icedtea/icedtea-7.9999.ebuild
b/dev-java/icedtea/icedtea-7.9999.ebuild
index dd2cdc3..ea47d15 100644
--- a/dev-java/icedtea/icedtea-7.9999.ebuild
+++ b/dev-java/icedtea/icedtea-7.9999.ebuild
@@ -144,9 +144,15 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP}
${CUPS_COMMON_DEP} ${X_COMMON_DEP}
${X_DEPEND}
pax_kernel? ( sys-apps/elfix )"
-PDEPEND="webstart? ( dev-java/icedtea-web:7 )
- nsplugin? ( dev-java/icedtea-web:7[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
+PDEPEND="webstart? ( || (
+ dev-java/icedtea-web:0
+ >=dev-java/icedtea-web-1.3.2:7
+ ) )
+ nsplugin? ( || (
+ dev-java/icedtea-web:0[icedtea7,nsplugin]
+ >=dev-java/icedtea-web-1.3.2:7[nsplugin]
+ ) )
+ pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"/${ICEDTEA_PKG}
