gentoo resync : 19.01.2018

3 files changed, 44 insertions, 54 deletions

diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
index 7120a23623f4..44c5c37ff821 100644
--- a/games-board/tetzle/Manifest
+++ b/games-board/tetzle/Manifest
@@ -1,3 +1,3 @@
-DIST tetzle-2.0.3-src.tar.bz2 641065 BLAKE2B ff5108fa592c3907bcf38af3b2bf2984f80734bf6ae8fd8f78d52d657089db11acae6b7d6c5cc206c157b11b0fe1fc66a054f1dbf981b0de2edcdb61bed9bee8 SHA512 39853cc37b0bae676fc516e56c2bb6a54d5cacccd5978d5bd9cd735bf9fcb09948871af06cdb3b3d1a510c51ea71ac3720bbfe2558c2effaa00e00708a70f7d9
-EBUILD tetzle-2.0.3.ebuild 976 BLAKE2B d2d08d14bbd1346981e0505e7a70a19f47b6cb2b8259fd512b8a24fd87dd3bb39ce5f77949cf24eeb602446fcebe6c8d1ad3ef8e12f0dc6c43ecc1ca896e6c34 SHA512 436fa93831460111786ff8bd110d1924217b9e41269bfc83b6b0330ce7a9741278385a6c0117935c1b15209425a4de912bf1cffcdd194a04b49ee71bc32ae25a
+DIST tetzle-2.1.1-src.tar.bz2 1246920 BLAKE2B dab8128b70fd6650da190b27f356b1db9d763b65b9192cb19140d81b5ae6aed8eadef19d5c5e36a9d223e5a9dee81c8c90b604a822df7dce725b4c98fbe139b0 SHA512 80022556ccadc19f0b4357b0f629b340cb040fdff927dccd540fba5383ae4638fcca020be020c78a3809d0ca70fae7d7f19342f3e2a162f53f5e5e3b83ddf11d
+EBUILD tetzle-2.1.1.ebuild 702 BLAKE2B 58b3a728c9f415b0260c0c1f45cea3b3dc84366fb1f4659ec7ab90461585397032fc409fa434ee3abecbb00b224497d68498a51b77a3f3f1953041ecdf73e090 SHA512 c8f3ef15c4c76482816aab9968670bede057b60da40a4dab662aa79b256f59bd875a5ec5f464bd11642b61fc845b06488c849af9de87654abc09807f436f4ff2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/tetzle/tetzle-2.0.3.ebuild b/games-board/tetzle/tetzle-2.0.3.ebuild
deleted file mode 100644
index 6539368bf913..000000000000
--- a/games-board/tetzle/tetzle-2.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2 gnome2-utils games
-
-DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
-HOMEPAGE="https://gottcode.org/tetzle/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-qt/qtgui-4.7:4
-	>=dev-qt/qtopengl-4.7:4"
-RDEPEND="${DEPEND}"
-
-DOCS="ChangeLog CREDITS"
-
-src_prepare() {
-	sed -i \
-		-e "s:appdir + \"/../share/\":\"${GAMES_DATADIR}/\":" \
-		src/locale_dialog.cpp || die
-	sed -i \
-		-e "/qm.path/s:\$\$PREFIX/share:${GAMES_DATADIR}:" \
-		${PN}.pro || die
-}
-
-src_configure() {
-	eqmake4 BINDIR="${GAMES_BINDIR/\/usr}" PREFIX="/usr"
-}
-
-src_install() {
-	qt4-r2_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/tetzle/tetzle-2.1.1.ebuild b/games-board/tetzle/tetzle-2.1.1.ebuild
new file mode 100644
index 000000000000..de1e76ffa68a
--- /dev/null
+++ b/games-board/tetzle/tetzle-2.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils qmake-utils
+
+DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
+HOMEPAGE="https://gottcode.org/tetzle/"
+SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( ChangeLog CREDITS )
+
+src_configure() {
+	eqmake5
+}
+
+src_install(){
+	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}