Version bump; thanks to Tom Hendriks in bug #293981 (also for ipv6 USE flag).

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

3 files changed, 169 insertions, 2 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index a47e9c3ed000..ad8b5dbb0617 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-misc/awstats
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.3 2009/05/26 17:08:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.4 2009/11/21 22:58:13 flameeyes Exp $
+
+*awstats-6.95 (21 Nov 2009)
+
+  21 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  +awstats-6.95.ebuild:
+  Version bump; thanks to Tom Hendriks in bug #293981 (also for ipv6 USE
+  flag).
 
   26 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   awstats-6.9-r1.ebuild:
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index 8bc7799d6977..328783ac1593 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,6 +1,8 @@
 AUX awstats-6.3-gentoo.diff 1219 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 SHA1 8a1971c0e710cec05004a7e94461f83f77b2fd1a SHA256 0de073550f021a93d883c307f999b4b6ead1abf3a587118e2e01578907d15814
 AUX postinst-en-r1.txt 2412 RMD160 6f4b9705b36ab0968d82f94915d8d6526f52fbe8 SHA1 953ec2765fd8322035c4b5dbc92741343814ffee SHA256 ae1c4d318867c444583af0b34b057955cc10f45fc6fa5457f06261d8ba5b3884
 DIST awstats-6.9.tar.gz 1125906 RMD160 339af2df9c44713d632b4d1ae3d733132f7b0bab SHA1 5ad8485eab04147b20adf5e8a7bdd5b6d3e2468b SHA256 c5e288d05c71c5692c59625aa4bcf4c9b41ee0c46cb9b83e7dcac6510bb8b04f
+DIST awstats-6.95.tar.gz 1138306 RMD160 62394005828e49d714200f907adf44fbe5cb8834 SHA1 0eba9c3f834b05dbfc3392ce443140008fa12525 SHA256 7cda2f470abae83b10c819aec6511897034e75b73b36b706a98736b5d04d81d3
 EBUILD awstats-6.9-r1.ebuild 4041 RMD160 9c09c3789ea7397c067314e6d65dccfef167bb3a SHA1 74dfcaaf34361f1d488ad6ecb69ae47343fedc34 SHA256 01c95468227dea9bc45cffed0ab3c6a5d4756bc4ba97e5c6bf19259043d44af1
