summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/sarg/ChangeLog5
-rw-r--r--net-analyzer/sarg/Manifest13
-rw-r--r--net-analyzer/sarg/sarg-2.3.1-r1.ebuild56
3 files changed, 15 insertions, 59 deletions
diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 3408a395ffe8..5207684ac822 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,9 @@
# 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.65 2012/02/14 21:43:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.66 2012/02/15 02:21:08 jer Exp $
+
+ 15 Feb 2012; Jeroen Roovers <jer@gentoo.org> -sarg-2.3.1-r1.ebuild:
+ Old.
14 Feb 2012; Brent Baude <ranger@gentoo.org> sarg-2.3.1-r2.ebuild:
Marking sarg-2.3.1-r2 ppc for bug 388977
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index f094bdf09fa5..ca66c4996565 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
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
DIST sarg-2.3.2.tar.gz 1180411 RMD160 244e3f994fcf285e8a0219970bfb70402d1d5db3 SHA1 5d0e2c9efbffb163b030a46e51491dca6ab6aa0c SHA256 b117f417da577e73e8d6b44d8f63c99ceb8cd34b72bc0c4a5af889bfacb5c8a5
-EBUILD sarg-2.3.1-r1.ebuild 1726 RMD160 ab460b3a6e815c342a240f08c1d9eb21ba477f3e SHA1 03e32dbd3e27a1de3460db9dd509f8f445ad5b40 SHA256 5d9c4d51272f5aa188650cdbe28e6af2e2be0d8d0832ca6b403b5f557c0732f6
EBUILD sarg-2.3.1-r2.ebuild 1861 RMD160 0fe1f68ff88b2638af912c154ea9a4ecae4234b5 SHA1 6459ed95949e9bf45ff7ff51f2f1e28bc51f4403 SHA256 2bf254615ae263314bf5290c067950080f760ea9826d80d3749c7da1e72cf730
EBUILD sarg-2.3.2.ebuild 1785 RMD160 6c0a1212b9ae95caa46f652a74114701e7728f81 SHA1 b3e2d1ca5ee6802fa91d61755033d9ad859c5bea SHA256 1e03a67ae9d6f6e5569126f831c1cf7bdd57bcec821815c53f1aeb24a9a813b8
-MISC ChangeLog 9339 RMD160 2f66dafaa0f7cfdcd884a5ecd18f815112fa153c SHA1 bb408cf3f959a7403bf87ff2e234baf35d2fc4e5 SHA256 3a417652f0a150209a5a311a271df7fe054a21b14ecfeeb77389dc24e05f47ee
+MISC ChangeLog 9414 RMD160 93709d6b4c9fab766565264adb37a1fc169c9bf9 SHA1 d3beee0ed74fca083950985fe4e38bf43a762321 SHA256 c0af62847acacaad5d5d8789ee744432f25b42c1c2fed2704505d074a780691d
MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk87FpoACgkQVWmRsqeSphOQGQCfUetnbptFs1AqBPcZADV5Q25w
+IlQAnR8z6w4NLDme0HHeDOFgsB2JYcL3
+=y+0b
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sarg/sarg-2.3.1-r1.ebuild b/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
deleted file mode 100644
index 621b59f2a54f..000000000000
--- a/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.5 2011/05/31 16:40:36 phajdan.jr Exp $
-
-EAPI="4"
-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:' \
- -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"
-}
-
-src_configure() {
- econf --sysconfdir=/etc/sarg/
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
-}