libsrs2: Fix parallel make (#244812), remove .la file.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 35 insertions, 7 deletions

diff --git a/mail-filter/libsrs2/ChangeLog b/mail-filter/libsrs2/ChangeLog
index 2a67c08bedea..c7b4b12a5dcc 100644
--- a/mail-filter/libsrs2/ChangeLog
+++ b/mail-filter/libsrs2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/libsrs2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/ChangeLog,v 1.9 2009/09/23 17:54:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/ChangeLog,v 1.10 2009/09/29 14:21:34 hanno Exp $
+
+  29 Sep 2009; Hanno Boeck <hanno@gentoo.org> libsrs2-1.0.18.ebuild,
+  +files/libsrs2-1.0.18-parallel-make.diff:
+  Fix parallel make (#244812), remove .la file.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> libsrs2-1.0.16.ebuild,
   libsrs2-1.0.17.ebuild, libsrs2-1.0.18.ebuild:
diff --git a/mail-filter/libsrs2/Manifest b/mail-filter/libsrs2/Manifest
index e59eb0c9e53d..b18115e82b05 100644
--- a/mail-filter/libsrs2/Manifest
+++ b/mail-filter/libsrs2/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libsrs2-1.0.18-parallel-make.diff 477 RMD160 b287f36b74c75832f12dd0beade9e0d48eb6e542 SHA1 85044aa96b80efc4aaa8f498a70c671c5183f434 SHA256 fc2dafc9edb7c6ff3d018c594f3d60b3696f7dfe7574895e8f6a0724f2d7e418
 DIST libsrs2-1.0.18.tar.gz 295748 RMD160 7efa96f457ebac45178afa84aeaeb28834a1f4e7 SHA1 db9452e5207bb573eca4b3409c201f1e0275d300 SHA256 9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492
-EBUILD libsrs2-1.0.18.ebuild 669 RMD160 34bfb91d742eae7bd28dcf4c7a5ea62a0227a0c7 SHA1 04522a8a81173a6367676b6d251e0d096ac03ca3 SHA256 15c402dea1f19c58c4c3f7cb4a66183a791f84e2bcecb6b2b9e306a480fa61a2
-MISC ChangeLog 1329 RMD160 5fca055bc66916ec05a15ad6f510f3eb6d877962 SHA1 298792521433f857392d6065083c49b947af1279 SHA256 dc62f6fb85add22016f30a181d7bad57541925358f760056a32c52926103ffb5
+EBUILD libsrs2-1.0.18.ebuild 828 RMD160 c8cf5f5296c53cbe087e762d5878f630439089bb SHA1 512da86bb1760220a6fab29b0556bf970c719b58 SHA256 0b0995a96394c99de24bc9892416948738fddcdc9f7239938517b6744272e0bb
+MISC ChangeLog 1490 RMD160 ad2bccd6e718c2c1557205144731a54a4cd014e6 SHA1 a10fc4ff93a49ab8284cf58415ae61cc9f93e9e8 SHA256 bbbb4853a9c1fa83b7fc6c602564a924e2b3f251c806e2ab2c206ca8172e9a64
 MISC metadata.xml 676 RMD160 8c6b3d18319e7132e2120c9572cbe505e42bb24c SHA1 13fe3e41090e4e882f02103aa70cf0eeff21467e SHA256 a130cfde63013557b3af42d11587cb9df9d38421197fef95568ba95fea3105c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrCF0IACgkQr2QksT29OyBELgCeNFLpzZ8qqvL7X1GylRrzkAq1
-sDwAn0YCdfvACEtkL248mm3PqfEqC2C+
-=poQJ
+iEYEARECAAYFAkrCF+4ACgkQr2QksT29OyCCAQCeM+meslIR2rg/lCZfVuEG9uK7
+WDYAoJWqTHiFQeU3eoK7yg5FXNItobu5
+=1bYJ
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
new file mode 100644
index 000000000000..a5ce4d5a0028
--- /dev/null
+++ b/mail-filter/libsrs2/files/libsrs2-1.0.18-parallel-make.diff
@@ -0,0 +1,13 @@
+diff -Naur libsrs2-1.0.18/libsrs2/Makefile.am libsrs2-1.0.18-1/libsrs2/Makefile.am
+--- libsrs2-1.0.18/libsrs2/Makefile.am	2004-06-10 11:33:28.000000000 +0200
++++ libsrs2-1.0.18-1/libsrs2/Makefile.am	2009-09-29 16:08:29.000000000 +0200
+@@ -3,9 +3,6 @@
+ include_HEADERS = srs2.h
+ noinst_HEADERS = win32.h
+ 
+-lib_LIBRARIES = libsrs2.a
+-libsrs2_a_SOURCES = srs2.c sha1.c
+-
+ lib_LTLIBRARIES = libsrs2.la
+ libsrs2_la_LDFLAGS = -version-info 0:0:0
+ libsrs2_la_SOURCES = srs2.c sha1.c
diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
index 301c67de6937..3c83a58192f1 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/libsrs2-1.0.18.ebuild,v 1.4 2009/09/23 17:54:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/libsrs2-1.0.18.ebuild,v 1.5 2009/09/29 14:21:34 hanno Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
 HOMEPAGE="http://www.libsrs2.org/"
@@ -14,6 +16,13 @@ IUSE=""
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-parallel-make.diff"
+	eautoreconf
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
@@ -21,5 +30,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
+	find "${D}" -name '*.la' -delete
 	dodoc AUTHORS INSTALL NEWS README
 }