cleanups and added new fluxbox with xinerama enabled by default.

5 files changed, 12 insertions, 148 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 15c48921d7a6..46ea1d91dc49 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.15 2002/07/02 01:02:15 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.16 2002/07/09 01:53:21 drobbins Exp $
+
+*fluxbox-0.19-r4 (7 Jul 2002)
+  
+  7 Jul 2002; Daniel Robbins <drobbins@gentoo.org> : xinerama (multi-monitor
+  support) is now enabled by default.  This closes bug #4514.
 
 *fluxbox-0.19-r3 (1 Jul 2002)
+  
   1 Jul 2002; Owen Stampflee <owen@gentoo.org> fluxbox-0.19-r3.ebuild
   Fixed a slight syntax error in the -r2 ebuild.
 
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.9-r4 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.9-r4
new file mode 100644
index 000000000000..077e6e656071
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.9-r4
@@ -0,0 +1,3 @@
+MD5 adfecad6a050572e4cb1fcc079dc491d fluxbox-0.1.9.tar.gz 440638
+MD5 51bb4dca071958d7ffcc5d90c3a26eca fluxbox-0.1.9-bugfix2.patch 1377
+MD5 3c1043fbcc87a8241dcca0c36f037423 fluxbox-0.1.9-oly-allinone.patch.bz2 110919
diff --git a/x11-wm/fluxbox/fluxbox-0.1.9-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.1.9-r1.ebuild
deleted file mode 100644
index 565e765423a9..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.9-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.9-r1.ebuild,v 1.2 2002/07/08 13:47:11 aliz Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-http://fluxbox.sourceforge.net/download/patches/${P}-bugfix2.patch"
-
-HOMEPAGE="http://fluxbox.sf.net"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/x11"
-	
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/blackbox"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	patch -p1 < ${DISTDIR}/${P}-bugfix2.patch || die
-}
-
-src_compile() {
-	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	use kde \
-		&& myconf="${myconf} --enable-kde" \
-		&& export KDEDIR=/usr/kde/2 \
-		|| myconf="${myconf} --disable-kde"
-
-	use gnome \
-		&& myconf="${myconf} --enable-gnome" \
-		|| myconf="${myconf} --disable-gnome"
-	 
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/fluxbox \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die
-
-	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
-	docinto data
-	dodoc data/README*
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fluxbox" > ${D}/etc/X11/Sessions/fluxbox
-	chmod +x ${D}/etc/X11/Sessions/fluxbox
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.9-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.1.9-r2.ebuild
deleted file mode 100644
index cb4b96aa668c..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.9-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.9-r2.ebuild,v 1.2 2002/07/08 13:47:11 aliz Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
-	http://fluxbox.sourceforge.net/download/patches/${P}-bugfix2.patch
-	truetype? ( http://www.oberdorf.org/oly/Computers/OlyWare/FluxBoxAA/${P}-oly-allinone.patch.bz2 )"
-
-HOMEPAGE="http://fluxbox.sf.net"
-
-DEPEND="virtual/x11"
-	
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/blackbox"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	patch -p1 < ${DISTDIR}/${P}-bugfix2.patch || die
-
-	use truetype && \
-		bzcat ${DISTDIR}/${P}-oly-allinone.patch.bz2 | patch -p1
-}
-
-src_compile() {
-	local myconf
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	use kde \
-		&& myconf="${myconf} --enable-kde" \
-		&& export KDEDIR=/usr/kde/2 \
-		|| myconf="${myconf} --disable-kde"
-
-	use gnome \
-		&& myconf="${myconf} --enable-gnome" \
-		|| myconf="${myconf} --disable-gnome"
-
-	use truetype \
-		&& myconf="${myconf} --enable-antialiasing" \
-		|| myconf="${myconf} --disable-antialiasing"
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		sysconfdir=${D}/etc/X11/fluxbox \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		install || die
-
-	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
-	docinto data
-	dodoc data/README*
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/fluxbox" > ${D}/etc/X11/Sessions/fluxbox
-	fperm +x /etc/X11/Sessions/fluxbox
-}
-
-
-pkg_postinst() {
-
-	use truetype && ( \
-		einfo "To actually enable anti-aliasing in fluxbox, you must call"
-		einfo "it using: fluxbox -antialias"
-	)
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.9-r3.ebuild b/x11-wm/fluxbox/fluxbox-0.1.9-r4.ebuild
index 49ac9c4600fb..e77fc0e2793f 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.9-r3.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.9-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.9-r3.ebuild,v 1.2 2002/07/08 13:47:11 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.9-r4.ebuild,v 1.1 2002/07/09 01:53:21 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on BlackBox"
@@ -48,7 +48,7 @@ src_compile() {
 		&& myconf="${myconf} --enable-antialiasing" \
 		|| myconf="${myconf} --disable-antialiasing"
 
-	econf ${myconf} || die
+	econf ${myconf} --enable-xinerama || die
 
 	emake || die
 }