Fix bug #372379.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 36 insertions, 5 deletions

diff --git a/kde-misc/semantik/ChangeLog b/kde-misc/semantik/ChangeLog
index 752c7212a299..81d281742f04 100644
--- a/kde-misc/semantik/ChangeLog
+++ b/kde-misc/semantik/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/semantik
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/ChangeLog,v 1.2 2011/06/13 21:55:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/ChangeLog,v 1.3 2011/07/13 17:36:21 mschiff Exp $
+
+  13 Jul 2011; Marc Schiffbauer <mschiff@gentoo.org>
+  semantik-0.7.3_p20091013.ebuild,
+  +files/semantik-0.7.3_p20091013-wscript_libstr.patch:
+  Fix bug #372379. Ocaml only provides str.a instead of libstr.a
 
   13 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   semantik-0.7.3_p20091013.ebuild:
diff --git a/kde-misc/semantik/Manifest b/kde-misc/semantik/Manifest
index c7bb7f8e2642..1b1a4acae162 100644
--- a/kde-misc/semantik/Manifest
+++ b/kde-misc/semantik/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX semantik-0.7.3_p20091013-wscript_ldconfig.patch 727 RMD160 cac51e1f33de0e23b538625af1e76a023047e594 SHA1 ab1aaf52317fceb781517c3827a22b2be8c86dcc SHA256 b0c864d79f6b7bffeb59f02fcea180839a1330d5b3a3739fd20149f28482c9b2
+AUX semantik-0.7.3_p20091013-wscript_libstr.patch 611 RMD160 2df06cf6db3e06baad6063f4067105eaddfcf299 SHA1 8014a440e23fcd1afcba2f9f6e1726ff347d4a1a SHA256 b20735e12f6f9e71b988a80b0ae65228eecd7b3c3bf13aa5b2e2a352e3a284d6
 DIST semantik-0.7.3_p20091013.tar.bz2 379208 RMD160 21e975fac9ba9bb51fcd8998b37335805c7a1686 SHA1 7c1f48e013c1e0e9cd94bf011facd49e24a11703 SHA256 9b45a246fb8f79e831dea932d621c3667a8895e2c670773b1fdb0c99f13eb322
-EBUILD semantik-0.7.3_p20091013.ebuild 942 RMD160 a80dde58817f1aab53a37813172811faa088d085 SHA1 db0c7379de6afa097864b63c6ec9497b9014e011 SHA256 88916ee0ffa9baf9b5dc62d3b359ddc4fd42bf6940bfdeffc753bfc40d7d6f17
-MISC ChangeLog 634 RMD160 19e7dd54a920922d0e79404be30ca922b373284f SHA1 f4cb752e1987de289fdd369bbe504a022408a4cf SHA256 3cc492b012251ac09150185a08771826c3a602ebea030a35c99673902fd44c66
+EBUILD semantik-0.7.3_p20091013.ebuild 982 RMD160 5e42c31cc5ba1cc0b5c42cdd1b7d98a60e2d738d SHA1 9cad15731cb0096cedfde84810ca39cce3a1a27b SHA256 07300f871e934fad8c2f1ae781fb08a318886f2e81793e8bd7355376bb731baf
+MISC ChangeLog 842 RMD160 ccf5af1ac2b8674ef4703ff560f0b3daf517a231 SHA1 eeed18510c55700b48404aa01d96dc6a5e7d05fe SHA256 f09253e37c2ade0fa922ddd72eee24b160ec3f24c5872c2c14a65c6417bdcfcc
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iD8DBQFOHdefKWxsyjWmQTQRAj6ZAJ4w6jBEOpzRgFcpoRjDNXvUvMC2vwCgoVZq
+kSfabGPMohqr5BJUcJGc2HY=
+=eYAo
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch b/kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch
new file mode 100644
index 000000000000..b943a7dd2185
--- /dev/null
+++ b/kde-misc/semantik/files/semantik-0.7.3_p20091013-wscript_libstr.patch
@@ -0,0 +1,12 @@
+diff -urN semantik-0.7.4.orig/wscript semantik-0.7.4/wscript
+--- semantik-0.7.4.orig/wscript	2011-07-13 19:00:04.004405901 +0200
++++ semantik-0.7.4/wscript	2011-07-13 19:02:14.853796943 +0200
+@@ -207,7 +207,7 @@
+ 		conf.fatal('Compiling Semantik requires kde4 -devel')
+ 
+ 	conf.env.OCALINKFLAGS_OPT_PP = 'str.cmxa'
+-	conf.env.LINKFLAGS_CAML = '-lasmrun -lstr -lnums'.split()
++	conf.env.LINKFLAGS_CAML = '-lasmrun -l:str.a -lnums'.split()
+ 	conf.env.LIBPATH_CAML = conf.env.OCAMLLIB
+ 	conf.env.LIB_CAML = "m".split()
+ 	conf.env.OCAMLFLAGS_TWT = '-pp default/util/ocamltwt'.split() #-unsafe -noassert -inline 10'
diff --git a/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild b/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild
index cefb04dcdf26..1b26e4eb4d7c 100644
--- a/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild
+++ b/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild,v 1.2 2011/06/13 21:55:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/semantik/semantik-0.7.3_p20091013.ebuild,v 1.3 2011/07/13 17:36:21 mschiff Exp $
 
 EAPI=4
 
@@ -29,7 +29,10 @@ RDEPEND="
 S="${WORKDIR}/semantik-0.7.4"
 WAF_BINARY="${S}/waf"
 
-PATCHES=( "${FILESDIR}/${P}"-wscript_ldconfig.patch )
+PATCHES=(
+	"${FILESDIR}/${P}"-wscript_ldconfig.patch
+	"${FILESDIR}/${P}"-wscript_libstr.patch
+)
 
 src_configure() {
 	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \