do not use USE_APACHE2; whitespace cleanup

Package-Manager: portage-2.1.3.7

6 files changed, 47 insertions, 168 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/Manifest b/net-www/awstats/Manifest
index ec7b0bbf81ef..a2651d7c2cda 100644
--- a/net-www/awstats/Manifest
+++ b/net-www/awstats/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX awstats-6.3-gentoo.diff 1219 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 SHA1 8a1971c0e710cec05004a7e94461f83f77b2fd1a SHA256 0de073550f021a93d883c307f999b4b6ead1abf3a587118e2e01578907d15814
 MD5 7a52d3f65ff7220a519056716d460ecd files/awstats-6.3-gentoo.diff 1219
 RMD160 8c6ea2a093c231043674f8f14bc4332cfeeee930 files/awstats-6.3-gentoo.diff 1219
@@ -10,34 +13,34 @@ AUX postinst-en.txt 5049 RMD160 e95456f3254699bb14a27d20ae766fbd46147507 SHA1 fc
 MD5 f881494a979cdea82d58e31b589d9a97 files/postinst-en.txt 5049
 RMD160 e95456f3254699bb14a27d20ae766fbd46147507 files/postinst-en.txt 5049
 SHA256 95bbc8d3ef9d7376fe743de4d8cb7aae3206550811a9ea4ea47513f34d578c1f files/postinst-en.txt 5049
-DIST awstats-6.5.tar.gz 972275 RMD160 f5bac64fe43a0629474203f4846a863a439416cf SHA1 24ef0caf9ed47d8e30880721d2ce5a6d5c8e199d SHA256 2d536fac86e97b4ba22fc811753536a0081823136b3a337f5833a6ad04b6f7f1
+DIST awstats-6.5.tar.gz 1051780 RMD160 9cd71cc8f85b476a1381e2697c8f8af2d2ea4d9e SHA1 0042e6b84983a3704b1c26d9d377154fafc8ab9b SHA256 08a63a30c5be698a164c957b3d68e8bacafc0c86ab72458382584d9f8b45bd2c
 DIST awstats-6.7.tar.gz 1089638 RMD160 5a84327871b65cad5cb6dbaded5c223660806953 SHA1 7dab4208441bce494bf1b3937242794a2328ace1 SHA256 36344e7c2271393cf60e9a3818392fbece0ff838c83fcf59fed9818dfac5a081
 EBUILD awstats-6.5-r1.ebuild 4122 RMD160 1235931bded7bb24a2d8a9c80be4c71cc784eea0 SHA1 76b62e0ac246842e897cd6ad654f55c5ac7c53a4 SHA256 802a1e0616ad2104d15c8579c3ef8e8a783d9a417d8cc865271d1330ac74c168
 MD5 2e1b3b68834a6019fcc5a501ed733764 awstats-6.5-r1.ebuild 4122
 RMD160 1235931bded7bb24a2d8a9c80be4c71cc784eea0 awstats-6.5-r1.ebuild 4122
 SHA256 802a1e0616ad2104d15c8579c3ef8e8a783d9a417d8cc865271d1330ac74c168 awstats-6.5-r1.ebuild 4122
