do not use USE_APACHE2; whitespace cleanup

(Portage version: 2.1.3.7)

5 files changed, 25 insertions, 149 deletions

diff --git a/net-www/awstats/ChangeLog b/net-www/awstats/ChangeLog
index dcf540d3e9b2..87860aea40a0 100644
--- a/net-www/awstats/ChangeLog
+++ b/net-www/awstats/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/awstats
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.49 2007/09/07 04:43:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/ChangeLog,v 1.50 2007/09/08 11:58:41 hollow Exp $
+
+  08 Sep 2007; Benedikt Böhm <hollow@gentoo.org> -awstats-6.5-r2.ebuild,
+  awstats-6.7.ebuild:
+  do not use USE_APACHE2; whitespace cleanup
 
   07 Sep 2007; Jeroen Roovers <jer@gentoo.org> awstats-6.7.ebuild:
   Marked ~hppa (bug #191525).
diff --git a/net-www/awstats/awstats-6.5-r2.ebuild b/net-www/awstats/awstats-6.5-r2.ebuild
deleted file mode 100644
index 9e226c645e1e..000000000000
--- a/net-www/awstats/awstats-6.5-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.5-r2.ebuild,v 1.3 2006/10/27 01:28:34 rl03 Exp $
-
-inherit eutils webapp versionator depend.apache
-
-DESCRIPTION="AWStats is short for Advanced Web Statistics."
-HOMEPAGE="http://awstats.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="http://awstats.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-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"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-want_apache
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix security bug #130487
-	epatch "${FILESDIR}"/${PN}-6.5-CVE-2006-2237-CVE-2006-1945.diff
-
-	epatch "${FILESDIR}"/${PN}-6.3-gentoo.diff
-
-	# change default installation directory
-	for file in tools/* wwwroot/cgi-bin/*; do
-	    if [[ -f "${file}" ]]; then
-	        sed -i -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" \
-			   "${file}" || die "sed ${file} failed"
-	    fi
-	done
-
-	# set the logpath
-	if use apache || use apache2; then
-		logpath="apache${USE_APACHE2}/access_log"
-	else
-		logpath="awstats_log"
-	fi
-
-	# set default values for directories
-	sed -i -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
-	    -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
-	    -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
-	    -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
-		"${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
-
-	# set version in postinst-en.txt
-	sed -e "s/PVR/${PVR}/g" \
-		"${FILESDIR}"/postinst-en.txt > "${WORKDIR}"/postinst-en.txt || die
-}
-
-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 "${WORKDIR}"/postinst-en.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
-	mkdir -p "${D}${MY_CGIBINDIR}"
-	for dir in lang lib plugins; do
-		cp -R "${S}/wwwroot/cgi-bin/${dir}" "${D}${MY_CGIBINDIR}"
-		chmod 0755 "${D}${MY_CGIBINDIR}/${dir}"
-	done
-
-	# install the app's www files
-	mkdir -p "${D}${MY_HTDOCSDIR}"
-	for dir in icon css js; do
-		cp -R "${S}/wwwroot/${dir}" "${D}${MY_HTDOCSDIR}"
-		chmod 0755 "${D}${MY_HTDOCSDIR}/${dir}"
-	done
-
-	# copy configuration file
-	insinto /etc/awstats
-	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf
-
-	# create the data directory for awstats
-	mkdir -p "${D}/${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
-
-	webapp_src_install
-}
-
-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."
-}
diff --git a/net-www/awstats/awstats-6.7.ebuild b/net-www/awstats/awstats-6.7.ebuild
index bad834318965..ae71cc28b3a2 100644
--- a/net-www/awstats/awstats-6.7.ebuild
+++ b/net-www/awstats/awstats-6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7.ebuild,v 1.2 2007/09/07 04:43:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/awstats/awstats-6.7.ebuild,v 1.3 2007/09/08 11:58:41 hollow Exp $
 
 inherit eutils webapp versionator depend.apache
 
@@ -33,29 +33,31 @@ src_unpack() {
 
 	# change default installation directory
 	for file in tools/* wwwroot/cgi-bin/*; do
-	    if [[ -f "${file}" ]]; then
-	        sed -i -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" \
-			   "${file}" || die "sed ${file} failed"
-	    fi
+		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="apache${USE_APACHE2}/access_log"
+		logpath="apache2/access_log"
 	else
 		logpath="awstats_log"
 	fi
 
 	# set default values for directories
-	sed -i -e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
-	    -e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
-	    -e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
-	    -e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
-		"${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
+	sed \
+		-e "s|^\(LogFile=\).*$|\1\"/var/log/${logpath}\"|" \
+		-e "s|^\(SiteDomain=\).*$|\1\"localhost\"|" \
+		-e "s|^\(DirIcons=\).*$|\1\"/awstats/icons\"|" \
+		-e "s|^\(DirCgi=\).*$|\1\"/cgi-bin/awstats\"|" \
+		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
 
 	# set version in postinst-en.txt
 	sed -e "s/PVR/${PVR}/g" \
diff --git a/net-www/awstats/files/digest-awstats-6.5-r1 b/net-www/awstats/files/digest-awstats-6.5-r1
index b326ee291e86..ea6aa5c3e43f 100644
--- a/net-www/awstats/files/digest-awstats-6.5-r1
+++ b/net-www/awstats/files/digest-awstats-6.5-r1
@@ -1,3 +1,3 @@
-MD5 f323e197f78934c66b3bf4cb07422606 awstats-6.5.tar.gz 972275
-RMD160 f5bac64fe43a0629474203f4846a863a439416cf awstats-6.5.tar.gz 972275
-SHA256 2d536fac86e97b4ba22fc811753536a0081823136b3a337f5833a6ad04b6f7f1 awstats-6.5.tar.gz 972275
+MD5 aef00b2ff5c5413bd2a868299cabd69a awstats-6.5.tar.gz 1051780
+RMD160 9cd71cc8f85b476a1381e2697c8f8af2d2ea4d9e awstats-6.5.tar.gz 1051780
+SHA256 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c awstats-6.5.tar.gz 1051780
diff --git a/net-www/awstats/files/digest-awstats-6.5-r2 b/net-www/awstats/files/digest-awstats-6.5-r2
deleted file mode 100644
index b326ee291e86..000000000000
--- a/net-www/awstats/files/digest-awstats-6.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f323e197f78934c66b3bf4cb07422606 awstats-6.5.tar.gz 972275
-RMD160 f5bac64fe43a0629474203f4846a863a439416cf awstats-6.5.tar.gz 972275
-SHA256 2d536fac86e97b4ba22fc811753536a0081823136b3a337f5833a6ad04b6f7f1 awstats-6.5.tar.gz 972275