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

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     edb765a2f8df483e73dce01b6d2af3d061da72fd
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 21:41:02 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 21:41:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=edb765a2

[kde-misc/semantik] First version without the rpath warnings

(Portage version: 2.1.10.2/git/Linux x86_64, unsigned Manifest commit)

---
 kde-misc/semantik/ChangeLog                        |    4 ++++
 kde-misc/semantik/Manifest                         |    6 ++++--
 .../files/semantik-0.7.3_p13102009-rpath.patch     |   17 +++++++++++++++++
 kde-misc/semantik/semantik-0.7.3_p13102009.ebuild  |   17 ++++++++++++++---
 4 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/kde-misc/semantik/ChangeLog b/kde-misc/semantik/ChangeLog
index 3a92197..e444c9b 100644
--- a/kde-misc/semantik/ChangeLog
+++ b/kde-misc/semantik/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  semantik-0.7.3_p13102009.ebuild, +files/semantik-0.7.3_p13102009-rpath.patch:
+  [kde-misc/semantik] First version without the rpath warnings
+
   26 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   semantik-0.7.3-r1.ebuild:
   Bump EAPI

diff --git a/kde-misc/semantik/Manifest b/kde-misc/semantik/Manifest
index c1e618f..dd1d9d1 100644
--- a/kde-misc/semantik/Manifest
+++ b/kde-misc/semantik/Manifest
@@ -1,8 +1,10 @@
 AUX semantik-0.7.3-wscript_ldconfig.patch 808 RMD160 682cb2056599d7bbd17bbeade8ade4e7730e934d SHA1 c1ca80aa6ac742a093c28d49c67a7026bd40e454 SHA256 0e6daf125c394f52358c58d89015fa4744aa30fa8a2ff0da7ec31bec0db8c068
+AUX semantik-0.7.3_p13102009-rpath.patch 708 RMD160 5fd525bf7032f933f89455ef940723ffed3b77d1 SHA1 d9431c0bb5104509efa0b984ba44223558b59990 SHA256 21004e3167c65d4c2712e0d95d4825cecd64a914fe8f13453fa4e523645f05e6
 AUX semantik-0.7.3_p13102009-wscript_ldconfig.patch 727 RMD160 cac51e1f33de0e23b538625af1e76a023047e594 SHA1 ab1aaf52317fceb781517c3827a22b2be8c86dcc SHA256 b0c864d79f6b7bffeb59f02fcea180839a1330d5b3a3739fd20149f28482c9b2
 DIST semantik-0.7.3.tar.bz2 378795 RMD160 bccf1c755d11e204ca86255c8fcd396f48ff0baa SHA1 4ddf0e63e05dd16e2d91dd2b4e75f8b1ebbc5293 SHA256 fb9be0f7b27772ec1debd95ca7b85d9ac68f8242ca097791b7a03317de10e899
 DIST semantik-0.7.3_p13102009.tar.bz2 379208 RMD160 21e975fac9ba9bb51fcd8998b37335805c7a1686 SHA1 7c1f48e013c1e0e9cd94bf011facd49e24a11703 SHA256 9b45a246fb8f79e831dea932d621c3667a8895e2c670773b1fdb0c99f13eb322
+DIST waf-1.5.19 92452 RMD160 d08e3d2511e21db42400762e95be090046e18c82 SHA1 b5aed0d117d00f2c83989a06bab7c4e836c50234 SHA256 98636c364ab8590336d9ef78423538394a77841b151bfd68780dd58712ba27dd
 EBUILD semantik-0.7.3-r1.ebuild 766 RMD160 a8e2212273fe8617b11bbe43cb72428fc46d6c03 SHA1 5ba707cb0f9b4fd06ea7492c50cf13697197fb36 SHA256 20125d0952d986d4fc48500522cc030cf465e59800f3e63bacde7bcafb2d8eba
