Drop old.

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 6 insertions, 149 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 1da54b2a42e5..4195507a24c5 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.59 2011/05/31 16:40:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.60 2011/09/12 06:04:09 pva Exp $
+
+  12 Sep 2011; Peter Volkov <pva@gentoo.org> -sarg-2.2.5-r5.ebuild,
+  -sarg-2.3.1.ebuild:
+  Drop old.
 
   31 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> sarg-2.3.1-r1.ebuild:
   x86 stable wrt bug #368569
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 36ad7b8ba1ce..e12f81ada674 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,19 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sarg-2.3.1-underlinking.patch 441 RMD160 28e8961035eb9f602078c7868c333935b9da5c57 SHA1 74fb04a711fa6b9767bf4da589cf206d4ae3c6a1 SHA256 e977cb5811696a231aba408ac78d359b0aa4cf3d7b2f73bcd1af94f897202176
-DIST sarg-2.2.5-patchset-5.tar.bz2 19830 RMD160 af81d065b8f9148052cb48c06ccc16267af7df7b SHA1 4abc7999a90d7e86fed182c44b9348e68acb9dd3 SHA256 e2660de19c117743077667fad002ebd8813d6dc40b381b0c056eb42b47139e0a
-DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d
 DIST sarg-2.3.1.tar.gz 1073514 RMD160 b990ffd6baa170f0fd63c160555882779343c140 SHA1 823849387090bd6ff85db045a38db5a5ac7b7887 SHA256 2228d5dea0e9ce7a3996e0ec238a4e8ca0681e809eda85e9bf334e76cd621d0f
-EBUILD sarg-2.2.5-r5.ebuild 2440 RMD160 337d452068f06c18e66a78dea526d25cd00ecbb7 SHA1 d79631a5a2b4fa1c84ec47b6d5be82a37d965e63 SHA256 ab84c1fa11ec62e7f67bf09d18ac4ce1d850599d656b70a3fcb26331dcb431e2
 EBUILD sarg-2.3.1-r1.ebuild 1726 RMD160 ab460b3a6e815c342a240f08c1d9eb21ba477f3e SHA1 03e32dbd3e27a1de3460db9dd509f8f445ad5b40 SHA256 5d9c4d51272f5aa188650cdbe28e6af2e2be0d8d0832ca6b403b5f557c0732f6
-EBUILD sarg-2.3.1.ebuild 1651 RMD160 af7551bc016fc038c9562c7879d634c15270cb18 SHA1 6e9358b3cd2a2699c19b01bc527ca212196044cf SHA256 5e0f0b2829acbe7ae13babee13448c66875df8cdb641fc2110d4f1fa754156ac
-MISC ChangeLog 8385 RMD160 d37665c047716832a8f5e89085b5e2197e3ce90b SHA1 22cac32e84fb7a0f6815248c20558265c27a8f9f SHA256 2cfda66316f5d6c3df5d6c059a11f99dadc6712707e5800d99bbd5f058eb34f9
+MISC ChangeLog 8481 RMD160 21bb584a9f5ca7137783928f1557d755b6d8d5e6 SHA1 fcf02f3dede1f635d4ec26ee33ac3aa1bb528eb0 SHA256 053806df2ae66e7e940aee3d52caf67dfbf2b984c5fe520ac9c9902a3b9e614a
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3lGhIACgkQuUQtlDBCeQJY2ACfa8FfaoijakZk5xyXFOorj9q+
-3iUAnjZFEYQabYxKtPyFGNJApjXO+6J2
-=p/9j
------END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/sarg-2.2.5-r5.ebuild b/net-analyzer/sarg/sarg-2.2.5-r5.ebuild
deleted file mode 100644
index 356e7a973c67..000000000000
--- a/net-analyzer/sarg/sarg-2.2.5-r5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r5.ebuild,v 1.3 2009/04/18 13:40:56 ranger Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="Squid Analysis Report Generator"
-HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-		mirror://gentoo/${P}-patchset-5.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="media-libs/gd[png,truetype]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="patch" epatch
-
-	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:' \
-		-i sarg.conf || die
-
-	sed \
-		-e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
-		-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
-		-e 's:"/usr/local/sarg/passwd":"/etc/sarg/passwd":' \
-			-i log.c || die #43132
-
-	sed	-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
-		-i htaccess || die
-
-	sed -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
-		-i splitlog.c convlog.c || 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:' \
-		-e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
-			-i sarg.1 sarg-php/sarg-squidguard-block.php || die
-
-	sed -i -e 's:sarg_tmp:sarg:' email.c || die #64743
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-bindir=/usr/bin \
-		--enable-mandir=/usr/share/man/man1 \
-		--enable-sysconfdir=/etc/sarg/
-}
-
-src_install() {
-	# This is workaround for sarg installation script, which does not create dirs
-	dodir /etc/sarg /usr/sbin
-
-	make \
-		BINDIR="${D}"/usr/sbin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		SYSCONFDIR="${D}"/etc/sarg \
-		HTMLDIR="${D}"/var/www/html \
-		install || die "sarg installation failed"
-
-	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
-}
diff --git a/net-analyzer/sarg/sarg-2.3.1.ebuild b/net-analyzer/sarg/sarg-2.3.1.ebuild
deleted file mode 100644
index 45561e671b87..000000000000
--- a/net-analyzer/sarg/sarg-2.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.1 2010/09/19 09:20:05 pva Exp $
-
-EAPI="2"
-inherit eutils autotools
-
-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:' \
-		-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
-}
-
-src_configure() {
-	econf --sysconfdir=/etc/sarg/
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "sarg installation failed"
-	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess || die
-}