Revision bump; added patch to fix underquoted m4 defs.

Package-Manager: portage-2.0.51.22-r1

10 files changed, 67 insertions, 31 deletions

diff --git a/dev-libs/dvutil/ChangeLog b/dev-libs/dvutil/ChangeLog
index a7789f27047e..85ecf2244ec0 100644
--- a/dev-libs/dvutil/ChangeLog
+++ b/dev-libs/dvutil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dvutil
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.17 2005/05/07 15:16:23 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/ChangeLog,v 1.18 2005/05/20 12:57:46 ka0ttic Exp $
+
+*dvutil-0.13.15-r2 (20 May 2005)
+
+  20 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dvutil-0.13.15-fix-underquoted-m4.diff, -dvutil-0.13.15-r1.ebuild,
+  +dvutil-0.13.15-r2.ebuild:
+  Revision bump; added patch to fix underquoted m4 defs.
 
 *dvutil-0.13.15-r1 (07 May 2005)
 
diff --git a/dev-libs/dvutil/Manifest b/dev-libs/dvutil/Manifest
index 843757a3e68a..ca6f89c76ac4 100644
--- a/dev-libs/dvutil/Manifest
+++ b/dev-libs/dvutil/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5fd0fb969fe181169f3bacc8ea0238ec dvutil-0.13.13.ebuild 874
 MD5 36f32cf88135aa428b40685b955c8c3a dvutil-0.13.15.ebuild 748
-MD5 5cc601addede571a591fb39d7cb334bf dvutil-0.13.15-r1.ebuild 926
-MD5 efeadee290709d109369a4ab81d1755c ChangeLog 2860
+MD5 2c2eb43555a380b2c05d4eeedd277076 ChangeLog 3106
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 6ff89e398e2f94f517a945a5b4962a69 dvutil-0.13.15-r2.ebuild 995
 MD5 c811d8de8b8fdf0d0524c1e57e637129 files/digest-dvutil-0.13.13 66
 MD5 b9c081ae2386a2b75bf1b5835364233b files/digest-dvutil-0.13.15 66
-MD5 b9c081ae2386a2b75bf1b5835364233b files/digest-dvutil-0.13.15-r1 66
+MD5 b9c081ae2386a2b75bf1b5835364233b files/digest-dvutil-0.13.15-r2 66
 MD5 75609f1d5318b7d0a9e375ddbca118b3 files/0.13.13-gentoo-doc_distdir.patch 455
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfNveEZCkKN40op4RAudFAJ4zdBLDytF/yOw/wscJQhQDz8LIDQCeP9fg
-RGgCz7O+iuR/rf2G2pZHkz8=
-=POkL
------END PGP SIGNATURE-----
+MD5 fe20149f0cdfcf848443da51c71bb4f0 files/dvutil-0.13.15-fix-underquoted-m4.diff 599
diff --git a/dev-libs/dvutil/dvutil-0.13.15-r1.ebuild b/dev-libs/dvutil/dvutil-0.13.15-r2.ebuild
index 6678dc544472..e4067e0662ab 100644
--- a/dev-libs/dvutil/dvutil-0.13.15-r1.ebuild
+++ b/dev-libs/dvutil/dvutil-0.13.15-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-0.13.15-r1.ebuild,v 1.1 2005/05/07 15:16:23 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvutil/dvutil-0.13.15-r2.ebuild,v 1.1 2005/05/20 12:57:46 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="dvutil provides some general C++ utility classes for files, directories, dates, property lists, reference counted pointers, number conversion etc. "
 HOMEPAGE="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/html/"
@@ -14,13 +16,15 @@ IUSE="doc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-underquoted-m4.diff
+
 	sed -i 's|^\(SUBDIRS =.*\)doc\(.*\)$|\1\2|' Makefile.in || \
 		die "sed Makefile.in failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS README
+	dodoc AUTHORS ChangeLog NEWS README
 
 	if use doc ; then
 		doman doc/man/*/*.[1-9]
diff --git a/dev-libs/dvutil/files/digest-dvutil-0.13.15-r1 b/dev-libs/dvutil/files/digest-dvutil-0.13.15-r2
index 539caec16fd8..539caec16fd8 100644
--- a/dev-libs/dvutil/files/digest-dvutil-0.13.15-r1
+++ b/dev-libs/dvutil/files/digest-dvutil-0.13.15-r2
diff --git a/dev-libs/dvutil/files/dvutil-0.13.15-fix-underquoted-m4.diff b/dev-libs/dvutil/files/dvutil-0.13.15-fix-underquoted-m4.diff
new file mode 100644
index 000000000000..55a7f03c6732
--- /dev/null
+++ b/dev-libs/dvutil/files/dvutil-0.13.15-fix-underquoted-m4.diff
@@ -0,0 +1,12 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN dvutil-0.13.15.orig/m4/dvutil.m4.in dvutil-0.13.15/m4/dvutil.m4.in
+--- dvutil-0.13.15.orig/m4/dvutil.m4.in	2005-05-20 04:30:45.000000000 -0400
++++ dvutil-0.13.15/m4/dvutil.m4.in	2005-05-20 04:31:06.000000000 -0400
+@@ -1,7 +1,7 @@
+ dnl @PACKAGE@-@VERSION@ autoconf macros
+ 
+ dnl =====================================================================
+-AC_DEFUN(DV_REQUIRE_DVUTIL,
++AC_DEFUN([DV_REQUIRE_DVUTIL],
+ [
+ DV_REQUIRE_LTLIB([dvutil/props.h],[Dv::Util::Props props;],dvutil,
+   [${prefix}/lib /usr/local/lib /usr/lib ${ac_default_prefix}/lib ],
diff --git a/dev-libs/dvxml/ChangeLog b/dev-libs/dvxml/ChangeLog
index 0910b4620c25..1db1910170c9 100644
--- a/dev-libs/dvxml/ChangeLog
+++ b/dev-libs/dvxml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/dvxml
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvxml/ChangeLog,v 1.8 2005/05/13 11:39:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvxml/ChangeLog,v 1.9 2005/05/20 12:58:41 ka0ttic Exp $
+
+*dvxml-0.1.4-r2 (20 May 2005)
+
+  20 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dvxml-0.1.4-fix-underquoted-m4.diff, -dvxml-0.1.4-r1.ebuild,
+  +dvxml-0.1.4-r2.ebuild:
+  Revision bump; added patch to fix underquoted m4 defs.
 
   13 May 2005; Aaron Walker <ka0ttic@gentoo.org>
   -files/dvxml-0.1.4-gentoo.diff, dvxml-0.1.4-r1.ebuild:
diff --git a/dev-libs/dvxml/Manifest b/dev-libs/dvxml/Manifest
index 2c1754883e98..da883afd56a4 100644
--- a/dev-libs/dvxml/Manifest
+++ b/dev-libs/dvxml/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 29f125948cd9d341c4279cade667c63d dvxml-0.1.4-r1.ebuild 837
 MD5 f0f510f85e5d6af82db97f7b77d7c910 dvxml-0.1.4.ebuild 645
-MD5 031dab8edc88dd746cca42982dd60c87 ChangeLog 1035
+MD5 3f4dd5fe362fbef615412c36465f4f11 ChangeLog 1269
 MD5 d4c8b46f106b5227d676a585a0f84063 metadata.xml 255
+MD5 b6f76753f97cc2205c18aa05f387a2d7 dvxml-0.1.4-r2.ebuild 903
+MD5 f9b2c635e2f9b2e91ec2fcf57fee9b70 files/dvxml-0.1.4-fix-underquoted-m4.diff 660
 MD5 5de30c94b365805af6e1acca7587cc8c files/digest-dvxml-0.1.4 63
-MD5 5de30c94b365805af6e1acca7587cc8c files/digest-dvxml-0.1.4-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFChJJdEZCkKN40op4RAiG2AKDFValI0+wN8+YpEmC4V0rQH9kQ1gCfWDDj
-2PDvqLwQ4Jh+e/+LKQiPuo8=
-=qeYx
------END PGP SIGNATURE-----
+MD5 5de30c94b365805af6e1acca7587cc8c files/digest-dvxml-0.1.4-r2 63
diff --git a/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild b/dev-libs/dvxml/dvxml-0.1.4-r2.ebuild
index 0ec9cc05466b..88e02a56916d 100644
--- a/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild
+++ b/dev-libs/dvxml/dvxml-0.1.4-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild,v 1.2 2005/05/13 11:39:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvxml/dvxml-0.1.4-r2.ebuild,v 1.1 2005/05/20 12:58:41 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="dvxml provides some convenient stuff on top of the xmlwrapp package"
 SRC_URI="http://tinf2.vub.ac.be/~dvermeir/software/dv/dvxml/download/dvxml-${PV}.tar.gz"
@@ -17,6 +19,8 @@ DEPEND="dev-libs/dvutil
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	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/dvxml/files/digest-dvxml-0.1.4-r1 b/dev-libs/dvxml/files/digest-dvxml-0.1.4-r2
index 18941371c2f3..18941371c2f3 100644
--- a/dev-libs/dvxml/files/digest-dvxml-0.1.4-r1
+++ b/dev-libs/dvxml/files/digest-dvxml-0.1.4-r2
diff --git a/dev-libs/dvxml/files/dvxml-0.1.4-fix-underquoted-m4.diff b/dev-libs/dvxml/files/dvxml-0.1.4-fix-underquoted-m4.diff
new file mode 100644
index 000000000000..74a7e2216025
--- /dev/null
+++ b/dev-libs/dvxml/files/dvxml-0.1.4-fix-underquoted-m4.diff
@@ -0,0 +1,20 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN dvxml-0.1.4.orig/m4/dvxml.m4.in dvxml-0.1.4/m4/dvxml.m4.in
+--- dvxml-0.1.4.orig/m4/dvxml.m4.in	2005-05-20 04:26:03.000000000 -0400
++++ dvxml-0.1.4/m4/dvxml.m4.in	2005-05-20 04:26:24.000000000 -0400
+@@ -1,6 +1,6 @@
+ dnl @PACKAGE@-@VERSION@ autoconf macros
+ 
+-AC_DEFUN(DV_REQUIRE_XMLWRAPP,
++AC_DEFUN([DV_REQUIRE_XMLWRAPP],
+ [
+ DV_REQUIRE_CFUNC(xmlBufferCat,xml2)
+ DV_APPEND_UNIQ("-lxml2", CXXLTLIBS)
+@@ -13,7 +13,7 @@
+ DV_APPEND_UNIQ("-lxsltwrapp", CXXLTLIBS)
+ ])
+ 
+-AC_DEFUN(DV_REQUIRE_DVXML,
++AC_DEFUN([DV_REQUIRE_DVXML],
+ [
+ DV_REQUIRE_XMLWRAPP
+ DV_REQUIRE_LTLIB([dvxml/xml.h],[Dv::Xml::Document doc;],dvxml,