Version bump. See ChangeLog at http://sarg.sourceforge.net/sarg.ChangeLog.txt

Package-Manager: portage-2.1-r2

4 files changed, 89 insertions, 5 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 370480af1b97..a339aa05322f 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.29 2006/07/30 17:35:51 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.30 2006/08/29 19:40:16 pva Exp $
+
+*sarg-2.2.2 (29 Aug 2006)
+
+  29 Aug 2006; Peter Volkov <pva@gentoo.org> +sarg-2.2.2.ebuild:
+  Version bump. See ChangeLog at http://sarg.sourceforge.net/sarg.ChangeLog.txt
 
   30 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> sarg-2.2.1.ebuild:
   ppc stable
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 9a623a26c7c1..60117ff7c786 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -12,6 +12,7 @@ RMD160 37d4b96a5af7132ff16548cc85837792b048c1c9 files/sarg-2.1-sort-options.patc
 SHA256 f71d573c2031308f34cc6f4cf3967949b214a9199a95965f523786ce4b7fbb61 files/sarg-2.1-sort-options.patch 757
 DIST sarg-2.1.tar.gz 352935 RMD160 5b2732d5e4a5bcd4c2b24e5694a3d19581d87b05 SHA256 89ec31f3b7b8187de1e4ee4fa0a4abf6867f2404bd9059bbfbe4beb609dd5818
 DIST sarg-2.2.1.tar.gz 385693 RMD160 ff0eb80ebac162b44e8f9a0ae93f51dd1c8a0f16 SHA1 2daa5ccfd7201501367cf5fbc64ac855115c6421 SHA256 1f7ad24d7afa18279c232ce0b97f35b6145e33de824abfe7ea6ff058f7045cc0
+DIST sarg-2.2.2.tar.gz 381797 RMD160 dc6599ca3766067c1e6a027757139b70bb2a1d0c SHA1 9510c93383d9d882ebf31c245be99fb818c2f1a9 SHA256 7a80750c87616d3c576e81d73ac5ea4f04e9f8ba7e5cfed1ebdd7986eecc99d9
 EBUILD sarg-2.1-r1.ebuild 2084 RMD160 4f123bdd6b1143e76e7c66a2857eb22e22b49cd6 SHA1 447f3da4080daa80c49f6c971943a1d1984a8f50 SHA256 96afc99383ae291ebbddae75e3f9e6bb28beb1bbc72dcbac81e5494393cdd602
 MD5 d5177fb2540df9c266c252ea06681d01 sarg-2.1-r1.ebuild 2084
 RMD160 4f123bdd6b1143e76e7c66a2857eb22e22b49cd6 sarg-2.1-r1.ebuild 2084
@@ -20,10 +21,14 @@ EBUILD sarg-2.2.1.ebuild 1934 RMD160 1b2ddc14b6994618cf1ec87de8391704f2d1d73e SH
 MD5 4f62024209f35dd848a2d4358da7ef84 sarg-2.2.1.ebuild 1934
 RMD160 1b2ddc14b6994618cf1ec87de8391704f2d1d73e sarg-2.2.1.ebuild 1934
 SHA256 3550632f039f6483a5a60449c174aa7777b7f7f8ece43f689ef5d688aff9ffa3 sarg-2.2.1.ebuild 1934
