Version bump; remove older prerelease versions.

Package-Manager: portage-2.1.5_rc3

4 files changed, 16 insertions, 65 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/Manifest b/x11-wm/openbox/Manifest
index dcb526e98ac3..6b72ee147e79 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA1
 
 DIST openbox-3.4.6.1.tar.gz 781848 RMD160 4761fe5e1f2731d912819a2daaa905fec10dd7b4 SHA1 9ca6acb44fa1f41e5c016762e06d274481120e2e SHA256 8a3a34ff5f6f5db484497c97fc87a6ec921687c6ade9f6f86d8667a144975a49
-DIST openbox-3.4.7-pre2.tar.gz 820458 RMD160 173e32e6456e0e40b3c8b177030c4de44b4ff3ea SHA1 45dc5fc627c0ef2d7595cc817f92a63dbd21d1bc SHA256 e6335893c2357cccbfeab4c085642f3b6bb5a452827762b453cc97d520d294ff
-DIST openbox-3.4.7-pre3.tar.gz 826864 RMD160 d918ebbe32f9b0f0c99363e2132a5abf391fc352 SHA1 c2cddf2a8921f5463e92b91306641ff2acf9bf38 SHA256 c43198df926dcdcaed8a373086fbaf8d12e04d3bf706b90592700afee4cbbb38
+DIST openbox-3.4.7.1.tar.gz 827590 RMD160 49bb2d382bf35a7edd9ee760850ba766344d7f4b SHA1 3a1856aee10b735645222e3f5b7abbd7150e5ac1 SHA256 3f8468056e15317615704b10eb51df5347bea9ba9a6ea0c5030dc07937f7ab42
 EBUILD openbox-3.4.6.1.ebuild 1313 RMD160 fb70e583e9e0e0e182d90fe561dd223e015feffb SHA1 d1710f5b28468b1d98d03719834178f1e1947220 SHA256 f11bb8572146785fd614ae6a2c2e34b84054d5e990f622763b4fba042a716245
-EBUILD openbox-3.4.7_pre2.ebuild 1354 RMD160 17700b62b3c06b865b8c1f563b4c50a9b0148cfd SHA1 c4fde65699a053004d9fd16c26e76856ccad4fb1 SHA256 736dbc8a760e73fbd496b54833783e50e207ba71274e54a885cb7f0a33521913
-EBUILD openbox-3.4.7_pre3.ebuild 1354 RMD160 e8c80ab2d888509475c14ab552f759c304031fe0 SHA1 c0a50eb227eb2918228cdde7a85f74b47055514c SHA256 c856a0b30ee92b12aeffc8ba10f07b928c7f8b9db6c980a3f585acc54968756f
-MISC ChangeLog 25783 RMD160 fa80fdf9370d7d350efad9ff1c6a5b5fabdb497c SHA1 aba353e1e42996145ef9f4616f4f8803da69634c SHA256 2d436ddf58fc7641b6be72ca1e0813d4410109c9723b5945c00f02bfb1155631
+EBUILD openbox-3.4.7.1.ebuild 1320 RMD160 6377ce781232c043352dfd1bcfc04f94b7e165de SHA1 48255f74ac79bc0650d62697cb467d5c4b012115 SHA256 245fce9fe4d4b3f0d266db9a3c8fe8daa545b4a659d62759d9c73df6d67652b4
+MISC ChangeLog 25997 RMD160 b13fece3fa194ebda71db05c6a139d483c807f4a SHA1 492b4930efb555a722b1a0832bf44a9092fa3d2e SHA256 6d987434bcfe46b8a60049386e4446c8824bc0f33f6491d75b4e324db5fc1d90
 MISC metadata.xml 255 RMD160 49355eedad34bddca494a9be237276acc337a111 SHA1 ab7bff7e6e014f162799a4887e7f0928117a7f35 SHA256 7eb98db008c8532bdd6f3091831192dcc42634326065455f10615b540da04ff3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH7zBOvSApE0uP4UsRAm+yAKCN3oXGk2oyK02teQH75EUBzh1k7gCeP1n3
-6IjPaoUc1UQSBEq1aPxWJSI=
-=ozsi
+iEYEARECAAYFAkgIUT4ACgkQvSApE0uP4Uvm0ACghW3rMBs3QtAmdVQaxCqRTEmY
+LdsAniXya/H2oLmv9ghjDw4FrN/LSPYw
+=MthB
 -----END PGP SIGNATURE-----
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"
-}