Remove old; bump to a new snapshot as per bug #440764.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 30 insertions, 68 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index cf83a60e90f2..77f8a93c3da3 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-misc/awstats
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.28 2012/02/01 17:06:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.29 2012/11/01 16:23:28 flameeyes Exp $
+
+*awstats-7.1_p20121017 (01 Nov 2012)
+
+  01 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +awstats-7.1_p20121017.ebuild, -awstats-7.0_p20101205-r3.ebuild,
+  -files/awstats-6.3-gentoo.diff, -files/awstats-7.0_p20101205-nofollow.patch:
+  Remove old; bump to a new snapshot as per bug #440764.
 
   01 Feb 2012; Brent Baude <ranger@gentoo.org> awstats-7.1-r2.ebuild:
   Marking awstats-7.1-r2 ppc for bug 384237
@@ -419,4 +426,3 @@
   Perolo Silantico < per.sil @ gmx.it >
   and me < zul @ gentoo.org >
   Finally closes # 19382.
-
diff --git a/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild b/www-misc/awstats/awstats-7.1_p20121017.ebuild
index 6e0c0973ec1c..049d47f016e0 100644
--- a/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild
+++ b/www-misc/awstats/awstats-7.1_p20121017.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild,v 1.6 2011/06/06 12:15:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.1_p20121017.ebuild,v 1.1 2012/11/01 16:23:28 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
 MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics."
-HOMEPAGE="http://awstats.sourceforge.net/"
-
-SRC_URI="http://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
-
-# The following SRC_URI is useful only when fetching for the first time
-# after bump; upstream does not bump the version when they change it, so
-# we rename it to include the date and upload to our mirrors instead.
-#SRC_URI="http://awstats.sourceforge.net/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://www.awstats.org/"
+
+if [ ${MY_P} != ${P} ]; then
+	SRC_URI="http://dev.gentoo.org/~flameeyes/awstats/${P}.tar.gz"
+	# The following SRC_URI is useful only when fetching for the first time
+	# after bump; upstream does not bump the version when they change it, so
+	# we rename it to include the date and upload to our mirrors instead.
+	#SRC_URI="http://www.awstats.org/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="http://www.awstats.org/files/${P}.tar.gz"
+fi
 
 S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
 IUSE="geoip ipv6"
 
 SLOT="0"
@@ -34,12 +37,12 @@ RDEPEND=">=dev-lang/perl-5.6.1
 DEPEND=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
-	epatch "${FILESDIR}"/${P}-nofollow.patch
+	epatch "${FILESDIR}"/${PN}-7.1-gentoo.diff
 
 	# change default installation directory
 	find . -type f -exec sed \
 		-e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/wwwroot#g" \
+		-e '/PossibleLibDir/s:(.*):("/usr/share/awstats/wwwroot/cgi-bin/lib"):' \
 		-i {} + || die "find/sed failed"
 
 	# set default values for directories; use apache log as an example
@@ -65,23 +68,22 @@ src_prepare() {
 }
 
 src_install() {
-	dohtml -r docs/* || die
-	dodoc README.TXT || die
+	dohtml -r docs/*
+	dodoc README.TXT
 	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
-	docinto xslt
-	dodoc tools/xslt/* || die
+	dodoc -r tools/xslt
 
 	keepdir /var/lib/awstats
 
 	insinto /etc/awstats
-	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf || die
+	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
 
 	# remove extra content that we don't want to install
 	rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
 		"${S}"/wwwroot/classes/src || die
 
 	insinto /usr/share/awstats
-	doins -r wwwroot || die
+	doins -r wwwroot
 	chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
 
 	cd "${S}"/tools
diff --git a/www-misc/awstats/files/awstats-6.3-gentoo.diff b/www-misc/awstats/files/awstats-6.3-gentoo.diff
deleted file mode 100644
index 8b316670ab3c..000000000000
--- a/www-misc/awstats/files/awstats-6.3-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN awstats-6.3.orig/tools/awstats_configure.pl awstats-6.3/tools/awstats_configure.pl
---- awstats-6.3.orig/tools/awstats_configure.pl	2005-01-24 09:28:43.980923725 -0500
-+++ awstats-6.3/tools/awstats_configure.pl	2005-01-24 09:28:52.034571769 -0500
-@@ -658,6 +658,20 @@
-     		print "\n-----> Restart Web server with '$command'\n";
- 	 	    my $ret=`$command`;
- 	 	    print "$ret";
-+	} elsif (-f "/etc/gentoo-release") {
-+	    my $command;
-+	    if (-x "/usr/sbin/apache2ctl") {
-+		$command="/usr/sbin/apache2ctl graceful";
-+	    } elsif (-x "/usr/sbin/apachectl") {
-+		$command="/usr/sbin/apachectl graceful";
-+	    } else {
-+       		print "\n-----> Don't forget to restart manually your web server\n";
-+	    }
-+	    if ($command != "") {
-+		print "\n-----> Restart Web server with '$command'\n";
-+		my $ret=`$command`;
-+		print "$ret";
-+	    }
-         } elsif (-x "/sbin/service") {
-             # We are not on debian
-        	 	my $command="/sbin/service httpd restart";
diff --git a/www-misc/awstats/files/awstats-7.0_p20101205-nofollow.patch b/www-misc/awstats/files/awstats-7.0_p20101205-nofollow.patch
deleted file mode 100644
index 5f314481a063..000000000000
--- a/www-misc/awstats/files/awstats-7.0_p20101205-nofollow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: awstats-7.0_p20101205/wwwroot/cgi-bin/awstats.pl
-===================================================================
---- awstats-7.0_p20101205.orig/wwwroot/cgi-bin/awstats.pl
-+++ awstats-7.0_p20101205/wwwroot/cgi-bin/awstats.pl
-@@ -8787,7 +8787,7 @@ sub HTMLShowURLInfo {
- 			{    # URL seems to be extracted from a proxy log file
- 				print "<a href=\""
- 				  . XMLEncode("$newkey")
--				  . "\" target=\"url\">"
-+				  . "\" target=\"url\" rel=\"nofollow\">"
- 				  . XMLEncode($nompage) . "</a>";
- 			}
- 			elsif ( $newkey =~ /^\// )
-@@ -8802,7 +8802,7 @@ sub HTMLShowURLInfo {
- 				}
- 				print "<a href=\""
- 				  . XMLEncode("$urlprot://$SiteDomain$newkey")
--				  . "\" target=\"url\">"
-+				  . "\" target=\"url\" rel=\"nofollow\">"
- 				  . XMLEncode($nompage) . "</a>";
- 			}
- 			else {