-EBUILD semantik-0.7.3_p13102009.ebuild 816 RMD160 6ea20c2852d8ab4dd3701e6592385aceb9630f72 SHA1 1ff0e2ef8d63b019e76e4480708c5b99a091e9b5 SHA256 0ec37d2c1a7d44432254733f4ae7ef436d79c526ed8d6e6e1260500ebca396b0
-MISC ChangeLog 852 RMD160 2a55f37b2147abaf17316ce9372e8742051b18c7 SHA1 cf259ef104d61c08f350d00a64e8c275dc00dcbc SHA256 1d446bfeb4dcc06811328ed9a42d3c56c9da629cc600a1bc35acc21b63ccb756
+EBUILD semantik-0.7.3_p13102009.ebuild 1059 RMD160 630aa7fc4c54754846b6cc282b78901f61b63cc2 SHA1 f032f4329863246fe17e71efa439e179360ae781 SHA256 7ca0c82cf842acff289f9c751a96a33a1b37f56cb029f1d8b57adef42a0a4962
+MISC ChangeLog 1053 RMD160 229d49732e10e91303bb3f47c0e47649a28ae26e SHA1 51b8adeb9bdd4e85f686adea2812cb490c4163c9 SHA256 a9f59bc8262506f2eb76d5306a064f1a860bb00c157b055b47b7d1648aef4e57
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892

diff --git a/kde-misc/semantik/files/semantik-0.7.3_p13102009-rpath.patch b/kde-misc/semantik/files/semantik-0.7.3_p13102009-rpath.patch
new file mode 100644
index 0000000..4efc363
--- /dev/null
+++ b/kde-misc/semantik/files/semantik-0.7.3_p13102009-rpath.patch
@@ -0,0 +1,17 @@
+diff -ruN semantik-0.7.4.orig/wscript semantik-0.7.4/wscript
+--- semantik-0.7.4.orig/wscript	2009-10-12 18:26:26.000000000 +0200
++++ semantik-0.7.4/wscript	2011-06-13 23:24:35.490762785 +0200
+@@ -247,9 +247,10 @@
+ 
+ 	# the Debian packagers compile with --prefix=/usr and set /etc/ld.so.conf accordingly
+ 	# the rpath is for end users installing into /usr/local/lib only
+-	sur = '/usr/local'
+-	if Options.options.prefix[:len(sur)] == sur:
+-		conf.env.RPATH_NABLAH = '-Wl,--rpath=/usr/local/lib'
++	#sur = '/usr/local'
++	#if Options.options.prefix[:len(sur)] == sur:
++	#	conf.env.RPATH_NABLAH = '-Wl,--rpath=/usr/local/lib'
++	conf.env.RPATH = '/usr/lib64/qt'
+ 
+ def set_options(opt):
+ 	opt.tool_options('kde4')

diff --git a/kde-misc/semantik/semantik-0.7.3_p13102009.ebuild b/kde-misc/semantik/semantik-0.7.3_p13102009.ebuild
index 3fd2925..3515e20 100644
--- a/kde-misc/semantik/semantik-0.7.3_p13102009.ebuild
+++ b/kde-misc/semantik/semantik-0.7.3_p13102009.ebuild
@@ -8,7 +8,8 @@ inherit kde4-base waf-utils
 
 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"
+SRC_URI="http://semantik.googlecode.com/files/semantik-snapshot.tar.bz2 -> ${P}.tar.bz2
+	http://waf.googlecode.com/files/waf-1.5.19"
 
 LICENSE="QPL"
 SLOT="0"
@@ -29,10 +30,20 @@ RDEPEND="
 S="${WORKDIR}/semantik-0.7.4"
 WAF_BINARY="${S}/waf"
 
-PATCHES=( "${FILESDIR}/${P}"-wscript_ldconfig.patch )
+PATCHES=( "${FILESDIR}/${P}"-{wscript_ldconfig,rpath}.patch )
+
+src_prepare() {
+	cp "${DISTDIR}/waf-1.5.19" ${WAF_BINARY} || die
+	kde4-base_src_prepare
+}
 
 src_configure() {
 	CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" "${WAF_BINARY}" \
-		"--prefix=${EPREFIX}/usr" \
+		"--prefix=${EPREFIX}/usr" --want-rpath=0 \
 		configure || die "configure failed"
 }
+
+src_install() {
+	dodir /usr/share/apps/semantik/templates/
+	waf-utils_src_install
+}