New version, clean old ebuilds, and lots of syntax cleanups

10 files changed, 66 insertions, 64 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 8fccc8a8016b..95bd41cd89c6 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.45 2003/09/01 01:25:47 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.46 2003/09/03 14:24:45 tseng Exp $
+
+*openbox-3.0_alpha8 (03 Sep 2003)
+
+  03 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha4.ebuild,
+  openbox-3.0_alpha5.ebuild, openbox-3.0_alpha8.ebuild:
+  Version bump + cleanup old builds
 
 *openbox-3.0_alpha7 (31 Aug 2003)
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 1e95ef56cb8b..2c03e13b2140 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,11 +1,11 @@
 MD5 5dfe3a3dad2d7e59ec7e5fc229b3997f openbox-1.2.4.ebuild 629
 MD5 cd8e991ef4a7829c1a715bf68403ecdf openbox-2.1.3-r4.ebuild 874
-MD5 7278593f90fb004c75f3c16c337f627a ChangeLog 10714
-MD5 6144b702b0ebc0dcc9d7c0ad6db540d3 openbox-2.3.0.ebuild 1238
-MD5 2e8942d6295c8a1fb6dbee32c8295386 openbox-2.3.1.ebuild 1258
-MD5 2f4bb7078299f75904540f463a460f1b openbox-3.0_alpha7.ebuild 919
-MD5 2f4bb7078299f75904540f463a460f1b openbox-3.0_alpha8.ebuild 919
-MD5 2f4bb7078299f75904540f463a460f1b openbox-3.0_alpha6.ebuild 919
+MD5 08d33d13e81d46085bddf526aaed8249 ChangeLog 10714
+MD5 d00d1c66664d638aa414324a9de97a24 openbox-2.3.0.ebuild 1237
+MD5 bbddfe37157511609a9ef1a0674b1a73 openbox-2.3.1.ebuild 1257
+MD5 f0ec40880e9e420e8a60007571228c9f openbox-3.0_alpha7.ebuild 1021
+MD5 227d36217c96ebdf73f1756f30386fd0 openbox-3.0_alpha8.ebuild 1021
+MD5 f37c638c0e9d87183de38f8b761e53bb openbox-3.0_alpha6.ebuild 1021
 MD5 f0b52d0f48a8b10c418a6d6558c4198c files/digest-openbox-1.2.4 65
 MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r4 65
 MD5 e8173797964d97d9293eee8faa1a95aa files/digest-openbox-2.3.0 65
diff --git a/x11-wm/openbox/files/digest-openbox-3.0_alpha4 b/x11-wm/openbox/files/digest-openbox-3.0_alpha4
deleted file mode 100644
index eba3a1092336..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.0_alpha4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1701fd58e3537430b3711c7ae5fea37f openbox-3.0-alpha4.tar.gz 469905
diff --git a/x11-wm/openbox/files/digest-openbox-3.0_alpha8 b/x11-wm/openbox/files/digest-openbox-3.0_alpha8
new file mode 100644
index 000000000000..cd29cc55961e
--- /dev/null
+++ b/x11-wm/openbox/files/digest-openbox-3.0_alpha8
@@ -0,0 +1 @@
+MD5 af0efee91aaf9801b37eb6dac830fe07 openbox-3.0-alpha8.tar.gz 567536
diff --git a/x11-wm/openbox/openbox-2.3.0.ebuild b/x11-wm/openbox/openbox-2.3.0.ebuild
index 70591a792431..a76dded15d00 100644
--- a/x11-wm/openbox/openbox-2.3.0.ebuild
+++ b/x11-wm/openbox/openbox-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.0.ebuild,v 1.9 2003/07/18 14:16:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.0.ebuild,v 1.10 2003/09/03 14:24:45 tseng Exp $
 
 IUSE="gnome kde xinerama truetype"
 
