Remove DESTDIR patch as we sed out doc/ from SUBDIRS anyways.

(Portage version: 2.0.51.21-r1)

4 files changed, 10 insertions, 42 deletions

diff --git a/dev-libs/dvxml/ChangeLog b/dev-libs/dvxml/ChangeLog
index f672eb03024e..0910b4620c25 100644
--- a/dev-libs/dvxml/ChangeLog
+++ b/dev-libs/dvxml/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2005/05/07 14:12:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dvxml/ChangeLog,v 1.8 2005/05/13 11:39:58 ka0ttic Exp $
+
+  13 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/dvxml-0.1.4-gentoo.diff, dvxml-0.1.4-r1.ebuild:
+  Remove DESTDIR patch as we sed out doc/ from SUBDIRS anyways.
 
 *dvxml-0.1.4-r1 (07 May 2005)
 
diff --git a/dev-libs/dvxml/Manifest b/dev-libs/dvxml/Manifest
index 27c6b1fbf74a..0f3f1757ba8a 100644
--- a/dev-libs/dvxml/Manifest
+++ b/dev-libs/dvxml/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a5bdedf30d3bd3b6cbd30464b2183336 dvxml-0.1.4-r1.ebuild 797
+MD5 27002ca98678615ca4717f6756fb363a dvxml-0.1.4-r1.ebuild 837
 MD5 f0f510f85e5d6af82db97f7b77d7c910 dvxml-0.1.4.ebuild 645
-MD5 b43f5b8ec02e889bd0eca87188bbcde5 ChangeLog 864
+MD5 84e7edf4e753be743cd057d336e9b6fd ChangeLog 1035
 MD5 d4c8b46f106b5227d676a585a0f84063 metadata.xml 255
 MD5 5de30c94b365805af6e1acca7587cc8c files/digest-dvxml-0.1.4 63
 MD5 5de30c94b365805af6e1acca7587cc8c files/digest-dvxml-0.1.4-r1 63
-MD5 f9601f327a1b9db4d75fef234343952b files/dvxml-0.1.4-gentoo.diff 1095
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfM0jEZCkKN40op4RAkF2AJ0d4BkwUQOGky2vI5d/LERAhbhyOgCeKfiR
-q+US6Q299fWjFNQGX7v4woY=
-=3zD4
------END PGP SIGNATURE-----
diff --git a/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild b/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild
index 0f237d6c4a2b..0ec9cc05466b 100644
--- a/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild
+++ b/dev-libs/dvxml/dvxml-0.1.4-r1.ebuild
@@ -1,8 +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/dvxml/dvxml-0.1.4-r1.ebuild,v 1.1 2005/05/07 14:12:35 ka0ttic Exp $
-
-inherit eutils
+# $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 $
 
 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"
@@ -19,7 +17,8 @@ DEPEND="dev-libs/dvutil
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	sed -i 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' Makefile.in || \
+		die "sed Makefile.in failed"
 }
 
 src_install() {
diff --git a/dev-libs/dvxml/files/dvxml-0.1.4-gentoo.diff b/dev-libs/dvxml/files/dvxml-0.1.4-gentoo.diff
deleted file mode 100644
index 21e544f94f34..000000000000
--- a/dev-libs/dvxml/files/dvxml-0.1.4-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN dvxml-0.1.4.orig/doc/Makefile.in dvxml-0.1.4/doc/Makefile.in
---- dvxml-0.1.4.orig/doc/Makefile.in	2005-05-07 04:35:42.000000000 -0400
-+++ dvxml-0.1.4/doc/Makefile.in	2005-05-07 04:19:14.000000000 -0400
-@@ -310,7 +310,7 @@
- 	uninstall-info-am uninstall-nobase_dist_pkgdataDATA
- 
- install-exec-local: # ensures this is done before install-data
--	$(mkinstalldirs) $(pkgdatadir)/download
-+	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/download
- 
- ############################################
- # edit -l options of installdox as needed
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN dvxml-0.1.4.orig/Makefile.in dvxml-0.1.4/Makefile.in
---- dvxml-0.1.4.orig/Makefile.in	2005-05-07 04:07:22.000000000 -0400
-+++ dvxml-0.1.4/Makefile.in	2005-05-07 04:39:00.000000000 -0400
-@@ -135,7 +135,7 @@
- xmlwrapp_LIB_DIR = @xmlwrapp_LIB_DIR@
- 
- # $Id: dvxml-0.1.4-gentoo.diff,v 1.1 2005/05/07 14:12:35 ka0ttic Exp $
--SUBDIRS = dvxml m4 doc
-+SUBDIRS = dvxml m4
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs