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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

5 files changed, 51 insertions, 77 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/Manifest b/www-misc/awstats/Manifest
index d9ce431e149a..92fbfc933c4d 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,9 +1,21 @@
-AUX awstats-6.3-gentoo.diff 984 RMD160 5d49076bfc2a4b0c948d354ad2e0cf6b7703de2f SHA1 a93892f11f8004f9fc11268506637ff223d7c534 SHA256 488224144c66ac410f21a5df2f7d593384a42a1f5b35af709e721931ac3ec37c
-AUX awstats-7.0_p20101205-nofollow.patch 805 RMD160 b5b33ac9e63060cd22ddf4e58e81e303fa7add61 SHA1 5f26c2f7b06a1f791819dc09308dffea25ffdcf6 SHA256 8f4ffd36732aec5cbbc92184a808c532dab93c54548bdccd24bf50bcd1225aaf
-AUX awstats-7.1-gentoo.diff 795 RMD160 feb469547df8e9b1670076e90fead446416c5f0f SHA1 f9ac858e0a76ac19239e4db7ccd955a17204b34a SHA256 528b9c8608824dcadbd5e1f76f6a4e4931186c4dfb87b33820c27d9ca20f6bca
-DIST awstats-7.0_p20101205.tar.gz 1254327 RMD160 0bd46afbd3159cf5f3e517b37a43b7d0852fc2a3 SHA1 733fa7d6a540f4a54f52c69a5f271c789472b0b7 SHA256 e2651d4a5ff40e1d792b37cc13784d444cae479b4f98118aed27f46f5a18ce92
-DIST awstats-7.1.tar.gz 1255868 RMD160 517e5323172a8fa9b3a0c7431238b0331deaec31 SHA1 8b8be15e30be32f94493479580e22acfa1a780cc SHA256 67c8c4d97d85b37d08028cfeec0e1746784b5397042f129c6264891503ce0373
-EBUILD awstats-7.0_p20101205-r3.ebuild 3408 RMD160 e886f4a99d36d2efa403f770a79c7ea41059a933 SHA1 8a91516faa4859ca3cb24790e8cee2a2c1e03f26 SHA256 6a6e25b241da96f5ab12e320519ee6691a6bad60a2f26793270d86bce3d01eac
-EBUILD awstats-7.1-r2.ebuild 3458 RMD160 5dd1330ce8152eaa3a37d28244a994df7adaf777 SHA1 9cec9808a02ca7610e6713643a9f011b09b90193 SHA256 91a7049eb42299f476b9fc5a3fb2ae4d1fa145697bc616ac157a5ae57091def9
-MISC ChangeLog 15166 RMD160 cbbaa6135bef57d23cf476871be05d75b16dddb7 SHA1 271bafe8f08c04abf0edd61d8a28c0c280c45ebb SHA256 f38a237e235d00e212e870a17e510598eca3ff923cd4538a86db31a11a79d563
-MISC metadata.xml 234 RMD160 4aaa37cfc1520c193a82b7a8d705657642c03217 SHA1 fa45005b308271aa12f4c87237efa3f0ae948019 SHA256 546f04e42ad54ad26e9b3514961516a0286b2d14bdbbd83166d9dd480698945b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX awstats-7.1-gentoo.diff 795 SHA256 528b9c8608824dcadbd5e1f76f6a4e4931186c4dfb87b33820c27d9ca20f6bca SHA512 09e46f32b31389cd1d98465c8b2578c37d5d4d601baf58eb8ed6811875743c3b19819d6820977a9aaace8d8f8c97be8f798fcbaa10f7ed0cb950a2f7f843754c WHIRLPOOL 953e133ff9110cd051728544033bab4eb631a7ad800a2626531d21513c0e9c6c0cd6a2cadd4f38e604fc91ee0ff147045343e8c355155f4d5f062295cb99e901
+DIST awstats-7.1.tar.gz 1255868 SHA256 67c8c4d97d85b37d08028cfeec0e1746784b5397042f129c6264891503ce0373 SHA512 1fa411bbac4e417cd1d2dfb46617b0f772ad0d4f50c076c3b42b7ac3de78becc948835ab589d3a94b2552f19718eab82026584f86d50e38248ff46282664f7fd WHIRLPOOL 426aae77368494a9a7c47cd7e0baf1523ba5572ee3ddbd380fc7c18d9f3fceea5c3e64301470808cee8de1b4834ae13468707262bb0f06317bac5488d83cf5c5
+DIST awstats-7.1_p20121017.tar.gz 1258135 SHA256 262364b77d825096fee088b207f9f6c3d986dddd89645fca53fe09aa8c1fd850 SHA512 171ff3118955c8b73c968a23983885d967632d2c6e95a45f71e5f6fea74afe34d869c9cc901e2e739419068babc96385d7d7df1e8ca10074be7388fbe5c51f53 WHIRLPOOL 678bd6e36634ae2bdee46f42df6d2239a260a188fb1ae07199ef9043a0ad3b54baca7152032873848fabd42f94ef6a92da623e1eb9439d2dbcff15411679f207
+EBUILD awstats-7.1-r2.ebuild 3458 SHA256 91a7049eb42299f476b9fc5a3fb2ae4d1fa145697bc616ac157a5ae57091def9 SHA512 9073cf87d0797b88f540d41708f90c17499464974b640a02c6035476363b7333cd37fcd2ce92ad658fc10c71ae976606384f508b2d6c320b386a7e0c2bfe7eb6 WHIRLPOOL 994d251cde522d2edd22a07f0a5018ba0f3763d5e3f7f73baea63b79cfc301770c29192db449d159c2231443a07fbfb82863e8cc81cb00fc02f8f1b55650e7f4
+EBUILD awstats-7.1_p20121017.ebuild 3472 SHA256 b52557c7ad13ab47c011f6263f7fc5f8f35cc367b57bf71bb5d094400845309a SHA512 ba73caee15f8b904e8f13d561afb035d17a5b65fcfc7638b3cbe06419ab22d4edc679ae10e4fbbadeb24a9389f15d4cc8de9e6b0881a1e3b93253973e272634e WHIRLPOOL 1cb56cc4d47efa3d9ce5fe3825bad15eb9af30bc99ade976c290d15dc33920bd3b3928efb75c07a65a64703bb922c5834e7301f6291ff5facde623d2b6348ff3
+MISC ChangeLog 15466 SHA256 ab6a0ef2c365190b0a808ba8f060c5575716a9174e9f0f89f29c8614e980bc5b SHA512 363042ea124cc65b7cce5514f46446fe630b3966dc2f4f4a1f4b7f387cf0c72e432a0a2e21702430f8c8adca9e6f2cf9df8ecdbdf440ddf3e2a5fe25fb8b2a0a WHIRLPOOL 2e34a2c33fe2650436b134fb98cd332768d4df235f1833f12d48959c70c30df5d6bccb36db4a6b01345396613f02323699d520922af0af043f880cd07cfcd6a4
+MISC metadata.xml 234 SHA256 546f04e42ad54ad26e9b3514961516a0286b2d14bdbbd83166d9dd480698945b SHA512 708fd2ff0a1f9daeaf66105ea02d1b2e15b63318ccfacaa7807f9dbf442ac574f6811dead155766a6fb808792fde9ff5a0137950910e12193d5619d46afc1ae9 WHIRLPOOL a5467333e49957feb563a15d55126779444e201c1dd8083edfb915bd2935bb92d8fe7b9611fdfca0b70b812899e87b3f7e16584d260580e8044e973e1cb97881
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQkqIFAAoJEBzRPIrUMBNCwaIH/35pHtOxo9j3ryL1UyPMcVLU
+Q+4M4GszOPJJoyTC8F+EXFYCMXDH3FFMd05TZMYQVO7k0CIi+eXvfjuxlIpAsqqG
+I75kNppLWsOKTlBkbcJgMXCIw4UWkmVseZL0Zbpva0ZTsnmbnJ3E/fYDtjhZPrpd
+satLIB9agRh86jPx/ucdKWvMf0p2MeqU5qp02Nw5g3Y5a4bbkK4DwxAWgY7jlfzS
+24UPkCd+O1zeLyUuqD5goT17ih/yyavOT51pU8mk/bxLCR/pfhm1zPGrebYRu0gm
+7P4Ig+vxqiZPQWr8KhkSDVwAiRUWq/ICwpqnJnW025ih9GmZzd3mF0n/cPicH88=
+=WvQV
+-----END PGP SIGNATURE-----
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 {