Link to libintl correctly and work with -j N on non glibc systems

Package-Manager: portage-2.1.3.9

4 files changed, 40 insertions, 11 deletions

diff --git a/dev-libs/confuse/ChangeLog b/dev-libs/confuse/ChangeLog
index e2dde80ad96c..6f219cbb04b6 100644
--- a/dev-libs/confuse/ChangeLog
+++ b/dev-libs/confuse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/confuse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.20 2007/05/08 18:38:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/ChangeLog,v 1.21 2007/09/13 10:15:24 uberlord Exp $
+
+  13 Sep 2007; Roy Marples <uberlord@gentoo.org>
+  +files/confuse-2.5-libintl.patch, confuse-2.5.ebuild:
+  Link to libintl correctly and work with -j N on non glibc systems
 
   08 May 2007; Fabian Groffen <grobian@gentoo.org> confuse-2.5.ebuild:
   Dropped ppc-macos keyword, see you in prefix
diff --git a/dev-libs/confuse/Manifest b/dev-libs/confuse/Manifest
index d21513e46fea..a7200ffa1634 100644
--- a/dev-libs/confuse/Manifest
+++ b/dev-libs/confuse/Manifest
@@ -1,16 +1,20 @@
+AUX confuse-2.5-libintl.patch 322 RMD160 33d1b75e745b935c85493d6e8baa0878f671a22b SHA1 6e95340cd14aa2bddb7388289feba528c33a616c SHA256 6480a551fcc868205152e4459bdcda8b5aa8aa877a956c3a005b7af89535a729
+MD5 3ebe2061cb29c27301dce8aa8115322c files/confuse-2.5-libintl.patch 322
+RMD160 33d1b75e745b935c85493d6e8baa0878f671a22b files/confuse-2.5-libintl.patch 322
+SHA256 6480a551fcc868205152e4459bdcda8b5aa8aa877a956c3a005b7af89535a729 files/confuse-2.5-libintl.patch 322
 AUX confuse-2.5-maketest.patch 581 RMD160 4be7e8c57f29fbd97e8c26d7885be32f2ae26c8f SHA1 170a457a906f4b940977fe34220d7cdcc9ffe4f8 SHA256 2ea10b5ae544e3c0c13222b9c1dc9a2a66f1493456aff2cacb45f9b3c539727c
 MD5 e63af9d342810c6b32080c4d5c4a5456 files/confuse-2.5-maketest.patch 581
 RMD160 4be7e8c57f29fbd97e8c26d7885be32f2ae26c8f files/confuse-2.5-maketest.patch 581
 SHA256 2ea10b5ae544e3c0c13222b9c1dc9a2a66f1493456aff2cacb45f9b3c539727c files/confuse-2.5-maketest.patch 581
 DIST confuse-2.5.tar.gz 502501 RMD160 25314942e740bb4c7e90dc9860df4df73f8ffc07 SHA1 0ba87baeb0f6540414b24c4b2d47ae375d0b870d SHA256 65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
