diff options
24 files changed, 144 insertions, 223 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 diff --git a/x11-wm/integrity/ChangeLog b/x11-wm/integrity/ChangeLog index 85ab56f4cf4c..f77c8c1d7bcb 100644 --- a/x11-wm/integrity/ChangeLog +++ b/x11-wm/integrity/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-wm/integrity -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/ChangeLog,v 1.4 2005/10/02 13:53:05 metalgod Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/ChangeLog,v 1.5 2006/02/11 11:48:38 nelchael Exp $ + + 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> integrity-1.0.ebuild: + Fixed DEPEND for modular X. 02 Oct 2005; Luis Medinas <metalgod@gentoo.org> integrity-1.0.ebuild: Added ~amd64 keyword. diff --git a/x11-wm/integrity/integrity-1.0.ebuild b/x11-wm/integrity/integrity-1.0.ebuild index 87a738939f06..fc8a225cb2ae 100644 --- a/x11-wm/integrity/integrity-1.0.ebuild +++ b/x11-wm/integrity/integrity-1.0.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/integrity/integrity-1.0.ebuild,v 1.4 2005/10/02 13:53:05 metalgod Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/integrity-1.0.ebuild,v 1.5 2006/02/11 11:48:38 nelchael Exp $ IUSE="" @@ -14,8 +14,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -DEPEND="virtual/x11 - =x11-libs/qt-3*" +DEPEND="=x11-libs/qt-3*" src_compile() { emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die diff --git a/x11-wm/jwm/ChangeLog b/x11-wm/jwm/ChangeLog index 14f895275aa6..e6bdd7c029b4 100644 --- a/x11-wm/jwm/ChangeLog +++ b/x11-wm/jwm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/jwm -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.5 2005/07/01 21:57:27 josejx Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.6 2006/02/11 11:53:34 nelchael Exp $ + + 11 Feb 2006; Krzysiek Pawlik <nelchael@gentoo.org> jwm-0.21.ebuild, + jwm-0.22.ebuild, jwm-0.23.ebuild: + Fixed DEPEND for modular X. 01 Jul 2005; Joseph Jezak <josejx@gentoo.org> jwm-0.21.ebuild: Marked ppc stable for bug #96737. diff --git a/x11-wm/jwm/jwm-0.21.ebuild b/x11-wm/jwm/jwm-0.21.ebuild index 3ccdb9859b42..37476fd32b22 100644 --- a/x11-wm/jwm/jwm-0.21.ebuild +++ b/x11-wm/jwm/jwm-0.21.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/jwm/jwm-0.21.ebuild,v 1.4 2005/07/01 21:57:27 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.21.ebuild,v 1.5 2006/02/11 11:53:34 nelchael Exp $ IUSE="" @@ -12,7 +12,17 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="ppc x86" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 )" src_install() { dodir /usr/bin diff --git a/x11-wm/jwm/jwm-0.22.ebuild b/x11-wm/jwm/jwm-0.22.ebuild index e10dc2be12f5..8b4bf0424ac3 100644 --- a/x11-wm/jwm/jwm-0.22.ebuild +++ b/x11-wm/jwm/jwm-0.22.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/jwm/jwm-0.22.ebuild,v 1.1 2005/05/20 04:23:59 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.22.ebuild,v 1.2 2006/02/11 11:53:34 nelchael Exp $ IUSE="" @@ -12,7 +12,17 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 )" src_install() { dodir /usr/bin diff --git a/x11-wm/jwm/jwm-0.23.ebuild b/x11-wm/jwm/jwm-0.23.ebuild index 9a6d3e94591b..34fb1904bf7a 100644 --- a/x11-wm/jwm/jwm-0.23.ebuild +++ b/x11-wm/jwm/jwm-0.23.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/jwm/jwm-0.23.ebuild,v 1.1 2005/05/28 18:46:25 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.23.ebuild,v 1.2 2006/02/11 11:53:34 nelchael Exp $ IUSE="" @@ -12,7 +12,17 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~ppc" -DEPEND="virtual/x11" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXt + x11-libs/libXext + x11-libs/libXpm ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( ( + x11-proto/xextproto + x11-proto/xproto ) + virtual/x11 )" src_install() { dodir /usr/bin 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 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 |