Big cleanup.

12 files changed, 11 insertions, 294 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 56d8d4f6bd41..1defe9db23f9 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.87 2004/06/25 03:14:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.88 2004/07/18 20:25:06 tseng Exp $
+
+  18 Jul 2004; Brandon Hale <tseng@gentoo.org> -openbox-3.0-r1.ebuild,
+  -openbox-3.0.ebuild, -openbox-3.1-r1.ebuild, -openbox-3.1.ebuild,
+  -openbox-3.2.ebuild:
+  Big cleanup.
 
   08 Jun 2004; Travis Tilley <lv@gentoo.org> openbox-3.2-r1.ebuild,
   openbox-3.2.ebuild:
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index eb1e790fb8c6..30df5cda6a0c 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,19 +1,9 @@
-MD5 428a92cbb3cf1ba7c318d5c6bbda6c8a openbox-3.0-r1.ebuild 1435
-MD5 d2200a9bb76c10f6b484f0b7566caa96 openbox-3.1.ebuild 1438
-MD5 cc774ca6daf66409fd980c72c37aab61 openbox-3.0.ebuild 1332
-MD5 9bf1d56d2429a6cb1166340d5b8aea63 openbox-3.2-r1.ebuild 1503
-MD5 f262ab50eab980716c0bfcd04c441447 ChangeLog 15820
-MD5 e84ec437ae76447cba809d5ddef76bd4 openbox-3.2.ebuild 1402
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
-MD5 230b792ce8d113044a8740d6212cbd21 openbox-3.1-r1.ebuild 1410
-MD5 b304744ad6cee743ab5e4c2f1ddd3409 files/digest-openbox-3.0-r1 134
-MD5 65fe3e6fb33eb6717d28799c961b51ca files/digest-openbox-3.1-r1 134
-MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r1 134
-MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
+MD5 133f008df43ffc957a5a17c75a3d62f2 ChangeLog 15995
+MD5 9bf1d56d2429a6cb1166340d5b8aea63 openbox-3.2-r1.ebuild 1503
 MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
-MD5 b304744ad6cee743ab5e4c2f1ddd3409 files/digest-openbox-3.0 134
-MD5 65fe3e6fb33eb6717d28799c961b51ca files/digest-openbox-3.1 134
-MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2 134
+MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
+MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
 MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192
+MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r1 134
 MD5 0b79bdcff70f29cdaf7980382b34dee4 files/openbox-2.3.1-nls-codeset.patch 306
-MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
diff --git a/x11-wm/openbox/files/digest-openbox-3.0 b/x11-wm/openbox/files/digest-openbox-3.0
deleted file mode 100644
index 91ae849ebf39..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 61074775106004b0add30dcaaf85a759 openbox-3.0.tar.gz 549264
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/files/digest-openbox-3.0-r1 b/x11-wm/openbox/files/digest-openbox-3.0-r1
deleted file mode 100644
index 91ae849ebf39..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 61074775106004b0add30dcaaf85a759 openbox-3.0.tar.gz 549264
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/files/digest-openbox-3.1 b/x11-wm/openbox/files/digest-openbox-3.1
deleted file mode 100644
index 03ac811de4db..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3152631bb8c892b919129e2a58978aad openbox-3.1.tar.gz 550425
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/files/digest-openbox-3.1-r1 b/x11-wm/openbox/files/digest-openbox-3.1-r1
deleted file mode 100644
index 03ac811de4db..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3152631bb8c892b919129e2a58978aad openbox-3.1.tar.gz 550425
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/files/digest-openbox-3.2 b/x11-wm/openbox/files/digest-openbox-3.2
deleted file mode 100644
index 40daee057d5f..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 96b6393839883c4b260388879154d294 openbox-3.2.tar.gz 561115
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/openbox-3.0-r1.ebuild b/x11-wm/openbox/openbox-3.0-r1.ebuild
deleted file mode 100644
index 1741b6d8af50..000000000000
--- a/x11-wm/openbox/openbox-3.0-r1.ebuild
+++ /dev/null
@@ -1,56 +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/openbox/openbox-3.0-r1.ebuild,v 1.6 2004/06/25 03:14:02 agriffis 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
-		mirror://gentoo/ob-themes-usability.tar.bz2"
-
-HOMEPAGE="http://icculus.org/openbox/"
-IUSE="nls"
-SLOT="3"
-
-RDEPEND="virtual/xft
-	virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-src_compile() {
-
-	econf \
-		`use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
-	fperms a+x /etc/X11/Sessions/openbox
-
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog TODO
-
-	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
-	# These are included due to the poor usability of the default themes
-	# for users with limited vision. These are based on Jimmac's
-	# Gorilla and Industrial themes for Metacity.
-
-	dodir /usr/share/themes
-	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The binary is now moved to /usr/bin/openbox."
-	ewarn "Likewise for the session files."
-	ewarn
-}
diff --git a/x11-wm/openbox/openbox-3.0.ebuild b/x11-wm/openbox/openbox-3.0.ebuild
deleted file mode 100644
index 41fc45d72c7c..000000000000
--- a/x11-wm/openbox/openbox-3.0.ebuild
+++ /dev/null
@@ -1,50 +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/openbox/openbox-3.0.ebuild,v 1.7 2004/06/25 03:14:02 agriffis 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
-		mirror://gentoo/ob-themes-usability.tar.bz2"
-
-HOMEPAGE="http://icculus.org/openbox/"
-IUSE="nls"
-SLOT="3"
-
-RDEPEND="virtual/xft
-	virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		--program-suffix="3" || die
-	emake || die
-}
-
-src_install () {
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox3" > ${D}/etc/X11/Sessions/openbox3
-	fperms a+x /etc/X11/Sessions/openbox3
-
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog TODO
-
-	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
-	# These are included due to the poor usability of the default themes
-	# for users with limited vision. These are based on Jimmac's
-	# Gorilla and Industrial themes for Metacity.
-
-	dodir /usr/share/themes
-	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
-}
diff --git a/x11-wm/openbox/openbox-3.1-r1.ebuild b/x11-wm/openbox/openbox-3.1-r1.ebuild
deleted file mode 100644
index 03f79ef86ce7..000000000000
--- a/x11-wm/openbox/openbox-3.1-r1.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/openbox/openbox-3.1-r1.ebuild,v 1.5 2004/06/25 03:14:02 agriffis 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
-		mirror://gentoo/ob-themes-usability.tar.bz2"
-
-HOMEPAGE="http://icculus.org/openbox/"
-IUSE="nls"
-SLOT="3"
-
-RDEPEND="virtual/xft
-	virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc amd64 ~hppa"
-
-src_compile() {
-
-	econf \
-		`use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
-	fperms a+x /etc/X11/Sessions/openbox
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/${PN}.desktop
-
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog TODO
-
-	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
-	# These are included due to the poor usability of the default themes
-	# for users with limited vision. These are based on Jimmac's
-	# Gorilla and Industrial themes for Metacity.
-
-	dodir /usr/share/themes
-	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
-}
diff --git a/x11-wm/openbox/openbox-3.1.ebuild b/x11-wm/openbox/openbox-3.1.ebuild
deleted file mode 100644
index 7acbc7e4f447..000000000000
--- a/x11-wm/openbox/openbox-3.1.ebuild
+++ /dev/null
@@ -1,56 +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/openbox/openbox-3.1.ebuild,v 1.7 2004/06/25 03:14:02 agriffis 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
-		mirror://gentoo/ob-themes-usability.tar.bz2"
-
-HOMEPAGE="http://icculus.org/openbox/"
-IUSE="nls"
-SLOT="3"
-
-RDEPEND="virtual/xft
-	virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc amd64"
-
-src_compile() {
-
-	econf \
-		`use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
-	fperms a+x /etc/X11/Sessions/openbox
-
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog TODO
-
-	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
-	# These are included due to the poor usability of the default themes
-	# for users with limited vision. These are based on Jimmac's
-	# Gorilla and Industrial themes for Metacity.
-
-	dodir /usr/share/themes
-	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "The binary is now moved to /usr/bin/openbox."
-	ewarn "Likewise for the session files."
-	ewarn
-}
diff --git a/x11-wm/openbox/openbox-3.2.ebuild b/x11-wm/openbox/openbox-3.2.ebuild
deleted file mode 100644
index 2f7039c782b6..000000000000
--- a/x11-wm/openbox/openbox-3.2.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/openbox/openbox-3.2.ebuild,v 1.7 2004/06/25 03:14:02 agriffis 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
-		mirror://gentoo/ob-themes-usability.tar.bz2"
-
-HOMEPAGE="http://icculus.org/openbox/"
-IUSE="nls"
-SLOT="3"
-
-RDEPEND="virtual/xft
-	virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc amd64"
-
-src_compile() {
-
-	econf \
-		`use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
-	fperms a+x /etc/X11/Sessions/openbox
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/${PN}.desktop
-
-	make DESTDIR=${D} install || die
-	dodoc README AUTHORS ChangeLog TODO
-
-	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
-	# These are included due to the poor usability of the default themes
-	# for users with limited vision. These are based on Jimmac's
-	# Gorilla and Industrial themes for Metacity.
-
-	dodir /usr/share/themes
-	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
-}