fix macros, bug #132339

(Portage version: 2.1_pre10-r2)

7 files changed, 18 insertions, 4 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index 9febc08d7c0e..6e9e19f20927 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/epiphany
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.68 2006/05/03 21:42:03 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.69 2006/05/05 13:22:01 allanonjl Exp $
+
+  05 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+  epiphany-2.14.1.ebuild:
+  fix macros, bug #132339
 
   03 May 2006; <dang@gentoo.org> +files/epiphany-2.14.1-as-needed.patch,
   epiphany-2.14.1.ebuild:
diff --git a/www-client/epiphany/epiphany-2.14.1.ebuild b/www-client/epiphany/epiphany-2.14.1.ebuild
index ae85fe5286d1..5d675802f084 100644
--- a/www-client/epiphany/epiphany-2.14.1.ebuild
+++ b/www-client/epiphany/epiphany-2.14.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.3 2006/05/03 21:42:03 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.14.1.ebuild,v 1.4 2006/05/05 13:22:01 allanonjl Exp $
 
 inherit eutils gnome2 multilib autotools
 
@@ -49,7 +49,6 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
-USE_DESTDIR="1"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
@@ -72,7 +71,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.9.2-broken-firefox.patch
 	epatch ${FILESDIR}/${P}-as-needed.patch
 
-	AT_M4DIR="${S}/m4" WANT_AUTOCONF="2.59" \
+	cp aclocal.m4 old_macros.m4
+	AT_M4DIR=". ${S}/m4" WANT_AUTOCONF="2.59" \
 	eautoreconf || die "Failed to reconfigure"
 }
 
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.0-r3 b/www-client/epiphany/files/digest-epiphany-1.6.0-r3
index 3b6ddf3ac56b..576c8356d73c 100644
--- a/www-client/epiphany/files/digest-epiphany-1.6.0-r3
+++ b/www-client/epiphany/files/digest-epiphany-1.6.0-r3
@@ -1 +1,3 @@
 MD5 53eda1c713aec26a51fb806210c8afa7 epiphany-1.6.0.tar.bz2 2983514
+RMD160 2b8670023b5a8f2c20c03ee3c69a5b3cbbd35b35 epiphany-1.6.0.tar.bz2 2983514
+SHA256 465f7cffb494e71f5dfd31233cef86c09413b878765f6607f1fb64a49793120b epiphany-1.6.0.tar.bz2 2983514
diff --git a/www-client/epiphany/files/digest-epiphany-1.6.3 b/www-client/epiphany/files/digest-epiphany-1.6.3
index 7347c490516e..a487dff099e3 100644
--- a/www-client/epiphany/files/digest-epiphany-1.6.3
+++ b/www-client/epiphany/files/digest-epiphany-1.6.3
@@ -1 +1,3 @@
 MD5 dcb0dfd819a04dfaa55e63d10ef51496 epiphany-1.6.3.tar.bz2 3021173
+RMD160 fce6c356abe8aeb923ea974b4b959af6a9e47d4f epiphany-1.6.3.tar.bz2 3021173
+SHA256 b0d432501523069196d5716be8750267098928702d9eca5ae7a5649d54b51367 epiphany-1.6.3.tar.bz2 3021173
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.2 b/www-client/epiphany/files/digest-epiphany-1.8.2
index 011a71f72a41..ef2a1f3203a6 100644
--- a/www-client/epiphany/files/digest-epiphany-1.8.2
+++ b/www-client/epiphany/files/digest-epiphany-1.8.2
@@ -1 +1,3 @@
 MD5 0a2e479816a1b2845c758e7a5d84a848 epiphany-1.8.2.tar.bz2 3354620
+RMD160 8fcc70a936a55ac33ef716f83b12ff6609110042 epiphany-1.8.2.tar.bz2 3354620
+SHA256 b254c631a4949031d60a039f6d5b385a1ee3330f975eef827b7af5adfbeef13b epiphany-1.8.2.tar.bz2 3354620
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.3 b/www-client/epiphany/files/digest-epiphany-1.8.3
index cc095791c51e..c6bab2e6bb15 100644
--- a/www-client/epiphany/files/digest-epiphany-1.8.3
+++ b/www-client/epiphany/files/digest-epiphany-1.8.3
@@ -1 +1,3 @@
 MD5 317e18f1d415a37d3b9934c106edf34a epiphany-1.8.3.tar.bz2 3355417
+RMD160 f1086c551632ece29f056fad9a409f0e903c6aee epiphany-1.8.3.tar.bz2 3355417
+SHA256 3f5b5f750ba05f8baa44b598d732a94b105dde2c42bd110c1d98ddfca41b8ab5 epiphany-1.8.3.tar.bz2 3355417
diff --git a/www-client/epiphany/files/digest-epiphany-1.8.4.1 b/www-client/epiphany/files/digest-epiphany-1.8.4.1
index d2b189b5e814..55b592a8a8d6 100644
--- a/www-client/epiphany/files/digest-epiphany-1.8.4.1
+++ b/www-client/epiphany/files/digest-epiphany-1.8.4.1
@@ -1 +1,3 @@
 MD5 e34870feff1db2c529568a75be7546b0 epiphany-1.8.4.1.tar.bz2 3360178
+RMD160 de5e4f6bfed1269300145c015fea34b03238a771 epiphany-1.8.4.1.tar.bz2 3360178
+SHA256 ccdcfddbd0dfaa5eeca57e868c3b77c90369bb1126eaa0175efeee823e67f112 epiphany-1.8.4.1.tar.bz2 3360178