Polish rough edges left by the transition away from webapp-config, now install all the tools in the path (and all prefixed with awstats_), and make the cgi-bin executable. Also don't install extraneous data in /usr/share.

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

2 files changed, 23 insertions, 10 deletions

diff --git a/www-misc/awstats/ChangeLog b/www-misc/awstats/ChangeLog
index a8e8dedb1953..71fe5d5d50d6 100644
--- a/www-misc/awstats/ChangeLog
+++ b/www-misc/awstats/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2011/01/10 09:56:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/ChangeLog,v 1.14 2011/01/10 10:32:17 flameeyes Exp $
+
+*awstats-7.0_p20101205-r2 (10 Jan 2011)
+
+  10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -awstats-7.0_p20101205-r1.ebuild, +awstats-7.0_p20101205-r2.ebuild:
+  Polish rough edges left by the transition away from webapp-config, now
+  install all the tools in the path (and all prefixed with awstats_), and make
+  the cgi-bin executable. Also don't install extraneous data in /usr/share.
 
   10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   awstats-7.0_p20101205-r1.ebuild:
diff --git a/www-misc/awstats/awstats-7.0_p20101205-r1.ebuild b/www-misc/awstats/awstats-7.0_p20101205-r2.ebuild
index f07fb8295b3a..8e5d807f2b0e 100644
--- a/www-misc/awstats/awstats-7.0_p20101205-r1.ebuild
+++ b/www-misc/awstats/awstats-7.0_p20101205-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.2 2011/01/10 09:56:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/awstats/awstats-7.0_p20101205-r2.ebuild,v 1.1 2011/01/10 10:32:17 flameeyes Exp $
 
 EAPI=2
 
@@ -61,7 +61,7 @@ src_prepare() {
 		-i "${S}"/wwwroot/cgi-bin/awstats.model.conf || die "sed failed"
 	fi
 
-	find "${S}" -type f -not -name '*.pl' -exec chmod -x {} + || die
+	find "${S}" '(' -type f -not -name '*.pl' ')' -exec chmod -x {} + || die
 }
 
 src_install() {
@@ -76,13 +76,20 @@ src_install() {
 	insinto /etc/awstats
 	doins "${S}"/wwwroot/cgi-bin/awstats.model.conf || die
 
+	# remove extra content that we don't want to install
+	rm -r "${S}"/wwwroot/cgi-bin/awstats.model.conf \
+		"${S}"/wwwroot/classes/src || die
+
 	insinto /usr/share/awstats
-	pushd "${S}"wwwroot &>/dev/null
-	doins -r * || die
-	popd &>/dev/null
+	doins -r wwwroot || die
+	chmod +x "${D}"/usr/share/awstats/wwwroot/cgi-bin/*.pl
 
-	exeinto /usr/libexec/awstats
-	doexe tools/*.pl || die
+	cd "${S}"/tools
+	dobin awstats_buildstaticpages.pl awstats_exportlib.pl \
+		awstats_updateall.pl
+	newbin logresolvemerge.pl awstats_logresolvemerge.pl
+	newbin maillogconvert.pl awstats_maillogconvert.pl
+	newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl
 
 	dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die
 }
@@ -99,6 +106,4 @@ pkg_postinst() {
 	ewarn "instead you should point your configuration to the stable"
 	ewarn "directory tree in the following path:"
 	ewarn "    /usr/share/awstats"
-	ewarn "while the tools can be found in"
-	ewarn "    /usr/libexec/tools"
 }