Fixed libantlr issue (see bug #286630).

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

4 files changed, 19 insertions, 8 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 1cad2f639b75..dde2e615399d 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.18 2010/02/27 05:03:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.19 2010/02/27 05:28:16 markusle Exp $
+
+  27 Feb 2010; Markus Dittrich <markusle@gentoo.org> gdl-0.9_rc4.ebuild,
+  files/gdl-0.9_rc4-antlr.patch:
+  Fixed libantlr issue (see bug #286630).
+  Thanks much to Jan Kohnert for tracking this down.
 
   27 Feb 2010; Markus Dittrich <markusle@gentoo.org> gdl-0.9_rc4.ebuild,
   +files/gdl-0.9_rc4-gcc4.3.patch:
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 1cebee9fbe24..80fbfaf1e4a0 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -4,13 +4,13 @@ AUX gdl-0.9_rc1-proj4.patch 1087 RMD160 222d10268dc3d99de76312a1e1ccef3b9f1af015
 AUX gdl-0.9_rc2-antlr.patch 1437 RMD160 3f74655e528d03c72d806e836cb932b047c14d65 SHA1 8c9aa2befb652a47bfe56ae5d620f187e2d506c1 SHA256 1814491c3f2c63ac60ac3a35df90857e3551bbe95e6a627f572fecd213765945
 AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
 AUX gdl-0.9_rc3-proj4.patch 4261 RMD160 83d80b4010b301a504b0bc5adb926c719faa723c SHA1 375a2ac3f050ceb3461cf39df0c3cf509c3870bd SHA256 2dc32635273ab8d58c84e45839c50acee2d942ba1fffdd5f1ef442c03e836870
-AUX gdl-0.9_rc4-antlr.patch 1656 RMD160 d0668acb50fb36a168a1031bad9e9e158f5e8e31 SHA1 3c95f45adcc0e1d2c88064159a5d3b171c29e4f0 SHA256 c8a40bc14302bec331c36204dbdabcf675c4df2f50a8b1430156e7629d5b8f9b
+AUX gdl-0.9_rc4-antlr.patch 1660 RMD160 29b275369d39e1ce53a8844c7cfeb2a897246220 SHA1 34d42ac6a2af794fac47ffa9578eae99b5f6cd63 SHA256 82f6211f9171438802372d7d1cd2fd141036bcc4abd8364e84a8b036c811f7d0
 AUX gdl-0.9_rc4-gcc4.3.patch 377 RMD160 b32e74d24fde6c37292b5a70450ad892a8ebbe46 SHA1 223bfc83e74f3ef788fd8e0c78f3cc82019834b4 SHA256 81d769b09bead8a103b85ff17083d3a8aac1b68b06db8d7cf2d2330787dd5f1c
 DIST gdl-0.9rc2.tar.gz 1310414 RMD160 79a92daa6167ed45bedc06668dd86682ee2758cb SHA1 f2c87e0a6cecc9dab1e98232cf154d0c78771aa9 SHA256 0a3f0b5e1e70d3d1fc2356eebe1eead5c61baaf5675931f06898c2a1e621aba3
 DIST gdl-0.9rc3.tar.gz 1899718 RMD160 d5e47420462a200853fc6b33447181e477218368 SHA1 bce9b091b17ede0675f347a3aef1a46c9b0abec9 SHA256 468db2ee2533d665eebcb5dca32aad526b0af788aaa43614be371b7ef11d8daa
 DIST gdl-0.9rc4.tar.gz 1486747 RMD160 504f072d4dbf30403a2e9e0ed18223537619f01a SHA1 ffd133b9bc213613c89952f341defb447a87bf1d SHA256 b4b6c64c0d6b208d0a1c577986740308b388ef31b6960cf6c9cc93618b8b97b2
 EBUILD gdl-0.9_rc2.ebuild 2572 RMD160 bbeecf52a18f58b8bd41fe6439763fbba8e2053a SHA1 65fb5917c65e80e7a5db2400e1a6a38b144fa283 SHA256 6777ca6ccde758c164e5aa646786200765471eca86de8dc5f9f716ddb46c7527
 EBUILD gdl-0.9_rc3.ebuild 2531 RMD160 c5a841936c78ee220c139441d72275182d0ff285 SHA1 077e8fe0df9d9301af19da35cdad3a0bed64f6c7 SHA256 3ab77be6e7478a29d6a4c493ce8ae239bd5fe8ed9ce26138c13bb9cd860209fc
-EBUILD gdl-0.9_rc4.ebuild 2227 RMD160 803088f5c268a7ca77549f952ea8dc08ecc79bfa SHA1 960e5046d49883b8f1b6f83ee8ab5f3e7c70c5f3 SHA256 d9c74dfdfa8a0218cf7416247d3d03ea3291dac506b7ac2d442dd8ef8ee19902
-MISC ChangeLog 3932 RMD160 e23eb211b7e9374cab93063e1c853bbb54cfbab7 SHA1 1ad648ff9c83f5660c688bc82ab4cfdcd0173f82 SHA256 b9f0d2539370fa97e2e04d64425962b1228599fa98f638006f21c9b5871c1b0d
+EBUILD gdl-0.9_rc4.ebuild 2519 RMD160 a23224ab62c9c9d1a9f869cfdd4c38dcd9656a52 SHA1 4772f19dcd02c6b257ffc39167a2a241c1ae4ac6 SHA256 ba44a0b3851f1f4577c459318988fe7231e26b094ac2c8abbe9f58f7e610c022
+MISC ChangeLog 4134 RMD160 4eb296c7b22919a67d83da8d53a4166467d34457 SHA1 c12862910d302d1d108b952079836afdf070b912 SHA256 82b7195205717685f9e1190566710dedc072153acfe82d0ed7864c16423cf1af
 MISC metadata.xml 626 RMD160 88f7a1519569b5dca8e3f1b8817c5d34a82e56f3 SHA1 9751e41c6656a74f9f0776f8f93edbef0f147392 SHA256 68cd2fff8c6ff4c79d58d36ea648bf133b90df9b579bb8f968ed3edce7a57bc4
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
index 47baaebd8cac..ab1ba5ee5431 100644
--- a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
+++ b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
@@ -26,7 +26,7 @@ diff -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am
  # the library search path.
  gdl_LDFLAGS = $(all_libraries)
 -gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+gdl_LDADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
++gdl_LDADD = ANTLR_LIB -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
  endif
  
  # build as library (for python module)
@@ -35,6 +35,6 @@ diff -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am
  endif 
  
 -libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
++libgdl_la_LIBADD = ANTLR_LIB -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
  endif
  
diff --git a/dev-lang/gdl/gdl-0.9_rc4.ebuild b/dev-lang/gdl/gdl-0.9_rc4.ebuild
index c501e307a012..d71db6298153 100644
--- a/dev-lang/gdl/gdl-0.9_rc4.ebuild
+++ b/dev-lang/gdl/gdl-0.9_rc4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.4 2010/02/27 05:03:45 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9_rc4.ebuild,v 1.5 2010/02/27 05:28:16 markusle Exp $
 
 EAPI="2"
 
-inherit eutils flag-o-matic autotools
+inherit eutils flag-o-matic autotools multilib
 
 MYP=${P/_/}
 DESCRIPTION="An Interactive Data Language compatible incremental compiler"
@@ -46,6 +46,12 @@ src_prepare() {
 	# adjust the *.pro file install path
 	sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \
 		|| die "Failed to fix *.pro install patch."
+
+	# set path to libantlr. Note that we need to explicitly link against
+	# libantlr.a since kde-sdk provides libantlr.so which we can not
+	# use (see bug #286630).
+	sed -i -e "s:ANTLR_LIB:/usr/$(get_libdir)/libantlr.a:" src/Makefile.am \
+		|| die "Failed to adjust link to libantlr."
 	eautoreconf
 }