Improve ebuild of ktikz to cope with multiple building configurations

5 files changed, 76 insertions, 12 deletions

diff --git a/media-gfx/ktikz/Manifest b/media-gfx/ktikz/Manifest
index f072246..bb774bc 100644
--- a/media-gfx/ktikz/Manifest
+++ b/media-gfx/ktikz/Manifest
@@ -3,4 +3,4 @@ DIST ktikz_0.10.tar.gz 1527034 SHA256 31d18ab2e9207acf5507ed74bb6f38f06b2a2eb2aa
 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
+EBUILD ktikz-0.10_p1.ebuild 1520 SHA256 a7094b45ce1c2e89383920ba848f62f844c7d85e87ebbbf227f2f7ff98c32d97 SHA512 49cbcb5a401803964d6c3057cd6852dce8136257adc528cbf5d34d434c69e3e4efd87dbce204e49cd3b3f6c69f2a32a65f849b78a1095e88129fb5b1d3007a7b WHIRLPOOL 9a1d62e5d4fcf749bec59028093bd6373e324a73ef1d484f8521ce47288e523231446b2f42ff6dfccaa3101e1c75ee7442bf429f9ef1ae223dc75dcd3cb55b7c
diff --git a/media-gfx/ktikz/ktikz-0.10-r1.ebuild b/media-gfx/ktikz/ktikz-0.10-r1.ebuild
index 74553e8..81733c0 100644
--- a/media-gfx/ktikz/ktikz-0.10-r1.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10-r1.ebuild
@@ -50,3 +50,20 @@ src_configure() {
 	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
 	fi
 }
+
+src_compile() {
+	if use kde; then
+	    cmake-utils_src_compile
+	else
+	    qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	if use kde; then
+	    cmake-utils_src_install
+	else
+	    qt4-r2_src_install
+	fi
+	
+}
\ No newline at end of file
diff --git a/media-gfx/ktikz/ktikz-0.10-r2.ebuild b/media-gfx/ktikz/ktikz-0.10-r2.ebuild
index cb68d37..e1a7a8f 100644
--- a/media-gfx/ktikz/ktikz-0.10-r2.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10-r2.ebuild
@@ -51,3 +51,20 @@ src_configure() {
 	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
 	fi
 }
+
+src_compile() {
+	if use kde; then
+	    cmake-utils_src_compile
+	else
+	    qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	if use kde; then
+	    cmake-utils_src_install
+	else
+	    qt4-r2_src_install
+	fi
+	
+}
\ No newline at end of file
diff --git a/media-gfx/ktikz/ktikz-0.10.ebuild b/media-gfx/ktikz/ktikz-0.10.ebuild
index 47d6056..c003daf 100644
--- a/media-gfx/ktikz/ktikz-0.10.ebuild
+++ b/media-gfx/ktikz/ktikz-0.10.ebuild
@@ -46,3 +46,20 @@ src_configure() {
 	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
 	fi
 }
+
+src_compile() {
+	if use kde; then
+	    cmake-utils_src_compile
+	else
+	    qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	if use kde; then
+	    cmake-utils_src_install
+	else
+	    qt4-r2_src_install
+	fi
+	
+}
diff --git a/media-gfx/ktikz/ktikz-0.10_p1.ebuild b/media-gfx/ktikz/ktikz-0.10_p1.ebuild
index 702a4e0..daee8c1 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 cmake-utils
+inherit eutils qt4-r2 cmake-utils git-2
 
 MY_P="${PN}_${PV}"
 
@@ -37,20 +37,16 @@ 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() {
-	# libs are not equal ldflags, make that sure:
-	sed -i -e 's|QMAKE_LFLAGS|LIBS|' macros.pri || die "sed failed"
+	if ! use kde; then
+	    # 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"
+	    # our lrelease is not versioned
+	    sed -i -e 's|lrelease-qt4|lrelease|' conf.pri || die "sed failed"
+	fi
 }
 
 src_configure() {
@@ -62,3 +58,20 @@ src_configure() {
 	    eqmake4 qtikz.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
 	fi
 }
+
+src_compile() {
+	if use kde; then
+	    cmake-utils_src_compile
+	else
+	    qt4-r2_src_compile
+	fi
+}
+
+src_install() {
+	if use kde; then
+	    cmake-utils_src_install
+	else
+	    qt4-r2_src_install
+	fi
+	
+}