asneeded fix, thanks to Daniel Lin <dtlin@andrew.cmu.edu>, bug #164015

Package-Manager: portage-2.1.2-r5

4 files changed, 41 insertions, 21 deletions

diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index 842e0852aaa1..fd199bfb7138 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/cxfe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.17 2007/01/10 21:29:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.18 2007/01/30 19:18:44 aballier Exp $
+
+  30 Jan 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/cxfe-0.9.1-asneeded.patch, cxfe-0.9.1-r2.ebuild:
+  asneeded fix, thanks to Daniel Lin <dtlin@andrew.cmu.edu>, bug #164015
 
   10 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Add missing email address for herd with name != alias.
diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest
index 8235233f018d..5b132d896a8e 100644
--- a/media-video/cxfe/Manifest
+++ b/media-video/cxfe/Manifest
@@ -9,6 +9,10 @@ AUX black-background.patch 792 RMD160 0f8eb63394ed7434b3376923ae1fb32b1f96b03c S
 MD5 f8e468cea0a41a9ed57857a1bb0436d7 files/black-background.patch 792
 RMD160 0f8eb63394ed7434b3376923ae1fb32b1f96b03c files/black-background.patch 792
 SHA256 70ea78e9a12c780fc96191ed483c0821e3efb4344aee0fd14e357f280435db68 files/black-background.patch 792
+AUX cxfe-0.9.1-asneeded.patch 355 RMD160 94908c094e1703f4b1f9e9abfa2423bd8014fa47 SHA1 b1fccb9a62eb74dd51cb8b7412ebab3766ad06d7 SHA256 1f0cfcdc0f00ff1271352ac87d88bdd5755e58c4fc15000ee1fcffdddc9deadc
+MD5 b68b9da2bfbeceec85fba81ed5f285b0 files/cxfe-0.9.1-asneeded.patch 355
+RMD160 94908c094e1703f4b1f9e9abfa2423bd8014fa47 files/cxfe-0.9.1-asneeded.patch 355
+SHA256 1f0cfcdc0f00ff1271352ac87d88bdd5755e58c4fc15000ee1fcffdddc9deadc files/cxfe-0.9.1-asneeded.patch 355
 AUX disable-dpms.patch 3277 RMD160 a4e7eed212f7d5702fa3932701b4ac588e7fbae0 SHA1 19b73865ae11f96a0a90cd37847a65132d92f970 SHA256 3d65c021edcff4e61bd7d890f57eff098164262726441551b54d4dfaa2b8bea4
 MD5 0d403e10e19e0524e5687b7dcdc710c2 files/disable-dpms.patch 3277
 RMD160 a4e7eed212f7d5702fa3932701b4ac588e7fbae0 files/disable-dpms.patch 3277
@@ -29,19 +33,19 @@ AUX xv-default.patch 650 RMD160 31c8ae131dc680c51f55df6fe7dbc02f80f23720 SHA1 9b
 MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
 RMD160 31c8ae131dc680c51f55df6fe7dbc02f80f23720 files/xv-default.patch 650
 SHA256 e3368f688d44abd5b1991f31045bb63d5792d39301b7edda3770ff23a81a70e9 files/xv-default.patch 650
-DIST cxfe-0.9.1.tar.gz 91650 RMD160 90a34fde9e78fef3e8c922b9ccbb9edf7f0babb1 SHA256 4ed007d799d1e8728b22a874cc1b104af540e1f58ee1facb01a59b55fa956a07
-EBUILD cxfe-0.9.1-r2.ebuild 1145 RMD160 5b8d79bf47c47107402e657441326497b8ffdc37 SHA1 078725dc568c8dfd0b9f262f22d34d4b9f108fd6 SHA256 19013c39ce717e3e4770b6f26937517e90a6633694db2092d78893b03c9a0614
-MD5 bf0252a20f33d07c890f70b377bcfa7f cxfe-0.9.1-r2.ebuild 1145
-RMD160 5b8d79bf47c47107402e657441326497b8ffdc37 cxfe-0.9.1-r2.ebuild 1145
-SHA256 19013c39ce717e3e4770b6f26937517e90a6633694db2092d78893b03c9a0614 cxfe-0.9.1-r2.ebuild 1145
+DIST cxfe-0.9.1.tar.gz 91650 RMD160 90a34fde9e78fef3e8c922b9ccbb9edf7f0babb1 SHA1 d2bd8f239d1b63345cea8efa4d2953ae8f1d6eeb SHA256 4ed007d799d1e8728b22a874cc1b104af540e1f58ee1facb01a59b55fa956a07
+EBUILD cxfe-0.9.1-r2.ebuild 1204 RMD160 1d8a6201e4d81bd5c31a55def79db58d393561ea SHA1 7d337eeb373a387d969261086326a9b822d06dc0 SHA256 e799d6d2c803c1836c64cd38ca5c7d0bb1c780044895ffcc9ccdd6e7ddae4995
+MD5 39f8adbd97a5b09c51f2753dba380d68 cxfe-0.9.1-r2.ebuild 1204
+RMD160 1d8a6201e4d81bd5c31a55def79db58d393561ea cxfe-0.9.1-r2.ebuild 1204
+SHA256 e799d6d2c803c1836c64cd38ca5c7d0bb1c780044895ffcc9ccdd6e7ddae4995 cxfe-0.9.1-r2.ebuild 1204
 EBUILD cxfe-0.9.1.ebuild 916 RMD160 7df25ebdbbfb342c8d461eb29cd31f0128bc1711 SHA1 dcb49dea7137d754c74975081891a046c3e7cc94 SHA256 87115ee3c0a0c6cf1fc3ad0e7eff7421adb0e66fdf2103d5e7cff73008cedcc1
 MD5 104f327de28f79ff523f2772a74a61f2 cxfe-0.9.1.ebuild 916
 RMD160 7df25ebdbbfb342c8d461eb29cd31f0128bc1711 cxfe-0.9.1.ebuild 916
 SHA256 87115ee3c0a0c6cf1fc3ad0e7eff7421adb0e66fdf2103d5e7cff73008cedcc1 cxfe-0.9.1.ebuild 916
