Version bump. Clean up patch.

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

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index c0f7e090228fb9a528e8591adffd43870751b9da..93dcf1011eb7b7adaf97675371d69b54a784b9c0 100644 (file)
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,12 @@
 # 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.63 2011/11/03 10:18:54 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.64 2011/12/07 02:23:41 jer Exp $
+
+*sarg-2.3.2 (07 Dec 2011)
+
+  07 Dec 2011; Jeroen Roovers <jer@gentoo.org>
+  files/sarg-2.3.1-underlinking.patch, +sarg-2.3.2.ebuild:
+  Version bump. Clean up patch.
 
   03 Nov 2011; Tony Vroon <chainsaw@gentoo.org> sarg-2.3.1-r2.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo, Ian

diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index e90bf1464546290d2f8eec6d87752bb8ffd9aeb1..350edc42c398da761ee4ace0120d9208c7de7797 100644 (file)
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX sarg-2.3.1-underlinking.patch 441 RMD160 28e8961035eb9f602078c7868c333935b9da5c57 SHA1 74fb04a711fa6b9767bf4da589cf206d4ae3c6a1 SHA256 e977cb5811696a231aba408ac78d359b0aa4cf3d7b2f73bcd1af94f897202176
+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 1864 RMD160 7866e1e32afac8403659350c956d29d257886715 SHA1 9adf679a5d2e1ee91f9999d41efcb7fd6f0e429b SHA256 d0f0e258b3cb2d520207259df5a510cfe30a1d1f2b7f19fb3cf851762c900f49
-MISC ChangeLog 9062 RMD160 235a9766835e25547aaec1268a6b5940f849badd SHA1 49bcf4351a2ce5e5a904a1a1fde9c4b70291372a SHA256 8ba30b0afcb0f6155ae7054fa7d942e71324ce400850e2c700ad0f7bb599f01e
+EBUILD sarg-2.3.2.ebuild 1785 RMD160 6c0a1212b9ae95caa46f652a74114701e7728f81 SHA1 b3e2d1ca5ee6802fa91d61755033d9ad859c5bea SHA256 1e03a67ae9d6f6e5569126f831c1cf7bdd57bcec821815c53f1aeb24a9a813b8
+MISC ChangeLog 9223 RMD160 64dd38192ff5a01ab64ce9e9fea5be7618ebb43a SHA1 ebe56482f9b71f55df1754bb2fb9dec8ffb1e3c1 SHA256 c0040734dc8c42ff8bb9530f605b3c1916f2ccef6feed06e66c7f8c4ef73882b
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6yaqEACgkQp5vW4rUFj5qF7wCgoNSZQsg99H8Ifx7qSByGiSe8
-cuUAnjQ0oZj7RKxpUBkTR0r1WZ5P2gel
-=ttY3
+iEYEARECAAYFAk7ezjQACgkQVWmRsqeSphOWXQCeLrxHwJOmHN3FQUQFRpN4DLn3
+YIMAn1ejQ78ZTvT7FItc/av/YW2sKkV9
+=m2B/
 -----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
index 0a64e32498ee883d4d20e9aff6a60bf0a96f4e8e..03c2284bd2db904a399279885c3228bc1d4467da 100644 (file)
--- a/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch
+++ b/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch
@@ -1,7 +1,7 @@
 https://sourceforge.net/tracker/?func=detail&aid=3306865&group_id=68910&atid=522793
 
---- Makefile.in        2011-05-24 11:05:15 +0000
-+++ Makefile.in        2011-05-24 11:05:21 +0000
+--- Makefile.in
++++ Makefile.in
 @@ -23,7 +23,7 @@
  CPPFLAGS    = @CPPFLAGS@
  LDFLAGS     = @LDFLAGS@

diff --git a/net-analyzer/sarg/sarg-2.3.2.ebuild b/net-analyzer/sarg/sarg-2.3.2.ebuild
new file mode 100644 (file)
index 0000000..eed0f6a
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.2.ebuild
@@ -0,0 +1,55 @@
+# 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.2.ebuild,v 1.1 2011/12/07 02:23:42 jer 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}"
+
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+
+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
+
+       # 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() {
+       chmod +x configure
+       econf --sysconfdir=/etc/sarg/
+}