change the version suffix code a bit

2 files changed, 29 insertions, 24 deletions

diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 347d0be8aac8..61f41e6d08f6 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,45 +1,45 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 dc270d29d58134c9b35d7ac2244510e0 fluxbox-0.9.11.ebuild 4798
+MD5 ed4a197c46b3826d430000dc715fc07b ChangeLog 25511
 MD5 8f675a157001695fa8f3c09a8f690162 fluxbox-0.9.10-r2.ebuild 2005
 MD5 be4ab9bc33879873dd411fd56a4d1820 fluxbox-0.9.9.ebuild 1703
 MD5 54b87ebae52c41babf1591d41584ce0e fluxbox-0.9.10-r4.ebuild 5132
-MD5 fee7526601227e2d5a49c256e3129e39 fluxbox-0.9.11.ebuild 4722
-MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
 MD5 c7b089dfbfc0eb9166e9d115905b5d99 fluxbox-0.9.10-r1.ebuild 1829
-MD5 1b886182e31cb486c385e9305be30636 fluxbox-0.9.10-r3.ebuild 4098
-MD5 ed4a197c46b3826d430000dc715fc07b ChangeLog 25511
+MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
+MD5 1b886182e31cb486c385e9305be30636 fluxbox-0.9.10-r3.ebuild 4098
+MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67
 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65
-MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
 MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r2 67
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67
 MD5 8371840822662e7d40019b5f5ee7888f files/digest-fluxbox-0.9.10-r4 150
 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
-MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
-MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127
-MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
+MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r2 67
+MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
 MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93
+MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968
+MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203
 MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915
-MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
 MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563
-MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203
-MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117
-MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804
-MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
-MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
-MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
-MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295
 MD5 05e049a3f92497ddb1cf615abfdc5f35 files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch 946
+MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
+MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127
 MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008
+MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
+MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804
+MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117
+MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
+MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
 MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948
-MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968
+MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBt3DrCHk4+ZoBpvsRAnDjAJ0TmkWzYL9oBk8r5qryKvQ1zJcRhwCfW6Jm
-FW8baZvSNLiR/cmvI8th4AY=
-=hkKT
+iD8DBQFBxboHLLFUmVNQ7rkRAob8AJ0ds4D4pGV6AwjZ5QN/GZkTus/uQACfbBLK
+j979Kg7H0VrD5cgIBu34QHQ=
+=Fz4Q
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/fluxbox-0.9.11.ebuild b/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
index 9922b0dc1bc8..a6c7810fe0d2 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.11.ebuild,v 1.4 2004/12/08 21:22:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.11.ebuild,v 1.5 2004/12/19 17:26:29 ciaranm Exp $
 
 inherit eutils
 
@@ -43,8 +43,13 @@ src_unpack() {
 	epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-fancy-gentoo-styledirs.patch
 
 	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
 	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-gentoo${PR:+-${PR}}~" \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
 		version.h.in || die "version sed failed"
 
 	# Use a less fugly default theme