Old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 5 insertions, 166 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/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/"
-}