fix modular X

(Portage version: 2.1_pre4-r1)

9 files changed, 58 insertions, 103 deletions

diff --git a/media-video/cxfe/ChangeLog b/media-video/cxfe/ChangeLog
index 73126f56751c..d84fb1e936e8 100644
--- a/media-video/cxfe/ChangeLog
+++ b/media-video/cxfe/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-video/cxfe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.13 2005/11/07 10:18:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/ChangeLog,v 1.14 2006/02/23 21:41:39 arj Exp $
 
+  23 Feb 2006; Anders Rune Jensen <arj@gentoo.org> -cxfe-0.7.5.ebuild,
+  -cxfe-0.9.1-r1.ebuild, cxfe-0.9.1-r2.ebuild, cxfe-0.9.1.ebuild:
+  Removed old versions and fix modular X dependencies.
+	
   07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> cxfe-0.7.5.ebuild,
   cxfe-0.9.1.ebuild, cxfe-0.9.1-r1.ebuild, cxfe-0.9.1-r2.ebuild:
   Don't install COPYING file.
diff --git a/media-video/cxfe/Manifest b/media-video/cxfe/Manifest
index 6fcc46d1fec2..c40007f3f981 100644
--- a/media-video/cxfe/Manifest
+++ b/media-video/cxfe/Manifest
@@ -1,27 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 92ffcef903eacf54a9eaad8a4c530dbf ChangeLog 2107
-MD5 b38f2e4778a7bc69cc6b8b85d39b04d3 cxfe-0.7.5.ebuild 724
-MD5 2b6d56b572e270e8bb121ba1c7aad624 cxfe-0.9.1-r1.ebuild 960
-MD5 f3009dbd4d9e30f22fb11ded861c9e35 cxfe-0.9.1-r2.ebuild 1003
-MD5 142391a8678ce5685d3c25d2f01bff6c cxfe-0.9.1.ebuild 775
+MD5 ff696cee969594e40d10db8a866d064a ChangeLog 2282
+RMD160 ba206221b5b8f5fce9e3c1414c7562c16f05194b ChangeLog 2282
+SHA256 17e8d4de32cf969458c8b9b206c2920a8183bf6e9d1c04214e5fa2fcf07b69d4 ChangeLog 2282
+MD5 794ae02ccdcb48d68ac74db52f2a3ed8 cxfe-0.9.1-r2.ebuild 1151
+RMD160 41dbd4737b65c1cd1d2b01d7712e21a22469e646 cxfe-0.9.1-r2.ebuild 1151
+SHA256 78b1b69eb8d2e6e2fba93eaa547b23edd3b2e59bb9c6c8da2b38d538f657f7fc cxfe-0.9.1-r2.ebuild 1151
+MD5 81c1136243c2e22ea27b01c4f09a5996 cxfe-0.9.1.ebuild 922
+RMD160 a1212fe94bd25db9f971efca73d276b1089fe48b cxfe-0.9.1.ebuild 922
+SHA256 00d46c226a78242a85412fa7327300f4ffe229b8d31e5fb277183a1b94b7d633 cxfe-0.9.1.ebuild 922
 MD5 8b9e755c332942ee010472cb4db6a68f files/Makefile-fix.patch 1509
+RMD160 c8ef294052a9a913c93d41a3cc904eefe78dd290 files/Makefile-fix.patch 1509
+SHA256 37f580e5d743cbe2cb5900249342c29625378c9cba93976bcff44f6754390a83 files/Makefile-fix.patch 1509
 MD5 f8e468cea0a41a9ed57857a1bb0436d7 files/black-background.patch 792
-MD5 d75978f6e55a95ec4a87ba6144aaea71 files/digest-cxfe-0.7.5 61
+RMD160 0f8eb63394ed7434b3376923ae1fb32b1f96b03c files/black-background.patch 792
+SHA256 70ea78e9a12c780fc96191ed483c0821e3efb4344aee0fd14e357f280435db68 files/black-background.patch 792
 MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1 61
-MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r1 61
-MD5 d0c0290cd640b2146b22461991dcd224 files/digest-cxfe-0.9.1-r2 61
+RMD160 47e192698478a9352fadb58d5a6d06f9d1710860 files/digest-cxfe-0.9.1 61
+SHA256 f1de0f0e6f24b99d222e3ecdac816787a1292b15eea8a39fba8b1aee56b6edaa files/digest-cxfe-0.9.1 61
+MD5 7cccfcea209a1289eaf15fed5604f73a files/digest-cxfe-0.9.1-r2 229
+RMD160 b6a601ab1da5ef5bc6df39d708a71010c95276a5 files/digest-cxfe-0.9.1-r2 229
+SHA256 b69c8889063494933c086d799253985670b578aadf59bf23e1595b7bf74ae82d files/digest-cxfe-0.9.1-r2 229
 MD5 0d403e10e19e0524e5687b7dcdc710c2 files/disable-dpms.patch 3277
+RMD160 a4e7eed212f7d5702fa3932701b4ac588e7fbae0 files/disable-dpms.patch 3277
+SHA256 3d65c021edcff4e61bd7d890f57eff098164262726441551b54d4dfaa2b8bea4 files/disable-dpms.patch 3277
 MD5 09a6bfee8d8313dd6ff3acb30b4dad33 files/gcc-2.95-fix.patch 583
+RMD160 ce0e035998e415840d96356e7dd2e03f6a872f70 files/gcc-2.95-fix.patch 583
+SHA256 7464afafc835fff318daa2e687f123f4de010e27e29d24e1b7b5e1fa178c5deb files/gcc-2.95-fix.patch 583
 MD5 b7df88994713f7337645ce491f5d76d9 files/max-osd-fix.patch 728
+RMD160 d593695a5f433fe068dc28814dbf0854f8c802da files/max-osd-fix.patch 728
+SHA256 bc22df5fb1cd3dea6887448b863001a6e63b25a2b381ad45ca5ec6a44bb7d404 files/max-osd-fix.patch 728
 MD5 89258150099c21b29f6ba5c5f27cdb56 files/position-osd.patch 1784
+RMD160 df2cf3b35a39b1067b16f3a894ceaedcdfb4859f files/position-osd.patch 1784
+SHA256 d396ec6054b41c831b1c51407f341641692a6c8f53c739bf3fdffbcbd6fc4ce3 files/position-osd.patch 1784
 MD5 b3b0eb83642ffd1d2e89799f70169edb files/xv-default.patch 650
+RMD160 31c8ae131dc680c51f55df6fe7dbc02f80f23720 files/xv-default.patch 650
+SHA256 e3368f688d44abd5b1991f31045bb63d5792d39301b7edda3770ff23a81a70e9 files/xv-default.patch 650
 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbyoMj5H05b2HAEkRAsejAJ9MfMB1F0Ka4SXkslIA6hSsFBxv4wCginpe
-w6Ar2tU1uJOSawtWVpcqOt0=
-=Aw70
------END PGP SIGNATURE-----
+RMD160 0b4ae278181365a665506f0042648b7da9ce0c7f metadata.xml 247
+SHA256 170119da5689d0b770a34cb780ffecf0642fca90ed5525e9565781ad97bdcc57 metadata.xml 247
diff --git a/media-video/cxfe/cxfe-0.7.5.ebuild b/media-video/cxfe/cxfe-0.7.5.ebuild
deleted file mode 100644
index c73aeae1b80b..000000000000
--- a/media-video/cxfe/cxfe-0.7.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.7.5.ebuild,v 1.5 2005/11/07 10:18:23 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="A command line interface for xine."
-HOMEPAGE="http://www.rtwnetwork.com/cxfe/"
-
-SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="lirc"
-
-DEPEND=">=media-libs/xine-lib-1_rc1
-	   virtual/x11
-	   lirc? ( app-misc/lirc )
-	   sys-libs/ncurses"
-
-src_unpack() {
-	unpack ${A}
-	mv cxfe ${P}
-
-	cd ${P}
-
-	# Fix broken Makefile
-	epatch ${FILESDIR}/Makefile-fix.patch
-}
-
-src_install() {
-	dobin cxfe
-	dodoc README TODO lircrc-example
-}
diff --git a/media-video/cxfe/cxfe-0.9.1-r1.ebuild b/media-video/cxfe/cxfe-0.9.1-r1.ebuild
deleted file mode 100644
index 2859a6b7c9a0..000000000000
--- a/media-video/cxfe/cxfe-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.4 2005/11/07 10:18:23 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="A command line interface for xine."
-HOMEPAGE="http://www.rtwnetwork.com/cxfe/"
-
-SRC_URI="ftp://ftp.rtwnetwork.com/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="lirc"
-
-DEPEND=">=media-libs/xine-lib-1_rc1
-	   virtual/x11
-	   lirc? ( app-misc/lirc )
-	   sys-libs/ncurses"
-
-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
-
-	# add missing space, see #82684
-	sed -i -e 's/\-lXext\@LDFLAGS/\-lXext \@LDFLAGS/' Makefile.in
-}
-
-src_install() {
-	dobin cxfe
-	dodoc README TODO lircrc-example
-}
diff --git a/media-video/cxfe/cxfe-0.9.1-r2.ebuild b/media-video/cxfe/cxfe-0.9.1-r2.ebuild
index 44b9cd22ad09..c71168418c88 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.2 2005/11/07 10:18:23 flameeyes Exp $
+# $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 $
 
 inherit eutils
 
@@ -14,11 +14,18 @@ SLOT="0"
 KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE="lirc"
 
-DEPEND=">=media-libs/xine-lib-1_rc1
-	   virtual/x11
+RDEPEND=">=media-libs/xine-lib-1_rc1
+	   || ( ( x11-libs/libX11
+	      x11-libs/libXext )
+	   virtual/x11 )
 	   lirc? ( app-misc/lirc )
 	   sys-libs/ncurses"
 
+DEPEND="${RDEPEND}
+	   || ( ( x11-libs/libX11
+	      x11-libs/libXext )
+	   virtual/x11 )"
+
 src_unpack() {
 	unpack ${A}
 	mv cxfe ${P}
diff --git a/media-video/cxfe/cxfe-0.9.1.ebuild b/media-video/cxfe/cxfe-0.9.1.ebuild
index 43bf98403544..13da07c6e11b 100644
--- a/media-video/cxfe/cxfe-0.9.1.ebuild
+++ b/media-video/cxfe/cxfe-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.ebuild,v 1.3 2005/11/07 10:18:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cxfe/cxfe-0.9.1.ebuild,v 1.4 2006/02/23 21:41:39 arj Exp $
 
 inherit eutils
 
@@ -14,11 +14,17 @@ SLOT="0"
 KEYWORDS="x86 amd64"
 IUSE="lirc"
 
-DEPEND=">=media-libs/xine-lib-1_rc1
-	   virtual/x11
+RDEPEND=">=media-libs/xine-lib-1_rc1
+	   || ( ( x11-libs/libX11
+	      x11-libs/libXext )
+	   virtual/x11 )
 	   lirc? ( app-misc/lirc )
 	   sys-libs/ncurses"
 
+DEPEND="${RDEPEND}
+	   || ( ( x11-libs/libX11
+	      x11-libs/libXext )
+	   virtual/x11 )"
 src_unpack() {
 	unpack ${A}
 	mv cxfe ${P}
diff --git a/media-video/cxfe/files/digest-cxfe-0.7.5 b/media-video/cxfe/files/digest-cxfe-0.7.5
deleted file mode 100644
index 181f44eafa65..000000000000
--- a/media-video/cxfe/files/digest-cxfe-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f99b13d83a57caf6481072b3e685f21a cxfe-0.7.5.tar.gz 81491
diff --git a/media-video/cxfe/files/digest-cxfe-0.9.1-r1 b/media-video/cxfe/files/digest-cxfe-0.9.1-r1
deleted file mode 100644
index f1f0f36f2aeb..000000000000
--- a/media-video/cxfe/files/digest-cxfe-0.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c38ddaea38a5d330c3610e2f3d3afae cxfe-0.9.1.tar.gz 91650
diff --git a/media-video/cxfe/files/digest-cxfe-0.9.1-r2 b/media-video/cxfe/files/digest-cxfe-0.9.1-r2
index f1f0f36f2aeb..5a484cc4a478 100644
--- a/media-video/cxfe/files/digest-cxfe-0.9.1-r2
+++ b/media-video/cxfe/files/digest-cxfe-0.9.1-r2
@@ -1 +1,3 @@
 MD5 9c38ddaea38a5d330c3610e2f3d3afae cxfe-0.9.1.tar.gz 91650
+RMD160 90a34fde9e78fef3e8c922b9ccbb9edf7f0babb1 cxfe-0.9.1.tar.gz 91650
+SHA256 4ed007d799d1e8728b22a874cc1b104af540e1f58ee1facb01a59b55fa956a07 cxfe-0.9.1.tar.gz 91650