Old.

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

5 files changed, 9 insertions, 185 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index a46aba467c85..94d9afc932fe 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.93 2015/08/02 18:46:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.94 2015/08/05 06:33:23 jer Exp $
+
+  05 Aug 2015; Jeroen Roovers <jer@gentoo.org> -sarg-2.3.8.ebuild,
+  -sarg-2.3.9.ebuild, -files/sarg-2.3.8-long-long-int.patch:
+  Old.
 
   02 Aug 2015; Agostino Sarubbo <ago@gentoo.org> sarg-2.3.10.ebuild:
   Stable for x86, wrt bug #553278
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 37ae28ac0847..1ae3d81b066f 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,31 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sarg-2.3.8-long-long-int.patch 1009 SHA256 adc45aa8972318e79c18ebdc092130b4f724d8d6473c9aae4aaf75c53ecbbd86 SHA512 b6ed7ae9e93837159cc247efbaf282491ad10d93ca1d5dad6c0ce426862fb57531309ba09026fbac8a7e45154a24cb109a214b3288c99337425d8255e51b9c4f WHIRLPOOL 7069526bc609def4be6ddb0505f5c39f3b7f5217aa742e5154821916eab15bb86a3ada4a118949b133eae9aa05f4d46813bf2db717d998565850173c24e25d4e
 AUX sarg-2.3.9-configure-bash.patch 4033 SHA256 363678ba575691e37e589d920895d8454864c45c3785cc106f50ed31aaa7519c SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68 WHIRLPOOL 7cf87c7ef154201765d065a023bbbb942ec74957bc93b8eb3b4cec2e4fd7f4d7edaef73f1f0aca801c558f805a943fbe19c8833325bc0d15f029918b4648fb21
 AUX sarg-2.3.9-configure.patch 641 SHA256 f9ee6b9d69a4a360cca028922f33d9ff609708004d569d24c4dedbcb680b9885 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae WHIRLPOOL f185d436bab58ca0b3b2ac362c86807930aba07f6293d28c74d249305ff84e8dee0fe15faeedb660ffd82f7e13970d4f8f4aa796cea05a0179dd80314fa2e51b
 DIST sarg-2.3.10.tar.gz 1278071 SHA256 40f4408a6180516bbc8762a05ce90e06274639d7e8d74b5c142781dac751e3e7 SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d WHIRLPOOL 6550231d7e7479360857cd1908601963364990ab0f83417aed56ddc2d2bce289fcafd5c5f55a185dd0e15a3d16f6662e23a1901fe65658ab6df04fa9c143f1e0
-DIST sarg-2.3.8.tar.gz 1282735 SHA256 c7071526e44500e6401adc4383a6cb00c00c3110399aac26cd52ea65240eb21d SHA512 8bda850548cdbc0f0a657cbeafe09edce28d588a02563031aec59c7b18c8ae85efcda99d1aef78cff5f0ac4f8305dad4689cfd27e26710399ea2463a088a95c7 WHIRLPOOL 05fe326743acfc05e2696a71b4caec2c691b6237f9354b1a92436fff24011712e58d151fcceddece466fe7fa1521fd4bf6ad422f1b0d55ee64ee300df5782246
-DIST sarg-2.3.9.tar.gz 1288619 SHA256 7c96b8067f75a1e843af030cf4061efb6b190ea3850fbcc5b7e41af9a02a4117 SHA512 b9687a372d79d01e23bb3d1ca271cadb315ad9fa5fe1d61e41a08734b9dfae9ad97e830ff68f119c8b524cdf1c95bb4b9e8509bb951be2433f62d624fe4352b3 WHIRLPOOL 75f053cfb598882737a13af0e33312a3e76d78b71d14b5833053d5e04b153d13a0088d60624caa16027329fd0f1b4ecfd7be8fad6a5770fb651b838976df631d
 EBUILD sarg-2.3.10.ebuild 1865 SHA256 4d7173ee0b9b36703ea87162a71ba2a51e4e581127ce7df54cf21de8a605bfc3 SHA512 d18a067470ee388196c527f89222f302a90627adfade058eab9cbec1bab27e59634e8249de39a0540ae99a2e636a5ab6ee2f07235f16291b7f923ff36095e12c WHIRLPOOL dc094c459c527b51f465b19e66f00af3270cb1ee2066b44e124e9c15ea87f553df31806e3d79f565b3a8886faf065dea8006010e31ac72166c10070d95894814
