Fix doc path not to use /usr/local (bug #188034)

Package-Manager: portage-2.1.3.2

4 files changed, 26 insertions, 17 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 561d08811fb1..6318c9fd816a 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.82 2007/08/04 17:04:55 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.83 2007/08/08 17:40:59 lavajoe Exp $
+
+*xv-3.10a-r14 (08 Aug 2007)
+
+  08 Aug 2007; Joe Peterson <lavajoe@gentoo.org> -xv-3.10a-r13.ebuild,
+  +xv-3.10a-r14.ebuild:
+  Fix doc path not to use /usr/local (bug #188034)
 
 *xv-3.10a-r13 (04 Aug 2007)
 
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 6eff20525126..6060661a764a 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -73,14 +73,14 @@ EBUILD xv-3.10a-r12.ebuild 2393 RMD160 f71a12127e17b1b15051c3acc44bfed8f52a2a29
 MD5 bda7349f72dfb91a0db913ef2b50854a xv-3.10a-r12.ebuild 2393
 RMD160 f71a12127e17b1b15051c3acc44bfed8f52a2a29 xv-3.10a-r12.ebuild 2393
 SHA256 06f72d0ce40dae4c9b5d67a9d5d2d50abd9ac40641ebf02f764f59866e7d9cdc xv-3.10a-r12.ebuild 2393
-EBUILD xv-3.10a-r13.ebuild 2345 RMD160 a713582958fd3617a985675840d517d07f9f2f17 SHA1 c4eb85fa0f83c9aa2183f9f83576ddf6fd276923 SHA256 aae35fb1d8c2c5a5000e610190ba0ebd5b63be463443d53d2c80dc17a32f68ef
-MD5 fac69ff63ac6cbb73cb952c3394c5592 xv-3.10a-r13.ebuild 2345
-RMD160 a713582958fd3617a985675840d517d07f9f2f17 xv-3.10a-r13.ebuild 2345
-SHA256 aae35fb1d8c2c5a5000e610190ba0ebd5b63be463443d53d2c80dc17a32f68ef xv-3.10a-r13.ebuild 2345
-MISC ChangeLog 12302 RMD160 19e6c5980eda25bd4996fc41d2b1bbfe70d6c923 SHA1 b7ac5895c129e2ebd6a47df7da817d7acf583eb1 SHA256 1ebc30fa0dd145b2df8b54f5ae22baac0d5a9ced6a48f3a6e3f214625f4bfd7d
-MD5 60dbdc5b62af86704c63021977d64c26 ChangeLog 12302
-RMD160 19e6c5980eda25bd4996fc41d2b1bbfe70d6c923 ChangeLog 12302
-SHA256 1ebc30fa0dd145b2df8b54f5ae22baac0d5a9ced6a48f3a6e3f214625f4bfd7d ChangeLog 12302
+EBUILD xv-3.10a-r14.ebuild 2366 RMD160 e0e49c72af3318c09791417c90c7fb020ab66e93 SHA1 b529f61a76af3a5ad92c56ba8032f58983951ee4 SHA256 4578b7e66f01466cd847756f3da5ca6a469613b9de61b534c9799726c54c6c6f
+MD5 08d76706cf200e6445768a9751197eef xv-3.10a-r14.ebuild 2366
+RMD160 e0e49c72af3318c09791417c90c7fb020ab66e93 xv-3.10a-r14.ebuild 2366
+SHA256 4578b7e66f01466cd847756f3da5ca6a469613b9de61b534c9799726c54c6c6f xv-3.10a-r14.ebuild 2366
+MISC ChangeLog 12478 RMD160 85fe950aa96cbc3086145e2ee3ced82fcae457c3 SHA1 f3c44ba143cd524bf5dd7ff3cbb89faee27f53b9 SHA256 bc6d363b0946d3fbcf620450b8e0f863406b81368e6abb519e4febf9e13e290c
+MD5 0fbece14b06853dd67f6248fc4cb2be8 ChangeLog 12478
+RMD160 85fe950aa96cbc3086145e2ee3ced82fcae457c3 ChangeLog 12478
+SHA256 bc6d363b0946d3fbcf620450b8e0f863406b81368e6abb519e4febf9e13e290c ChangeLog 12478
 MISC metadata.xml 223 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 SHA1 7904e6fb45104baf2cb67fb9886c633af4dc7056 SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055
 MD5 0ef201e70a5c0d73d25e83aa0cb8ec4c metadata.xml 223
 RMD160 0c9c59654305e8789fe6c93fd07c561cfe003f54 metadata.xml 223
@@ -88,6 +88,6 @@ SHA256 a24b49fe5448d4cb329acf1d8113ac30eb1d61d63a7319b66c077d3f1775d055 metadata
 MD5 22b359f8cd8c30228eb3630a7a31f072 files/digest-xv-3.10a-r12 527
 RMD160 0b59ab4dd14d47744c399c8a941a1ede5752f694 files/digest-xv-3.10a-r12 527
 SHA256 b48cc4e77866f978f3a2811c420f0611403c7724cf24f4762d614f90905e9cdf files/digest-xv-3.10a-r12 527
-MD5 75c136bec3d91d23e0849d38f2650d08 files/digest-xv-3.10a-r13 527
-RMD160 de6546e6de8b879938079f3461dedceaa790f568 files/digest-xv-3.10a-r13 527
-SHA256 61fe17fa60ef6ea3dca3af5b8c5186266ddbf015cce336a5d36061f592ee02b8 files/digest-xv-3.10a-r13 527
+MD5 75c136bec3d91d23e0849d38f2650d08 files/digest-xv-3.10a-r14 527
+RMD160 de6546e6de8b879938079f3461dedceaa790f568 files/digest-xv-3.10a-r14 527
+SHA256 61fe17fa60ef6ea3dca3af5b8c5186266ddbf015cce336a5d36061f592ee02b8 files/digest-xv-3.10a-r14 527
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r13 b/media-gfx/xv/files/digest-xv-3.10a-r14
index 2694f385921d..2694f385921d 100644
--- a/media-gfx/xv/files/digest-xv-3.10a-r13
+++ b/media-gfx/xv/files/digest-xv-3.10a-r14
diff --git a/media-gfx/xv/xv-3.10a-r13.ebuild b/media-gfx/xv/xv-3.10a-r14.ebuild
index 255d5266ab20..d077eb8fba6e 100644
--- a/media-gfx/xv/xv-3.10a-r13.ebuild
+++ b/media-gfx/xv/xv-3.10a-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r13.ebuild,v 1.2 2007/08/04 17:37:40 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r14.ebuild,v 1.1 2007/08/08 17:40:59 lavajoe Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -72,7 +72,10 @@ src_compile() {
 	fi
 	einfo "done."
 
-	emake CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+	emake	CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+			PREFIX=/usr \
+			DOCDIR=/usr/share/doc/${P} \
+			LIBDIR=${T} || die
 }
 
 src_install() {
@@ -80,9 +83,9 @@ src_install() {
 	dodir /usr/share/man/man1
 
 	emake	DESTDIR=${D} \
-			BINDIR=/usr/bin \
-			MANDIR=/usr/share/man/man1 \
+			PREFIX=/usr \
+			DOCDIR=/usr/share/doc/${PF} \
 			LIBDIR=${T} install || die
 
-	dodoc README{,.jumbo,.pcd} CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
+	dodoc CHANGELOG BUGS IDEAS
 }