diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2013-10-27 12:13:21 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2013-10-27 12:13:21 +0000 |
| commit | 3b29bb5d478f154cdd62e778c1dc266abc33341c (patch) | |
| tree | 6094d990a3cae27efe15327e5e319aac2372251c /dev-java | |
| parent | Add missing patches for 1.24, bug #489334. (diff) | |
| download | historical-3b29bb5d478f154cdd62e778c1dc266abc33341c.tar.gz historical-3b29bb5d478f154cdd62e778c1dc266abc33341c.tar.bz2 historical-3b29bb5d478f154cdd62e778c1dc266abc33341c.zip | |
Allow switching to the new shared icedtea-web:0
Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x4E61DE84
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/icedtea/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-7.2.4.3.ebuild | 12 |
3 files changed, 18 insertions, 9 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index b92974d7a024..9bc679f30b6b 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.106 2013/10/27 12:04:19 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.107 2013/10/27 12:13:15 caster Exp $ + + 27 Oct 2013; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.4.3.ebuild: + Allow switching to the new shared icedtea-web:0 *icedtea-7.2.4.3 (27 Oct 2013) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 9c8b988b9de5..b91be3a2a6c7 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -49,13 +49,13 @@ EBUILD icedtea-6.1.12.5.ebuild 9556 SHA256 8fb99e471917048a3827ad49dcf4f4c6e759b EBUILD icedtea-6.1.12.6.ebuild 9575 SHA256 280e497062b28d149d017b0983c3581f0829861497bacc70f83ae4d214996157 SHA512 a362f993fa4680be11c23886b2bb5351aeee5546f177a03052e77367477a35aadcb050a93730e27db3e0b2c6146dbad6f55edf1b9c0998ad6793ecf536f53b05 WHIRLPOOL e226f1b1c9b308a627bebb23d299cd77c38f838d6cb3829c8f9daa0a1f0fee29777bced14fab2fc393ddb8eaf1c6cb98c572774031c5f69ddb4115f9d00a5dd0 EBUILD icedtea-7.2.3.12.ebuild 12034 SHA256 d6e87d5f82d881f9709d951ddc9b44c860a57b8bfbd5d0888a7e5cc427a58d12 SHA512 f7b6b8c1c97a5eecb77ef5bdbd00aff2e7468da70529a9c078118af62a1d3e1defbad5ea64e58b8c684dd11065182997a4bb8a5b50fe38c07c929485c23b8759 WHIRLPOOL 058cf249b4b5f8f15ca1bb485fe1c61af6bc70588237c79c7d19ee7fdc11170664472e0999375e7c237fc53c77d5556d525eb8e596bc735626884459e214a4a8 EBUILD icedtea-7.2.4.1.ebuild 11950 SHA256 193b5f8a4d5b505ea9c88e8c2246b26b3bd88896c7c17ac1a0e2b18c63c4f142 SHA512 8d1c288f5d059105579386fa78889500c5f0c7553e424dadf7719946264719a00b266123a2c4ace8ec4eee27d855017495e4fbac21248671c7b3f681664af79b WHIRLPOOL 027666a57e75e80aef922bd82e2a00d513d17502f95325f1c1f69f519dc7e7ab578d6788dbe46cbf60158b603946ee817a8bc1cd16231919dcb9024326fa7150 -EBUILD icedtea-7.2.4.3.ebuild 12118 SHA256 b12de7545dc0d5aa51710aa081a1c8640d22a2e217b5bcf7ffa6946966b9ecc9 SHA512 8fe54572aa516ba99420371145e4c9628f149f60a84d6e5285c56311b31dc729284a856a80d5cc517b7e7208c241c415b55c0d696ff51489c38ee81ff9c23b87 WHIRLPOOL eb06133f0ebf46f8591062a9b5de15bfb3630acf95491d0a38f69bd2941b44feec45db044f1098679f62017dc862d9c9dffc3339649665508ec7268cd76259a5 -MISC ChangeLog 24024 SHA256 f26196fd705584e853fed674aa757a1a1dd9ee6abbaa9f4b3337a4a0176985df SHA512 ba270aca58caea594104e28b631f4cb1b850ef1562108326ecbcad4cf2822e8785929c0b6fe99862b3365aa50017f23a71c918eaa8878df6b14d70dc23a9f326 WHIRLPOOL 869ec8a60970f57f3dc20d66396e7c9f00e017d3f87a7e348a211997ed9f1f54d760be778b4aafd58ccd40b8a495becfb33689d4c91877cd4a6c47432c38b82f +EBUILD icedtea-7.2.4.3.ebuild 12205 SHA256 7a075aec8265ebc6d8f5fc9adb3a8224a488987368a36b07284131a8f3e41424 SHA512 b878a02517a8417e328d180d628b90ce54f155954bbcae7d4cf86b07ab606fc344d0b6697268e8b8c76033253aa22bf33f066790fd864967b6af69925e3d0b82 WHIRLPOOL 68a605fa38ec3b574a2b5d6ea2195f841044f5517fd575a9cdd6e7be68638821bf77f9b8d84a9c80f9a79296f085df79d1c6ab22b1d97cda3ebc1cf2c32c4399 +MISC ChangeLog 24150 SHA256 ef4d8459e99818e7a6581c756b4fff1b2a834a0ac4929b6a9e9b7d0f95bcb97b SHA512 1d34a45449fb59bcdd1945c81dbeae83a2445bec05230efc3fd9b55b2ebe75e43899f511dfb8fa4fed156bc315c35c7d7282e52346183a3489b49e278ca730c0 WHIRLPOOL b1aa1775779e414d856cacc4d6bf566040204deb260f4a728a6492434ef21022571dbe9d2664b28e096bb28ab525d70edb004a1721fba3eb14626b392842df94 MISC metadata.xml 1625 SHA256 af543836956dfb8bb72b853eeb35ccac283110b000ef60bc8df1319938cfb347 SHA512 2d7bf08168dcbd24f5ae9420f0151274def1c5ec248e73e5e3f51cd9fe0273c44feca33eca7976fa1c7aa22f6046a938e77cdc3178b3e58d771949b61ee4fb20 WHIRLPOOL 6d4cd813a615f880efe0918b7bf4c87aeff76ccfd7b6e0b63379c176c7443d3067f99cac922ab98cf4bc980036f0f7f447ee9face14402b099c89f981ac059be -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iEYEAREKAAYFAlJtAUoACgkQtbrAj05h3oTOQgCeN4o2uXfwadNBDaOG6BMxnPc8 -dvkAn39M5zzpHLneQUk7odHE7TxS9pNO -=3+vA +iEYEAREKAAYFAlJtA2EACgkQtbrAj05h3oSkOQCfZjz0NSJwxi5GQzQRJMzRQ4fK +RrQAnidGdBjQxYqJkxIUQz3TfNQPVOTa +=C60s -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-7.2.4.3.ebuild b/dev-java/icedtea/icedtea-7.2.4.3.ebuild index 9eb9f104f024..a7261d02a2b6 100644 --- a/dev-java/icedtea/icedtea-7.2.4.3.ebuild +++ b/dev-java/icedtea/icedtea-7.2.4.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.1 2013/10/27 12:04:19 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.3.ebuild,v 1.2 2013/10/27 12:13:15 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -151,8 +151,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-1.3.2:7 ) - nsplugin? ( >=dev-java/icedtea-web-1.3.2:7[nsplugin] )" +PDEPEND="webstart? ( || ( + dev-java/icedtea-web:0 + >=dev-java/icedtea-web-1.3.2:7 + ) ) + nsplugin? ( || ( + dev-java/icedtea-web:0[nsplugin] + >=dev-java/icedtea-web-1.3.2:7[nsplugin] + ) )" S="${WORKDIR}"/${ICEDTEA_PKG} |