fix macros, bug #132339

Package-Manager: portage-2.1_pre10-r2

3 files changed, 28 insertions, 120 deletions

diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 1ee11ba055e3..f83125a51ec0 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -26,13 +26,12 @@ AUX epiphany-2.14.1-as-needed.patch 883 RMD160 0cf6604205f6a2237c3f894b5d36b4be6
 MD5 535d3916ce512a2952ebc5998491a35a files/epiphany-2.14.1-as-needed.patch 883
 RMD160 0cf6604205f6a2237c3f894b5d36b4be684c82b6 files/epiphany-2.14.1-as-needed.patch 883
 SHA256 c7a4bc19998c7f0dedd1d732e9d1e553961c6018e2c20200ad77968987d10738 files/epiphany-2.14.1-as-needed.patch 883
-DIST epiphany-1.6.0.tar.bz2 2983514 size 2983514
-DIST epiphany-1.6.3.tar.bz2 3021173 size 3021173
+DIST epiphany-1.6.0.tar.bz2 2983514 RMD160 2b8670023b5a8f2c20c03ee3c69a5b3cbbd35b35 SHA256 465f7cffb494e71f5dfd31233cef86c09413b878765f6607f1fb64a49793120b size 2983514
+DIST epiphany-1.6.3.tar.bz2 3021173 RMD160 fce6c356abe8aeb923ea974b4b959af6a9e47d4f SHA256 b0d432501523069196d5716be8750267098928702d9eca5ae7a5649d54b51367 size 3021173
 DIST epiphany-1.6.4.tar.bz2 3036153 size 3036153
-DIST epiphany-1.8.2.tar.bz2 3354620 size 3354620
-DIST epiphany-1.8.3.tar.bz2 3355417 size 3355417
-DIST epiphany-1.8.4.1.tar.bz2 3360178 size 3360178
-DIST epiphany-2.14.0.tar.bz2 3560639 RMD160 01dc22da1fc66eb00b28ebdc436e9b1438472623 SHA256 ace2f95ccf7fe4dccf7dc96a46ef3ddc2a30c4eedf8641f2e9fef603a9841595 size 3560639
+DIST epiphany-1.8.2.tar.bz2 3354620 RMD160 8fcc70a936a55ac33ef716f83b12ff6609110042 SHA256 b254c631a4949031d60a039f6d5b385a1ee3330f975eef827b7af5adfbeef13b size 3354620
+DIST epiphany-1.8.3.tar.bz2 3355417 RMD160 f1086c551632ece29f056fad9a409f0e903c6aee SHA256 3f5b5f750ba05f8baa44b598d732a94b105dde2c42bd110c1d98ddfca41b8ab5 size 3355417
+DIST epiphany-1.8.4.1.tar.bz2 3360178 RMD160 de5e4f6bfed1269300145c015fea34b03238a771 SHA256 ccdcfddbd0dfaa5eeca57e868c3b77c90369bb1126eaa0175efeee823e67f112 size 3360178
 DIST epiphany-2.14.1.tar.bz2 3520979 RMD160 bb755beacab63470381daf32b9d25cf74886e80e SHA256 4eb5f8f8dacc81f47c54e3a579af3059cca3a7fa59d6cc270ed5b50d0b6a37a2 size 3520979
 EBUILD epiphany-1.6.0-r3.ebuild 1539 RMD160 7e1d0d366702dbe9efb6f732c64b5d35e9e9cd61 SHA1 c4c7ed5e8d902fd10a64c7c5cd580a1d1abca325 SHA256 336e83e2fe1e9dc7c79f4aaeb5380da5120bba74b713351a6bbed2c696df17ae size 1539
 MD5 5ef08e685400da84661b9f037d81a668 epiphany-1.6.0-r3.ebuild 1539
@@ -58,43 +57,36 @@ EBUILD epiphany-1.8.4.1.ebuild 1817 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e
 MD5 8a9d604bd0df162154fc85372470052c epiphany-1.8.4.1.ebuild 1817
 RMD160 983f69a2ee756c8f0e82d7643337cb2da851e43b epiphany-1.8.4.1.ebuild 1817
 SHA256 df7e9556413855c1f6ce1fe87668e9a22523311195b0ac85c509da5559ad9996 epiphany-1.8.4.1.ebuild 1817
