Version bump since upstream changed the tarball; now use stored versioned tarballs as upstream seem to re-release it even when no actual changes are in the code.

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

4 files changed, 20 insertions, 317 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index 04b97b91b869..af70b0404f96 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-misc/awstats
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.10 2010/10/15 13:09:17 flameeyes Exp $
+# 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 $
+
+*awstats-7.0_p20101205 (09 Jan 2011)
+
+  09 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -awstats-6.9-r1.ebuild,
+  -awstats-7.0.ebuild, -awstats-7.0_p20100929.ebuild,
+  +awstats-7.0_p20101205.ebuild:
+  Version bump since upstream changed the tarball; now use stored versioned
+  tarballs as upstream seem to re-release it even when no actual changes are in
+  the code.
 
 *awstats-7.0_p20100929 (15 Oct 2010)
 
diff --git a/www-misc/awstats/awstats-6.9-r1.ebuild b/www-misc/awstats/awstats-6.9-r1.ebuild
deleted file mode 100644
index 4a0dab204ac2..000000000000
--- a/www-misc/awstats/awstats-6.9-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.9-r1.ebuild,v 1.2 2009/05/26 17:08:50 arfrever 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"
-
-RESTRICT="mirror"
-
-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 )"
-
-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"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dohtml -r docs/*.html docs/*.xml docs/*.css docs/*.js 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
-}
diff --git a/www-misc/awstats/awstats-7.0.ebuild b/www-misc/awstats/awstats-7.0.ebuild
deleted file mode 100644
index d7c5a7401a85..000000000000
--- a/www-misc/awstats/awstats-7.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.0.ebuild,v 1.1 2010/09/08 11:55:18 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 || die
-	dodoc README.TXT docs/COPYING.TXT docs/LICENSE.TXT || die
-	newdoc wwwroot/cgi-bin/plugins/example/example.pm example_plugin.pm
-	docinto xslt
-	dodoc tools/xslt/* || die
-
-	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 || die
-
-	exeinto "${MY_HTDOCSDIR}"/classes
-	doexe "${S}"/wwwroot/classes/*.jar || die
-
-	# 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} || die
-	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} || die
-	done
-
-	dodir /usr/share/awstats
-	dosym "${MY_HTDOCSDIR}" /usr/share/awstats/htdocs || die
-
-	for dir in lang lib plugins; do
-		dosym "${MY_CGIBINDIR}"/"${dir}" /usr/share/awstats/"${dir}" || die
-	done
-
-	# copy configuration file
-	insinto /etc/awstats
-	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf || die
-
-	# create the data directory for awstats
-	dodir "${MY_HOSTROOTDIR}"/datadir || die
-
-	# install command line tools
-	cd "${S}"/tools
-	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
-		awstats_updateall.pl logresolvemerge.pl \
-		maillogconvert.pl awstats_configure.pl || die
-	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl || die
-	dosym "${MY_CGIBINDIR}"/awstats.pl /usr/bin/awstats.pl || die
-
-	webapp_src_install
-
-	# fix perms
-	for dir in lang lib plugins; do
-		fperms 0755 "${MY_CGIBINDIR}"/"${dir}" || die
-	done
-	for dir in icon css js; do
-		fperms 0755 "${MY_HTDOCSDIR}"/"${dir}" || die
-	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
-		elog
-		elog "Add the following line to /etc/awstats/awstats.<yourdomain>.conf"
-		elog "to enable GeoIP plugin:"
-		elog "LoadPlugin=\"geoip GEOIP_STANDARD /usr/share/GeoIP/GeoIP.dat\" "
-		elog
-	fi
-
-	webapp_pkg_postinst
-}
diff --git a/www-misc/awstats/awstats-7.0_p20100929.ebuild b/www-misc/awstats/awstats-7.0_p20101205.ebuild
index 9da5212006fb..cd6cde84a596 100644
--- a/www-misc/awstats/awstats-7.0_p20100929.ebuild
+++ b/www-misc/awstats/awstats-7.0_p20101205.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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_p20100929.ebuild,v 1.1 2010/10/15 13:09:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.0_p20101205.ebuild,v 1.1 2011/01/09 18:09:22 flameeyes Exp $
 
 EAPI=2
 
@@ -10,8 +10,13 @@ MY_P=${PN}-${PV%_p*}
 
 DESCRIPTION="AWStats is short for Advanced Web Statistics."
 HOMEPAGE="http://awstats.sourceforge.net/"
-#SRC_URI="http://awstats.sourceforge.net/files/${P}.tar.gz"
-SRC_URI="http://awstats.sourceforge.net/files/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+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}