Stable on x86.

(Portage version: 2.0.51.22-r1)

5 files changed, 33 insertions, 16 deletions

diff --git a/dev-libs/dvenv/ChangeLog b/dev-libs/dvenv/ChangeLog
index 8517421be655..12c52954344c 100644
--- a/dev-libs/dvenv/ChangeLog
+++ b/dev-libs/dvenv/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-libs/dvenv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvenv/ChangeLog,v 1.8 2005/05/13 11:44:52 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvenv/ChangeLog,v 1.9 2005/07/04 12:36:46 ka0ttic Exp $
+
+  04 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dvenv-0.2.2-fix-underquoted-m4.diff, -dvenv-0.2.2-r1.ebuild,
+  +dvenv-0.2.2-r2.ebuild:
+  Stable on x86.
+
+*dvenv-0.2.2-r2 (20 May 2005)
+
+  20 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dvenv-0.2.2-fix-underquoted-m4.diff, -dvenv-0.2.2-r1.ebuild,
+  +dvenv-0.2.2-r2.ebuild:
+  Revision bump; added patch to fix underquoted m4 defs.
 
   13 May 2005; Aaron Walker <ka0ttic@gentoo.org>
   +files/dvenv-0.2.2-virtual-dtors.diff, dvenv-0.2.2-r1.ebuild:
diff --git a/dev-libs/dvenv/Manifest b/dev-libs/dvenv/Manifest
index 1e6a3a0dbb72..d8679b750691 100644
--- a/dev-libs/dvenv/Manifest
+++ b/dev-libs/dvenv/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 90d5b27f5bdf0c609345c61a0ca41612 dvenv-0.2.2.ebuild 693
-MD5 a6bf1a885f7d61164d522d96bb323b79 ChangeLog 1117
+MD5 eed7e835afad57ccb0dcd7940ce03189 dvenv-0.2.2-r2.ebuild 949
+MD5 dc4b943e89c28fe631fcedaffbb4c5bb ChangeLog 1514
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 f26d7d1c9b73e309e025f1157b9beab5 dvenv-0.2.2-r1.ebuild 899
-MD5 c42cc75097a337cb937538324a491c7f files/digest-dvenv-0.2.2-r1 63
+MD5 c42cc75097a337cb937538324a491c7f files/digest-dvenv-0.2.2-r2 63
 MD5 f23f466dd46b56d2296211125dbde567 files/dvenv-0.2.2-virtual-dtors.diff 1167
 MD5 c42cc75097a337cb937538324a491c7f files/digest-dvenv-0.2.2 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFChJOCEZCkKN40op4RAs+8AJ4oRCdIFRxd22UAu/xLGShZ03pZjACghJm7
-mN+u7j8Hch0gcXEG5U5jKoc=
-=j7CW
------END PGP SIGNATURE-----
+MD5 5de48606ea67549a654be86ada156870 files/dvenv-0.2.2-fix-underquoted-m4.diff 498
diff --git a/dev-libs/dvenv/dvenv-0.2.2-r1.ebuild b/dev-libs/dvenv/dvenv-0.2.2-r2.ebuild
index 4c7a0669966e..fd39a1802297 100644
--- a/dev-libs/dvenv/dvenv-0.2.2-r1.ebuild
+++ b/dev-libs/dvenv/dvenv-0.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvenv/dvenv-0.2.2-r1.ebuild,v 1.2 2005/05/13 11:44:52 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvenv/dvenv-0.2.2-r2.ebuild,v 1.1 2005/07/04 12:36:46 ka0ttic Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvenv/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 IUSE="doc"
 
 DEPEND="dev-libs/dvutil"
@@ -18,7 +18,10 @@ DEPEND="dev-libs/dvutil"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+
 	epatch ${FILESDIR}/${P}-virtual-dtors.diff
+	epatch ${FILESDIR}/${P}-fix-underquoted-m4.diff
+
 	sed -i 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' Makefile.in || \
 		die "sed Makefile.in failed"
 }
diff --git a/dev-libs/dvenv/files/digest-dvenv-0.2.2-r1 b/dev-libs/dvenv/files/digest-dvenv-0.2.2-r2
index d7d564081fde..d7d564081fde 100644
--- a/dev-libs/dvenv/files/digest-dvenv-0.2.2-r1
+++ b/dev-libs/dvenv/files/digest-dvenv-0.2.2-r2
diff --git a/dev-libs/dvenv/files/dvenv-0.2.2-fix-underquoted-m4.diff b/dev-libs/dvenv/files/dvenv-0.2.2-fix-underquoted-m4.diff
new file mode 100644
index 000000000000..080d8147311d
--- /dev/null
+++ b/dev-libs/dvenv/files/dvenv-0.2.2-fix-underquoted-m4.diff
@@ -0,0 +1,11 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN dvenv-0.2.2.orig/m4/dvenv.m4.in dvenv-0.2.2/m4/dvenv.m4.in
+--- dvenv-0.2.2.orig/m4/dvenv.m4.in	2005-05-20 04:15:08.000000000 -0400
++++ dvenv-0.2.2/m4/dvenv.m4.in	2005-05-20 04:15:26.000000000 -0400
+@@ -1,6 +1,6 @@
+ dnl @PACKAGE@-@VERSION@ autoconf macros
+ 
+-AC_DEFUN(DV_REQUIRE_DVENV,
++AC_DEFUN([DV_REQUIRE_DVENV],
+ [
+ DV_REQUIRE_LTLIB([dvenv/env.h],[Dv::Util::Env env;],dvenv,
+   [${prefix}/lib /usr/local/lib /usr/lib ${ac_default_prefix}/lib ],