-EBUILD epiphany-2.14.0.ebuild 2207 RMD160 9ca0ad946f822be03acca1e234aa42e254692505 SHA1 3526eb469de576bcb2c7847dfcc9fb3849afdd7a SHA256 4d00d143d180aee5f52244ec661b62a8372c5011eaa7529243b8313e23cefd98 size 2207
-MD5 9cf03c76a426def51b1c873639d78017 epiphany-2.14.0.ebuild 2207
-RMD160 9ca0ad946f822be03acca1e234aa42e254692505 epiphany-2.14.0.ebuild 2207
-SHA256 4d00d143d180aee5f52244ec661b62a8372c5011eaa7529243b8313e23cefd98 epiphany-2.14.0.ebuild 2207
-EBUILD epiphany-2.14.1.ebuild 2353 RMD160 a47009a728a999311757dd0f8d1101981015355f SHA1 a15ee066cbde61244f98dcb2e4eb2ff8893e7a16 SHA256 9e58e4e77f8431a79f5f6ddc72600e042a9853fa5259428d8302db268f62b913 size 2353
-MD5 302225b1caba6f52619888c4ac95ea93 epiphany-2.14.1.ebuild 2353
-RMD160 a47009a728a999311757dd0f8d1101981015355f epiphany-2.14.1.ebuild 2353
-SHA256 9e58e4e77f8431a79f5f6ddc72600e042a9853fa5259428d8302db268f62b913 epiphany-2.14.1.ebuild 2353
-MISC ChangeLog 21038 RMD160 eb3ff22eee335855b23e60cf5c3ce91712b36ec6 SHA1 87dc28fa2af2722b38bdc9e0233fe35114fb8833 SHA256 0547ccd2ce8280f0932b55eaa0171412e5d4211ca7fd462786ccc48baad9f828 size 21038
-MD5 e9b83704442759d8518836b2380d0dcb ChangeLog 21038
-RMD160 eb3ff22eee335855b23e60cf5c3ce91712b36ec6 ChangeLog 21038
-SHA256 0547ccd2ce8280f0932b55eaa0171412e5d4211ca7fd462786ccc48baad9f828 ChangeLog 21038
+EBUILD epiphany-2.14.1.ebuild 2373 RMD160 68da7bc44a282732d60fb7cf7f44a77ad51eee3b SHA1 73d125fcf57a85aadbac43347a149bb9eb6e5a28 SHA256 b82f44745e78d5a824e9ff51ce09491f6e521ce22b6380bb325497b9e3f62c0e size 2373
+MD5 b6980b61879ba8c28a3d52f37407229e epiphany-2.14.1.ebuild 2373
+RMD160 68da7bc44a282732d60fb7cf7f44a77ad51eee3b epiphany-2.14.1.ebuild 2373
+SHA256 b82f44745e78d5a824e9ff51ce09491f6e521ce22b6380bb325497b9e3f62c0e epiphany-2.14.1.ebuild 2373
+MISC ChangeLog 21152 RMD160 5736f771b1b476e445234e805178455e1d499eb8 SHA1 01894145537a030ac9937bb420fe16a227863f21 SHA256 f37f9272569f35f9a8cd1bf46a4e0f9aea810330544a8ed278a2077825b48cd9 size 21152
+MD5 b5b0c7171a39c8acfdec2624d793b37d ChangeLog 21152
+RMD160 5736f771b1b476e445234e805178455e1d499eb8 ChangeLog 21152
+SHA256 f37f9272569f35f9a8cd1bf46a4e0f9aea810330544a8ed278a2077825b48cd9 ChangeLog 21152
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 6d49238d1100396b965c157b89c7038f files/digest-epiphany-1.6.0-r3 68
-RMD160 b99d47ca61cd962c2383dfede7efd7f52109cc32 files/digest-epiphany-1.6.0-r3 68
-SHA256 5e13dc8f1db669a0d78ad9d055b21f2fae62a264333cd729185bbb8a6be8256d files/digest-epiphany-1.6.0-r3 68
-MD5 eb83ab75c0e81a4aff0d93a8d8a4e338 files/digest-epiphany-1.6.3 68
-RMD160 a3c77718a26cbe30cce3c5a937a1a8281f1183f8 files/digest-epiphany-1.6.3 68
-SHA256 63423e9fcbd26699356322230a9457e72bf75e9fe474568c5965deffc4c86c12 files/digest-epiphany-1.6.3 68
+MD5 d3550788ad5f55a1c88826e120a4065c files/digest-epiphany-1.6.0-r3 250
+RMD160 80c707fadbed523ec438e1aca9e7cab310ca544f files/digest-epiphany-1.6.0-r3 250
+SHA256 450ab114c51b1ff75be09a162244b0c43ffdb701567081a1241e744294dfcc65 files/digest-epiphany-1.6.0-r3 250
+MD5 bf3c2df87a36c6f75c8a7d787a04a86e files/digest-epiphany-1.6.3 250
+RMD160 753f216451981ee6dccdd0b7e5b9bb52111e965a files/digest-epiphany-1.6.3 250
+SHA256 87046078d64dc3913bd6f70f9c779142782f68df1b587f9639b62516a0db34df files/digest-epiphany-1.6.3 250
 MD5 f5e29a6e660b776ab387ee60f32007da files/digest-epiphany-1.6.4 68
 RMD160 1d9fdbfd683a39e55eb6fd216ce9657e14dcb5b7 files/digest-epiphany-1.6.4 68
 SHA256 c3229eb1243786ad9c48120f8f65309219b216fa3080b901d8fd552c0b6fe8b8 files/digest-epiphany-1.6.4 68
