Merge pull request #11 from EinstokFair/ktikz-bump

copied from pixlra overlay
EinstokFair · Jan 28, 2021 · 3a0edfb · 3a0edfb
2 parents d3cf016 + c09ae49
commit 3a0edfb
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 27 deletions.
diff --git a/media-gfx/ktikz/Manifest b/media-gfx/ktikz/Manifest
@@ -1,4 +1,4 @@
-DIST ktikz-0.12.tar.gz 2039771 BLAKE2B 7c1de97f36df753f875b81ec684c4e075787adbab4862b0f22ca79c59c2a9200c4a2ba2af517c873fa23a443fc0e5f889f3752c40fb67b23201430638aa1e7df SHA512 22e1022d4c203b714a7bceae0e5387549ef7c563965c46b36cc522212ceb2c61ad30ad34e6e1309c39f735e25603d940fae09b9ba59ab6d91f4b231dc877648a
-EBUILD ktikz-0.12-r1.ebuild 1506 BLAKE2B 3fe124b2171997766fc22cd5e020bedc16831cf0a61c5ee710d44330265866840d408707f5a73d8042d02d3b2f4911fb8206734c20493b4ec34d7fdfce2aa21b SHA512 8955b27f225708e0f45d03ffb5cbff54e02cff9546c54889f56413c0776b27744f01a323c2030db9f13112073219bb6439a43d2815e917b634d986db8eb5c112
-EBUILD ktikz-9999.ebuild 1550 BLAKE2B 6baee1f28661ef8a65ba42975cc0de6aa8296e0f9cc97449186cdb8757b7c9a6b5e7206264e5e9a1c2983f8bce932aab2f8a5fac9b0356d6a69d97a3a166d4aa SHA512 c3a1c23e1b61d058fe124fc4be8022ae6dcc871061d31bd9fad16723e59b8ad6680243886e94e0a5cc622828d7de7c666ecfd78deaba647e21934e1b419f69c4
+DIST 0.13.1.tar.gz 2045321 BLAKE2B f479f31b5eb5b6e20f5065971ace512518539349bc6ab8e8bf052dca2f1585e6826e5bf5addbf904a1067d44d2ac54ad107d2750b66388470428c12802561698 SHA512 a132303306a5a7fdb8bfb60a46b681a301cf73f31c5b5059e5a4990924c96920661438dd3d1fc1af1d6b4faacd7c9dcecaec0e547e9cfc47efb3eddbd2a119ae
+EBUILD ktikz-0.13.1.ebuild 1283 BLAKE2B 5bdad8805d22da77ba55fef60ea52baa392224f128f08dd523e66c9927c1b72f91f042c4db99a381b3e11421c72341d193da2a9ea4bedb5ef205f11f82139fc7 SHA512 89a6d7aa709a1359701e5bc77020b5fa3f3ea30cc3a54576e47096b68838feaaf6fd1340b749224adb675ec0af6d3a2f1f19f057ba9603319442e3ae8aea095d
+EBUILD ktikz-9999.ebuild 1276 BLAKE2B a366fb45bb3409f4c30c9e42e838b029f4beaa3b18134035f4e1971c1754ea4950a3f06d15159c88cc32f133fc29a693aada2b96a2e68dc924a00cc3ded28f25 SHA512 f7bc4c1c074e8e4e728c7f9cf71458d9e1a79cf2b7788d8697eff1d97fd3a06f3457ae938ef9cbe7036f856ab874bf3059fdf3695fcea66b2dbc74f78711c638
 MISC metadata.xml 328 BLAKE2B 2a1dafe2282c0174d53461c62306b9a3a343fa829360184567a2c97b589479e010b19f03c5b3aed54f41d1913fae990a1a1aaa7556667b72884b4653d31fa2c7 SHA512 dc73a7632e99e68db8d43e9a0cd15e4aa381a162de6ca96a81449775e34cca325ce447ec5bc6aec2fe79f7dad24b2428583dd8a68c676b69e93d87151e84bd53