@@ -33,7 +33,7 @@ src_unpack() {
 
 src_install() {
 
-    commonbox_src_install
+	commonbox_src_install
 
 	rm -f ${D}/usr/share/man/man1/xftlsfonts*
 	mv ${D}/usr/share/commonbox/openbox/epistrc \
diff --git a/x11-wm/openbox/openbox-2.3.1.ebuild b/x11-wm/openbox/openbox-2.3.1.ebuild
index b53949cce63d..1692ce3367a6 100644
--- a/x11-wm/openbox/openbox-2.3.1.ebuild
+++ b/x11-wm/openbox/openbox-2.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.1.ebuild,v 1.7 2003/06/24 08:57:05 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-2.3.1.ebuild,v 1.8 2003/09/03 14:24:45 tseng Exp $
 
 IUSE="gnome kde nls xinerama"
 
@@ -32,7 +32,7 @@ src_unpack() {
 
 src_install() {
 
-    commonbox_src_install
+	commonbox_src_install
 
 	rm -f ${D}/usr/share/man/man1/xftlsfonts*
 	mv ${D}/usr/share/commonbox/openbox/epistrc \
diff --git a/x11-wm/openbox/openbox-3.0_alpha4.ebuild b/x11-wm/openbox/openbox-3.0_alpha4.ebuild
deleted file mode 100644
index 03277d81d923..000000000000
--- a/x11-wm/openbox/openbox-3.0_alpha4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.0_alpha4.ebuild,v 1.3 2003/08/02 15:10:49 seemant Exp $
-
-IUSE="nls"
-
-S=${WORKDIR}/${P/_/-}
-DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
-HOMEPAGE="http://icculus.org/openbox/"
-SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz"
-
-DEPEND="virtual/x11"
-
-SLOT="3"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips"
-
-src_compile() {
-	econf `use_enable nls` \
-		--program-suffix="3" || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	# Add a file for the DM's to recognise it:
-	echo "/usr/bin/openbox3" > ob3.xsession
-	exeinto /etc/X11/Sessions
-	newexe ob3.xsession openbox3
-	
-	dodoc README AUTHORS ChangeLog TODO
-}
-
-pkg_postinst () {
-	einfo "In Openbox 3, the rc and menu have been combined into rc3."
-	einfo "You can find a sample at /usr/share/openbox/rc3."
-	einfo "Openbox 3 is found at /usr/bin/openbox3,"
-	einfo "Installed versions of openbox 2 are still available"
-}
diff --git a/x11-wm/openbox/openbox-3.0_alpha6.ebuild b/x11-wm/openbox/openbox-3.0_alpha6.ebuild
index 43b3fe55e6b5..03c7d7dbd2fe 100644
--- a/x11-wm/openbox/openbox-3.0_alpha6.ebuild
+++ b/x11-wm/openbox/openbox-3.0_alpha6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.0_alpha6.ebuild,v 1.3 2003/09/03 14:24:45 tseng Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
@@ -14,11 +14,10 @@ DEPEND="virtual/xft
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
 	>=gnome-base/libglade-2"
-	
 RDEPEND=${DEPEND}
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 src_compile() {
 
@@ -26,7 +25,6 @@ src_compile() {
 		`use_enable nls` \
 		--program-suffix="3" || die
 	emake || die
-	
 }
 
 src_install () {
diff --git a/x11-wm/openbox/openbox-3.0_alpha7.ebuild b/x11-wm/openbox/openbox-3.0_alpha7.ebuild
index 43b3fe55e6b5..87191bbdd5e0 100644
--- a/x11-wm/openbox/openbox-3.0_alpha7.ebuild
+++ b/x11-wm/openbox/openbox-3.0_alpha7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.0_alpha7.ebuild,v 1.2 2003/09/03 14:24:45 tseng Exp $
 
 S=${WORKDIR}/${P/_/-}
 DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
@@ -14,11 +14,10 @@ DEPEND="virtual/xft
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
 	>=gnome-base/libglade-2"
-	
 RDEPEND=${DEPEND}
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 src_compile() {
 
@@ -26,7 +25,6 @@ src_compile() {
 		`use_enable nls` \
 		--program-suffix="3" || die
 	emake || die
-	
 }
 
 src_install () {
diff --git a/x11-wm/openbox/openbox-3.0_alpha8.ebuild b/x11-wm/openbox/openbox-3.0_alpha8.ebuild
new file mode 100644
index 000000000000..1879d2a571fc
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.0_alpha8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.0_alpha8.ebuild,v 1.1 2003/09/03 14:24:45 tseng Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
+SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz"
+HOMEPAGE="http://icculus.org/openbox/"
+IUSE="nls"
+SLOT="3"
+
+DEPEND="virtual/xft
+	virtual/x11
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2"
+RDEPEND=${DEPEND}
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+src_compile() {
+
+	econf \
+		`use_enable nls` \
+		--program-suffix="3" || die
+	emake || die
+}
+
+src_install () {
+
+	make DESTDIR=${D} install || die
+	dodoc README AUTHORS ChangeLog TODO
+}
+
+pkg_postinst () {
+	einfo "This release moves the menu back to its own file."
+	einfo "There are also many changes in the rc3 file."
+	einfo "Please check out the examples in /usr/share/openbox/ before running."
+}