Old.

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

4 files changed, 16 insertions, 78 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index fe7280fbae4d..8557cd01040b 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,10 @@
 # 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.69 2012/04/17 15:59:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.70 2012/04/17 18:07:41 jer Exp $
+
+  17 Apr 2012; Jeroen Roovers <jer@gentoo.org> -sarg-2.3.1-r2.ebuild,
+  -files/sarg-2.3.1-underlinking.patch:
+  Old.
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> sarg-2.3.2.ebuild:
   Marking sarg-2.3.2 ppc for bug 404817
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index c7abb2e292bc..1335ddae117a 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,7 +1,14 @@
-AUX sarg-2.3.1-underlinking.patch 389 RMD160 d220a663233d6051178901cc6454f438e7b9fa9d SHA1 c3b2ab623537ea9bbc0adaefc7322eabc0c9b55f SHA256 4d55604e572530326e940ab375e57f90189e88f71a921b74812dfa238d312949
-DIST sarg-2.3.1.tar.gz 1073514 RMD160 b990ffd6baa170f0fd63c160555882779343c140 SHA1 823849387090bd6ff85db045a38db5a5ac7b7887 SHA256 2228d5dea0e9ce7a3996e0ec238a4e8ca0681e809eda85e9bf334e76cd621d0f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST sarg-2.3.2.tar.gz 1180411 RMD160 244e3f994fcf285e8a0219970bfb70402d1d5db3 SHA1 5d0e2c9efbffb163b030a46e51491dca6ab6aa0c SHA256 b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5
-EBUILD sarg-2.3.1-r2.ebuild 1861 RMD160 0fe1f68ff88b2638af912c154ea9a4ecae4234b5 SHA1 6459ed95949e9bf45ff7ff51f2f1e28bc51f4403 SHA256 2bf254615ae263314bf5290c067950080f760ea9826d80d3749c7da1e72cf730
 EBUILD sarg-2.3.2.ebuild 1785 RMD160 cb8ac6259b192336b11c4c84ebbf1543d8fefa7d SHA1 03f28bf7d44c0752c5f6636960fcfe6fa443a978 SHA256 2748e3a7c69691b62a718fce04d7dfcaf85cdff8e4d12431442c3c562131e13a
-MISC ChangeLog 9726 RMD160 38f1f4ff9ce1e84f047b83e7eb3abe390d7cf070 SHA1 c015ad8adeb951c28d85b28eef3034567b5a4683 SHA256 4fe2a3d3aced604b3d3366c87b7e1c26b0d7239d2d60e09bef45975167a5e0e3
+MISC ChangeLog 9841 RMD160 8933c71ac2a2a2a72e8744f2f1bff5dae98f2ada SHA1 71573e023afa072f048284c24cbc02aa80951592 SHA256 08475fc33544967b8389ffe30b17483857755b5c67167f6d87a4c4636f9aed27
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk+NsXMACgkQVWmRsqeSphP82gCdH/nzht5ztCgFbO/YOojSXypz
+1JYAn3WhbJhhvJ+EmKbzVKpULyFMthGl
+=y+aY
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch b/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch
deleted file mode 100644
index 03c2284bd2db..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3306865&group_id=68910&atid=522793
-
---- Makefile.in
-+++ Makefile.in
-@@ -23,7 +23,7 @@
- CPPFLAGS    = @CPPFLAGS@
- LDFLAGS     = @LDFLAGS@
- DEFS        = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $(ILOCALEDIR) @DEFS@
--LIBS        = @LIBS@
-+LIBS        = @LIBS@ -lm
- SRCDIR      = .
- VPATH       = .
- INSTALL     = cp
-
diff --git a/net-analyzer/sarg/sarg-2.3.1-r2.ebuild b/net-analyzer/sarg/sarg-2.3.1-r2.ebuild
deleted file mode 100644
index 6e07c4e89b8f..000000000000
--- a/net-analyzer/sarg/sarg-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.1-r2.ebuild,v 1.4 2012/02/14 21:43:33 ranger Exp $
-
-EAPI="4"
-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[png,truetype]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	einfo "Running sed to substitute paths..."
-	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
-
-	epatch "${FILESDIR}/${P}-underlinking.patch"
-
-	# https://sourceforge.net/tracker/?func=detail&aid=3415225&group_id=68910&atid=522793
-	sed 's:\(@mandir@\):\1/man1:' -i Makefile.in || die #379395
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/sarg/
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
-}