Version bump.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 85 insertions, 10 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 8557cd01040b..1c5f2e708619 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.70 2012/04/17 18:07:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.71 2012/12/18 21:39:26 jer Exp $
+
+*sarg-2.3.3 (18 Dec 2012)
+
+  18 Dec 2012; Jeroen Roovers <jer@gentoo.org> +sarg-2.3.3.ebuild,
+  metadata.xml:
+  Version bump.
 
   17 Apr 2012; Jeroen Roovers <jer@gentoo.org> -sarg-2.3.1-r2.ebuild,
   -files/sarg-2.3.1-underlinking.patch:
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 1335ddae117a..ed86984886ef 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST sarg-2.3.2.tar.gz 1180411 RMD160 244e3f994fcf285e8a0219970bfb70402d1d5db3 SHA1 5d0e2c9efbffb163b030a46e51491dca6ab6aa0c SHA256 b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5
-EBUILD sarg-2.3.2.ebuild 1785 RMD160 cb8ac6259b192336b11c4c84ebbf1543d8fefa7d SHA1 03f28bf7d44c0752c5f6636960fcfe6fa443a978 SHA256 2748e3a7c69691b62a718fce04d7dfcaf85cdff8e4d12431442c3c562131e13a
-MISC ChangeLog 9841 RMD160 8933c71ac2a2a2a72e8744f2f1bff5dae98f2ada SHA1 71573e023afa072f048284c24cbc02aa80951592 SHA256 08475fc33544967b8389ffe30b17483857755b5c67167f6d87a4c4636f9aed27
-MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
+DIST sarg-2.3.2.tar.gz 1180411 SHA256 b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5 SHA512 d20a18b4e5856385685a11e45fcb04a6d56618a08330496117cd010cc27cf722e98b069bd5ee54661363e0e70f0c86578e68ea82f1a8bcab3536352141d94227 WHIRLPOOL ad357233f6719c62b04a3cc757834ac18a619ed32bc008457390595d0d56785dccd01064683f96614d74752d8bba9b072d193460984699a970e36a8740e23381
+DIST sarg-2.3.3.tar.gz 1281405 SHA256 7747c468ccd72bd2aa1f826dffe5e2f68fe1e3b64748e5916c3918c67e46dcab SHA512 7d1d3f19c4cd948536b12de92d39cdc42c57ef247239b16b276b3f0604256f50d45ae41a20b0b655bae1653e3e5c7fb8cb32ed6fc8eed4a4a71e847a7e578e5f WHIRLPOOL d2c10082fc802a259cf923f693215134033d9bf6f77914b9ca660cc926877c2e6c672ee506f50764ec801ff42c35ab27a163c4effc4ed031dabf43e849930c34
+EBUILD sarg-2.3.2.ebuild 1785 SHA256 2748e3a7c69691b62a718fce04d7dfcaf85cdff8e4d12431442c3c562131e13a SHA512 5d2bcf365b620fc55c77e230d4f285bd187d53d426bda4e7d4b0c239a74361cad57692b22a7a97bf8d60c773e3d798f29a8087bdfa3d36fba3ca7997738ed077 WHIRLPOOL 55a8c2cb881093d45b98e32b7674cd91c9415ca94de428fe37617887d0c441ae13081acabc7e27c36209a5ad167d651d779cf998c40fdf8d2cc0431e78c36660
+EBUILD sarg-2.3.3.ebuild 1895 SHA256 2f48a6f4348c98f73cf183e6e75a6491d2ec36cec56bb085e9b64dc0a595aba7 SHA512 e1161831337925d8c80aca6ca9a350e12fb8a3ee3ad1ae748016bd4a81dcf8f72cc76dbfb4fbbd370d31afa48c2bf85ce4ccfddd53e941aace287bfb7c3e5788 WHIRLPOOL e483d2db7a25b6d1a88af6194aafc2e3f41a4bc1b03e99d66fcbb3921be759cb7ba4377af142d5ce1478e8a62ab22d93468b399b1cad2e1f529124891b1b0358
+MISC ChangeLog 9968 SHA256 2878f4a248b49f77e320ffeafa82f87dd04f40330161f6d297213957c38004ad SHA512 7a1f3f3d50ecf44ff8d8a8fb32138bae8f47c00bd1bb3d17e51efda45df91d244ad8f29002e31a8ebffba5549deb5734a83af3ce7741b2ec7e4a36e518f9ca41 WHIRLPOOL 5cba25bb8f73f6c28d40f1802bc0c9752315be598ddaf2b830146417ea8524500533242a4109ebb8f69e637052d7720c81cd902134de5db0f82568db10665ec2
+MISC metadata.xml 733 SHA256 1d45fa666282238215976831a1eb64cbaf1834b0c013fcf912c2eea9f8e3d6f5 SHA512 fd45a6a8da7726f52c9342da3b4eccb747adce9df5b931bbfae2035c84655cf7ecff54e571b96bb6f96c81af9c01edc3ff34bf0bb52712b043f5cab10d959f28 WHIRLPOOL 0a557ed47e6c7bb8ccc13a145322e5aa3459c31c7142de3ff25e3c1fdd58aaaa2e702bbd71758ccb853662d764c5c8ec3470bf8ec32a5f01555be45c3d74daf9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+NsXMACgkQVWmRsqeSphP82gCdH/nzht5ztCgFbO/YOojSXypz
-1JYAn3WhbJhhvJ+EmKbzVKpULyFMthGl
-=y+aY
+iEYEAREIAAYFAlDQ4pAACgkQVWmRsqeSphOHWgCeK8NpUH4KMCS4N+giv+N1CdiA
+g9QAn36E26KBhm0+M9blqDsf+dgQQALb
+=p85v
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index cc912433d83d..426edc634023 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/metadata.xml
@@ -10,4 +10,8 @@
  you to view "where" your users are going to on the Internet. Sarg provides many
  informations about Squid users activities: times, bytes, sites, etc...
  </longdescription>
+ <use>
+  <flag name="pcre">Enable support for regular expressions in the hostalias file through <pkg>dev-libs/libpcre</pkg></flag>
+  <flag name="gd">Enable support for graphs in reports through <pkg>media-libs/gd</pkg></flag>
+ </use>
 </pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-2.3.3.ebuild b/net-analyzer/sarg/sarg-2.3.3.ebuild
new file mode 100644
index 000000000000..48a4b358d9b7
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.3.ebuild,v 1.1 2012/12/18 21:39:26 jer Exp $
+
+EAPI=4
+inherit autotools 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="+gd pcre"
+
+DEPEND="
+	pcre? ( dev-libs/libpcre )
+	gd? ( media-libs/gd[png,truetype] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+
+src_prepare() {
+	sed -i configure.in -e '/LDFLAGS=/s:LDFLAGS:LIBS:g' || die
+
+	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
+
+	# https://sourceforge.net/tracker/?func=detail&aid=3415225&group_id=68910&atid=522793
+	sed 's:\(@mandir@\):\1/man1:' -i Makefile.in || die #379395
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with pcre) \
+		$(use_with gd) \
+		--sysconfdir=/etc/sarg/
+}