[gentoo-commits] dev/dilfridge:master commit in: kde-misc/semantik/, kde-misc/semantik/files/

[Andreas Hüttel]

commit:     60ec0ac470b39d1cc367813e9ee5adf3cee9ff34
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Thu Jul 28 10:37:34 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 10:22:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=60ec0ac4

[kde-misc/semantik] Resync with main tree

(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 kde-misc/semantik/ChangeLog                        |   11 ++++++--
 kde-misc/semantik/Manifest                         |   25 ++++++++++++++++++-
 .../semantik-0.7.3_p20091013-wscript_libstr.patch  |   12 +++++++++
 kde-misc/semantik/semantik-0.7.3_p20091013.ebuild  |    9 ++++--
 4 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/kde-misc/semantik/ChangeLog b/kde-misc/semantik/ChangeLog
index 98e48fc..2248c44 100644
--- a/kde-misc/semantik/ChangeLog
+++ b/kde-misc/semantik/ChangeLog
@@ -2,9 +2,14 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jul 2011; Andreas K. Huettel <dilfridge@g.o>
+  semantik-0.7.3_p20091013.ebuild,
+  +files/semantik-0.7.3_p20091013-wscript_libstr.patch:
+  Resync with main tree
+
   13 Jun 2011; Andreas K. Huettel <dilfridge@g.o>
   semantik-0.7.3_p20091013.ebuild:
-  [kde-misc/semantik] Cleanup, ready now
+  Cleanup, ready now
 
 *semantik-0.7.3_p20091013 (13 Jun 2011)
 
@@ -15,11 +20,11 @@
   -files/semantik-0.7.3_p13102009-rpath.patch,
   -files/semantik-0.7.3_p13102009-wscript_ldconfig.patch,
   +files/semantik-0.7.3_p20091013-wscript_ldconfig.patch:
-  [kde-misc/semantik] Cleanup
+  Cleanup
 
   13 Jun 2011; Andreas K. Huettel <dilfridge@g.o>
   semantik-0.7.3_p13102009.ebuild, +files/semantik-0.7.3_p13102009-rpath.patch:
-  [kde-misc/semantik] First version without the rpath warnings
+  First version without the rpath warnings
 
   26 Jan 2011; Andreas K. Huettel <dilfridge@g.o>
   semantik-0.7.3-r1.ebuild:

diff --git a/kde-misc/semantik/Manifest b/kde-misc/semantik/Manifest
index 0844069..c625b03 100644
--- a/kde-misc/semantik/Manifest
+++ b/kde-misc/semantik/Manifest
@@ -1,5 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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 826 RMD160 8fc5490bbb70681fcfc5829c39370dc1e32a94c0 SHA1 cec5083edfe25cf566294d021e1a7885ec320030 SHA256 b074db84e1ec68e970ebf3d7025806ed4860cecf28e0110deee9f00b2f700a51
-MISC ChangeLog 1626 RMD160 ad2231bb1052adb0864446e1b7ecd21f8faf62cb SHA1 b9347a9f1ba9cea133017099942edf533e22cbeb SHA256 804fb7a222887ca8c0971ede576a22e48ffbc12afe01e67d700bd2948eb5e872
+EBUILD semantik-0.7.3_p20091013.ebuild 982 RMD160 5e42c31cc5ba1cc0b5c42cdd1b7d98a60e2d738d SHA1 9cad15731cb0096cedfde84810ca39cce3a1a27b SHA256 07300f871e934fad8c2f1ae781fb08a318886f2e81793e8bd7355376bb731baf
+MISC ChangeLog 1739 RMD160 21e5444f02bac6daef8e57a4b0db20b9f463028c SHA1 d30cff43186714fe3589a45c48963124d2ed0c5c SHA256 e825015631c04511f66406653a1c0b9dbdfe5247a4556a010903e47933140d77
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOMTvuAAoJEEb+UGWnxTyHF8MP/3M3j8PdI0TMwL4adgKmfBqe
+Vr/KJkSrA6AbZAZtA89itDkS7ykSRuBO7xQu9p3AO8vScGrRyGU0PkBjITvz8K2h
+N7NaLUFNvfc6vl/x9pPdJMqiBTFzkAkbKxwKtdM7cHOuEjfSnzu82LCkPjC+oDUU
+FlOcJ6lqkXMKQDaeWO49D/gsylNI4SYPHy5iqqA9V9MR43AujqhYJ0C71RKi+agB
+UILJsjLWLFx585nk4x69KSquE3nbR5wKeByFMCzeQJO9RkiYM7C5wnKWsBHdvwdo
+1O9oAgWYSPhF6Ds1gI9S3KMWyVCp6WBsdsOEiuiJ1rQMlwbf6U4xalN0OuJuhuIP
+mB0q5LDkfXZtY3BSaPRNqpazye1XSIfVE7C/3Hu6HVF7rb4BpCRiCBDZPPWSOB5P
+jguaVSEY7YC2pBAPyLiuAorvCISpmHQAkm/gCt1i/5saUwi6ouZjHKwgKBkCWauO
+HAsxwYCCl394Bz7m3S0oQQVyKl/l0OCSsVmYLduKsjC1h1g2YIxe4iASqTJ2SlPV
+lvf6USDnU4JhB6jtv+W9IPGij3D2SRMiwwXCH//Pzep0foW4R4Zc7JHllfo1qR0l
+icYIA0pFPZ1Nx3BocHphZFyYkoqk4mpiupR+R1E50sPHiU3yRAv25dxtUGox9Q7W
+cSAgONNqMTA9wEsl63yH
+=Pkl6
+-----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 0000000..b943a7d
--- /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 45e41d7..1b26e4e 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: $
+# $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
 
@@ -10,7 +10,7 @@ DESCRIPTION="Mindmapping-like tool for document generation."
 HOMEPAGE="http://freehackers.org/~tnagy/semantik.html"
 SRC_URI="http://semantik.googlecode.com/files/semantik-snapshot.tar.bz2 -> ${P}.tar.bz2"
 
-LICENSE="QPL"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
@@ -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}" \