-EBUILD confuse-2.5.ebuild 1283 RMD160 626ddcf6e822a4409213bd4fde3215fb223044e8 SHA1 583e5139f89eb7683b683f567603037abaeff50f SHA256 b88e234868ea45987f45aadafe7b6c2cc92de060dd7ff115800c0435234b6554
-MD5 2210e76b3f6d19893afb8e688b1e0ce1 confuse-2.5.ebuild 1283
-RMD160 626ddcf6e822a4409213bd4fde3215fb223044e8 confuse-2.5.ebuild 1283
-SHA256 b88e234868ea45987f45aadafe7b6c2cc92de060dd7ff115800c0435234b6554 confuse-2.5.ebuild 1283
-MISC ChangeLog 2516 RMD160 8cecab3830b9a2afcbc87f1c4ac4b2603001f8d1 SHA1 1dab9dab62193501e163f709b40c180e096e6ce7 SHA256 cd30474d01cb8e15f5ab4c35c5625e9f0085f7cab50ce2733aabd3521f216856
-MD5 8da0bbcd006ad98aab8e36a321299e62 ChangeLog 2516
-RMD160 8cecab3830b9a2afcbc87f1c4ac4b2603001f8d1 ChangeLog 2516
-SHA256 cd30474d01cb8e15f5ab4c35c5625e9f0085f7cab50ce2733aabd3521f216856 ChangeLog 2516
+EBUILD confuse-2.5.ebuild 1519 RMD160 966bf789cbe6a845dfee42d7645d4573b9bffa0b SHA1 42280fd0876bd53dbb029f95b2556bc6945a979b SHA256 8b07e1ed934fa7706ed50d02fa9f8ff64cac434a00cd2270986a2cf205ce5c6d
+MD5 60ece354a5348b3c7bb3088ac051e340 confuse-2.5.ebuild 1519
+RMD160 966bf789cbe6a845dfee42d7645d4573b9bffa0b confuse-2.5.ebuild 1519
+SHA256 8b07e1ed934fa7706ed50d02fa9f8ff64cac434a00cd2270986a2cf205ce5c6d confuse-2.5.ebuild 1519
+MISC ChangeLog 2691 RMD160 9811b6b50625c7f86e75c9730d0ab09539e4cea6 SHA1 9202f3756c0fe0c30b8b9f6b6b496e4964758934 SHA256 efc32e4e7184439bd034694923db759f292ce428ed4078c1a248a8db8e7ea415
+MD5 7a0aa8f091b1f25fda6762d697da1ce4 ChangeLog 2691
+RMD160 9811b6b50625c7f86e75c9730d0ab09539e4cea6 ChangeLog 2691
+SHA256 efc32e4e7184439bd034694923db759f292ce428ed4078c1a248a8db8e7ea415 ChangeLog 2691
 MISC metadata.xml 165 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 SHA1 54b9da7fdc6d8376c990288c72938be9855ef8b6 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a
 MD5 420df847a3db1c4969aff20243f656dd metadata.xml 165
 RMD160 3965c22a153ed350bcbd52de07c08ad47dd03cd7 metadata.xml 165
diff --git a/dev-libs/confuse/confuse-2.5.ebuild b/dev-libs/confuse/confuse-2.5.ebuild
index d505a961c1f3..183143eb172d 100644
--- a/dev-libs/confuse/confuse-2.5.ebuild
+++ b/dev-libs/confuse/confuse-2.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.5.ebuild,v 1.22 2007/05/08 18:38:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/confuse/confuse-2.5.ebuild,v 1.23 2007/09/13 10:15:24 uberlord Exp $
 
-inherit eutils libtool
+WANT_AUTOMAKE="1.8"
+
+inherit eutils libtool autotools
 
 DESCRIPTION="a configuration file parser library"
 HOMEPAGE="http://www.nongnu.org/confuse/"
@@ -24,6 +26,14 @@ src_unpack(){
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-maketest.patch
+
+	# eautoreconf or elibtoolize will refresh install-sh
+	# so that -j N works on FreeBSD
+	rm support/install-sh
+
+	# We should link to libintl correctly
+	epatch "${FILESDIR}"/${P}-libintl.patch 
+	eautomake
 	elibtoolize
 }
 
diff --git a/dev-libs/confuse/files/confuse-2.5-libintl.patch b/dev-libs/confuse/files/confuse-2.5-libintl.patch
new file mode 100644
index 000000000000..60192292c8f6
--- /dev/null
+++ b/dev-libs/confuse/files/confuse-2.5-libintl.patch
@@ -0,0 +1,11 @@
+diff -ur a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am	2004-10-02 16:25:13 +0100
++++ b/src/Makefile.am	2007-09-13 10:48:44 +0100
+@@ -2,6 +2,7 @@
+ 
+ libconfuse_la_SOURCES = confuse.c lexer.l
+ include_HEADERS = confuse.h
++libconfuse_la_LIBADD = $(LTLIBINTL)
+ 
+ datadir = @datadir@
+ localedir = $(datadir)/locale