Version bump; remove older prerelease versions.

(Portage version: 2.1.5_rc3)

3 files changed, 9 insertions, 56 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index e8c0230b5541..2439d2eae0dd 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.162 2008/03/30 06:16:32 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.163 2008/04/18 07:43:42 omp Exp $
+
+*openbox-3.4.7.1 (18 Apr 2008)
+
+  18 Apr 2008; David Shakaryan <omp@gentoo.org> -openbox-3.4.7_pre2.ebuild,
+  -openbox-3.4.7_pre3.ebuild, +openbox-3.4.7.1.ebuild:
+  Version bump; remove older prerelease versions.
 
 *openbox-3.4.7_pre3 (30 Mar 2008)
 
diff --git a/x11-wm/openbox/openbox-3.4.7_pre2.ebuild b/x11-wm/openbox/openbox-3.4.7.1.ebuild
index eb1b8b1b760a..3b9027c30e92 100644
--- a/x11-wm/openbox/openbox-3.4.7_pre2.ebuild
+++ b/x11-wm/openbox/openbox-3.4.7.1.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.7_pre2.ebuild,v 1.1 2008/03/21 03:49:07 omp Exp $
-
-MY_P=${P/_/-}
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.7.1.ebuild,v 1.1 2008/04/18 07:43:42 omp Exp $
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
 HOMEPAGE="http://icculus.org/openbox/"
-SRC_URI="http://icculus.org/openbox/${MY_P}.tar.gz"
+SRC_URI="http://icculus.org/openbox/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3"
@@ -29,8 +27,6 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 	xinerama? ( x11-proto/xineramaproto )"
 
-S=${WORKDIR}/${MY_P}
-
 src_compile() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
diff --git a/x11-wm/openbox/openbox-3.4.7_pre3.ebuild b/x11-wm/openbox/openbox-3.4.7_pre3.ebuild
deleted file mode 100644
index 798b280256bb..000000000000
--- a/x11-wm/openbox/openbox-3.4.7_pre3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.4.7_pre3.ebuild,v 1.1 2008/03/30 06:16:32 omp Exp $
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager."
-HOMEPAGE="http://icculus.org/openbox/"
-SRC_URI="http://icculus.org/openbox/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nls startup-notification xinerama"
-
-RDEPEND=">=dev-libs/glib-2.6
-	>=dev-libs/libxml2-2.0
-	>=media-libs/fontconfig-2
-	virtual/xft
-	x11-libs/libXrandr
-	x11-libs/libXt
-	>=x11-libs/pango-1.8
-	nls? ( sys-devel/gettext )
-	startup-notification? ( >=x11-libs/startup-notification-0.8 )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xf86vidmodeproto
-	xinerama? ( x11-proto/xineramaproto )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable nls) \
-		$(use_enable startup-notification) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox-session" > "${D}/etc/X11/Sessions/${PN}"
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-}