From 88a885927e819c3df9f2efce26015b3338f7b6c3 Mon Sep 17 00:00:00 2001 From: Aaron Walker Date: Wed, 11 May 2005 13:49:41 +0000 Subject: Fix bash param expansion that broke on versions with a revision; bug 91529 Package-Manager: portage-2.0.51.21-r1 --- net-www/awstats/ChangeLog | 6 +++++- net-www/awstats/Manifest | 12 ++++++------ net-www/awstats/awstats-6.3-r2.ebuild | 4 ++-- net-www/awstats/awstats-6.4.ebuild | 5 +++-- 4 files changed, 16 insertions(+), 11 deletions(-) (limited to 'net-www') 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 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 awstats-6.4.ebuild: Marked stable on x86. diff --git a/net-www/awstats/Manifest b/net-www/awstats/Manifest index ec9ed43afe1d..10abac4f7a6e 100644 --- a/net-www/awstats/Manifest +++ b/net-www/awstats/Manifest @@ -1,9 +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 4732d4c420db27d2588352c9fff128b8 awstats-6.3-r2.ebuild 4039 +MD5 49141cd3989de828cbdbc846123725c3 awstats-6.4.ebuild 3897 +MD5 115161a383bd8164d455a0466e60d37f ChangeLog 3197 MD5 6bc2db5b1e135821863e91fa8658ad48 metadata.xml 255 MD5 803faa3640a7aadd2fadbbd05968a45e files/digest-awstats-6.4 60 MD5 70a086a2f452243a500aa67b1df7f26f files/digest-awstats-6.3-r2 135 @@ -13,7 +13,7 @@ MD5 8f8b0ad336b5066db17452db770ed878 files/awstats-6.3-CAN-2005-0363.diff 1243 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCajO9EZCkKN40op4RAqPxAJ9vjQNRlb5hyyXSuuOuaOia91dJgwCggMe6 -hA9BUBCwlX1xUnlFjNU2Khs= -=8zLE +iD8DBQFCgg3DEZCkKN40op4RAnZHAJ0fsHYtZh2ojIBYYeZcB/mvBG4cDQCfdi+A +dZNcGt9xizyDt27NOZWc0lU= +=On76 -----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 -- cgit v1.2.3-65-gdbad