media-gfx/ktikz: Version bump, see also bug 236750

svn path=/sunrise/; revision=9310

5 files changed, 84 insertions, 47 deletions

diff --git a/media-gfx/ktikz/ChangeLog b/media-gfx/ktikz/ChangeLog
index 8a2ab6910..64d40a761 100644
--- a/media-gfx/ktikz/ChangeLog
+++ b/media-gfx/ktikz/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for media-gfx/ktikz
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Oct 2009; Thomas Fischer (f15h) <fischer@unix-ag.uni-kl.de>
+  -ktikz-0.7.ebuild, +ktikz-0.9.ebuild, +files/ktikz-0.9-kde-includes.patch:
+  Version bump, see also bug 236750
+
   10 Dec 2008; Tiziano Müller <dev-zero@gentoo.org> +ktikz-0.7.ebuild,
   +metadata.xml:
   Initial commit for bug #236750 (based on the ebuild written by Nico
diff --git a/media-gfx/ktikz/Manifest b/media-gfx/ktikz/Manifest
index 252615644..0ad44a0fc 100644
--- a/media-gfx/ktikz/Manifest
+++ b/media-gfx/ktikz/Manifest
@@ -1,4 +1,5 @@
-DIST ktikz-0.7.tar.gz 218955 RMD160 65e19cd85d531a901c9bb9ad72e8827b5946712a SHA1 1be66ef0ba47980a9e17930ca66daa32cc2b1135 SHA256 32a48c0c9a5c2b8d8ecd1aafa9a3eaf1a3dc6212f3ad5c47a09c7374c699d6cf
-EBUILD ktikz-0.7.ebuild 1107 RMD160 d19e2bf173c9a9efbbece2a5f1185b212362fb6c SHA1 798cbd29cd3796e66727d6868cb844509c689a90 SHA256 2e8cb68561939277e4a9e440a249ffbfa138661ae3949d09b63ebaad9141d9af
-MISC ChangeLog 340 RMD160 51962c03840df53c81023a1961d447ff159ada56 SHA1 b46dcd467c617f93d7f326d814330f185da74e83 SHA256 2504a36eb7fa4bbb52d706cd7d1bf92f5b51bc6694e879cc9b054f3ae79a20c8
+AUX ktikz-0.9-kde-includes.patch 786 RMD160 f3ab5d226874087ba32f3904c4b4e66331fb6f77 SHA1 36214940266574f93c6addbbf83be86901ceafc2 SHA256 c72af30205ee5f3f68aac607f3928eeda27dede05773603b8eee92a62f397a4e
+DIST ktikz-0.9.tar.gz 226383 RMD160 4df0b4797e353f9e1939a41b8b41754b2cf7a178 SHA1 d194db6937f045be2d35a37b694c370858fc0c30 SHA256 22c958d26eaa5cc800fde9a05d924174eb671a575eec54f80a5f6c8544e726e8
+EBUILD ktikz-0.9.ebuild 1358 RMD160 d6546262ab5e299d3458016fc26736b01435255d SHA1 44bae514bc69358f2de231dc05017eb0adce6a12 SHA256 77a3e04012f282a089be26f2738c78afb3addc1d21487d246099b0336446498f
+MISC ChangeLog 519 RMD160 10339b820a5e2d93b777e48b30728849ea95d367 SHA1 db2adb42c7ea0ef21f5598a10e3465a457649065 SHA256 a8517e36308e4aac6d4ff8fcced6fb8876e456cbe6dddee1cd4e208d9a39c605
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-gfx/ktikz/files/ktikz-0.9-kde-includes.patch b/media-gfx/ktikz/files/ktikz-0.9-kde-includes.patch
new file mode 100644
index 000000000..0f0b359d8
--- /dev/null
+++ b/media-gfx/ktikz/files/ktikz-0.9-kde-includes.patch
@@ -0,0 +1,25 @@
+diff -Naur ktikz-0.9/src/configgeneralwidget.cpp ktikz-0.9/src/configgeneralwidget.cpp
+--- ktikz-0.9/src/configgeneralwidget.cpp	2009-09-13 12:40:40.000000000 +0200
++++ ktikz-0.9/src/configgeneralwidget.cpp	2009-10-03 18:53:13.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include "configgeneralwidget.h"
+ #ifdef KTIKZ_USE_KDE
+ #include <KMessageBox>
++#include <KLocale>
+ #else
+ #include <QMessageBox>
+ #endif
+diff -Naur ktikz-0.9/src/ktikzapplication.cpp ktikz-0.9/src/ktikzapplication.cpp
+--- ktikz-0.9/src/ktikzapplication.cpp	2009-09-13 12:40:40.000000000 +0200
++++ ktikz-0.9/src/ktikzapplication.cpp	2009-10-03 18:53:53.000000000 +0200
+@@ -21,7 +21,8 @@
+ #include "ktikzapplication.h"
+ 
+ #ifdef KTIKZ_USE_KDE
+-
++#include <KCmdLineArgs>
++#include <KUrl>
+ #else
+ #include <QFileInfo>
+ #endif
+
diff --git a/media-gfx/ktikz/ktikz-0.7.ebuild b/media-gfx/ktikz/ktikz-0.7.ebuild
deleted file mode 100644
index 8ada622ba..000000000
--- a/media-gfx/ktikz/ktikz-0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils qt4
-
-DESCRIPTION="A QT4-based editor for the TikZ language."
-HOMEPAGE="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language"
-SRC_URI="http://www.hackenberger.at/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="x11-libs/qt-core
-	x11-libs/qt-gui
-	app-text/poppler-bindings[qt4]
-	virtual/latex-base
-	dev-texlive/texlive-latexextra
-	dev-tex/pgf"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# don't install desktop icon (and cause sandbox violation)
-	sed -i -e '59,66d' src/src.pro || die "sed failed"
-	# ... and libs are not equal ldflags, make that sure:
-	sed -i -e 's|QMAKE_LFLAGS|LIBS|' macros.pri || die "sed failed"
-}
-
-src_configure() {
-	eqmake4 ${PN}.pro PREFIX="${D}/usr" "CONFIG+=nostrip" || die "eqmake4 failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc Changelog TODO
-
-	newicon src/images/${PN}-128.png ${PN}.png
-	make_desktop_entry ${PN} KtikZ ${PN} Graphics
-}
diff --git a/media-gfx/ktikz/ktikz-0.9.ebuild b/media-gfx/ktikz/ktikz-0.9.ebuild
new file mode 100644
index 000000000..02f88a6fe
--- /dev/null
+++ b/media-gfx/ktikz/ktikz-0.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils qt4
+
+DESCRIPTION="A QT4-based editor for the TikZ language"
+HOMEPAGE="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language"
+SRC_URI="http://www.hackenberger.at/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kde"
+
+DEPEND="x11-libs/qt-gui:4
+	|| ( app-text/poppler-bindings[qt4] dev-libs/poppler-qt4 )
+	virtual/latex-base
+	dev-texlive/texlive-latexextra
+	dev-tex/pgf"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# don't install desktop icon (and cause sandbox violation)
+	sed -i -e '72,79d' src/src.pro || die "sed failed"
+	# ... and libs are not equal ldflags, make that sure:
+	sed -i -e 's|QMAKE_LFLAGS|LIBS|' macros.pri || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-kde-includes.patch"
+}
+
+src_configure() {
+	if use kde ; then
+		KDECONFIG="CONFIG+=usekde"
+	else
+		KDECONFIG="CONFIG-=usekde"
+	fi
+	eqmake4 ${PN}.pro PREFIX="${D}/usr" "CONFIG+=nostrip" "$KDECONFIG"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "emake install failed"
+
+	dodoc Changelog TODO || die "Cannot install documentation"
+
+	newicon src/images/${PN}-128.png ${PN}.png || die "Cannot install icon"
+	make_desktop_entry ${PN} KtikZ ${PN} Graphics \
+		|| die "Cannot create desktop entry"
+}