Fix bash param expansion that broke on versions with a revision; bug 91529

(Portage version: 2.0.51.21-r1)

4 files changed, 13 insertions, 18 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index 5d9512aca1fa..a7996a36384c 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.17 2005/04/23 11:37:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.18 2005/05/11 13:49:41 ka0ttic Exp $
+
+  11 May 2005; Aaron Walker <ka0ttic@gentoo.org> awstats-6.3-r2.ebuild,
+  awstats-6.4.ebuild:
+  Fix bash param expansion that broke on versions with a revision; bug 91529
 
   23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> awstats-6.4.ebuild:
   Marked stable on x86.
diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest
index ec9ed43afe1d..2a48741764fc 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0b56bf509337f3f5697eaa6924d40fb0 awstats-6.3-r2.ebuild 4038
-MD5 ef6d37e607f5a4ea476b6b254ef8f0bb awstats-6.4.ebuild 3867
-MD5 97693dd640c89e3971ee30307eaf22f2 ChangeLog 3025
+MD5 0bfaeb3132253243b1596b5cd58a6642 awstats-6.3-r2.ebuild 4039
+MD5 6c651ddcd9c72f810b951974fe4dd72e awstats-6.4.ebuild 3897
+MD5 e4f7c1021e9710252a2cc62286be7cea ChangeLog 3197
 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255
 MD5 803faa3640a7aadd2fadbbd05968a45e files/digest-awstats-6.4 60
 MD5 70a086a2f452243a500aa67b1df7f26f files/digest-awstats-6.3-r2 135
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
 MD5 f881494a979cdea82d58e31b589d9a97 files/postinst-en.txt 5049
 MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0363.diff 1243
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCajO9EZCkKN40op4RAqPxAJ9vjQNRlb5hyyXSuuOuaOia91dJgwCggMe6
-hA9BUBCwlX1xUnlFjNU2Khs=
-=8zLE
------END PGP SIGNATURE-----
diff --git a/net-www/awstats/awstats-6.3-r2.ebuild b/net-www/awstats/awstats-6.3-r2.ebuild
index 381215ac5029..702a30e29d9b 100644
--- a/net-www/awstats/awstats-6.3-r2.ebuild
+++ b/net-www/awstats/awstats-6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3-r2.ebuild,v 1.3 2005/03/21 13:36:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.3-r2.ebuild,v 1.4 2005/05/11 13:49:41 ka0ttic Exp $
 
 inherit eutils webapp versionator
 
@@ -44,7 +44,7 @@ src_unpack() {
 	done
 
 	local apachever=$(best_version net-www/apache)
-	apachever="$(get_major_version ${apachever##*-})"
+	apachever="$(get_major_version ${apachever#*/*-})"
 	[[ ${apachever} == "1" ]] && apachever=""
 
 	# set default values for directories
diff --git a/net-www/awstats/awstats-6.4.ebuild b/net-www/awstats/awstats-6.4.ebuild
index 300c16278682..4a8ee038c12b 100644
--- a/net-www/awstats/awstats-6.4.ebuild
+++ b/net-www/awstats/awstats-6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.4.ebuild,v 1.2 2005/04/23 11:37:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.4.ebuild,v 1.3 2005/05/11 13:49:41 ka0ttic Exp $
 
 inherit eutils webapp versionator
 
@@ -37,8 +37,9 @@ src_unpack() {
 	    fi
 	done
 
+	# find apache major version
 	local apachever=$(best_version net-www/apache)
-	apachever="$(get_major_version ${apachever##*-})"
+	apachever="$(get_major_version ${apachever#*/*-})"
 	[[ ${apachever} == "1" ]] && apachever=""
 
 	# set default values for directories