gentoo resync : 14.07.2018

4 files changed, 66 insertions, 80 deletions

diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 83dfaba47e5c..15886c8da228 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,4 +1,4 @@
-AUX tanglet-1.3.1-datadir.patch 740 BLAKE2B 11c12dea2efd4f03afb433931965267bd81e2cdeaadde51a6cf48cdefe1bf5899a87867becfdc2a4e210243363688a3d2bd4c470aaf07a789cd510ed6aabe703 SHA512 2dd7bf5c75624379e270bf51681adb68c1573eacc134265c36c9370bfa18c6463c9fbd155f4cfbb7e6ddf1621c9b57ce34a71a6ec3286c55adeb33da2b0851e0
-DIST tanglet-1.3.1-src.tar.bz2 8461603 BLAKE2B 86542f6248b58dc7f72be8264ded94376d746827865b3633640a24055452a4c4d677bf3f6aab8eb6736ce1cf92b8a8b6963637418118861dad296bb4ccac5b2a SHA512 b939ca45f26baf8e7e32da8775e673707472e5cd07d344642eeb15986ff99319e0ab1bacf78e2ea49f004ec67a6d081a91c939cf7c75228a195654d429235625
-EBUILD tanglet-1.3.1-r1.ebuild 1270 BLAKE2B b5015194fbe34b4c91d30f306746d0cb83a755cb2afb27258c4bf6d97ef256a4720ba7608d64f5707efa9b646010db0bb4efa0ce6d0f40851632cec231c9ba66 SHA512 02147ab848c47fda50cc81b0ecbdf32d7ca4b59322feecc13d8b937b35cfcdffe7a9819b9f3e7347e32bb4e394839c49c435048c29012ce17ac050c7423b3964
+AUX tanglet-1.5.2-gentoo.patch 981 BLAKE2B a581aca772c797e31ad7bd85adf1fd1f12d2e768c9bee87139871f100eb8d4a77bfe343d86b1d29840a67338bdf5b003ff427acc6653abcd2fa4b182b8a362c4 SHA512 541d1feaf1b12acdf8ff477bf3e165d6ea6fa615eca8def32b092925dfb8902759ce29b3fe6f76d761688d298b3b452c71815e94e2cd71a9b07e6641f05386e6
+DIST tanglet-1.5.2-src.tar.bz2 8646616 BLAKE2B 0a38690069550e27a302f28e7db3753eaf67af7add730d8069ec4df001a431843e204603475146d56049cdf40c0be20d8ef83ea9f47b27cf82cc232e4fecef35 SHA512 a97b9fe3c9c80a843c4696766d15edcab48369bd905e893c2975bfb9faf91d4a58a3c440d242be91f5838aacdf1526022b5ce8c463adfd8b0bb62e008be460ee
+EBUILD tanglet-1.5.2.ebuild 876 BLAKE2B 0d3134ed3ee30c442b361d1b264c1172ef0e4ebba7b9abae289bcb9ae60a0794d2869ec53dcced262e317a2f0b28d70380896cee56170090b87254a1ccb9f8bd SHA512 75dd82c10284077788f1fe4dd01b9669f51c56dfe719cac263c24c8855e52782f10d402204a7e3966fdaf18ef0d1aace1f46c24c5ac900e0a6fdb71686d07ef9
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
index 18b56ca6c1a3..8409f2cc48cf 100644
--- a/games-puzzle/tanglet/files/tanglet-1.3.1-datadir.patch
+++ b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
@@ -1,22 +1,33 @@
---- a/src/locale_dialog.cpp.old
+--- a/src/src.pro	2018-05-29 13:11:55.000000000 +0200
++++ b/src/src.pro	2018-07-11 20:02:51.415773874 +0200
+@@ -99,7 +99,7 @@
+ 	RESOURCES += ../icons/icon.qrc
+ 
+ 	isEmpty(PREFIX) {
+-		PREFIX = /usr/local
++		PREFIX = /usr
+ 	}
+ 	isEmpty(BINDIR) {
+ 		BINDIR = bin
+--- a/src/locale_dialog.cpp
 +++ b/src/locale_dialog.cpp
 @@ -85,7 +85,7 @@
  	if (paths.isEmpty()) {
  		QString appdir = QCoreApplication::applicationDirPath();
  		paths.append(appdir);
 -		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
-+		paths.append("@GENTOO_DATADIR@");
++		paths.append("/usr/share");
  		paths.append(appdir + "/../Resources");
  	}
  	foreach (const QString& path, paths) {
---- a/src/main.cpp.old
+--- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -46,7 +46,7 @@
  	QString path = app.applicationDirPath();
  	QStringList paths;
  	paths.append(path + "/data/");
 -	paths.append(path + "/../share/tanglet/data/");
-+	paths.append("@GENTOO_DATADIR@/data/");
++	paths.append("/usr/share/data/");
  	paths.append(path + "/../Resources/data/");
  	QDir::setSearchPaths("tanglet", paths);
  
diff --git a/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild b/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild
deleted file mode 100644
index f599addb09f1..000000000000
--- a/games-puzzle/tanglet/tanglet-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-LANGS="cs de es en fr he hu it nl ro tr uk"
-LANGSLONG="es_CL"
-
-inherit desktop gnome2-utils qmake-utils
-
-DESCRIPTION="A single player word finding game based on Boggle"
-HOMEPAGE="https://gottcode.org/tanglet/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib
-	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-datadir.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		src/locale_dialog.cpp \
-		src/main.cpp || die
-}
-
-src_configure() {
-	eqmake5 tanglet.pro
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r data
-
-	# Translations
-	insinto /usr/share/${PN}/translations/
-	for lang in ${LINGUAS};do
-		for x in ${LANGS};do
-			if [[ ${lang} == ${x} ]];then
-				doins translations/${PN}_${x}.qm
-			fi
-		done
-	done
-
-	insinto /usr/share/icons
-	doins -r icons/hicolor
-
-	einstalldocs
-	doicon icons/${PN}.xpm
-	domenu icons/${PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/tanglet/tanglet-1.5.2.ebuild b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
new file mode 100644
index 000000000000..2595d233626d
--- /dev/null
+++ b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils xdg-utils
+
+DESCRIPTION="A single player word finding game based on Boggle"
+HOMEPAGE="https://gottcode.org/tanglet/"
+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
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	eqmake5 tanglet.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}