Clean up latest version and remove older version.

(Portage version: 2.1.2.5)

5 files changed, 10 insertions, 95 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index c7369104fd19..a4700c04128d 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.123 2007/04/22 09:40:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.124 2007/05/02 03:35:59 omp Exp $
+
+  02 May 2007; David Shakaryan <omp@gentoo.org>
+  -files/openbox-3.2-makefile.patch, -openbox-3.2-r2.ebuild,
+  openbox-3.3.1.ebuild:
+  Clean up latest version and remove older version.
 
   22 Apr 2007; Markus Rothe <corsair@gentoo.org> openbox-3.3.1.ebuild:
   Added ~ppc64
diff --git a/x11-wm/openbox/files/digest-openbox-3.2-r2 b/x11-wm/openbox/files/digest-openbox-3.2-r2
deleted file mode 100644
index 785bf030fa1b..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.2-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
-RMD160 0d5307746ba743647fe912eb8a364ca61c68b61a ob-themes-usability.tar.bz2 19204
-SHA256 36ce83c2d10abcc503dbaa6c89c0ce9a8793e5760d281973a38a41577421f5c5 ob-themes-usability.tar.bz2 19204
-MD5 96b6393839883c4b260388879154d294 openbox-3.2.tar.gz 561115
-RMD160 bd1045dc8c57a66ac2e6d6a0fb967ea65a02936d openbox-3.2.tar.gz 561115
-SHA256 1b21ae976ca84217aa34ee72c4dda81df5eff57bade5e0fd9f1910c92e56b647 openbox-3.2.tar.gz 561115
diff --git a/x11-wm/openbox/files/openbox-3.2-makefile.patch b/x11-wm/openbox/files/openbox-3.2-makefile.patch
deleted file mode 100644
index f50fa086f15a..000000000000
--- a/x11-wm/openbox/files/openbox-3.2-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.am.orig	2004-05-06 01:59:08.943196669 -0700
-+++ Makefile.am	2004-05-06 02:02:30.184343747 -0700
-@@ -55,6 +55,11 @@
- 	-DDEFAULT_THEME=\"$(theme)\"
- render_libobrender_la_LDFLAGS = \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+render_libobrender_la_LIBADD = \
-+	$(X_LIBS) \
-+	$(XFT_LIBS) \
-+	$(GLIB_LIBS) \
-+	$(XML_LIBS) 
- render_libobrender_la_SOURCES = \
- 	gettext.h \
- 	render/color.h \
diff --git a/x11-wm/openbox/openbox-3.2-r2.ebuild b/x11-wm/openbox/openbox-3.2-r2.ebuild
deleted file mode 100644
index d037ae997c9c..000000000000
--- a/x11-wm/openbox/openbox-3.2-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r2.ebuild,v 1.10 2006/06/09 18:36:28 anarchy Exp $
-
-inherit eutils
-
-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
-	mirror://gentoo/ob-themes-usability.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-IUSE="nls startup-notification xinerama"
-
-RDEPEND="|| ( ( x11-libs/libXrandr
-		x11-libs/libXt
-		xinerama? ( x11-libs/libXinerama )
-		)
-		virtual/x11
-	)
-	virtual/xft
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-
-DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		)
-		virtual/x11
-	 )
-	startup-notification? ( x11-libs/startup-notification )
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P/_/-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch
-}
-
-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.3.1.ebuild b/x11-wm/openbox/openbox-3.3.1.ebuild
index ff5951acad40..2ca65abaddf0 100644
--- a/x11-wm/openbox/openbox-3.3.1.ebuild
+++ b/x11-wm/openbox/openbox-3.3.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3.1.ebuild,v 1.9 2007/04/22 09:40:22 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3.1.ebuild,v 1.10 2007/05/02 03:35:59 omp Exp $
 
 inherit eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
 HOMEPAGE="http://icculus.org/openbox/"
-SRC_URI="http://icculus.org/openbox/releases/${P}.tar.gz"
+SRC_URI="http://icculus.org/${PN}/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
@@ -39,8 +39,8 @@ src_compile() {
 
 src_install() {
 	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox" > "${D}/etc/X11/Sessions/openbox"
-	fperms a+x /etc/X11/Sessions/openbox
+	echo "/usr/bin/openbox" > "${D}/etc/X11/Sessions/${PN}"
+	fperms a+x /etc/X11/Sessions/${PN}
 
 	insinto /usr/share/xsessions
 	doins "${FILESDIR}/${PN}.desktop"