Add support for kde in ktikz

5 files changed, 46 insertions, 20 deletions

diff --git a/media-gfx/ktikz/Manifest b/media-gfx/ktikz/Manifest
index 8e12c40..f072246 100644
--- a/media-gfx/ktikz/Manifest
+++ b/media-gfx/ktikz/Manifest
@@ -1,6 +1,6 @@
 AUX ktikz-0.10-currenthighlight.patch 1109 SHA256 7e52843ff0ecfbd6bef6d6c15be5e88882a2c248d4ef971bc0fe72771d224881 SHA512 24e691e9841254171c7d790e39896b7f383ce5c7fe58fe581348e865ca151cb59d7ca6d800ccfcc45efe606c24a16f91f61f95baf88579f716a058a5ba61561c WHIRLPOOL 7361f6420cd17553ed7ae8b54713b9ae768ec144d71041e3622c49e59ceb530189273d064a4b26ca5438784f2c780220f2e7008f38b0d27cd80445401b32cae5
 DIST ktikz_0.10.tar.gz 1527034 SHA256 31d18ab2e9207acf5507ed74bb6f38f06b2a2eb2aa8af2e0587bf076722254a6 SHA512 20aa7b5bb9b764e18492258a8e56b9912a5624173289d00a388e9273030c3d5fd6149445c5e97dd0b5ec12baef541884bf03a1b4165968238fa54479169d013f WHIRLPOOL 0f59d74f5090406b80ffdc859dac735c6962825d21a179c0ce0524973ab21642b457681914b8af1099ed11b632dd75ba5114f17d98a0a7ba40b701f675e2d395
-EBUILD ktikz-0.10-r1.ebuild 1078 SHA256 9a33ba752123cecfdb1684849d2a225961acd7b98127d55ac96aeeb8f7e230cf SHA512 d57ebfad8439285a70eb5432dcef9263e0188ee6ba377b691175ff49cceea09cd0825dfcfe9c853b7b43a0aaca6d846a5188b13d770d9cd00ccfb999876fcffc WHIRLPOOL 2f1d9cee56839fb8d79603fa845e7951594b97f749a96e4d0dc306c6c0084f4e281bf8e64fac4ee8cf9ea12193681914dabeef9f1ee4e236a6a9bf5857e559a4
-EBUILD ktikz-0.10-r2.ebuild 1125 SHA256 4ba90912014e29e406fc5290fef9a22c5e74242df2a40dd18a26e2b93510019d SHA512 8f940a8c22b73c095af3aa206d60b595ea9160230a9bc0e233c0187169f865b0c27d3155330c49a4826b9782ec45c0fe99c31bd0b34c4c91f33233bb069cb977 WHIRLPOOL e8fb91de0f88b80ea0bedc9d80f412f0322471d8db2307917e2f0562c9299a85e572cc8d25d5a8a508e60d7815aa0fe364948d0a00c1a7e51dd2cb842bc8609d
-EBUILD ktikz-0.10.ebuild 997 SHA256 28d55d5f025ccb61c39cb76d3cb759590de3b2f08d867d24e0268891e39cb2dd SHA512 0eb4bdd2dd67100c8243ec63392302bb090947e8c92bf2ea276622169fdc14fa78a45b9a4aa61ad19e7959cbc463dfb5dbc17c2d9cb58540f1e2f1708fd6d919 WHIRLPOOL 6fbe019ed6fe0e489de00bc2bddec3d036bfce7e15b4c63ab5a7ef69ef5c71eb3af568e32beb17e3978ec87dd51110a7e2b5753fa1de4a7e3aec5b8c18398f54
-EBUILD ktikz-0.10_p1.ebuild 1122 SHA256 fdd08415bf84591a81b36ccbefee98212510a026da603b1127097e09632bd547 SHA512 65865571c404cb6126e07e6607002ba97dca86af46e7421c0b8dbb91869869c72be46a9c5caecdae0bbe0ee985de65a8b4fc75b50194bc11aeacac03c25d0337 WHIRLPOOL db28b3ce3a8895b1581a521f0debfcdfaa7b3588fb45515d2d343e72c2464379afb014717d3b2bdf87391ceef7bea5e76fa991ea7061c816e1ed25e693a33784
+EBUILD ktikz-0.10-r1.ebuild 1234 SHA256 bd82daecc08adefda83117a4e223f8797d052dbf44e302703735fb16d09497f4 SHA512 393cc136815df4ad2dd449172f9f0f920970b6033361de47845e571180dff3fe49a88745b653d1c04bbb388b651d78f8382a15988020943a34d0632899e2bbc4 WHIRLPOOL 863480736e2b63aaffbcf812206489558492514027cb3ad7176147c805a3d19ead72ab65146515d759b942e401cd9bce3b5a59a105b05a047b813852558fb965
+EBUILD ktikz-0.10-r2.ebuild 1281 SHA256 7e7e4ecfc6f08691412b351d1e1cdd699120e365019cc50c77ceb831e604fad2 SHA512 7bfb0582cfa3d7481f2e73ee1a0b59700407c40ef6e6f619196dac3a5726cad01a7778e92274a5e8da509d0fc9c3b05922f5ffedf55f96b6f9af6841b7a15208 WHIRLPOOL 620dc2916a1fba8f4ca089af616690d73e033ff8458c95dad9cb3556f78843ac0ae758dbec952450d4c639fb97b4bd4bea026e4578367dd65faee379a88b4cf5
+EBUILD ktikz-0.10.ebuild 1153 SHA256 f2f031526763eb2c028967af55bf630c8634051a7a2b9e2fd5ba7b4dd6ecf4ed SHA512 72ff43d30bc955ac633f64e415d5475f766f0cf857ced340ecc092d974f130cf50a07a2b281b22907c62913bb84fda024acf54501c04579ec15e1df1a125f5d9 WHIRLPOOL 9a079fdebccad0cae91f686b85e1c5e109cca1321e799b58ecb0e91821b286293460cf22835723add341361f33f5dda9f60176c71facf1fab9c7c16c058ac1e7
+EBUILD ktikz-0.10_p1.ebuild 1493 SHA256 26e699d24485ca7f2140dc06d1af53769dcbc1cd54e7e401250baa81bfba8023 SHA512 6e2b19b15cd0a1811b0f639bf9c2a067893309eabeebe587749d63c9f58f32a722f8b2ee6ff58d7de1e0eeae6873d6914bb5bf7ce787852a83fa792c9be49146 WHIRLPOOL 5bc8e9a1f97905213a87103f09a79be14f46b73bbf5244266349fa1f81603bbeb8f710684ecd9598713223447dc4beddedc38724a7ae307a36074e38a1add6db
diff --git a/media-gfx/ktikz/ktikz-0.10-r1.ebuild b/media-gfx/ktikz/ktikz-0.10-r1.ebuild
index 2d849bc..74553e8 100644
--- a/media-gfx/ktikz/ktikz-0.10-r1.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils qt4-r2
+inherit eutils qt4-r2 cmake-utils
 
 MY_P="${PN}_${PV}"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hackenberger.at/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="kde debug"
 
 #DEPEND="x11-libs/qt-gui:4
 DEPEND="dev-qt/qtgui:4
