diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-06-06 12:15:53 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-06-06 12:15:53 +0000 |
commit | 2dba037587e24b1cf1af87c4db0858303b3674df (patch) | |
tree | 03a8d692a88223183f879d64d6f4aa6d702427d6 /www-misc | |
parent | Version bump. (diff) | |
download | gentoo-2-2dba037587e24b1cf1af87c4db0858303b3674df.tar.gz gentoo-2-2dba037587e24b1cf1af87c4db0858303b3674df.tar.bz2 gentoo-2-2dba037587e24b1cf1af87c4db0858303b3674df.zip |
Remove old; remove unused file; remove versionator inheritance.
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Diffstat (limited to 'www-misc')
-rw-r--r-- | www-misc/awstats/ChangeLog | 7 | ||||
-rw-r--r-- | www-misc/awstats/awstats-6.95.ebuild | 158 | ||||
-rw-r--r-- | www-misc/awstats/awstats-7.0_p20101205-r3.ebuild | 4 | ||||
-rw-r--r-- | www-misc/awstats/awstats-7.0_p20101205.ebuild | 167 | ||||
-rw-r--r-- | www-misc/awstats/files/postinst-en-r1.txt | 67 |
5 files changed, 8 insertions, 395 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/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> |