-MISC ChangeLog 2646 RMD160 87f383b45fe10f6c768edc15ee45d3d84b8d3d6f SHA1 b65463b7ce5f26da26c909f0c22e968a35a6e58f SHA256 7ba2481920421ff0260ac288f3408d87c895d1a7dd9a22a509e12c51c53733bf
-MD5 f25f716a1d37ac7513496b805efa65fc ChangeLog 2646
-RMD160 87f383b45fe10f6c768edc15ee45d3d84b8d3d6f ChangeLog 2646
-SHA256 7ba2481920421ff0260ac288f3408d87c895d1a7dd9a22a509e12c51c53733bf ChangeLog 2646
+MISC ChangeLog 2829 RMD160 acf59354432935b77a5fe6cde2e0804e8704e0f4 SHA1 ddbc21a8958f16b9b2b602556e0629e2cc3e7fff SHA256 f29675ebea47fcebd805b9ea4f0287fa05de3624690903d11948a9ce766a5b9f
+MD5 d2a5062daf76fb7a9ab1027c677dc9c2 ChangeLog 2829
+RMD160 acf59354432935b77a5fe6cde2e0804e8704e0f4 ChangeLog 2829
+SHA256 f29675ebea47fcebd805b9ea4f0287fa05de3624690903d11948a9ce766a5b9f ChangeLog 2829
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -55,7 +59,7 @@ SHA256 b69c8889063494933c086d799253985670b578aadf59bf23e1595b7bf74ae82d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFpVrLAiZjviIA2XgRAuqTAJ9mjdKVyIWGTAQ4SdeUC2a7ze5XvACgwSsU
-dxgd8KTnkKtvddaPZGX3KeQ=
-=pdPD
+iD8DBQFFv5oavFcC4BYPU0oRAs86AJ9FBA43lP2uZILPm5rqOe1/bA69eQCffTPu
+VFF7YuuMVmxeBhlCXZKD+aw=
+=FThR
 -----END PGP SIGNATURE-----
diff --git a/media-video/cxfe/cxfe-0.9.1-r2.ebuild b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
index c71168418c88..f1a424974f68 100644
--- a/media-video/cxfe/cxfe-0.9.1-r2.ebuild
+++ b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.3 2006/02/23 21:41:39 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1-r2.ebuild,v 1.4 2007/01/30 19:18:44 aballier Exp $
 
 inherit eutils
 
@@ -30,15 +30,16 @@ src_unpack() {
 	unpack ${A}
 	mv cxfe ${P}
 	cd ${P}
-	epatch ${FILESDIR}/gcc-2.95-fix.patch
-	epatch ${FILESDIR}/max-osd-fix.patch
-	epatch ${FILESDIR}/xv-default.patch
-	epatch ${FILESDIR}/disable-dpms.patch
-	epatch ${FILESDIR}/position-osd.patch
-	epatch ${FILESDIR}/black-background.patch
+	epatch "${FILESDIR}/gcc-2.95-fix.patch"
+	epatch "${FILESDIR}/max-osd-fix.patch"
+	epatch "${FILESDIR}/xv-default.patch"
+	epatch "${FILESDIR}/disable-dpms.patch"
+	epatch "${FILESDIR}/position-osd.patch"
+	epatch "${FILESDIR}/black-background.patch"
 
 	# add missing space, see #82684
 	sed -i -e 's/\-lXext\@LDFLAGS/\-lXext \@LDFLAGS/' Makefile.in
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 }
 
 src_install() {
diff --git a/media-video/cxfe/files/cxfe-0.9.1-asneeded.patch b/media-video/cxfe/files/cxfe-0.9.1-asneeded.patch
new file mode 100644
index 000000000000..3e357dcd3e35
--- /dev/null
+++ b/media-video/cxfe/files/cxfe-0.9.1-asneeded.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.old	2007-01-30 20:14:10.000000000 +0100
++++ Makefile.in	2007-01-30 20:14:16.000000000 +0100
+@@ -14,7 +14,7 @@
+ CC = @CC@ -Wall
+ CPPFLAGS = @CPPFLAGS@
+ CFLAGS = $(CPPFLAGS) @CFLAGS@ `xine-config --cflags`
+-LIBS = @LIBS@
++LDLIBS = @LIBS@
+ LDFLAGS = `xine-config --libs` -L/usr/X11R6/lib -lXext @LDFLAGS@ @LIBS@ -lX11 
+ INSTALL = @INSTALL@
+