From: James Le Cuirot Date: Thu, 7 May 2015 12:17:33 +0000 (+0000) Subject: Fix libpng dependency as you can't build against the non-0 SLOTs. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6369635bd884707bbf986155c56d6c1289735e9a;p=gentoo.git Fix libpng dependency as you can't build against the non-0 SLOTs. Package-Manager: portage-2.2.18/cvs/Linux x86_64 --- diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 3e5d02c4bed0..5ed0ffe6efad 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.133 2015/05/06 21:33:07 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.134 2015/05/07 12:17:28 chewi Exp $ + + 07 May 2015; icedtea-6.1.13.5.ebuild, + icedtea-6.1.13.7.ebuild, icedtea-7.2.4.8.ebuild, icedtea-7.2.5.5.ebuild: + Fix libpng dependency as you can't build against the non-0 SLOTs. *icedtea-7.2.5.5 (06 May 2015) *icedtea-6.1.13.7 (06 May 2015) diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index ab47e7aa5011..9c7655def7b4 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX fontconfig.Gentoo.properties.src 15626 SHA256 83d34411a91700a0f7f5ba60e112d15ff4b9eb1a1e2ebe6a2869f261f16ef9c4 SHA512 dbc3c94fe106eccce8c5e7eb1d6fe05fcb38e59149a97c951f166898045618e51cf5ad52d9e753add772203c4454b831a7894a65a0d552dab74bc82cfd976f44 WHIRLPOOL 27e29a0f06aa3b1c55999c215a6f34eecefa324021bc51179e68f0c616da2af74854d11d9d1acf44862e0e89bffaf7600ac0ee5c0938fc831df61d3906a5b154 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 AUX icedtea.env 1074 SHA256 b4ad677dede5c06785db6540d51a9dbe6401e894f03857f5b14dbf6bdf9a33a8 SHA512 933c5d96e1cd36badf9c467b5ac06e8cf5d842915662f6744fb641bba64bdbf024685011f48d2742fadf5a3d82ca2e7f3cc555e51079297f5962e22be3afd03a WHIRLPOOL 57ec8849e93bdd595006515c2cbd6e554ee0e84fa74b80fa2a29106e85f000bf5cd8d9e583f6e60974880b250cbb7d6271ac5d53edcbd2765a4dc0babd571258 @@ -31,28 +28,9 @@ DIST icedtea6-1.13.5.tar.xz 4642720 SHA256 3579852895dcce8dcb0277b221c5b27d57baf DIST icedtea6-1.13.7.tar.xz 4511300 SHA256 a5ca64ae94ec27d28be91f4f0624164f9b4e6e92e417e52b296556005142183b SHA512 8e701f78d31888f4e2d362fcd46ee73aae67b57e3fe0b648f12b408298391149704aefac749294a0911581e1e70f30bff57d35a748b8e3e19e57a1911aa3d241 WHIRLPOOL 5131a79b6481b500ff70a50964f0eb206565d149196c5ab350c5f06015a73cf063dceeb3946a3c3bf45eb99a0f178ab180537089c906a7816356b4e289e69002 DIST openjdk-6-src-b32-15_jul_2014.tar.xz 33267124 SHA256 9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871 SHA512 dc565c31dd0320fc3fb9f051fe69ed078d2533311fb5d32d69b6cb081f872a08a704a88ce889382da1362c70db37ec90c1336ba901ae4a4461a0a13b560948f9 WHIRLPOOL 16feed91a6d629d1cf3c3adb07f1e384698e61dab9606846edee85a48a9fa93f8966b237fe9cb3267dd3ecec3a72ad3c57e756f368e40c3dd71be574e6fd7aad DIST openjdk-6-src-b35-14_apr_2015.tar.xz 33730692 SHA256 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b SHA512 bd19261322aeafe84061be996378b6c65c8453ea4c780342bd44dd710bc6f6f414c4aee2d656db4a2750a6d217a92d20bc8d33c12b45e83504a40ff6d5a59cb5 WHIRLPOOL 69c2408afe7c8aac1a1dd62ab40f755d75c57c6ed3dee57d56c0d8fd5f1946a2516143923352660785d2740895f2c0a1ba90304a2e5f6f7d24fd8b1a78c14234 -EBUILD icedtea-6.1.13.5.ebuild 9968 SHA256 dafefb268e7a799bb78edb82ed9e24aeeddea8fe8ba35a2b18e5adf8f3e67ea6 SHA512 73d88b83607c0e0403f5b0dce1aa0d56720583951212fccd9e3bfe07e8106b9cba108a748d167c92980bf2938b78ea0fd6e10399ebb80d980b021426ed1ee28e WHIRLPOOL 652b644722d088432ba7dabb971874f05a64f833ffd5ba57bf767a54e0e2d239d99e263f411970d1e1eaee1513efbf4a8c4fbe3aa530772870ccbfda063a8eb8 -EBUILD icedtea-6.1.13.7.ebuild 10946 SHA256 4f94821795ae474f7d9cf1834734dbb094b989ccd766818cf29f08f42ca766e0 SHA512 f459115c59a6e8120005c11559eceeb07fd13911812521d04f01a78065867c61e6829f527e048eb7c2673d6a1e57e18028f16b15ff6e095309fc7ce47464983a WHIRLPOOL c591d3c8741a00c5493254495b285f749f5ea3a310246780ff359950faa1ba9615d81a35868f09a8c451ba1862106e9e9d3917a7096a9cd1b7fde170d2a34307 -EBUILD icedtea-7.2.4.8.ebuild 12134 SHA256 f06bfe6d54a9c4336426a5494f72197fea72dbf4b2d9231fc67357b10e9dab64 SHA512 391a178490e49095691e50b53d8d451a6c81cf75ff93ac5c75cc294dcb070a3eab5f422557428c49846f697043a6f05f56b3521159b9d9f063e5159f50467ed9 WHIRLPOOL 9acaeaffd6915817c09c867ca509baa935d1d4914d3c5dd1ddc1c0cb20960f55baea6adfcf284e669751df06d8a2fe8f98fab5045ae277da4263dfa3e6937fe0 -EBUILD icedtea-7.2.5.5.ebuild 13065 SHA256 0bcab93773d41dbbaf3463080113f1d47a0fbe49c99ce0228ba24fedb85fe27a SHA512 055f480584ecbc9f22ec59c27fae64452add61c3ae2403e1c797a6d8c2043aa358283380c81053d92f95324bde2b3aad0ddbd7d4ece3c1861406b3d569bfc344 WHIRLPOOL 05c670bf5a95d89f4805c2289455e012a85bf09ebc0946fe25ffb184ff2ea9644ffdf52e81634f55ee0a8aecf3b1128275629397f21ac67204185eea8d39030c -MISC ChangeLog 30619 SHA256 d622ef35c3904407b5f7b4705b6eb5989a44c57bf719b4676f5fd79e6ac0b619 SHA512 19c6676fd1459ebcc19620aed92ec5f6580789f61f08aa8586a4b1e46fcffdbe110d4ea17f8dfbc6f4262c3d8b5c716e2020a40f7de4bd11fdc330585fd18068 WHIRLPOOL c0e0addd9c4d8dc7b119d55ace2a8f07ebef46ee4268ac815eba4fbe5c59398bddd5b82a84c790b0144ed8fc2b291a394a20dfdc71aaf5956b9a1c037df6a22d +EBUILD icedtea-6.1.13.5.ebuild 9969 SHA256 4ffc085a8f5fa3d550a874773e039dc8b9c97374edeab105e53de6f9c10cc067 SHA512 0c1be7a9c3c2e4d7700390e20e46af3b9c47e70795eedcdc8952b70aa1129e9da193b4aebd643fdea5d8c08be5b38ea6d298c8ba0dcd3b27d270815d8b450430 WHIRLPOOL fee7dc083a2cdc2ade99ca17516ba1174626d9e6439e69325be39a8441a86c0eb04fbcc3d758843efb0133d2302ad3e1689aa044032dfe8be63d44b2f4d6306b +EBUILD icedtea-6.1.13.7.ebuild 10947 SHA256 0aa34fc9503d523c1bb005da5ef08a6a9730b6b6ae5188139a562fce5d7c07da SHA512 02d919e07e3dc807271b5251dc258a60c856e07624d56df72b3c13eac09a73c102690650cf142c32fe1ac2457598614351853a0a8d5db48a5e844e4a23fa8633 WHIRLPOOL 30b71112dbc6f9b0d4735e839fc6c1e3ee239ed0a5985b9d171b1338d410756408c599828d9d3acdaa5afb9a52634f7142752a2dd441c2dfc807935f94465f12 +EBUILD icedtea-7.2.4.8.ebuild 12135 SHA256 1a1839d133f3583995e3305c50b9045ccce7bc35ad85f3739d89acc42758b292 SHA512 923bae81e42fe9925fa77083d4c35b9404ee695cae46f4385b2d975eed7e0901c9c2c50f6641475deda4fde9d8c0ae2aa70bd0a3f0533951162513ca6966726c WHIRLPOOL 16ad09f37372b7fa5fdb70eca126bcde488df5a1d3696c71be6a684af06cee02f5ebb1b5ad576b5c1a328286f51c465f6e36db6dde231c9f4989f07fa44ebc00 +EBUILD icedtea-7.2.5.5.ebuild 13066 SHA256 d310703372bf7c0a25a71aea65d1503799f18562d196089a225a51c45251e210 SHA512 e823287f4cf10f81e4ae2f0dd3cb2017e86b2b8de08a778cd9090c5b7a697648ebd8113a458542da8859a3a48be0d5673cedebe6e83c40cbe08285443a820957 WHIRLPOOL 9ad4ac909a3f94444069393b44de7f24851faa3ec2e78d5ae995480ca1d0a663139664c044024cc0d3f65671786392ed953c765ac064f902df3bdaba02020d5f +MISC ChangeLog 30823 SHA256 1170ac9e4ed36cfc53af324f54a7b350e7435f39aea4f72c4415d7df002728ca SHA512 b559faf5bcd414e1ee2e9063e32c98700fa668c894e0ba2822dce408ecc3a10aa572d3946ce3381638c884a0d64a7d0c0a823ac690b9fa663f36f74cc9954705 WHIRLPOOL 8e9693dad1d1aa6bbc692549f0f8fb1ef6937ac6eae7fc52c5f50a39a9a46ef5fb3c0f169f0107912daf8f75efa7292ff73f2623573805675192c1ac6be04068 MISC metadata.xml 1921 SHA256 442ec2cd0931b287f5a2b6365aaf8fcf9306fcb997dfed2c35a28afe2d98043c SHA512 fcc6baf97eea30453bfdf13408c5f7ba56e46a7eade90280a2f0f31c560e4a855a45d51590617744e1102ef430a68c2b8ea23bbc309c02c736f3d0e53b2398ca WHIRLPOOL 134a129060f1c5c5855c86f60bd5b8198c5d37ae985930900abb84f5f7512d3bf171699827a6b0e71dc00fd57c1be5bb74257f942e3a7ce2ec6d57464be952fb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCABmBQJVSoiaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy -MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3krIQP/RDBFu6BjM17Dty86RHYcVKp -wofsj1+xzuIPm97g5aPmllVj5WJ7sWGxj/xzdTBLnm8NX8Qb4gtbYJlJzN/RcBp7 -bNxnnqvk/axlyAwjHX6gPTeOSeacBWV/gGAs1pk8SMOuGrOvEqIU/arp0e0YzmwC -tdA8NfiqVsdCcNliPOjKaMwWVKzZPQXdxHl9j+TYtTP7eOSfGNXm/K1l+XJ3Ep1S -MAU43TTiV5lAYHUGZmjxzQ4FG04trv4/io81HgKDIMz6RRMynUJRI69e0qkX/C/f -ldNGg+gT8bxwKR5PpxLqu0XZDDpegEXCXjtkTKxaXJ+0iU3pLr3sfFcaFMGGEMt4 -k/Fvzh+rUQh1Hg9YO8z+I/YfgwmfQFl8IWSCb+z4MoiOHHz5ceaQoz3JInH2r2AQ -RG82/JAOhAWu0lWwNLq5ZjxWtWeNj72gjOnZNUkN6E61VpRIayG359PUu55TCQy3 -RQmhWgch2kELqc2gyiABtrHK4WBjWAQXFCMFmrRZjH7ErvKiZFK7ap3xCNxjBgAb -fQhQEKKv/58tAkRE1/nkoPeLCEYsoIY4l3uEE8rz8xYqIW2soSgNNk5gWEqu0QLr -VfkQBjJOlu/bodZYu1X1dSJlS+aHlHHjSkYrgePEBpP8WtvBwR2igQ21B/YQ/TCl -ZRzILAz9uaMO9eosMYxv -=Qg2N ------END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-6.1.13.5.ebuild b/dev-java/icedtea/icedtea-6.1.13.5.ebuild index fb95931aa3fa..d0094e93e90f 100644 --- a/dev-java/icedtea/icedtea-6.1.13.5.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.2 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.5.ebuild,v 1.3 2015/05/07 12:17:28 chewi Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -65,7 +65,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-6.1.13.7.ebuild b/dev-java/icedtea/icedtea-6.1.13.7.ebuild index 5697f235c1fe..3f2fc1da3aa8 100644 --- a/dev-java/icedtea/icedtea-6.1.13.7.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild,v 1.1 2015/05/06 21:33:07 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.13.7.ebuild,v 1.2 2015/05/07 12:17:28 chewi Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -65,7 +65,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.4.8.ebuild b/dev-java/icedtea/icedtea-7.2.4.8.ebuild index bd0b59aa9a0f..11dd5881cc87 100644 --- a/dev-java/icedtea/icedtea-7.2.4.8.ebuild +++ b/dev-java/icedtea/icedtea-7.2.4.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.8.ebuild,v 1.3 2014/11/02 08:28:40 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.4.8.ebuild,v 1.4 2015/05/07 12:17:28 chewi Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -95,7 +95,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 ) diff --git a/dev-java/icedtea/icedtea-7.2.5.5.ebuild b/dev-java/icedtea/icedtea-7.2.5.5.ebuild index cb95dd58be66..14fcf1f3c067 100644 --- a/dev-java/icedtea/icedtea-7.2.5.5.ebuild +++ b/dev-java/icedtea/icedtea-7.2.5.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v 1.1 2015/05/06 21:33:07 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v 1.2 2015/05/07 12:17:28 chewi Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -96,7 +96,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 )