Remove old; remove unused file; remove versionator inheritance.

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

6 files changed, 20 insertions, 401 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index 952c10405449..e92b9c878e04 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2011/01/30 18:55:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.21 2011/06/06 12:15:53 flameeyes Exp $
+
+  06 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/postinst-en-r1.txt, -awstats-6.95.ebuild,
+  -awstats-7.0_p20101205.ebuild, awstats-7.0_p20101205-r3.ebuild:
+  Remove old; remove unused file; remove versionator inheritance.
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> awstats-6.95.ebuild:
   Move to ~alpha
diff --git a/www-misc/awstats/Manifest b/www-misc/awstats/Manifest
index b56a2d07b88d..e6357bc7a2ed 100644
--- a/www-misc/awstats/Manifest
+++ b/www-misc/awstats/Manifest
@@ -1,10 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 4218 RMD160 2e8abb1ad2a1dbc3247071e621795b0acbb724e3 SHA1 a53be55d1bc2977bcacfb1a6d9b796ddd1778abf SHA256 ba8a0bf0647b2a45ca69186aa91d179034d39d9c9fa1431f33b6bf5139dc41d7
-EBUILD awstats-7.0_p20101205-r3.ebuild 3421 RMD160 348515745fdda6f8012b51397c5743cc8759e9d5 SHA1 00b4e24fccd3e3b19e5fd81206c478463c5b114f SHA256 791981e25569a0c8e324e2bf135614139e2280833abb585db4dbc14ef4e029ee
-EBUILD awstats-7.0_p20101205.ebuild 4667 RMD160 849dfbfc6cb8510089c283bab6c4f2d2ab991119 SHA1 e0b30233ca18067559bb7698c2d79e47008e786e SHA256 6123d339e39ed6e60febcfbeef5589127327ca71873d009aee78e11ef0a1cae4
-MISC ChangeLog 13876 RMD160 1b716e7506580ccd1b71c7347688fba22169b5b0 SHA1 24066da49d95647a2a373fe2c55f47d8f13b95a0 SHA256 54da1da61287848be8a448f7050cce8522d3d1aed0a243501fe7bd6f1c2930e3
+EBUILD awstats-7.0_p20101205-r3.ebuild 3408 RMD160 e886f4a99d36d2efa403f770a79c7ea41059a933 SHA1 8a91516faa4859ca3cb24790e8cee2a2c1e03f26 SHA256 6a6e25b241da96f5ab12e320519ee6691a6bad60a2f26793270d86bce3d01eac
+MISC ChangeLog 14118 RMD160 fdd93625ca923b03fffe7a31b860fce058edd678 SHA1 4ea1fc05a5ea3662382f1c0acbcd5276c9a5a1d5 SHA256 89022baac9d6b2c04a2c22b9877e5bf6e5c596acffca1c10a96f2ca4dd3ea89d
 MISC metadata.xml 234 RMD160 4aaa37cfc1520c193a82b7a8d705657642c03217 SHA1 fa45005b308271aa12f4c87237efa3f0ae948019 SHA256 546f04e42ad54ad26e9b3514961516a0286b2d14bdbbd83166d9dd480698945b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3sxPQACgkQAiZjviIA2Xg7CACg8xAoT6+XJil8VQRTikfGD21k
+2+cAoLYr2G9c8QI5CcG/OKKSBFEyRGY/
+=EVfb
+-----END PGP SIGNATURE-----
diff --git a/www-misc/awstats/awstats-6.95.ebuild b/www-misc/awstats/awstats-6.95.ebuild
deleted file mode 100644
index 31f3c3f6023e..000000000000
--- a/www-misc/awstats/awstats-6.95.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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-6.95.ebuild,v 1.6 2011/01/30 18:55:32 armin76 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
-}
diff --git a/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild b/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild
index dabefdaea24c..6e0c0973ec1c 100644
--- a/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild
+++ b/www-misc/awstats/awstats-7.0_p20101205-r3.ebuild
@@ -1,10 +1,10 @@
 # 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-r3.ebuild,v 1.5 2011/01/26 08:17:08 xarthisius Exp $
+# $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 $
 
 EAPI=2
 
-inherit eutils versionator
+inherit eutils
 
 MY_P=${PN}-${PV%_p*}
 
diff --git a/www-misc/awstats/awstats-7.0_p20101205.ebuild b/www-misc/awstats/awstats-7.0_p20101205.ebuild
deleted file mode 100644
index cd6cde84a596..000000000000
--- a/www-misc/awstats/awstats-7.0_p20101205.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# 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.ebuild,v 1.1 2011/01/09 18:09:22 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils webapp versionator depend.apache
-
-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"
-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_prepare() {
-	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/files/postinst-en-r1.txt b/www-misc/awstats/files/postinst-en-r1.txt
deleted file mode 100644
index 94a36aa10e05..000000000000
--- a/www-misc/awstats/files/postinst-en-r1.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-###
-# INSTRUCTIONS:
-#
-# If you would like to require authentication to access AWStats, then use ONE
-# of the example configurations below. There are many other modules and
-# options for authentication which will not be discussed here.
-#
-# NOTE: Related AWStats configuration directives are:
-#
-# AllowAccessFromWebToAuthenticatedUsersOnly=1
-# AllowAccessFromWebToFollowingAuthenticatedUsers="user1 [user2 ...]"
-#
-# You can use these to set a per-domain user access when needed for virtual
-# hosting. That means: only the selected user(s) will have access to stats for
-# the particular domain. All other users will not be allowed to see the domain
-# stats even though they have authenticated successfully.
-###
-
-###
-# SECTION I - Basic Authentication
-#
-# The following example requires mod_auth (apache 2.0) or mod_auth_basic
-# (apache 2.2) to work. Make sure you have installed and enabled it in
-# /etc/apache2/httpd.conf
-#
-# Add your AWStats users to /etc/awstats/.htpasswd file.
-# Please see 'man htpasswd2' for more details if you need.
-#
-# htpasswd2 -c /etc/awstats/.htpasswd username1 htpasswd2
-# /etc/awstats/.htpasswd username2 etc...
-###
-
-#<Location "/cgi-bin/awstats.pl">
-#    AuthType Basic
-#    AuthName "AWStats authenticated zone"
-#    AuthUserFile /etc/awstats/.htpasswd
-#    Require valid-user
-#</Location>
-
-###
-# SECTION II - Digest Authentication
-#
-# The following example requires mod_auth_digest to work.  Make sure you have
-# installed and enabled it in /etc/apache2/httpd.conf
-#
-# Do not forget to replace www.example.com as appropriate. You can also add as
-# many domains as you need to this line.
-#
-# Add your AWStats users to /etc/awstats/.htdigest file. Please see 'man
-# htdigest2' and http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html for
-# more details if you need.
-#
-# htdigest2 -c /etc/awstats/.htdigest "AWStats authenticated zone" username1
-# htdigest2 /etc/awstats/.htdigest "AWStats authenticated zone" username2
-# etc...
-###
-
-#<Location "/cgi-bin/awstats.pl">
-#    AuthType Digest
-#    AuthName "AWStats authenticated zone"
-#    AuthDigestFile /etc/awstats/.htdigest
-#    AuthDigestDomain http://www.example.com https://www.example.com
-#    require valid-user
-#    # The following line is REQUIRED to work around a bug in MSIE.
-#    # See http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html
-#    BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
-#</Directory>