-MISC ChangeLog 3917 RMD160 bb1a75f00019ff7842f056b124505db7a1be7da6 SHA1 3fe783330f8fc5bf78154f2a15d3b3dd533f188b SHA256 c02619f5f310dbbae19b1925e7a412da41478ab56d59c7dcd37ce146197269a5
-MD5 5b031dcd24fac073aee136abfbd421b8 ChangeLog 3917
-RMD160 bb1a75f00019ff7842f056b124505db7a1be7da6 ChangeLog 3917
-SHA256 c02619f5f310dbbae19b1925e7a412da41478ab56d59c7dcd37ce146197269a5 ChangeLog 3917
+EBUILD sarg-2.2.2.ebuild 1929 RMD160 8e33536b1300bb8b8f951a540a6ec2f42b711f31 SHA1 5ba6470a151e2375be022b122b1b521a3a2b2a79 SHA256 32f3dddbf36a0766cbe95afb659a2bd45567907eca0191dfb369d06835620757
+MD5 403d67a9ab7c9b690bf81818f0c263bd sarg-2.2.2.ebuild 1929
+RMD160 8e33536b1300bb8b8f951a540a6ec2f42b711f31 sarg-2.2.2.ebuild 1929
+SHA256 32f3dddbf36a0766cbe95afb659a2bd45567907eca0191dfb369d06835620757 sarg-2.2.2.ebuild 1929
+MISC ChangeLog 4083 RMD160 6d5a5532cd0250df0928699b8910963101f2bfbf SHA1 31f06da1f10c19c0580503f4bf387d540eb8d333 SHA256 674d8d8e0502e4e6b292b3a353f966cfca2ddb5a190c518ab7924770e5212b6a
+MD5 77a8809014d8d43b6c35892b6c732116 ChangeLog 4083
+RMD160 6d5a5532cd0250df0928699b8910963101f2bfbf ChangeLog 4083
+SHA256 674d8d8e0502e4e6b292b3a353f966cfca2ddb5a190c518ab7924770e5212b6a ChangeLog 4083
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
 MD5 5d82bf1020f73776b224927b62cf6b43 metadata.xml 499
 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f metadata.xml 499
@@ -34,3 +39,6 @@ SHA256 e482074677a083f895267bce5b037798cd9980fa6d2f532ce617e0f863af4f66 files/di
 MD5 a924298c57b5b9b930658ca730ac1140 files/digest-sarg-2.2.1 232
 RMD160 3c130076d09225fde7641e921995d10096743bdf files/digest-sarg-2.2.1 232
 SHA256 e419b3f94d0afb5c3501dfb7680dfc2bb0eb406b97d576de7db3257cd4da0fcb files/digest-sarg-2.2.1 232
+MD5 32f25e35ef9a82d0a3bc3287dad1c12c files/digest-sarg-2.2.2 232
+RMD160 24a87cb939945659606cd8e72ffc9debd1a36244 files/digest-sarg-2.2.2 232
+SHA256 aff84dc7fc439a3ecaebae13c76b64343add16b41f625045514479a3fa67047e files/digest-sarg-2.2.2 232
diff --git a/net-analyzer/sarg/files/digest-sarg-2.2.2 b/net-analyzer/sarg/files/digest-sarg-2.2.2
new file mode 100644
index 000000000000..c0ffc67004c3
--- /dev/null
+++ b/net-analyzer/sarg/files/digest-sarg-2.2.2
@@ -0,0 +1,3 @@
+MD5 299f989f09d8b3c5218578eda7af724d sarg-2.2.2.tar.gz 381797
+RMD160 dc6599ca3766067c1e6a027757139b70bb2a1d0c sarg-2.2.2.tar.gz 381797
+SHA256 7a80750c87616d3c576e81d73ac5ea4f04e9f8ba7e5cfed1ebdd7986eecc99d9 sarg-2.2.2.tar.gz 381797
diff --git a/net-analyzer/sarg/sarg-2.2.2.ebuild b/net-analyzer/sarg/sarg-2.2.2.ebuild
new file mode 100644
index 000000000000..b75c893a81df
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.2.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.2.ebuild,v 1.1 2006/08/29 19:40:16 pva Exp $
+
+inherit eutils
+
+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"
+
+pkg_setup() {
+	built_with_use -a media-libs/gd png || die \
+	"Please recompile media-libs/gd with USE=\"png\""
+}
+
+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:"/var/www/html/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/access.log:' \
+	sarg.1 || die "Failed to fix man page."
+}
+
+src_compile() {
+	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 \
+		HTMLDIR=${D}/var/www/html \
+		install || die "sarg installation failed"
+
+	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
+}