commit: 1d6788b8a12ddf2f5ff53392424d30ed9bb5ca1d Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu May 7 12:33:01 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu May 7 12:33:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=1d6788b8
Fix various dependency SLOTs. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 9C6D7DE4 dev-java/icedtea/ChangeLog | 9 +++++++ dev-java/icedtea/Manifest | 36 +++++++++++++-------------- dev-java/icedtea/icedtea-3.9999.ebuild | 10 ++++---- dev-java/icedtea/icedtea-6.9999.ebuild | 2 +- dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild | 2 +- 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index c9ff76a..ecc023f 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 07 May 2015; James Le Cuirot <[email protected]> icedtea-3.9999.ebuild, + icedtea-6.9999.ebuild, icedtea-7.2.6.0_pre18.ebuild: + Fix various dependency SLOTs. + + 06 May 2015; James Le Cuirot <[email protected]> icedtea-3.9999.ebuild, + -icedtea-6.1.13.7.ebuild, icedtea-6.9999.ebuild, -icedtea-7.2.5.5.ebuild, + icedtea-7.2.6.0_pre18.ebuild: + Latest releases now in the tree. Apply my changes to the remainder. + *icedtea-6.1.13.7 (15 Apr 2015) *icedtea-7.2.5.5 (15 Apr 2015) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index 3530542..bccdba3 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -25,27 +25,27 @@ DIST icedtea7-jdk-19a30444897f.tar.bz2 32261734 SHA256 2f3c22d729d65851f491d924f DIST icedtea7-langtools-bb9d09219d3e.tar.bz2 1709221 SHA256 5df2c2a496409b0eb1f4ff923ee6de554ab74af8b91af26185f7e2f73071642d SHA512 51d9e5cbfbde281b8dbe0dc6d3ed3ee6a4cdda853809e64931220126de34ea74fa9359ea24cffaf913ea57b967a54fc0d25f31b2bdf62d0c8549cab07e83c969 WHIRLPOOL 655b67b53b6e8166e128bf1621eaa1fed39e18c0b336b6228a4fca4d64ec2efd60d66b1e02b5844beb9107ed1420f471f2ce687773c778418ab75e02e2d8d4f2 DIST icedtea7-openjdk-e229119aa0a0.tar.bz2 128769 SHA256 8c77d4d16d38b2ee4edd98525186548c33138a400c61978e1e54b70c494250df SHA512 91e0eab9e9ba1f6ddc922e1a8e6093f211aabfeef0b8e833db871a40a3b624fcf7155efcd2d2de48b9992985079430b5d193277bf3744e4083de0fa0c7e18bc0 WHIRLPOOL c0ad8c0ed7e12f3717f030412408791b1fa3670167baf58cf879c1034781bce9ac8666edf2beb4169c0e6aab7165797e7b366fa7decdebabf54dfacfc460593c DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 -EBUILD icedtea-3.9999.ebuild 11496 SHA256 6a41aa4e75075b70ca4e4932ae3fc7602bd56d3487976f3f22fc811cd827cfd0 SHA512 557247243bdd27ed9998ed15ceb5f149e8be85e4ba00816ff76418ba52b6a6cae2a57da6cf4e50f8adafc7a83d13480fcddea98a92b136405671fa5b59a2c681 WHIRLPOOL 5a40401c7dcefa15fdc49ebc100b47fc8e4ad3039708002c02aacafd2cae122a1517a24d474f3002dcdb423d30559376a943cda2829ba6399d9703fbe6d85c45 -EBUILD icedtea-6.9999.ebuild 10838 SHA256 7b2ce1fafb59a31eaddac430747c87e04db399ef9b2ad292e86faa180ad2a7ff SHA512 b32208511634bab46469a7206438d94e501e39db75818c70a35c73722cb8da11a632626015910a81fd3361d698fe936f9904279f6074a4cf0f675ea1121d60b1 WHIRLPOOL ffbd710fdc271e23b7e888ad181c8867ecbee20d58afd5f660101a0134a5051ec601c0f283b0bb320dbbf55d705203aaf68cf00980510451141dbde9dafc68bb -EBUILD icedtea-7.2.6.0_pre18.ebuild 12408 SHA256 cfc0fa5d980722060112f76ae6f3f1e8f06e04732b57ca53ecab5e119e1171eb SHA512 a00699fb1b22dc6211eb0c19b718d2668536e327ff906edfff0ac959d36c16be8ac73b94a358e44a6fa2d43246887a832c5caae1a0e1b330c310be58ea31e843 WHIRLPOOL 3e5c759e23bc2ae11a173d455e1d1366cd8d5fe8ed7d28b871debaa2ee32d846e21dc4dff19cedf1788b3d089a1a83a5325eca9c46dbbbe3fe873664a4b2b988 -MISC ChangeLog 89288 SHA256 84b1cbbdb1f15cafaea2db1312bab8914e0c0ea00a45b3a2ed8d85f3b1bca904 SHA512 607dd4788497aaa9b110f968da68f4712ef0efe27264c37f9139bfaf937937551e1a456b5281a3d5fab29787d75477a1c6d5fa2dc7573b4cd71abfcc79ec6c06 WHIRLPOOL 96efdf80bf92dcf4a92ed1898b4f484f113497df67c47aa377b952a4f6c97530ccd3eafb56aa9b3747d9084ee89b10f39ae8a5cbf9905aef505fc06e23db08f2 +EBUILD icedtea-3.9999.ebuild 11508 SHA256 bb74a988fd9094e22dbbf078cee09e761f13c8ef5ebdf63b63c6f9b2ac9d1e90 SHA512 79680e1c02a246d04cecf9ec683032fd070696937ddc562ef8b192d02877a877d8c01fa93c49cc6f79c728cb6f98706f4652b8e96859c942e1d3128784be34a3 WHIRLPOOL 637639e8a15ff8bb30a83f3948eaa0997c37efb313485aea7a7d65a40023cf749840fbb2404ed4292df510345fef0961c5e61e5389baf49bb4a6458a8346054b +EBUILD icedtea-6.9999.ebuild 10839 SHA256 ffa41507a26006ff1e7a16e8ca71c399dff000f5dcf080db57fe05a0aa539538 SHA512 2e52a795b404784ce5669c1e085761e623bf7dfb433eb0312989dc47b9ee58c97ea31052c486bafa66b20ab7bd82a35a43bc5866dd1047852d144ab65629c3af WHIRLPOOL 22dccdf4b9232e2d6d231e86086924c3005da09d152f7c3db651727e4791f03e85e43c32bd2693691d326c38c6fb384313aa1bc50fe26d2ff700d295f824ef52 +EBUILD icedtea-7.2.6.0_pre18.ebuild 12409 SHA256 0e4f133c68a421e89794560b2e956acc0106d4be1c86c512b7f71945db57c6a0 SHA512 a9b727004b708c1ea572b585e2b5281ded50e9caba2422961f6695590d63e61355cbc150192ab97c48c7713c8dcb63ff1deed183cb27b25d96b8926aa8f98e5d WHIRLPOOL 9a6554a678d0ea2d69723df6667f518138de549adc46d8d4110a8d867805ded356fea18fa4bb6ce9c1b761354368fa0a0b92bc2146cb878fe4f9d43e1aaa9ddf +MISC ChangeLog 89701 SHA256 5e776a8bf6021b6a60599658779e67bd52ef16b4126d060a47930c87a6014e73 SHA512 cc1a9ef5e30f3f7962e18ce285ab74bd0ecfb4f0bc2ec9e0921c1966e837ffd9334c15fce861fe3620fffc3dccd06bd0132c33cfd651840ee0eab1e161ced92e WHIRLPOOL 2d0b20f8e0f676a4d85a016498d8c2820693765c5931b7c5c323f8300f4026c5ad03af5c8113b70664f62d7fde34bdec743412b8b2bd7d24554d15b1261f636e MISC metadata.xml 1680 SHA256 41523b869d57bd7edfe8c19416a1fb2d95201931d4174883eef2a39843a7cde2 SHA512 5c1a920010ad325807d5ee24bde454e597ff1c2ae391deb76357e5364266da0433f199e9efccf259eb5f67bb1af99a9088e3a784b97cbffe57776f3639b3a89c WHIRLPOOL 5648750285eacaa1f7ba605b947181cc4ca3663c349c09446ee3b36235e4f387b9715af2c8c3afc50219f105f84a124d269ff5c9a347dfa9fbc2ef8fb235421d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVSo0KXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVS1t9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy -MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k+ZoP/3M9LO3sfq4Mu4/PNI1TlU7N -i9Mby284ABlYpOQanVGvMB1ONxM7Za+FgY1AD4opl/BW/t/Qmyu4cWmvnRKV+Qz+ -ca2GTNpWC24wee6DiuHOvlbraGs+LjVUnUBrwOx3dqCJwsrWaHMTEyiZ2FY3it8l -HkMVhv0v9PqFrq40kJ5M67H3Wt4xgEfnb6CDWdTwDeAIGCEtS7IWcITSvDFjgeAJ -4EJXdqEZ2J88SiairlIUYwenYeFvICvHOPrViT995jkgSHfEdtIr0GsxQa1q8Ra/ -vTn1Tj96YqI8LJO1Q61PfjPY0vcK2EROYWhD27+S2++0cgksnWkb5Oz41USMYZff -tp6OlqX2+nDgctgVUD/pBf3ULpQeFKEsibo/0dItmDVEB1IBK6qvcON7IvLeCqX3 -LcwGdIa2V9AtbJ4zJk5edrv1G0f7NJae+hULjushOtebwTlYQulvcZ7ojuhNjG04 -hy8nDnf9uh4kivAzJwv0pVJbwpxqzD4oTuPAocMVBjfkx0fcwNC6Mm11hCGEWJSf -vm3i4yycmiaWA8q/m1KgKRGCdjLppMsYQqCn4AJVFJ7/k8ld6lBwywKwvy4UP9Qb -Ke4KwMLCLh4w/tHcQY3ARp78Ks41lA3+tkpwo7gGVEYgpiREvLAnWbYKpMCdmj6X -e8sSb/1e2kf6eA3FfPjG -=D+Qt +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k2h0P/iSBOcgz63foJ5dspR/SFvCU +tie8BdUXCR3jy7oRcu5slOT/6YhwL8Q/FIB2Fk9x+eZH/VLnScAbc1pgKvdSezZ0 ++wQljxdAfx8UMJ0y3HXI73zheTHy+uv59VTfaghtu+k4RB94qL04WFNQ31/Me1DI +NrSVsAJuhyVvQyXXTau2OgheO4YcYeWGC72r/nspxm9lG6CqBpUIed7kvP7zhGzj +WYMssgNlWC6MCHJtaKAOIpmnl+QWkMJeK0FVwQ0QKbAqJ5uCOL0T5bXGaliKVDO7 +C3pPpJW4+WMhotmqBD4oUPOxfE1FIszv759zylpLHQzubEgzp6VvD/aTIyVCFkjt +vKuY1FD0GmUVg2fWyXu9GMGlljl+PQXW5ZNZVAVFSBiLjhe382bNkJawTNczHLjE +8aurkEggCQfMNV5rp8T7QRJ5/SVYE1F4vk7+2fMWB1l2Ca4xtrsMHTiWze5xQzSe +e0WtRRVYgWic1yMwjOWUuMSpWyS9lG8J8VgMbezeHCrzvSITydgpdF8xxU/86Lia +6+wZqtYnxC9DnnKNFVxF42YFamIuIYp2x17uOuWZNDANNokETcgLtk0JFqlPy3gf +J4Cr5/u+oQkYYn0o8xc8X3bUASyph1z+az5BL1aZC/u/mMt61K51Dw5qmIrkK+fB +0a7bELAJe6nyFiYoXEQi +=Osdu -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-3.9999.ebuild b/dev-java/icedtea/icedtea-3.9999.ebuild index 17ec04c..397e25a 100644 --- a/dev-java/icedtea/icedtea-3.9999.ebuild +++ b/dev-java/icedtea/icedtea-3.9999.ebuild @@ -73,7 +73,7 @@ X_COMMON_DEP=" >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.3.5 - >=x11-libs/cairo-1.8.8 + >=x11-libs/cairo-1.8.8:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 @@ -92,11 +92,11 @@ X_DEPEND=" x11-proto/xproto" COMMON_DEP=" - >=media-libs/giflib-4.1.6 + >=media-libs/giflib-4.1.6:= media-libs/lcms:2 - >=media-libs/libpng-1.2 - >=sys-libs/zlib-1.2.3 - virtual/jpeg + >=media-libs/libpng-1.2:0= + >=sys-libs/zlib-1.2.3:= + virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index 85d06cc..f8e33bc 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -64,7 +64,7 @@ X_DEPEND=" COMMON_DEP=" >=media-libs/giflib-4.1.6:= - >=media-libs/libpng-1.2:= + >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= >=media-libs/lcms-2.5 diff --git a/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild b/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild index b5984f2..5fa1829 100644 --- a/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.0_pre18.ebuild @@ -92,7 +92,7 @@ X_DEPEND=" COMMON_DEP=" >=media-libs/giflib-4.1.6:= >=media-libs/lcms-2.5 - >=media-libs/libpng-1.2:= + >=media-libs/libpng-1.2:0= >=sys-libs/zlib-1.2.3:= virtual/jpeg:0= javascript? ( dev-java/rhino:1.6 )
