3 files changed, 5 insertions, 74 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/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
-}