-MISC ChangeLog 10507 RMD160 acb4efbb6d9353f2218a2ce75b7e541226019199 SHA1 5c69937ad837da3f4bb65f90a90f3d0551ef23a8 SHA256 d144dcde654ebd423972dd588da67929b854894f2a66c14b3df2136fbb87b4e3
+EBUILD awstats-6.95.ebuild 4224 RMD160 5155ce2dd58b50f0514a8497df74f26583e96dc2 SHA1 03d13f44d08071a05953fb109146c4eaa3b0d337 SHA256 6b8654bac4819e4bde933f9436f601bb0693c266a2e224f8c5a5ab198c0368f2
+MISC ChangeLog 10700 RMD160 d27bd182991317d3f966c51172f0bcb9ecfc002c SHA1 50cbb4bcf10215370eba3f9fefcc333f379b19e6 SHA256 295c2f0f9a4711bac734c78a9eedae926000f048bb51ba67bcb29e726bd8c19e
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
diff --git a/www-misc/awstats/awstats-6.95.ebuild b/www-misc/awstats/awstats-6.95.ebuild
new file mode 100644
index 000000000000..6e2438b2596a
--- /dev/null
+++ b/www-misc/awstats/awstats-6.95.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-6.95.ebuild,v 1.1 2009/11/21 22:58:13 flameeyes Exp $
+
+inherit eutils webapp versionator depend.apache
+
+DESCRIPTION="AWStats is short for Advanced Web Statistics."
+HOMEPAGE="http://awstats.sourceforge.net/"
+SRC_URI="http://awstats.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="geoip ipv6"
+
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+
+RDEPEND=">=dev-lang/perl-5.6.1
+	>=media-libs/libpng-1.2
+	virtual/perl-Time-Local
+	dev-perl/URI
+	geoip? ( dev-perl/Geo-IP )
+	ipv6? ( dev-perl/Net-IP dev-perl/Net-DNS )"
+
+want_apache
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	webapp_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
+
+	# change default installation directory
+	for file in tools/* wwwroot/cgi-bin/*; do
+		if [[ -f "${file}" ]]; then
+			sed \
+				-e "s#/usr/local/awstats/wwwroot/cgi-bin#${MY_CGIBINDIR}#g" \
+				-e "s#/usr/local/awstats/wwwroot/icon#${MY_HTDOCSDIR}/icon#g" \
+				-e "s#/usr/local/awstats/wwwroot/plugins#${MY_HOSTROOTDIR}/plugins#g" \
+				-e "s#/usr/local/awstats/wwwroot/classes#${MY_HTDOCSDIR}/classes#g" \
+				-e "s#/usr/local/awstats/wwwroot#${MY_HTDOCSDIR}#g" \
+				-i "${file}" || die "sed ${file} failed"
+		fi
+	done
+
+	# set the logpath
+	if use apache2; then
+		logpath="apache2/access_log"
+	else
+		logpath="awstats_log"
+	fi
+
+	# set default values for directories
+	sed \
+		-e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
+		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icon\"|" \
+		-e "s|^\(DirCgi=\).*$|\1\"/cgi-bin\"|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+
+	# enable ipv6 plugin
+	if use ipv6; then
+		sed -e "s|^#\(LoadPlugin=\"ipv6\"\)$|\1|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	dohtml -r docs/*.html docs/*.xml docs/*.css docs/images
+	dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT
+	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
+	docinto xslt
+	dodoc tools/xslt/*
+
+	webapp_postinst_txt en "${FILESDIR}"/postinst-en-r1.txt
+
+	keepdir /var/lib/awstats
+
+	# Copy the app's main files
+	exeinto "${MY_CGIBINDIR}"
+	doexe "${S}"/wwwroot/cgi-bin/*.pl
+
+	exeinto "${MY_HTDOCSDIR}"/classes
+	doexe "${S}"/wwwroot/classes/*.jar
+
+	# install language files, libraries and plugins
+	dodir "${MY_CGIBINDIR}"
+	for dir in lang lib plugins; do
+		insinto "${MY_CGIBINDIR}"
+		doins -r "${S}"/wwwroot/cgi-bin/${dir}
+	done
+
+	# install the app's www files
+	dodir "${MY_HTDOCSDIR}"
+	for dir in icon css js; do
+		insinto "${MY_HTDOCSDIR}"
+		doins -r "${S}"/wwwroot/${dir}
+	done
+
+	dodir /usr/share/awstats
+	dosym "${MY_HTDOCSDIR}" /usr/share/awstats/htdocs
+
+	for dir in lang lib plugins; do
+		dosym "${MY_CGIBINDIR}"/"${dir}" /usr/share/awstats/"${dir}"
+	done
+
+	# copy configuration file
+	insinto /etc/awstats
+	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
+
+	# create the data directory for awstats
+	dodir "${MY_HOSTROOTDIR}"/datadir
+
+	# install command line tools
+	cd "${S}"/tools
+	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+		awstats_updateall.pl logresolvemerge.pl \
+		maillogconvert.pl awstats_configure.pl
+	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
+	dosym "${MY_CGIBINDIR}"/awstats.pl /usr/bin/awstats.pl
+
+	webapp_src_install
+
+	# fix perms
+	for dir in lang lib plugins; do
+		fperms 0755 "${MY_CGIBINDIR}"/"${dir}"
+	done
+	for dir in icon css js; do
+		fperms 0755 "${MY_HTDOCSDIR}"/"${dir}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	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
+	ewarn "Copy the /etc/awstats/awstats.model.conf to"
+	ewarn "/etc/awstats/awstats.<yourdomain>.conf and edit it."
+
+	if use geoip ; then
+		einfo
+		einfo "Add the following line to /etc/awstats/awstats.<yourdomain>.conf"
+		einfo "to enable GeoIP plugin:"
+		einfo "LoadPlugin=\"geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat\" "
+		einfo
+	fi
+
+	webapp_pkg_postinst
+}