-EBUILD awstats-6.5-r2.ebuild 3761 RMD160 79b3d43896a2018fa05ae2a3a89d91c42a95525a SHA1 dbf3ccfe4966e5d6c7aafdf840f06b5b9ea04434 SHA256 12e5168b70989ab525ac6245e6551ff3a32f21cd930261998c397242a4098822
-MD5 4d24bdf90cd1c04f4f83017a8475b1fb awstats-6.5-r2.ebuild 3761
-RMD160 79b3d43896a2018fa05ae2a3a89d91c42a95525a awstats-6.5-r2.ebuild 3761
-SHA256 12e5168b70989ab525ac6245e6551ff3a32f21cd930261998c397242a4098822 awstats-6.5-r2.ebuild 3761
-EBUILD awstats-6.7.ebuild 3931 RMD160 6c6ebf7231d3c593845648bd3cee5c943ba11e66 SHA1 db194b9f0bf0577a0723305586d6f9c5f92efb10 SHA256 e5fb3bcfb19beebff761cc6087cf3fc18097a6616a74922be0d4073303252b14
-MD5 ce2a5fc2e5178026ee2bb8cd93791f60 awstats-6.7.ebuild 3931
-RMD160 6c6ebf7231d3c593845648bd3cee5c943ba11e66 awstats-6.7.ebuild 3931
-SHA256 e5fb3bcfb19beebff761cc6087cf3fc18097a6616a74922be0d4073303252b14 awstats-6.7.ebuild 3931
-MISC ChangeLog 7598 RMD160 2620e8fa2e8344a950164dbd1d95542933455968 SHA1 55e14684945962fe6a1f783e91ab4af616e8c9a5 SHA256 dd29a62857081216aca2e04842cd5aff1c18e724c24f33895d93c659570fa834
-MD5 0b85961d985c21e4d24f846a905d9b19 ChangeLog 7598
-RMD160 2620e8fa2e8344a950164dbd1d95542933455968 ChangeLog 7598
-SHA256 dd29a62857081216aca2e04842cd5aff1c18e724c24f33895d93c659570fa834 ChangeLog 7598
+EBUILD awstats-6.7.ebuild 3876 RMD160 ce60b6e0fa07ffc76ed23e81c5e6eca55600a049 SHA1 e60f66ecb19556490931f796c54cd1f6a7f5f893 SHA256 13e689a54a20e993b9231a73325253e2332ea89672befdd4e2819c94adc5693e
+MD5 bbb0f5197124ac7a39fcbc87244a24c3 awstats-6.7.ebuild 3876
+RMD160 ce60b6e0fa07ffc76ed23e81c5e6eca55600a049 awstats-6.7.ebuild 3876
+SHA256 13e689a54a20e993b9231a73325253e2332ea89672befdd4e2819c94adc5693e awstats-6.7.ebuild 3876
+MISC ChangeLog 7743 RMD160 7cc40a28e1bcc13e5d5c846dfb3a29caffb6038e SHA1 9d7f6f0935321f26bcb52da058dccf6246eccf7e SHA256 6aa16f28c00e9a4bec731525bafaf6c00b7bdc620b9d9c71d9cc793df2b810ab
+MD5 c55b2692107ec70f0567b4c47dd8fed1 ChangeLog 7743
+RMD160 7cc40a28e1bcc13e5d5c846dfb3a29caffb6038e ChangeLog 7743
+SHA256 6aa16f28c00e9a4bec731525bafaf6c00b7bdc620b9d9c71d9cc793df2b810ab ChangeLog 7743
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
-MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5-r1 235
-RMD160 90bdedc189c5aed52a424d277f85e6d233ac1082 files/digest-awstats-6.5-r1 235
-SHA256 1439cd174fa0bd63e3aa15cb6dc5e88beb6d126707730253d4dee65d948898dc files/digest-awstats-6.5-r1 235
-MD5 1203937f6de452d6ae4ba8465234ad36 files/digest-awstats-6.5-r2 235
-RMD160 90bdedc189c5aed52a424d277f85e6d233ac1082 files/digest-awstats-6.5-r2 235
-SHA256 1439cd174fa0bd63e3aa15cb6dc5e88beb6d126707730253d4dee65d948898dc files/digest-awstats-6.5-r2 235
+MD5 10ec3c27065f82d1398f83257db10bbe files/digest-awstats-6.5-r1 238
+RMD160 2cd464f5fc23123ab0a9701d88f4233b6d7e6fbe files/digest-awstats-6.5-r1 238
+SHA256 b23dc986b45810b5c172a8b0b501425acb8769133c0d293358bf0d7ac5334429 files/digest-awstats-6.5-r1 238
 MD5 8e9bd030d560843e00d92c1cbc2c5259 files/digest-awstats-6.7 238
 RMD160 869c53d0179e70d29c3e1901c8cc06253222154e files/digest-awstats-6.7 238
 SHA256 282b6af0e8ed9b83a2b42ecbfdf85337d02e263421613014fe37add7541f2c64 files/digest-awstats-6.7 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.6 (GNU/Linux)
+
+iD8DBQFG4o56mPFBzbX68WERAuUaAJ4h0kReJp4QDa4f2mgtGFgzR1C8LgCeLJys
+eTY9YRLHmEEfJzvuM5qGTlk=
+=On+w
+-----END PGP SIGNATURE-----
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