-EBUILD sarg-2.3.8.ebuild 1848 SHA256 2d49f349aa60540da0f1fb3766c869585bca2dcf8f014f937fd1f14099029f99 SHA512 d67aa087a80b32eeb300b9ee601103682232e4f567ce5dd7dc633b3e261bc2e5a8e9bd0a81dc2429ebe57f3b067e80553ac46c1129eac9889026fbb9fd85b769 WHIRLPOOL 8688dc0fd96be379ba312ccee8949e49b91d7f99af03c7af7943a6e8f1727ab75ed815f936edc7cabec2cebb76a125abcf8e710c858ef8f481f42b85f31a6e54
-EBUILD sarg-2.3.9.ebuild 1853 SHA256 e1fe8317b2a6cac7d776afa53a7b34a82312f7fe56f0c33b18333d44376a513e SHA512 1208aa09788b88b8706795bbcdc461e2fa47889fe74b18025976ca1369a03b805a5928cf35a6c8a9c19699bd9f8971fffa259b8989be7f97eaf7d1900c807460 WHIRLPOOL 4e2f40a6a4a062014e9e6ff22f47ada0ea58643961157ba7e0f5f1719e41e00a38755cef0089d0a5bdcd86c6fd5efc34f30aafa6a7ffe0b95feb23400250bf6a
-MISC ChangeLog 12665 SHA256 17e25cf276b000f35341856ebc98b91d7eb4c23f324f56bbfb480b3e4f1de2c6 SHA512 4e0494fa2666158b4b299d7d3eaaa2f50bddf8cfd09571b4d1aa3e0f08eb64e7e92c668cf712699ccb2443f1ab285071b17cf234ba4aad41905c85ee54e2a5f2 WHIRLPOOL be03f221ae63ce0ec040806d8b4c3ec91dc2c4e5a0552d0a5b1521b411dec957b97fd571c9cc8022ad32c78e794aa851eca3fea6dbb02849937bacecc75dad34
+MISC ChangeLog 12801 SHA256 5d42e3e19d050471bf98d1fa88a867432883d16e2a0afe33023717ce967dcb41 SHA512 6482976c4177418c3c361e501dc92e43052570192bf7ef2ff83aa8139278719e83bcd1857aed6e3affe381a914e7f9800563ed801386dbda3c2ed634832b70d3 WHIRLPOOL b4fd883414acdb6f754e6953a251cd0935d40b03b7ed209b7652b2610d51c6fb37ad2c0efef1bf62f94d584c9e398ae6955002367741d87cf78ea12a12d54c37
 MISC metadata.xml 731 SHA256 215fc0346c226e7ffc4b98a70480322947578c555fee2cc7afef81704bb50b21 SHA512 5bfaa71fb39e1d9347f91c1fc678cb7da12c5ad8844c5a565dedece2395333d9aec3968ddedfa10ce4cf4ee17018f5a38423483d2c264db94ade8143d9cb7249 WHIRLPOOL 744e98a4e0ba026c89fe8fff7ec168771d0d1f63756c52e1c5b1d5e88a21997413b40cb25f96b6ffcc2a5e8675bb30e415bccacd96ebcbb6bc38528c54489bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVvmV/AAoJELp701BxlEWfcIEQAL7hWNhHhkSP7DSdgcIftrWe