diff --git a/media-gfx/ktikz/ktikz-0.12-r1.ebuild → media-gfx/ktikz/ktikz-0.13.1.ebuild b/media-gfx/ktikz/ktikz-0.12-r1.ebuild → media-gfx/ktikz/ktikz-0.13.1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils cmake-utils qmake-utils xdg
+inherit eutils cmake qmake-utils xdg
 
 DESCRIPTION="A QT5-based editor for the TikZ language"
 HOMEPAGE="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language"
-SRC_URI="https://github.com/fhackenberger/${PN}/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
-RESTRICT="mirror"
+SRC_URI="https://github.com/fhackenberger/${PN}/archive/${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="5"
 KEYWORDS="~amd64"
@@ -39,14 +38,15 @@ RDEPEND="${DEPEND}
 DOCS="Changelog TODO"
 
 src_prepare() {
-	# correct the qcollectiongenerator binary
-	sed -ie 's%#QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator%QCOLLECTIONGENERATORCOMMAND = /usr/lib/qt5/bin/qcollectiongenerator%g' qmake/qtikzconfig.pri || die
+	if use kde; then
+		cmake_src_prepare
+	fi
 	eapply_user
 }
 
 src_configure() {
 	if use kde; then
-		cmake-utils_src_configure
+		cmake_src_configure
 	else
 		KDECONFIG="CONFIG-=usekde"
 		eqmake5 qtikz.pro "CONFIG+=nostrip" "$KDECONFIG"
@@ -55,18 +55,18 @@ src_configure() {
 
 src_compile() {
 		if use !doc; then
-			comment_add_subdirectory doc
+			cmake_comment_add_subdirectory doc
 		fi
 		if use kde; then
-			cmake-utils_src_compile
+			cmake_src_compile
 		else
 			emake
 		fi
 }
 
 src_install() {
 		if use kde; then
-			cmake-utils_src_install
+			cmake_src_install
 		else
 			emake INSTALL_ROOT="${D}" install
 		fi

diff --git a/media-gfx/ktikz/ktikz-9999.ebuild b/media-gfx/ktikz/ktikz-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils cmake-utils qmake-utils git-r3 xdg
+inherit eutils cmake qmake-utils git-r3 xdg
 
 DESCRIPTION="A QT5-based editor for the TikZ language"
 HOMEPAGE="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language"
 LICENSE="GPL-2"
 SLOT="5"
 KEYWORDS=""
-IUSE="kde -ktexteditor +doc -debug"
+IUSE="kde +doc -debug"
 
-EGIT_REPO_URI="https://github.com/jfmcarreira/ktikz.git"
+EGIT_REPO_URI="https://github.com/fhackenberger/ktikz.git"
 
 DEPEND="
 	dev-qt/qtcore:5
@@ -38,17 +38,15 @@ RDEPEND="${DEPEND}
 DOCS="Changelog TODO"
 
 src_prepare() {
-	# correct the qcollectiongenerator binary
-	sed -ie 's%#QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator%QCOLLECTIONGENERATORCOMMAND = /usr/lib/qt5/bin/qcollectiongenerator%g' qmake/qtikzconfig.pri || die
+	if use kde; then
+		cmake_src_prepare
+	fi
 	eapply_user
 }
 
 src_configure() {
 	if use kde; then
-			local mycmakeargs=(
-			-DKTIKZ_USE_KTEXTEDITOR=$(usex ktexteditor)
-		)
-		cmake-utils_src_configure
+		cmake_src_configure
 	else
 		KDECONFIG="CONFIG-=usekde"
 		eqmake5 qtikz.pro "CONFIG+=nostrip" "$KDECONFIG"
@@ -60,15 +58,15 @@ src_compile() {
 		    cmake_comment_add_subdirectory doc
 		fi
 		if use kde; then
-			cmake-utils_src_compile
+			cmake_src_compile
 		else
 			emake
 		fi
 }
 
 src_install() {
 		if use kde; then
-			cmake-utils_src_install
+			cmake_src_install
 		else
 			emake INSTALL_ROOT="${D}" install
 		fi