General cleaning and final versions of a testing and stable package build

7 files changed, 140 insertions, 43 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 1ff2365d5b21..7ba056470f38 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
 # $Header
 
+*fluxbox-0.1.13-r3 (26 Nov 2002)
+
+  26 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r3.ebuild
+  files/digest-fluxbox-0.1.13-r3
+
+  Cleaned up. Remember patch is applied to this latest testing release.      
+
+*fluxbox-0.1.13-r3 (26 Nov 2002)
+
+  26 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r3.ebuild
+  files/digest-fluxbox-0.1.13-r3
+
+  Cleaned up and removed remember patch for a stable release.
+
 *fluxbox-0.1.13-r2 (24 Nov 2002)
 
   24 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r1.ebuild
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.12 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.12
deleted file mode 100644
index f1155a66225a..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.1.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f90b191af969b49be3dcf901c36d5e13 fluxbox-0.1.12.tar.gz 417680
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.13-r3 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.13-r3
new file mode 100644
index 000000000000..b74d9982fc39
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.13-r3
@@ -0,0 +1 @@
+MD5 24844a5961b56406e2d6d52f199e54bb fluxbox-0.1.13.tar.bz2 350608
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.13-r4 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.13-r4
new file mode 100644
index 000000000000..b74d9982fc39
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.13-r4
@@ -0,0 +1 @@
+MD5 24844a5961b56406e2d6d52f199e54bb fluxbox-0.1.13.tar.bz2 350608
diff --git a/x11-wm/fluxbox/fluxbox-0.1.12.ebuild b/x11-wm/fluxbox/fluxbox-0.1.12.ebuild
deleted file mode 100644
index 9868f6415933..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.1.12.ebuild
+++ /dev/null
@@ -1,42 +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.12.ebuild,v 1.4 2002/10/05 05:39:28 drobbins Exp $
-
-IUSE="nls"
-
-inherit commonbox flag-o-matic
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Window manager based on Blackbox and pwm -- has tabs."
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://fluxbox.sf.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64"
-
-mydoc="ChangeLog COPYING NEWS"
-myconf="--enable-xinerama"
-filter-flags -fno-exceptions
-export WANT_AUTOMAKE_1_6=1
-export WANT_AUTOCONF_2_5=1
-
-src_compile() {
-
-	commonbox_src_compile
-
-	cd data
-	make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-
-src_install() {
-
-	commonbox_src_install
-	cd data
-	insinto /usr/share/commonbox
-	doins init
-	insinto /usr/share/commonbox/fluxbox
-	doins keys
-}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.13-r3.ebuild b/x11-wm/fluxbox/fluxbox-0.1.13-r3.ebuild
new file mode 100644
index 000000000000..ca05577feeca
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.1.13-r3.ebuild
@@ -0,0 +1,61 @@
+# 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.13-r3.ebuild,v 1.1 2002/11/27 03:12:26 mkeadle Exp $
+
+IUSE="nls"
+
+inherit commonbox flag-o-matic eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Window manager based on Blackbox and pwm -- has tabs."
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://fluxbox.sf.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc ~sparc ~sparc64"
+
+mydoc="ChangeLog COPYING NEWS"
+myconf="--enable-xinerama"
+filter-flags -fno-exceptions
+export WANT_AUTOMAKE_1_6=1
+export WANT_AUTOCONF_2_5=1
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Enable keybindings for root and window menus
+	epatch ${FILESDIR}/${P}-menukey.patch
+	# Fix misshaped fonts on fluxbox first start
+	epatch ${FILESDIR}/${P}-aa2.patch
+	# Fix for Openoffice crashing X server
+	epatch ${FILESDIR}/${P}-openoffice.patch
+	# Make sure NLS catalogs get installed
+	epatch ${FILESDIR}/${P}-nls.patch
+
+	# NLS is still names after blackbox. Remind me to talk to fluxgen about this.
+	ssed -i "s:blackbox.cat:fluxbox.cat:" \
+		${S}/src/main.cc
+}
+
+src_compile() {
+
+	commonbox_src_compile
+
+	cd data
+	make \
+		pkgdatadir=/usr/share/commonbox init
+}
+
+
+src_install() {
+
+	commonbox_src_install
+	cd data
+	insinto /usr/share/commonbox
+	doins init
+	insinto /usr/share/commonbox/fluxbox
+	doins keys
+	rm -f ${D}/usr/bin/fluxbox-generate_menu
+}
diff --git a/x11-wm/fluxbox/fluxbox-0.1.13-r4.ebuild b/x11-wm/fluxbox/fluxbox-0.1.13-r4.ebuild
new file mode 100644
index 000000000000..69866c384a83
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.1.13-r4.ebuild
@@ -0,0 +1,63 @@
+# 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.13-r4.ebuild,v 1.1 2002/11/27 03:12:26 mkeadle Exp $
+
+IUSE="nls"
+
+inherit commonbox flag-o-matic eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Window manager based on Blackbox and pwm -- has tabs."
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://fluxbox.sf.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
+
+mydoc="ChangeLog COPYING NEWS"
+myconf="--enable-xinerama"
+filter-flags -fno-exceptions
+export WANT_AUTOMAKE_1_6=1
+export WANT_AUTOCONF_2_5=1
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Enable keybindings for root and window menus
+	epatch ${FILESDIR}/${P}-menukey.patch
+	# Fix misshaped fonts on fluxbox first start
+	epatch ${FILESDIR}/${P}-aa2.patch
+	# Enable remember/startup patch
+	epatch ${FILESDIR}/${P}-remember.patch
+	# Fix for Openoffice crashing X server
+	epatch ${FILESDIR}/${P}-openoffice.patch
+	# Make sure NLS catalogs get installed
+	epatch ${FILESDIR}/${P}-nls.patch
+
+	# NLS is still names after blackbox. Remind me to talk to fluxgen about this.
+	ssed -i "s:blackbox.cat:fluxbox.cat:" \
+		${S}/src/main.cc
+}
+
+src_compile() {
+
+	commonbox_src_compile
+
+	cd data
+	make \
+		pkgdatadir=/usr/share/commonbox init
+}
+
+
+src_install() {
+
+	commonbox_src_install
+	cd data
+	insinto /usr/share/commonbox
+	doins init
+	insinto /usr/share/commonbox/fluxbox
+	doins keys
+	rm -f ${D}/usr/bin/fluxbox-generate_menu
+}