@@ -42,6 +42,11 @@ src_prepare() {
 }
 
 src_configure() {
-	KDECONFIG="CONFIG-=usekde"
-	eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	if use kde; then
+	    local mycmakeargs=( -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` )
+	    cmake-utils_src_configure
+	else
+	    KDECONFIG="CONFIG-=usekde"
+	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	fi
 }
diff --git a/media-gfx/ktikz/ktikz-0.10-r2.ebuild b/media-gfx/ktikz/ktikz-0.10-r2.ebuild
index 82dca67..cb68d37 100644
--- a/media-gfx/ktikz/ktikz-0.10-r2.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils qt4-r2
+inherit eutils qt4-r2 cmake-utils
 
 MY_P="${PN}_${PV}"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hackenberger.at/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug highlight_black"
+IUSE="kde debug highlight_black"
 
 #DEPEND="x11-libs/qt-gui:4
 DEPEND="dev-qt/qtgui:4
@@ -43,6 +43,11 @@ src_prepare() {
 }
 
 src_configure() {
-	KDECONFIG="CONFIG-=usekde"
-	eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	if use kde; then
+	    local mycmakeargs=( -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` )
+	    cmake-utils_src_configure
+	else
+	    KDECONFIG="CONFIG-=usekde"
+	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	fi
 }
diff --git a/media-gfx/ktikz/ktikz-0.10.ebuild b/media-gfx/ktikz/ktikz-0.10.ebuild
index d0e36d1..47d6056 100644
--- a/media-gfx/ktikz/ktikz-0.10.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils qt4-r2
+inherit eutils qt4-r2 cmake-utils
 
 MY_P="${PN}_${PV}"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.hackenberger.at/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="kde debug"
 
 #DEPEND="x11-libs/qt-gui:4
 DEPEND="dev-qt/qtgui:4
@@ -38,6 +38,11 @@ src_prepare() {
 }
 
 src_configure() {
-	KDECONFIG="CONFIG-=usekde"
-	eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	if use kde; then
+	    local mycmakeargs=( -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` )
+	    cmake-utils_src_configure
+	else
+	    KDECONFIG="CONFIG-=usekde"
+	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	fi
 }
diff --git a/media-gfx/ktikz/ktikz-0.10_p1.ebuild b/media-gfx/ktikz/ktikz-0.10_p1.ebuild
index 0eebc07..702a4e0 100644
--- a/media-gfx/ktikz/ktikz-0.10_p1.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10_p1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils qt4-r2 git-2
+inherit eutils qt4-r2 git-2 cmake-utils
 
 MY_P="${PN}_${PV}"
 
@@ -18,7 +18,7 @@ EGIT_COMMIT="${PV}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="kde debug"
 
 
 
@@ -37,6 +37,12 @@ S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	git-2_src_unpack
+	
+	# libs are not equal ldflags, make that sure:
+	sed -i -e 's|QMAKE_LFLAGS|LIBS|' macros.pri || die "sed failed"
+
+	# our lrelease is not versioned
+	sed -i -e 's|lrelease-qt4|lrelease|' conf.pri || die "sed failed"
 }
 
 src_prepare() {
@@ -48,6 +54,11 @@ src_prepare() {
 }
 
 src_configure() {
-	KDECONFIG="CONFIG-=usekde"
-	eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	if use kde; then
+	    local mycmakeargs=( -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` )
+	    cmake-utils_src_configure
+	else
+	    KDECONFIG="CONFIG-=usekde"
+	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+	fi
 }