Update deps to match scanelf results more closely, fix #390945.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 5aeda7b1126dc5815d6a1e76cf8939233fe2f95b..c634f279a58ebda5c0e9da265f5765821a0b5557 100644 (file)
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/icedtea-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.5 2011/11/15 09:21:36 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.6 2011/11/18 20:27:58 caster Exp $
+
+  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-bin-7.2.0-r1.ebuild:
+  Update deps to match scanelf results more closely, fix #390945.
 
 *icedtea-bin-7.2.0-r1 (15 Nov 2011)
 

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 1e03ac762aae1b745f87e224ccb2dd4d1cd4bdf0..ca95717c73323599228a9595dd9a0f33257a0a49 100644 (file)
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -38,6 +38,6 @@ DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38
 EBUILD icedtea-bin-1.10.3-r2.ebuild 3593 RMD160 5b23781328ccaf973c53d48c78e6249b6eba8e58 SHA1 dc40596a5cd27c44a73841fee13f8a17c2bbd18c SHA256 a43cc23efcc22e55d31522b4ade9f77839f2bc7a879cee31e3457e552778ad9b
 EBUILD icedtea-bin-1.10.4.ebuild 3039 RMD160 e4ef9734c53528cf712979c729f77c36f93fb075 SHA1 dde30b51ca3fda962528512adcfea6446d09ca6f SHA256 fc8f37899ca2f5e14d3049a91d2fe78f8cf848bd1b23b09fa9d813ae512d9fa7
 EBUILD icedtea-bin-6.1.10.4.ebuild 3368 RMD160 acc798ba0953a2b4d70e0a98e27159f74b790066 SHA1 3f64a761ce05e3436968c4052c98eb02ae23f728 SHA256 7dd01f54b45c94fc6a44538fa1e5dfe970f6b347997ea3e6c824345d53f5badb
-EBUILD icedtea-bin-7.2.0-r1.ebuild 2801 RMD160 c8b16c1474f8c159ae1503423ec42ab8b862b7bc SHA1 03a97c8f686ee403640b03f07c16bff87e59f23c SHA256 28934114c7009d1ca72bc3e1e143ea466d77aadc8bbf28781ea77fcd39fb108c
-MISC ChangeLog 13359 RMD160 cdae035ac1336d64abbf0fa141fbdf728990cfc5 SHA1 3811d9f24d8005799f2b99550333f05822c94284 SHA256 e53e03274a22a5abb1de1566bafc2007134492e46c7eb736b354baeaf0d8bc16
+EBUILD icedtea-bin-7.2.0-r1.ebuild 2836 RMD160 aebb8d337cf25176358dcbfa945f2daa63200aa7 SHA1 46e86e2ab640b64733ad19549b3fcc2ec9c5a102 SHA256 900a8387e511f674347c7efeb5e64e848abf4072a16df6f957151696370c892c
+MISC ChangeLog 13508 RMD160 d6eba8d9d3fe4fcdfa127661e05d8f901bdbe901 SHA1 a1916804e49149981e0a18a420c5c695437cb0a4 SHA256 213a64570d3e4d9bd2e2fc3889eafd6c723fb7b472fff41dc24a81f6597d63d6
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb

diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
index b3d77a6d43fb91aab07d74d119f40bc6fdda35e5..51d549b8057c1cbce8b2306f7ed7fe2b1812be90 100644 (file)
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild,v 1.1 2011/11/15 09:21:36 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.0-r1.ebuild,v 1.2 2011/11/18 20:27:58 caster Exp $
 
 EAPI="4"
 
@@ -34,26 +34,26 @@ RDEPEND=">=sys-devel/gcc-4.3
        >=sys-libs/glibc-2.11.2
        >=media-libs/giflib-4.1.6-r1
        virtual/jpeg
+       media-libs/lcms:2
        >=media-libs/libpng-1.5
        >=sys-libs/zlib-1.2.3-r1
        "
 PDEPEND="
        alsa? ( >=media-libs/alsa-lib-1.0.20 )
        X? (
-               >=media-libs/freetype-2.3.9:2
+               >=dev-libs/atk-1.30.0
+               >=dev-libs/glib-2.20.5:2
                >=media-libs/fontconfig-2.6.0-r2:1.0
+               >=media-libs/freetype-2.3.9:2
+               >=net-print/cups-1.4
+               >=x11-libs/cairo-1.8.8
+               x11-libs/gdk-pixbuf:2
+               >=x11-libs/gtk+-2.20.1:2
                >=x11-libs/libXext-1.1
                >=x11-libs/libXi-1.3
+               x11-libs/libXrender
                >=x11-libs/libXtst-1.1
                >=x11-libs/libX11-1.3
-               x11-libs/libXt
-       )
-       nsplugin? (
-               >=dev-libs/atk-1.30.0
-               >=dev-libs/glib-2.20.5:2
-               >=dev-libs/nspr-4.8
-               >=x11-libs/cairo-1.8.8
-               >=x11-libs/gtk+-2.20.1:2
                >=x11-libs/pango-1.24.5
        )"
 DEPEND=""