4 files changed, 90 insertions, 14 deletions
diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 9b73107bd907..67d2b39993a7 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.13 2005/05/02 11:51:10 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.14 2005/06/22 14:35:10 smithj Exp $
+
+*sarg-2.0.8 (22 Jun 2005)
+
+  22 Jun 2005; Jonathan Smith <smithj@gentoo.org> +sarg-2.0.8.ebuild:
+  version bump for #71656, which also fixes #43132, #64743, and probably
+  #77285; thanks to Volkov Peter <torre_cremata@mail.ru> (a dev-in-training
+  :-) for the ebuild; fixed homepage and description while i was at it
 
   02 May 2005; Eldad Zack <eldad@gentoo.org> sarg-1.4.1-r2.ebuild:
   Homepage, SRC_URI updates. Closes #57527. Thanks to Daniel Webert
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 52bb56f8a71a..8d93e2f7e689 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2969a97b43e7764f8030ffe20db97c9c sarg-1.4.1-r2.ebuild 1116
-MD5 6efc452414b54a88e3817bdbb0f83750 ChangeLog 1741
+MD5 353da18b3ccdc9be26458cf9527de9e6 ChangeLog 2009
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 4ce75e6dba68e51c94d8fb4b47a5ed9f files/sarg-1.4.1-2.6.fix.patch 1556
+MD5 2969a97b43e7764f8030ffe20db97c9c sarg-1.4.1-r2.ebuild 1116
+MD5 53cfe0b21476e55d6d9a2be730adc262 sarg-2.0.8.ebuild 2052
 MD5 c1d5675a58b98064b57ce771a2ecd4b8 files/digest-sarg-1.4.1-r2 132
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCdhRWT+MN7JbqCpMRAhrTAJ4nQ8faSBjryX3XX1pa/9CTofPtbwCgiHJQ
-4ob/VKRcSAf/gAXMGA4bF7w=
-=RH+Z
------END PGP SIGNATURE-----
+MD5 4ce75e6dba68e51c94d8fb4b47a5ed9f files/sarg-1.4.1-2.6.fix.patch 1556
+MD5 51dfe863ba88a60c8c3ae74fb81729c1 files/digest-sarg-2.0.8 62
diff --git a/net-analyzer/sarg/files/digest-sarg-2.0.8 b/net-analyzer/sarg/files/digest-sarg-2.0.8
new file mode 100644
index 000000000000..dad6d53f9001
--- /dev/null
+++ b/net-analyzer/sarg/files/digest-sarg-2.0.8
@@ -0,0 +1 @@
+MD5 d761b32ba59e64538e7e385353357a8a sarg-2.0.8.tar.gz 420970
diff --git a/net-analyzer/sarg/sarg-2.0.8.ebuild b/net-analyzer/sarg/sarg-2.0.8.ebuild
new file mode 100644
index 000000000000..127e3b00a390
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.0.8.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.0.8.ebuild,v 1.1 2005/06/22 14:35:10 smithj Exp $
+
+inherit eutils
+
+DESCRIPTION="tool that allows viewing of where users are going on the Internet"
+HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/libc
+		media-libs/freetype
+		media-libs/libpng
+		sys-libs/zlib
+		media-libs/gd"
+
+RDEPEND=">=net-proxy/squid-2.5.1"
+
+pkg_setup() {
+	built_with_use -a media-libs/gd png truetype || die \
+	"Please recompile media-libs/gd with USE=\"+png +truetype\""
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fixes bug #43132
+	sed -i \
+	-e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
+	-e 's:"/usr/local/etc/httpd/htdocs/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+	log.c || die "setting default for gentoo directories... failed"
+
+	sed -i \
+	-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
+	-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
+	sarg.conf || die "setting default for gentoo directories... failed"
+
+	# Fixes bug #64743
+	sed -i -e 's:sarg_tmp:sarg:' email.c || die "fixing dir in email.c failed"
+
+	sed -i \
+	-e 's:/usr/local/sarg/sarg.conf:/etc/sarg/sarg.conf:' \
+	-e 's:/usr/local/squid/logs/access.log:/var/log/squid/logs/access.log:' \
+	sarg.1 || die "Failed to fix man page."
+}
+
+src_compile() {
+	rm -rf config.cache
+
+	econf \
+		--enable-bindir=/usr/bin \
+		--enable-mandir=/usr/share/man/man1 \
+		--enable-sysconfdir=/etc/sarg/ || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+
+	# This is workaround for sarg installation script, which does not create dirs
+	dodir /etc/sarg /usr/sbin
+
+	make \
+		BINDIR=${D}/usr/sbin \
+		MANDIR=${D}/usr/share/man/man1 \
+		SYSCONFDIR=${D}/etc/sarg \
+		install || die "sarg installation failed"
+
+	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
+}