Fix underlinking, bug #367519 thank Diego Elio Pettenò for report. Bump EAPI to 4.

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

4 files changed, 30 insertions, 9 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 62595392f002..f4ef4ece1f85 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sarg
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.55 2010/09/21 13:22:58 pva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.56 2011/05/24 11:15:54 pva Exp $
+
+  24 May 2011; Peter Volkov <pva@gentoo.org> sarg-2.3.1-r1.ebuild,
+  +files/sarg-2.3.1-underlinking.patch:
+  Fix underlinking, bug #367519 thank Diego Elio Pettenò for report. Bump EAPI
+  to 4.
 
 *sarg-2.3.1-r1 (21 Sep 2010)
 
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index bccccd866ff3..48a9a9279ebd 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,8 +1,9 @@
+AUX sarg-2.3.1-underlinking.patch 388 RMD160 0c1521a65abe10b072a124701c70c103cb87bf38 SHA1 aa8c4c2345cd9f9248e11f69624122daeed9acc4 SHA256 76ac656ebf869a06ad2197e9854c9d06c4cc4bed5dc85112be322b2cf3cd0b0e
 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 1716 RMD160 12d40813f74b40dae15fd354c14be1c6336da6eb SHA1 5d88b039084b7535677b6e47a2e24582b23fd283 SHA256 edccd4d47deb1def27aacbf81ffc56f2bd94b75b4ad0e67797e4708ba504eead
+EBUILD sarg-2.3.1-r1.ebuild 1722 RMD160 bdf943c2169d925f2c92ad7f562d8b24349eccb0 SHA1 1ed2826b863d8bbcbe3177df7890628ddffeef75 SHA256 403a611a170eb70ce239615f0ccfe79bf51702c8f62e19cdabd8050315828e40
 EBUILD sarg-2.3.1.ebuild 1651 RMD160 af7551bc016fc038c9562c7879d634c15270cb18 SHA1 6e9358b3cd2a2699c19b01bc527ca212196044cf SHA256 5e0f0b2829acbe7ae13babee13448c66875df8cdb641fc2110d4f1fa754156ac
-MISC ChangeLog 7852 RMD160 7240fdd4c4e45f52f3109449f35aeefbd484a252 SHA1 916e51620943795a781d77c4197ead78cff9b9a3 SHA256 0e6fff5a26c9da3a7fcc89ddb8f23d6a1daecc9430726fb1b5e7bebbcbe01550
+MISC ChangeLog 8048 RMD160 f015c25308e779cebbfe35aa6838e5f7c27a9ac5 SHA1 9788037b159af753fb8433f07640570fd5c344ac SHA256 77fbec956a5fcae3d2fb721b163dcac0fd608f5ae97357f29fdf4812f3a93036
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
diff --git a/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch b/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch
new file mode 100644
index 000000000000..8e6a44b1c863
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.1-underlinking.patch
@@ -0,0 +1,13 @@
+=== modified file 'Makefile.in'
+--- Makefile.in	2011-05-24 11:05:15 +0000
++++ Makefile.in	2011-05-24 11:05:21 +0000
+@@ -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-r1.ebuild b/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
index 582651d57ea8..b50b9b5bc9ae 100644
--- a/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.1 2010/09/21 13:22:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.1-r1.ebuild,v 1.2 2011/05/24 11:15:54 pva Exp $
 
-EAPI="2"
+EAPI="4"
 inherit eutils autotools
 
 DESCRIPTION="Squid Analysis Report Generator"
@@ -42,6 +42,8 @@ src_prepare() {
 	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() {
@@ -49,6 +51,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "sarg installation failed"
-	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess || die
+	emake DESTDIR="${D}" install
+	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
 }