Simplify ebuild by dropping apache.depend and webapp eclasses; this version no longer users webapp-config for setup, instead it relies on stable paths for configuration (suggested method), as it doesn't slot and it requires global paths to save data. Also, patch in rel=nofollow attribute on external links to avoid boosting spammers' pagerank.

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 144 insertions, 5 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index af70b0404f96..31215fc3f586 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-misc/awstats
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.11 2011/01/09 18:09:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.12 2011/01/10 01:12:33 flameeyes Exp $
+
+*awstats-7.0_p20101205-r1 (10 Jan 2011)
+
+  10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +awstats-7.0_p20101205-r1.ebuild,
+  +files/awstats-7.0_p20101205-nofollow.patch:
+  Simplify ebuild by dropping apache.depend and webapp eclasses; this version
+  no longer users webapp-config for setup, instead it relies on stable paths
+  for configuration (suggested method), as it doesn't slot and it requires
+  global paths to save data. Also, patch in rel=nofollow attribute on external
+  links to avoid boosting spammers' pagerank.
 
 *awstats-7.0_p20101205 (09 Jan 2011)
 
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 210a60856b40..32e3e40c3741 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 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 postinst-en-r1.txt 2412 RMD160 6f4b9705b36ab0968d82f94915d8d6526f52fbe8 SHA1 953ec2765fd8322035c4b5dbc92741343814ffee SHA256 ae1c4d318867c444583af0b34b057955cc10f45fc6fa5457f06261d8ba5b3884
 DIST awstats-6.95.tar.gz 1138306 RMD160 62394005828e49d714200f907adf44fbe5cb8834 SHA1 0eba9c3f834b05dbfc3392ce443140008fa12525 SHA256 7cda2f470abae83b10c819aec6511897034e75b73b36b706a98736b5d04d81d3
 DIST awstats-7.0_p20101205.tar.gz 1254327 RMD160 0bd46afbd3159cf5f3e517b37a43b7d0852fc2a3 SHA1 733fa7d6a540f4a54f52c69a5f271c789472b0b7 SHA256 e2651d4a5ff40e1d792b37cc13784d444cae479b4f98118aed27f46f5a18ce92
 EBUILD awstats-6.95.ebuild 4213 RMD160 95341b6082a1853904f43810da4d70c65b90534f SHA1 c6d097d755418a6e48c6a9ae4530a58f20a06a7a SHA256 dd6491700d6b099f53b02ac278624cef8cf3716ae1f6efc4898deb3694cb7ea4
+EBUILD awstats-7.0_p20101205-r1.ebuild 3125 RMD160 821fa208630107e7756afa1420174d6c1c39f123 SHA1 c69a8aa966843f0c84257e444057d52bdafe2952 SHA256 f4cfa9d6e97e1c63f5df85580f474b92befaf45c4ea6186d4ab3f05e14482fdb
 EBUILD awstats-7.0_p20101205.ebuild 4667 RMD160 849dfbfc6cb8510089c283bab6c4f2d2ab991119 SHA1 e0b30233ca18067559bb7698c2d79e47008e786e SHA256 6123d339e39ed6e60febcfbeef5589127327ca71873d009aee78e11ef0a1cae4
-MISC ChangeLog 12047 RMD160 a1ebf48decdfde7ea9e9a879a892f154df106c62 SHA1 7e7d4520d7525fb8115f4bb6d3c36bcb64cf36d3 SHA256 50369fb62f06cd3c93bfdba5b92a3dea0dce10eaf16b98464f3cf876e9fcbafd
+MISC ChangeLog 12583 RMD160 cfd19c1fb9a45ebada449b83c8a330cf061166ca SHA1 bb95d680788e902640fdd819683fc38063cc0b81 SHA256 e87883cc5869dded698f9a2f3a86c15f8727879181dccf268105c159270a85a2
 MISC metadata.xml 234 RMD160 4aaa37cfc1520c193a82b7a8d705657642c03217 SHA1 fa45005b308271aa12f4c87237efa3f0ae948019 SHA256 546f04e42ad54ad26e9b3514961516a0286b2d14bdbbd83166d9dd480698945b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0p+cAACgkQAiZjviIA2XhC1ACg4FnpMUpKpyqNUarol4kUfHtc
-RE8An0zt7uHvrP6vryAJ0CDRNH0Oqht5
-=yZDI
+iEYEARECAAYFAk0qXO0ACgkQAiZjviIA2XiodgCfZVbkPFNqXQHNF/yRl8PbgyDF
+nmoAnRaIw0tfDy1UH/O1mvrUUFNRaa6J
+=vp8e
 -----END PGP SIGNATURE-----
diff --git a/www-misc/awstats/awstats-7.0_p20101205-r1.ebuild b/www-misc/awstats/awstats-7.0_p20101205-r1.ebuild
new file mode 100644
index 000000000000..996623ddbc74
--- /dev/null
+++ b/www-misc/awstats/awstats-7.0_p20101205-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/01/10 01:12:33 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils versionator
+
+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"
+
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	virtual/perl-Time-Local
+	dev-perl/URI
+	geoip? ( dev-perl/Geo-IP )
+	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
+	epatch "${FILESDIR}"/${P}-nofollow.patch
+
+	# change default installation directory
+	find . -type f -exec sed \
+		-e "s#/usr/local/awstats/wwwroot#/usr/share/awstats/#g" \
+		-i {} + || die "find/sed failed"
+
+	# set default values for directories; use apache log as an example
+	sed \
+		-e "s|^\(LogFile=\).*$|\1\"/var/log/apache2/access_log\"|" \
+		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+	# enable plugins
+
+	if use ipv6; then
+		sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	fi
+
+	if use geoip; then
+		sed -e '/LoadPlugin="geoip/aLoadPlugin="geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat"' \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	fi
+
+	find "${S}" -type f -not -name '*.pl' -exec chmod -x {} + || die
+}
+
+src_install() {
+	dohtml -r docs/* || die
+	dodoc README.TXT || die
+	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+	docinto xslt
+	dodoc tools/xslt/* || die
+
+	keepdir /var/lib/awstats
+
+	insinto /etc/awstats
+	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf || die
+
+	insinto /usr/share/awstats
+	pushd "${S}"wwwroot &>/dev/null
+	doins -r * || die
+	popd &>/dev/null
+
+	exeinto /usr/libexec/awstats
+	doexe tools/*.pl || die
+
+	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
+}
+
+pkg_postinst() {
+	elog "The AWStats-Manual is available either inside"
+	elog "the /usr/share/doc/${PF} - folder, or at"
+	elog "http://awstats.sourceforge.net/docs/index.html ."
+	elog
+	elog "Copy the /etc/awstats/awstats.model.conf to"
+	elog "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+	elog ""
+	ewarn "This ebuild does no longer use webapp-config to install"
+	ewarn "instead you should point your configuration to the stable"
+	ewarn "directory tree in the following path:"
+	ewarn "    /usr/share/awstats"
+	ewarn "while the tools can be found in"
+	ewarn "    /usr/libexec/tools"
+}
diff --git a/www-misc/awstats/files/awstats-7.0_p20101205-nofollow.patch b/www-misc/awstats/files/awstats-7.0_p20101205-nofollow.patch
new file mode 100644
index 000000000000..5f314481a063
--- /dev/null
+++ b/www-misc/awstats/files/awstats-7.0_p20101205-nofollow.patch
@@ -0,0 +1,22 @@
+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 {