Fixed DEPEND for modular X.

(Portage version: 2.1_pre3-r1)

8 files changed, 34 insertions, 75 deletions

diff --git a/x11-misc/fspanel/ChangeLog b/x11-misc/fspanel/ChangeLog
index f86fd527cb35..e6af8ff1a11f 100644
--- a/x11-misc/fspanel/ChangeLog
+++ b/x11-misc/fspanel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fspanel
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.11 2005/06/19 19:26:07 smithj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.12 2006/01/21 12:03:15 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -fspanel-0.8_beta1-r1.ebuild, fspanel-0.8_beta1-r2.ebuild:
+  Fixed DEPEND for modular X.
 
   19 Jun 2005; Jonathan Smith <smithj@gentoo.org> +metadata.xml,
   -fspanel-0.8_beta1.ebuild:
diff --git a/x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1 b/x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1
deleted file mode 100644
index 536e61ef47f2..000000000000
--- a/x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 213ea167a50c4971c3c110db9b4be4e9 fspanel-0.8beta1.tar.gz 9703
diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild
deleted file mode 100644
index 027587b8e34e..000000000000
--- a/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild,v 1.5 2004/07/15 00:52:45 agriffis Exp $
-
-S=${WORKDIR}/fspanel-0.8beta1
-DESCRIPTION="F***ing Small Panel. Good (and small) replacement for gnome-panel"
-SRC_URI="http://www.chatjunkies.org/fspanel/fspanel-0.8beta1.tar.gz"
-HOMEPAGE="http://www.chatjunkies.org/fspanel"
-
-SLOT="0"
-KEYWORDS="x86 sparc"
-IUSE=""
-LICENSE="GPL-2"
-
-DEPEND="virtual/x11"
-
-src_compile() {
-
-	if pkg-config xft
-	then
-		CFLAGS="${CFLAGS} -I/usr/include/freetype2"
-	fi
-	./configure
-	emake || die
-}
-
-src_install () {
-	exeinto /usr/bin
-	doexe ${S}/fspanel
-
-	dodoc README
-}
diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild
index 8254d6856a5d..3351fe7785af 100644
--- a/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild
+++ b/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild,v 1.5 2004/08/04 20:54:44 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild,v 1.6 2006/01/21 12:03:15 nelchael Exp $
 
 S=${WORKDIR}/fspanel-0.8beta1
 DESCRIPTION="F***ing Small Panel. Good (and small) replacement for gnome-panel"
@@ -12,8 +12,14 @@ KEYWORDS="x86 sparc ppc ~amd64"
 IUSE=""
 LICENSE="GPL-2"
 
-DEPEND="virtual/x11
-		dev-util/pkgconfig"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXft )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )
+	dev-util/pkgconfig"
 
 src_compile() {
 
diff --git a/x11-misc/fxred/ChangeLog b/x11-misc/fxred/ChangeLog
index 2877ebc83b78..dffd5cc3f33c 100644
--- a/x11-misc/fxred/ChangeLog
+++ b/x11-misc/fxred/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fxred
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/ChangeLog,v 1.10 2005/11/01 14:43:17 nelchael Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/ChangeLog,v 1.11 2006/01/21 12:06:51 nelchael Exp $
+
+  21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -fxred-0.7.ebuild,
+  fxred-0.9.ebuild:
+  Fixed DEPEND for modular X.
 
   01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> fxred-0.7.ebuild,
   fxred-0.9.ebuild:
diff --git a/x11-misc/fxred/files/digest-fxred-0.7 b/x11-misc/fxred/files/digest-fxred-0.7
deleted file mode 100644
index 1b89ec33696c..000000000000
--- a/x11-misc/fxred/files/digest-fxred-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4c96b9ef277c6a5a4721fbbc9c24b29d fxred-0.7.tar.gz 55523
diff --git a/x11-misc/fxred/fxred-0.7.ebuild b/x11-misc/fxred/fxred-0.7.ebuild
deleted file mode 100644
index 56ddc02e8a29..000000000000
--- a/x11-misc/fxred/fxred-0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/fxred-0.7.ebuild,v 1.7 2005/11/01 14:43:17 nelchael Exp $
-
-DESCRIPTION="FXred is handler for the red scroll button of the Logitech TrackMan Marble FX, a trackball."
-HOMEPAGE="http://www.larskrueger.homestead.com/files/index.html#X11"
-SRC_URI="http://www.larskrueger.homestead.com/files/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/x11"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog README TODO
-	dohtml fxred/docs/en/*.html
-	insinto /etc
-	doins fxredrc
-}
diff --git a/x11-misc/fxred/fxred-0.9.ebuild b/x11-misc/fxred/fxred-0.9.ebuild
index df8807534cd6..d315ac0f91c7 100644
--- a/x11-misc/fxred/fxred-0.9.ebuild
+++ b/x11-misc/fxred/fxred-0.9.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/x11-misc/fxred/fxred-0.9.ebuild,v 1.6 2005/11/01 14:43:17 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fxred/fxred-0.9.ebuild,v 1.7 2006/01/21 12:06:51 nelchael Exp $
 
 DESCRIPTION="FXred is handler for the red scroll button of the Logitech TrackMan Marble FX, a trackball."
 HOMEPAGE="http://www.larskrueger.homestead.com/files/index.html#X11"
@@ -10,7 +10,16 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXtst )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-libs/libXt )
+	virtual/x11 )"
 
 src_compile() {
 	./configure \