-MD5 5fb4e1fd4c18f309c424c308686d9c43 files/digest-epiphany-1.8.2 68
-RMD160 f78f4ff5da5be3a1ac918d323237adac500ef0bb files/digest-epiphany-1.8.2 68
-SHA256 7f4a3b3ce79e0afce3474f322918248bbf113bac1fe4d870633a50a80d6a0d80 files/digest-epiphany-1.8.2 68
-MD5 b9000905bbd3607934a5c5d04600cd21 files/digest-epiphany-1.8.3 68
-RMD160 e22fc3db18313953ed90805ab7def2ce889aa86f files/digest-epiphany-1.8.3 68
-SHA256 eaa5a10e1393daf4e3b493e8cee3ac3dd548c5dbbfe0008f7ffa2fba02201ecc files/digest-epiphany-1.8.3 68
-MD5 c86f47f01ba1ef8c439c7cfbd112a5e2 files/digest-epiphany-1.8.4.1 70
-RMD160 7e5e2a962de86e1c6dd4f6cb9d8ec6efdd97c86c files/digest-epiphany-1.8.4.1 70
-SHA256 1a17411b686a6c4c7c16d384fb5cbc988780bc25cf06f4a86cd6efb12c87f617 files/digest-epiphany-1.8.4.1 70
-MD5 6f420997e981654cd613894986a66c3f files/digest-epiphany-2.14.0 253
-RMD160 639372d724f65a5dd5c1ed529b16395b504d918e files/digest-epiphany-2.14.0 253
-SHA256 2c674567f47ec90c91b465c0008be2f8491b06d27e5482611e54016769654ede files/digest-epiphany-2.14.0 253
+MD5 2e9c2790594b0a532a7b53cb8c4c33d4 files/digest-epiphany-1.8.2 250
+RMD160 941e2fc62e9df75981f45cdc09e7b09120589e41 files/digest-epiphany-1.8.2 250
+SHA256 11ad77afbc4d43742b9e519a169da4ecadf73be32c7c63bed4aa3b0e6ec47b18 files/digest-epiphany-1.8.2 250
+MD5 87de5c6695ecc1626278f3a8dafb0acb files/digest-epiphany-1.8.3 250
+RMD160 d0eb6f54a61804575b9d0e5106a44a1f739d34ad files/digest-epiphany-1.8.3 250
+SHA256 3194daec5c4e995c4ef229b7843caae8a2914024a56ac8cc6ba501e0b16ba527 files/digest-epiphany-1.8.3 250
+MD5 c1c5c058f46fd7d3f0993a3799bf6883 files/digest-epiphany-1.8.4.1 256
+RMD160 b45f694013b20ef2e4e632eb5b6e0b01cefdace7 files/digest-epiphany-1.8.4.1 256
+SHA256 fc4db14b7380baa26e2ac416baa0a6c00a52f44f0285387c798331ab3017fec5 files/digest-epiphany-1.8.4.1 256
 MD5 6d783a7edc5fa85710893a6d992bf897 files/digest-epiphany-2.14.1 253
 RMD160 5ab6497c2b5870e7c841ec707004eaa7e0a20412 files/digest-epiphany-2.14.1 253
 SHA256 bc07fba6c17f10159930aaa2f91c8d34231f477de1a3c6ddb4f8931c7c159a72 files/digest-epiphany-2.14.1 253
