Fix man page installation path, bug #379395 by Eugeny Shkrigunov.

Package-Manager: portage-2.1.10.16/cvs/Linux x86_64

3 files changed, 67 insertions, 2 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 4195507a24c5..a3eaaaa8b3f6 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.60 2011/09/12 06:04:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.61 2011/09/29 05:56:25 pva Exp $
+
+*sarg-2.3.1-r2 (29 Sep 2011)
+
+  29 Sep 2011; Peter Volkov <pva@gentoo.org> +sarg-2.3.1-r2.ebuild:
+  Fix man page installation path, bug #379395 by Eugeny Shkrigunov.
 
   12 Sep 2011; Peter Volkov <pva@gentoo.org> -sarg-2.2.5-r5.ebuild,
   -sarg-2.3.1.ebuild:
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index e12f81ada674..6efd34d34149 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,5 +1,6 @@
 AUX sarg-2.3.1-underlinking.patch 441 RMD160 28e8961035eb9f602078c7868c333935b9da5c57 SHA1 74fb04a711fa6b9767bf4da589cf206d4ae3c6a1 SHA256 e977cb5811696a231aba408ac78d359b0aa4cf3d7b2f73bcd1af94f897202176
 DIST sarg-2.3.1.tar.gz 1073514 RMD160 b990ffd6baa170f0fd63c160555882779343c140 SHA1 823849387090bd6ff85db045a38db5a5ac7b7887 SHA256 2228d5dea0e9ce7a3996e0ec238a4e8ca0681e809eda85e9bf334e76cd621d0f
 EBUILD sarg-2.3.1-r1.ebuild 1726 RMD160 ab460b3a6e815c342a240f08c1d9eb21ba477f3e SHA1 03e32dbd3e27a1de3460db9dd509f8f445ad5b40 SHA256 5d9c4d51272f5aa188650cdbe28e6af2e2be0d8d0832ca6b403b5f557c0732f6
-MISC ChangeLog 8481 RMD160 21bb584a9f5ca7137783928f1557d755b6d8d5e6 SHA1 fcf02f3dede1f635d4ec26ee33ac3aa1bb528eb0 SHA256 053806df2ae66e7e940aee3d52caf67dfbf2b984c5fe520ac9c9902a3b9e614a
+EBUILD sarg-2.3.1-r2.ebuild 1871 RMD160 2e5877f1dffa198681e41c57e7346f7de784771a SHA1 20d2b680a9e5dba229f1f828185533e06c400170 SHA256 c2a51c23046b1b4529f9bcdbb6535c9038ca97d265a30078a0953119805fda46
+MISC ChangeLog 8648 RMD160 d198813542b7723d0c52f3e0510e2ff2bae02774 SHA1 ce8fb5024b4f63d95ff3ce8d7051825fdab91e44 SHA256 34ee2769e392101b86c0196c5e30cea5a8b74efd92f48bb79c8d98f0267902e1
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
diff --git a/net-analyzer/sarg/sarg-2.3.1-r2.ebuild b/net-analyzer/sarg/sarg-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..ab5491701aea
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.1-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.1-r2.ebuild,v 1.1 2011/09/29 05:56:25 pva Exp $
+
+EAPI="4"
+inherit eutils autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="media-libs/gd[png,truetype]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	einfo "Running sed to substitute paths..."
+	sed \
+		-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
+		-e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \
+		-i sarg.conf || die
+
+	sed -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+			-i log.c || die #43132
+
+	sed	-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
+		-i htaccess || die
+
+	sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
+		-i user_limit_block || die
+
+	sed -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
+		-i sarg-php/sarg-block-it.php || die
+
+	sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+			-i sarg.1 sarg-php/sarg-squidguard-block.php || die
+
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+
+	# https://sourceforge.net/tracker/?func=detail&aid=3415225&group_id=68910&atid=522793
+	sed 's:\(@mandir@\):\1/man1:' -i Makefile.in || die #379395
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/sarg/
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
+}