Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

8 files changed, 50 insertions, 97 deletions

diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index 68ae857b8b51..7caf4aec7fd3 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/ctwm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.12 2005/09/02 00:04:27 dang Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.13 2006/02/11 11:39:54 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/ctwm-3.7_alpha5-gentoo.diff, ctwm-3.6-r1.ebuild,
+  -ctwm-3.7_alpha5.ebuild, ctwm-3.7.ebuild:
+  Fixed DEPEND for modular X.
 
   02 Sep 2005; <dang@gentoo.org> ctwm-3.7.ebuild:
   Marked ~amd64
diff --git a/x11-wm/ctwm/ctwm-3.6-r1.ebuild b/x11-wm/ctwm/ctwm-3.6-r1.ebuild
index aeb8fd08a99b..974452068fde 100644
--- a/x11-wm/ctwm/ctwm-3.6-r1.ebuild
+++ b/x11-wm/ctwm/ctwm-3.6-r1.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-wm/ctwm/ctwm-3.6-r1.ebuild,v 1.5 2004/06/24 23:40:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.6-r1.ebuild,v 1.6 2006/02/11 11:39:54 nelchael Exp $
 
 inherit eutils
 
@@ -16,7 +16,20 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 LICENSE="MIT"
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		app-text/rman
+		x11-misc/imake )
+	virtual/x11 )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
index 72aa342f5676..7de15f423862 100644
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ b/x11-wm/ctwm/ctwm-3.7.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-wm/ctwm/ctwm-3.7.ebuild,v 1.2 2005/09/02 00:04:27 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7.ebuild,v 1.3 2006/02/11 11:39:54 nelchael Exp $
 
 inherit eutils
 
@@ -18,7 +18,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="MIT"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		app-text/rman
+		x11-misc/imake )
+	virtual/x11 )
 	media-libs/jpeg"
 
 src_compile() {
diff --git a/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild b/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild
deleted file mode 100644
index e1803db2da0a..000000000000
--- a/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7_alpha5.ebuild,v 1.1 2004/11/14 09:50:36 usata Exp $
-
-inherit eutils
-
-IUSE=""
-
-MY_P="${P/_/-}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A clean, light window manager."
-#SRC_URI="http://ctwm.free.lp.se/dist/${MY_P}.tar.gz"
-SRC_URI="http://ctwm.free.lp.se/preview/${MY_P}.tar.gz"
-HOMEPAGE="http://ctwm.free.lp.se/"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-LICENSE="MIT"
-
-DEPEND="virtual/x11
-	media-libs/jpeg"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
-
-src_compile() {
-	xmkmf || die
-	make TWMDIR=/usr/share/${PN} || die
-}
-
-src_install() {
-	make BINDIR=/usr/bin \
-		 MANPATH=/usr/share/man \
-		 TWMDIR=/usr/share/${PN} \
-		 DESTDIR=${D} install || die
-
-	make MANPATH=/usr/share/man \
-		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR=${D} install.man || die
-
-	echo "#!/bin/sh" > ${T}/ctwm
-	echo "/usr/bin/ctwm" >> ${T}/ctwm
-
-	exeinto /etc/X11/Sessions
-	doexe ${T}/ctwm
-
-	dodoc CHANGES README* TODO* PROBLEMS
-	dodoc *.ctwmrc*
-}
diff --git a/x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff
deleted file mode 100644
index 0cdf25cc5ad2..000000000000
--- a/x11-wm/ctwm/files/ctwm-3.7_alpha5-gentoo.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN ctwm-3.7-alpha5.ORIG/Imakefile ctwm-3.7-alpha5/Imakefile
---- ctwm-3.7-alpha5.ORIG/Imakefile	2004-06-09 18:31:35.000000000 +0900
-+++ ctwm-3.7-alpha5/Imakefile	2004-11-14 18:36:41.093501472 +0900
-@@ -174,7 +174,7 @@
- 
- AllTarget(ctwm)
- 
--SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)$(TWMDIR)'/system.ctwmrc"')
-+SpecialObjectRule(parse.o,parse.c,'-DSYSTEM_INIT_FILE="'$(DESTDIR)/etc/X11/twm'/system.ctwmrc"')
- SpecialObjectRule(ctwm.o,ctwm.c,'-DPIXMAP_DIRECTORY="'$(DESTDIR)$(TWMDIR)'/images"')
- #if !HasPutenv
- SpecialObjectRule(util.o,util.c,-DNOPUTENV)
-@@ -184,7 +184,7 @@
- 
- NormalLibraryTarget(ctwm, libctwm.o)
- ComplexProgramTarget(ctwm)
--InstallNonExecFile(system.ctwmrc,$(TWMDIR))
-+InstallNonExecFile(system.ctwmrc,/etc/X11/twm)
- #ifdef XPM
- install::
- 	MakeDir($(DESTDIR)$(TWMDIR)/images)
diff --git a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha5 b/x11-wm/ctwm/files/digest-ctwm-3.7_alpha5
deleted file mode 100644
index 8d29b2e44c63..000000000000
--- a/x11-wm/ctwm/files/digest-ctwm-3.7_alpha5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35bb6d83853b8d6d0d9adc84da12c922 ctwm-3.7-alpha5.tar.gz 679158
diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog
index 39918c86a532..79fa3f5f8179 100644
--- a/x11-wm/flwm/ChangeLog
+++ b/x11-wm/flwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/flwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.10 2005/05/10 09:32:47 dholm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.11 2006/02/11 11:44:24 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> flwm-1.00-r4.ebuild:
+  Fixed DEPEND for modular X.
 
   10 May 2005; David Holm <dholm@gentoo.org> flwm-1.00-r4.ebuild:
   Added to ~ppc.
diff --git a/x11-wm/flwm/flwm-1.00-r4.ebuild b/x11-wm/flwm/flwm-1.00-r4.ebuild
index f6a78cdb315c..24467fe5aecb 100644
--- a/x11-wm/flwm/flwm-1.00-r4.ebuild
+++ b/x11-wm/flwm/flwm-1.00-r4.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-wm/flwm/flwm-1.00-r4.ebuild,v 1.9 2005/05/10 09:32:47 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.10 2006/02/11 11:44:24 nelchael Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc amd64"
 
 
-DEPEND="virtual/x11
-	>=x11-libs/fltk-1.0
+DEPEND="=x11-libs/fltk-1.1*
 	opengl? ( virtual/opengl )"
 
 	#Configuration of the appearance and behavior of flwm
@@ -33,15 +32,10 @@ src_compile() {
 
 	use opengl && export X_EXTRA_LIBS=-lGL
 
-	if has_version '>=x11-libs/fltk-1.1' ; then
-		export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1"
-		export LIBS="-L/usr/lib/fltk-1.1"
+	export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1"
+	export LIBS="-L/usr/lib/fltk-1.1"
 
-		epatch ${FILESDIR}/fltk1.1.patch
-	else	# fltk-1.0
-		export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.0"
-		export LIBS="-L/usr/lib/fltk-1.0"
-	fi
+	epatch ${FILESDIR}/fltk1.1.patch
 
 	econf || die
 	make || die