summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Pawlik <nelchael@gentoo.org>2006-02-11 12:01:53 +0000
committerKrzysztof Pawlik <nelchael@gentoo.org>2006-02-11 12:01:53 +0000
commit12d0641009f48588217d599332242823481c8e22 (patch)
treeb20acb88fdbb07182b1ef6621545603dbcbf4b1f /x11-wm/lwm
parentNot needed any more. (diff)
downloadhistorical-12d0641009f48588217d599332242823481c8e22.tar.gz
historical-12d0641009f48588217d599332242823481c8e22.tar.bz2
historical-12d0641009f48588217d599332242823481c8e22.zip
Fixed DEPEND for modular X.
Package-Manager: portage-2.1_pre4-r1
Diffstat (limited to 'x11-wm/lwm')
-rw-r--r--x11-wm/lwm/ChangeLog8
-rw-r--r--x11-wm/lwm/files/digest-lwm-1.2.01
-rw-r--r--x11-wm/lwm/lwm-1.2.0.ebuild33
-rw-r--r--x11-wm/lwm/lwm-1.2.1.ebuild15
4 files changed, 18 insertions, 39 deletions
diff --git a/x11-wm/lwm/ChangeLog b/x11-wm/lwm/ChangeLog
index 94f92fc3bcc4..a8bf05943a95 100644
--- a/x11-wm/lwm/ChangeLog
+++ b/x11-wm/lwm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/lwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.15 2005/07/06 21:07:31 herbs Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.16 2006/02/11 12:01:53 nelchael Exp $
+
+ 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> -lwm-1.2.0.ebuild,
+ lwm-1.2.1.ebuild:
+ Fixed DEPEND for modular X.
06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> lwm-1.2.1.ebuild:
Marked ~amd64 wrt bug #97951.
diff --git a/x11-wm/lwm/files/digest-lwm-1.2.0 b/x11-wm/lwm/files/digest-lwm-1.2.0
deleted file mode 100644
index 3b52c4dec03a..000000000000
--- a/x11-wm/lwm/files/digest-lwm-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22e3a008edeccdc3913eec72a4b56b1b lwm-1.2.0.tar.gz 45622
diff --git a/x11-wm/lwm/lwm-1.2.0.ebuild b/x11-wm/lwm/lwm-1.2.0.ebuild
deleted file mode 100644
index 9efd32c53d72..000000000000
--- a/x11-wm/lwm/lwm-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +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/lwm/lwm-1.2.0.ebuild,v 1.6 2004/10/09 19:35:34 usata Exp $
-
-IUSE="motif"
-
-DESCRIPTION="The ultimate lightweight window manager"
-SRC_URI="ftp://ftp.cs.york.ac.uk/pub/james/${P}.tar.gz"
-HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
-
-DEPEND="motif? ( x11-libs/openmotif >=sys-apps/sed-4 )
- virtual/x11"
-
-RDEPEND="motif? ( x11-libs/openmotif )
- virtual/x11"
-
-src_compile() {
- use motif && sed -i "s/-DHAVE_MOTIF//" Imakefile
- xmkmf || die
- emake lwm || die
-}
-
-src_install() {
-
- dobin lwm
-
- newman lwm.man lwm.1
- dodoc AUTHORS BUGS ChangeLog INSTALL README TODO
-}
diff --git a/x11-wm/lwm/lwm-1.2.1.ebuild b/x11-wm/lwm/lwm-1.2.1.ebuild
index bad424ddf70c..3280f9ee7f14 100644
--- a/x11-wm/lwm/lwm-1.2.1.ebuild
+++ b/x11-wm/lwm/lwm-1.2.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/x11-wm/lwm/lwm-1.2.1.ebuild,v 1.4 2005/07/06 21:07:31 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.2.1.ebuild,v 1.5 2006/02/11 12:01:53 nelchael Exp $
IUSE=""
@@ -12,7 +12,16 @@ SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ppc sparc x86"
-DEPEND="virtual/x11"
+RDEPEND="|| ( (
+ x11-libs/libX11
+ x11-libs/libXext )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || ( (
+ x11-proto/xproto
+ x11-proto/xextproto
+ x11-misc/imake )
+ virtual/x11 )"
src_compile() {
xmkmf || die