diff --git a/www-client/epiphany/epiphany-2.14.0.ebuild b/www-client/epiphany/epiphany-2.14.0.ebuild
deleted file mode 100644
index 499d0aa23147..000000000000
--- a/www-client/epiphany/epiphany-2.14.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.0.ebuild,v 1.2 2006/03/13 09:28:03 joem Exp $
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="GNOME webbrowser based on the mozilla rendering engine"
-HOMEPAGE="http://www.gnome.org/projects/epiphany/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="dbus doc firefox python"
-
-# Note that there is no libgnomeprint dep, while it is 
-# specified in configure.in . This could in some rare
-# situations break portage dep resolution.
-#
-# Marinus <foser@gentoo.org> 14-9-2005
-
-RDEPEND=">=dev-libs/glib-2.8
-	>=x11-libs/gtk+-2.8.3
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.7
-	>=gnome-base/libglade-2.3.1
-	>=gnome-base/gnome-vfs-2.9.2
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-desktop-2.9.91
-	>=x11-libs/startup-notification-0.5
-	>=gnome-base/libgnomeprintui-2.4
-	>=gnome-base/libbonobo-2
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2
-	>=app-text/iso-codes-0.35
-	!firefox? ( >=www-client/mozilla-1.7.9 )
-	firefox? ( >=www-client/mozilla-firefox-1.0.5 )
-	dbus? ( >=sys-apps/dbus-0.35 )
-	python? (
-		>=dev-lang/python-2.3
-		>=dev-python/pygtk-2.7.1
-		>=dev-python/gnome-python-2.6 )
-	x11-themes/gnome-icon-theme"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.29
-	app-text/gnome-doc-utils
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-USE_DESTDIR="1"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper \
-		$(use_enable dbus) \
-		$(use_enable python)"
-
-	if use firefox; then
-		G2CONF="${G2CONF} --with-mozilla=firefox"
-	else
-		G2CONF="${G2CONF} --with-mozilla=mozilla"
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
-}
-
-src_compile() {
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/xpti.dat
-	addpredict /usr/$(get_libdir)/mozilla-firefox/components/compreg.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat.tmp
-	addpredict /usr/$(get_libdir)/mozilla/components/xpti.dat
-	gnome2_src_compile
-}
diff --git a/www-client/epiphany/files/digest-epiphany-2.14.0 b/www-client/epiphany/files/digest-epiphany-2.14.0
deleted file mode 100644
index c163b2f5d3a1..000000000000
--- a/www-client/epiphany/files/digest-epiphany-2.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a4b91205aa610e4b3f11bfdd86aad12 epiphany-2.14.0.tar.bz2 3560639
-RMD160 01dc22da1fc66eb00b28ebdc436e9b1438472623 epiphany-2.14.0.tar.bz2 3560639
-SHA256 ace2f95ccf7fe4dccf7dc96a46ef3ddc2a30c4eedf8641f2e9fef603a9841595 epiphany-2.14.0.tar.bz2 3560639