-FOqJPsCdzvWbC8TER0y2jBQrZ1ppTBI9ulUF8AvZZJwwZPrweo/CAtsie7ePULaw
-u4y/J4VynfKjsi4aAAhaKm1Y5Y2aJIGhCXnYhVOMgDu8EDIW+eRuS3sRXCzVs1vm
-DuYy+xuYKX8v+L87ZhqCHXyc041Myd3BkJzjukz5tHSodISLozjq5RG+8qrYomWI
-UBjJehR/UtQniSTWUss8Sd8B43EEXe3XrUQlP4LPbqJp+QZ1lZ6v99LDFXkx8GgU
-nwzYGhm0wfJ34+uOJEDEToXGqSyZBG0oZiw2BU3qkftV3ixGFTRn9UoCC2QMxEVV
-gJZBdo2NcrL4GPjC8FDgkH2ikvJHMZ/l9Ywb6uLeGDIyo/m/lmDVNzZ6K+M2bnGv
-KIO0Uk0UG5cOmG/mXJb2VZiRdLmyWCdrNLxMDRsdX9cn1wJmWZE2rXy6Rk6gqsnr
-AZw8eAnDCBw/49UIPMD9lY26JM52g/ThQRKG/79Wx8P4LzhYlpNf2v1ZBw/ffHm0
-jbSlXGEn2jHHUYHUzGAIsn/fyQemAFSSvzSX+No65Nx5mhiKzRmMTfvNnPm9JV8V
-FF/1gBwfunzC5/9hWDSn5XgmP1+csaavtq08J5LfouRRwe9W1/Ryrxc85JDEe/Op
-KsOejjvZHRT7VxWKOuPa
-=Hh4p
+iEYEAREIAAYFAlXBrjQACgkQVWmRsqeSphMIuACdHa9l3PBqqwEKJGnhJVrywUu2
+OzQAn1a5Oju2hKPNqaZoRlIctp0iwm1x
+=80GO
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/files/sarg-2.3.8-long-long-int.patch b/net-analyzer/sarg/files/sarg-2.3.8-long-long-int.patch
deleted file mode 100644
index 85b3ec907b55..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.8-long-long-int.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-log.c:128: nbytes is defined as a long long int
-
-
---- a/log.c
-+++ b/log.c
-@@ -1503,14 +1503,14 @@
- 				}
- 			}
- 
--			if (fprintf(ufile->file, "%s\t%s\t%s\t%s\t%"PRIi64"\t%s\t%ld\t%s\n",dia,hora,ip,url,nbytes,code,elap_time,smartfilter)<=0) {
-+			if (fprintf(ufile->file, "%s\t%s\t%s\t%s\t%lld\t%s\t%ld\t%s\n",dia,hora,ip,url,nbytes,code,elap_time,smartfilter)<=0) {
- 				debuga(_("Write error in the log file of user %s\n"),user);
- 				exit(EXIT_FAILURE);
- 			}
- 			records_kept++;
- 
- 			if(fp_log && ilf!=ILF_Sarg)
--				fprintf(fp_log, "%s\t%s\t%s\t%s\t%s\t%"PRIi64"\t%s\t%ld\t%s\n",dia,hora,user,ip,url,nbytes,code,elap_time,smartfilter);
-+				fprintf(fp_log, "%s\t%s\t%s\t%s\t%s\t%lld\t%s\t%ld\t%s\n",dia,hora,user,ip,url,nbytes,code,elap_time,smartfilter);
- 
- 			totregsg++;
- 
-@@ -1561,7 +1561,7 @@
- 				printf("FUNC=\t%s\n",fun);
- 				printf("URL=\t%s\n",url);
- 				printf("CODE=\t%s\n",code);
--				printf("LEN=\t%"PRIi64"\n",nbytes);
-+				printf("LEN=\t%lld\n",nbytes);
- 			}
- 		}
- 		if (!from_stdin) {
diff --git a/net-analyzer/sarg/sarg-2.3.8.ebuild b/net-analyzer/sarg/sarg-2.3.8.ebuild
deleted file mode 100644
index e698f48db34a..000000000000
--- a/net-analyzer/sarg/sarg-2.3.8.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.8.ebuild,v 1.5 2014/08/13 09:27:49 ago Exp $
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-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() {
-	epatch "${FILESDIR}"/${P}-long-long-int.patch
-
-	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
-
-	eautoconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}
diff --git a/net-analyzer/sarg/sarg-2.3.9.ebuild b/net-analyzer/sarg/sarg-2.3.9.ebuild
deleted file mode 100644
index 996061d765a8..000000000000
--- a/net-analyzer/sarg/sarg-2.3.9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.9.ebuild,v 1.2 2014/10/28 09:03:43 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/"
-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() {
-	epatch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-configure-bash.patch
-
-	sed -i \
-		-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:' \
-		sarg.conf || die
-
-	sed -i \
-		-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
-		log.c || die #43132
-
-	sed	-i \
-		-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
-		htaccess || die
-
-	sed -i \
-		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
-		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
-		user_limit_block || die
-
-	sed -i \
-		-e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
-		sarg-php/sarg-block-it.php || die
-
-	sed -i \
-		-e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
-		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
-		sarg.1 sarg-php/sarg-squidguard-block.php || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gd) \
-		$(use_with ldap) \
-		$(use_with pcre) \
-		--sysconfdir="${EPREFIX}/etc/sarg/"
-}