Fixed wrong installation of xvdocs.ps to /usr/lib

5 files changed, 23 insertions, 12 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 8057f5eddd01..5986b6fb4f5a 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.22 2003/10/28 14:20:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.23 2003/11/05 18:26:30 usata Exp $
+
+  06 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  Changed to LIBDIR=/dev/null. xvdocs.ps was installed to /usr/lib
+  (not a directory, but a file called /usr/lib !) due to absence of
+  /usr/lib (we should dodir before calling make, if it is really
+  necessary in the ebuild), but anyhow we dodoc xvdocs.ps in
+  src_install so we don't need it.
 
 *xv-3.10a-r6 (28 Oct 2003)
 
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index cc4c70878eab..b1c34caa3081 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,10 +1,10 @@
-MD5 ce0b5bdf2ddca601afa0c20a121acc03 ChangeLog 4247
-MD5 3c871824a98bb8c408acb3df593e3349 xv-3.10a-r6.ebuild 1686
-MD5 d9c303faf327f9fd730972e74a3b5d5d xv-3.10a-r3.ebuild 1310
-MD5 cf8171ff6dbfdc4926d5c7aba3f096b6 xv-3.10a-r5.ebuild 1437
-MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r6 61
+MD5 06ecabeba6913565633172a6b8f203d0 ChangeLog 4653
+MD5 fef6fa30fcd85a862ef5af0750d66529 xv-3.10a-r3.ebuild 1368
+MD5 e6feef7d498a7bb3b53fc7b0802ec373 xv-3.10a-r6.ebuild 1744
+MD5 c3f12901b7e6e9a741051ecb65ead809 xv-3.10a-r5.ebuild 1497
 MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r3 125
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
+MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r6 61
 MD5 038271e3c5a7a3e94b5d1f5eb63c9f1e files/xv-3.10a-enhanced-Nu.patch 155050
 MD5 14eb913966c7e03b1014219c2620cac5 files/xv-3.10a-gentoo-Nu.patch 27873
 MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r5 61
diff --git a/media-gfx/xv/xv-3.10a-r3.ebuild b/media-gfx/xv/xv-3.10a-r3.ebuild
index 6561d23c8556..cc26ce52c502 100644
--- a/media-gfx/xv/xv-3.10a-r3.ebuild
+++ b/media-gfx/xv/xv-3.10a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.10 2003/09/28 17:22:11 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.11 2003/11/05 18:26:30 usata Exp $
 
 inherit ccc eutils
 
@@ -39,11 +39,12 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
 
+	# LIBDIR is where xv installs xvdocs.ps and we dodoc it below
 	make \
 		DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
 		MANDIR=${D}/usr/share/man/man1 \
-		LIBDIR=${D}/usr/lib \
+		LIBDIR=/dev/null \
 		install || die
 
 	dodoc README INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
diff --git a/media-gfx/xv/xv-3.10a-r5.ebuild b/media-gfx/xv/xv-3.10a-r5.ebuild
index 92d175ea02d0..b03e569d5758 100644
--- a/media-gfx/xv/xv-3.10a-r5.ebuild
+++ b/media-gfx/xv/xv-3.10a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.6 2003/10/26 08:58:43 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.7 2003/11/05 18:26:30 usata Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -42,11 +42,12 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
 
+	# LIBDIR is where xv installs xvdocs.ps and we dodoc it below
 	make \
 		DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
 		MANDIR=${D}/usr/share/man/man1 \
-		LIBDIR=${D}/usr/lib \
+		LIBDIR=/dev/null \
 		install || die
 
 	dodoc README INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
diff --git a/media-gfx/xv/xv-3.10a-r6.ebuild b/media-gfx/xv/xv-3.10a-r6.ebuild
index c7f6ea5c0f88..8a5df675366f 100644
--- a/media-gfx/xv/xv-3.10a-r6.ebuild
+++ b/media-gfx/xv/xv-3.10a-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r6.ebuild,v 1.1 2003/10/28 14:20:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r6.ebuild,v 1.2 2003/11/05 18:26:30 usata Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -48,11 +48,12 @@ src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
 
+	# LIBDIR is where xv installs xvdocs.ps and we dodoc it below
 	make \
 		DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
 		MANDIR=${D}/usr/share/man/man1 \
-		LIBDIR=${D}/usr/lib \
+		LIBDIR=/dev/null \
 		install || die
 
 	dodoc README INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc