Fixed DEPEND for modular X.

(Portage version: 2.1_pre4-r1)

6 files changed, 23 insertions, 70 deletions

diff --git a/x11-wm/larswm/ChangeLog b/x11-wm/larswm/ChangeLog
index 37814b9ecca7..242c9a63d480 100644
--- a/x11-wm/larswm/ChangeLog
+++ b/x11-wm/larswm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/larswm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/ChangeLog,v 1.16 2005/12/25 17:42:22 weeve Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/ChangeLog,v 1.17 2006/02/11 11:58:18 nelchael Exp $
+
+  11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> -larswm-7.2.10.ebuild,
+  -larswm-7.5.2.ebuild, larswm-7.5.3.ebuild:
+  Fixed DEPEND for modular X.
 
   25 Dec 2005; Jason Wever <weeve@gentoo.org> larswm-7.5.3.ebuild:
   Stable on SPARC.
diff --git a/x11-wm/larswm/files/digest-larswm-7.2.10 b/x11-wm/larswm/files/digest-larswm-7.2.10
deleted file mode 100644
index 7228130745d5..000000000000
--- a/x11-wm/larswm/files/digest-larswm-7.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a97f4287386d3cef3fd8675a0dcf7b38 larswm-7.2.10.tar.gz 74000
diff --git a/x11-wm/larswm/files/digest-larswm-7.5.2 b/x11-wm/larswm/files/digest-larswm-7.5.2
deleted file mode 100644
index f0a5e1b3edfd..000000000000
--- a/x11-wm/larswm/files/digest-larswm-7.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71963dd67df08008edc0e56e6a8e0844 larswm-7.5.2.tar.gz 84424
diff --git a/x11-wm/larswm/larswm-7.2.10.ebuild b/x11-wm/larswm/larswm-7.2.10.ebuild
deleted file mode 100644
index 544f406cbab8..000000000000
--- a/x11-wm/larswm/larswm-7.2.10.ebuild
+++ /dev/null
@@ -1,29 +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/larswm/larswm-7.2.10.ebuild,v 1.6 2004/07/15 01:13:30 agriffis Exp $
-
-DESCRIPTION="larswm is a hack for 9wm, adding for instance automatic window tiling and virtual desktops"
-HOMEPAGE="http://www.fnurt.net/larswm/"
-SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
-LICENSE="9wm"
-
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-IUSE=""
-DEPEND="virtual/x11"
-
-src_compile() {
-	xmkmf -a
-	emake || die
-
-	mv larsclock.man larsclock.1
-	mv larsremote.man larsremote.1
-	mv larswm.man larswm.1
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	doman *.1
-	dodoc *.ms ChangeLog README* sample.*
-}
diff --git a/x11-wm/larswm/larswm-7.5.2.ebuild b/x11-wm/larswm/larswm-7.5.2.ebuild
deleted file mode 100644
index f40933f38fc0..000000000000
--- a/x11-wm/larswm/larswm-7.5.2.ebuild
+++ /dev/null
@@ -1,34 +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/larswm/larswm-7.5.2.ebuild,v 1.5 2004/10/09 19:22:07 usata Exp $
-
-DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan."
-HOMEPAGE="http://larswm.fnurt.net/"
-SRC_URI="http://larswm.fnurt.net/${P}.tar.gz"
-LICENSE="9wm"
-
-SLOT="0"
-KEYWORDS="x86 alpha ppc"
-IUSE=""
-DEPEND="virtual/x11"
-
-src_compile() {
-	xmkmf -a || die
-	emake || die
-}
-
-src_install() {
-	dobin larsclock larsmenu larsremote larswm
-	newbin sample.xsession larswm-session
-	for x in *.man ; do
-		newman $x ${x/man/1}
-	done
-	dodoc ChangeLog README* sample.*
-
-	insinto /etc/X11
-	newins sample.larswmrc larswmrc || die
-	exeinto /etc/X11/Sessions
-	newexe sample.xsession larswm
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/larswm.desktop || die
-}
diff --git a/x11-wm/larswm/larswm-7.5.3.ebuild b/x11-wm/larswm/larswm-7.5.3.ebuild
index 1c79d83ec2cf..db8f86a2055f 100644
--- a/x11-wm/larswm/larswm-7.5.3.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3.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/larswm/larswm-7.5.3.ebuild,v 1.8 2005/12/25 17:42:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.5.3.ebuild,v 1.9 2006/02/11 11:58:18 nelchael Exp $
 
 DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan."
 HOMEPAGE="http://larswm.fnurt.net/"
@@ -10,7 +10,21 @@ LICENSE="9wm"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="virtual/x11"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-libs/libXext )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xproto
+		x11-proto/xextproto
+		x11-misc/imake
+		x11-misc/gccmakedep
+		app-text/rman )
+	virtual/x11 )"
 
 src_compile() {
 	xmkmf -a || die