Fix for linking against ICU when USE=icu. See bug #86723.

Package-Manager: portage-2.0.51.19

4 files changed, 28 insertions, 4 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 026315b311e5..baff31ec430c 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.35 2005/03/25 21:42:47 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.36 2005/03/28 02:58:19 latexer Exp $
+
+  27 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/mono-1.1.5-icu-linking.diff, mono-1.1.5.ebuild:
+  Fix for linking against ICU when USE=icu. See bug #86723.
 
 *mono-1.1.5 (25 Mar 2005)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index d2aca91418cc..88ffd4049fd5 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,10 +1,10 @@
-MD5 c982dd723cf606801d23b7b25cf53c0c mono-1.1.5.ebuild 2201
+MD5 dc4d953a71c347e45d1cc5f99a4722ad mono-1.1.5.ebuild 2435
 MD5 5c7a4c0458aa7e08da7f5572a6d215f5 mono-1.0.4.ebuild 1507
 MD5 ebddf7f07919de9d3b279d55d0f577df mono-1.0.4-r1.ebuild 2111
 MD5 c69ad4a401355c5a7f29cb0f2de55ae2 mono-1.0.5-r5.ebuild 3931
 MD5 e4d80474cce3145601e84a16325b3aaa mono-1.0.6.ebuild 3908
 MD5 fc071f649fb4cf6711c8ca4ec3466219 mono-1.1.4.ebuild 1844
-MD5 a3e4570e94b216b3e7aaba82e29a170a ChangeLog 14481
+MD5 ec65d55fd31a80d4aa37b833aa23d9fa ChangeLog 14650
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
 MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
@@ -18,3 +18,4 @@ MD5 2cef534891ce7b0c980d5615ae1397af files/digest-mono-1.0.4-r1 64
 MD5 9e2e1b58a310e4236f757e683b71c879 files/digest-mono-1.0.5-r5 127
 MD5 48284ee0228c56980a839fb245258db7 files/mcs-1.0.5-pathfix.diff 628
 MD5 08f6767a7160565ad6796eee60e412cb files/mono-1.1.5-r42122.diff 1037
+MD5 046e84a24a93a7c5c1b6a6c4e8cf3fed files/mono-1.1.5-icu-linking.diff 468
diff --git a/dev-lang/mono/files/mono-1.1.5-icu-linking.diff b/dev-lang/mono/files/mono-1.1.5-icu-linking.diff
new file mode 100644
index 000000000000..6ba1b8a89267
--- /dev/null
+++ b/dev-lang/mono/files/mono-1.1.5-icu-linking.diff
@@ -0,0 +1,11 @@
+diff -aur mono-1.1.5-orig/mono/metadata/Makefile.am mono-1.1.5/mono/metadata/Makefile.am
+--- mono-1.1.5-orig/mono/metadata/Makefile.am	2005-03-16 11:18:25.000000000 -0500
++++ mono-1.1.5/mono/metadata/Makefile.am	2005-03-26 18:08:34.000000000 -0500
+@@ -29,6 +29,7 @@
+ 
+ CLEANFILES = mono-bundle.stamp
+ 
++libmonoruntime_la_LIBADD = $(ICU_LIBS)
+ libmonoruntime_static_la_LIBADD = $(bundle_obj) $(PLATFORM_LIB) $(libmonoruntime_la_LIBADD)
+ 
+ libmonoruntime_la_SOURCES = \
diff --git a/dev-lang/mono/mono-1.1.5.ebuild b/dev-lang/mono/mono-1.1.5.ebuild
index 7cbb0cabbc66..1aab14d7f56a 100644
--- a/dev-lang/mono/mono-1.1.5.ebuild
+++ b/dev-lang/mono/mono-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5.ebuild,v 1.1 2005/03/25 21:42:47 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5.ebuild,v 1.2 2005/03/28 02:58:19 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -34,6 +34,9 @@ src_unpack() {
 	# Fix munging of Unix paths
 	epatch ${FILESDIR}/${P}-pathfix.diff || die
 
+	# Fix for linking to ICU
+	epatch ${FILESDIR}/${P}-icu-linking.diff || die
+
 	# Various fixes from SVN.
 	epatch ${FILESDIR}/${P}-r42108.diff || die
 	epatch ${FILESDIR}/${P}-r42122.diff || die
@@ -48,6 +51,11 @@ src_unpack() {
 	sed -i \
 		"s:^\t\(MONO_PATH.*)\):\tMONO_CFG_DIR='${D}/etc/' \1:" \
 		${S}/mcs/build/library.make || die
+
+	libtoolize --copy --force || die "libtoolize failed"
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+	automake || die "automake failed"
 }
 
 src_compile() {