Version bump

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64

3 files changed, 77 insertions, 13 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 1c5f2e708619..ec98db5b7122 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2012/12/18 21:39:26 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.72 2013/01/09 11:16:50 pinkbyte Exp $
+
+*sarg-2.3.4 (09 Jan 2013)
+
+  09 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> +sarg-2.3.4.ebuild:
+  Version bump
 
 *sarg-2.3.3 (18 Dec 2012)
 
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index ed86984886ef..0e4c62d85aee 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 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
+DIST sarg-2.3.4.tar.gz 1282009 SHA256 9448de524bd91dbf0eaa8ebd393bc34c716dfb98e4595c8f0166062b8fac9f76 SHA512 279b6bfa87502973d82d25369098a8875d76440ddf845d99160865ecbd99a9ab63dbcb8a7ca94d0cf9807f46ce5dfbcec321592294c3d2763b4038b658280011 WHIRLPOOL 97edeb5a1bb3aaca355df2c2760b62bd01f6b43a47a5886ad84fa5c4e5f99126b9e2a8220bd3821b46df065376c3527bbe82c03b126d30744a89401b5f4be69a
 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
+EBUILD sarg-2.3.4.ebuild 1931 SHA256 607483612d6b692c6b63a5eca7e1048607f6b93b25ed59f9349f98ec799df80c SHA512 3f0f94e26f70538b3dd3b869dd7f87eb8392fa5fe39914ea0477781330c372ea767b7c27aff70241570b412139f97ef90e69ef7d42708f0ea51234dfd18c355b WHIRLPOOL 7bb14a8e0e8e1cd1865173e5b83c3d3e3c46670530a87e53a7b3110b311cc0b4188b27253f85dd46f3797af79df229bdda074bba9d28ad9d46be0fb5121f8418
+MISC ChangeLog 10086 SHA256 4600ed29b94e2f7aa7239adedb4c95e7b084bb8d0f49faa93c383032048d7907 SHA512 cee9212fae83c03de9ca82dd56aae514e7963ea61a8954ff50976a71c4ce94ccc87d0cc5f3d93998675b5e98f7c0e914cbab0ab08462e5ce662a3ebbc87ef8c8 WHIRLPOOL 2c676d452e6e12f816ea9d2ce425ef8a936a4a55c543504b9076e030e126dc10b910e17fd1ed5b3ecfc27756ac7138c00895411ce3fad3e26bc55b4c73b04183
 MISC metadata.xml 733 SHA256 1d45fa666282238215976831a1eb64cbaf1834b0c013fcf912c2eea9f8e3d6f5 SHA512 fd45a6a8da7726f52c9342da3b4eccb747adce9df5b931bbfae2035c84655cf7ecff54e571b96bb6f96c81af9c01edc3ff34bf0bb52712b043f5cab10d959f28 WHIRLPOOL 0a557ed47e6c7bb8ccc13a145322e5aa3459c31c7142de3ff25e3c1fdd58aaaa2e702bbd71758ccb853662d764c5c8ec3470bf8ec32a5f01555be45c3d74daf9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDQ4pAACgkQVWmRsqeSphOHWgCeK8NpUH4KMCS4N+giv+N1CdiA
-g9QAn36E26KBhm0+M9blqDsf+dgQQALb
-=p85v
------END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/sarg-2.3.4.ebuild b/net-analyzer/sarg/sarg-2.3.4.ebuild
new file mode 100644
index 000000000000..7efe9596c2d5
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.4.ebuild,v 1.1 2013/01/09 11:16:50 pinkbyte Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils 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 ldap pcre"
+
+DEPEND="
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+"
+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
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with gd)
+		$(use_with ldap)
+		$(use_with pcre)
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+	)
+	autotools-utils_src_configure
+}