gentoo resync : 01.08.2021

7 files changed, 46 insertions, 89 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 834a65a7c2e1..948f29d4ce9e 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
index 21f4686caf6f..a1597163134d 100644
--- a/games-puzzle/lpairs/Manifest
+++ b/games-puzzle/lpairs/Manifest
@@ -1,3 +1,3 @@
-DIST lpairs-1.0.4.tar.gz 536625 BLAKE2B f020f50b47290b961d77335d567dd68bc009e0952e7ebd39d39c041fcc5a2d9e97d6827921b862dd3dd59c7bef0f11165356f41eda022d7583ca27f584e4b02b SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97
-EBUILD lpairs-1.0.4-r1.ebuild 939 BLAKE2B 93d2d8c38038efc7ceed0ca8a0554fa5489ca838591f2d36f918b4a54bfd3c6680f12332288b73f99d8d9c518a9e6632eb887c45b2d50fd710ed4b920b9399a2 SHA512 5ecf4fcbcdc5bd6487959c9fecc8027af2e60c01d7200072424ae3a212db96a59ae76984b23cf711456c65bb38abee596864d910d02607fe54eef88eab482fb2
+DIST lpairs-1.0.5.tar.gz 557997 BLAKE2B 940482bc0b5cd209366d541fc4b936055741a7d3936b0f218c68a3ecf43ed0189bfe87fc52eefd85896cfe0b2ed592b1362581d93941a0fb73965cf4341cba6f SHA512 381c47969446b778c694f484647ab6a6bd41eb996e741a01a63f1b854c30f78c7e9f1043546a3b8649ec6db940cac3b7ae5ba3c23e6c9df2716a93e6f6d37324
+EBUILD lpairs-1.0.5.ebuild 716 BLAKE2B 45706a7b449842c7346789486d50ff79719630cba4c0017fdad5e4d7678fc1479da07afef098c99271800fc39aa9cb336c5f9e1276f43186036ec87952f285d3 SHA512 e086b04ce8a003c6cdba7f851f89d4c3db0db26b534c31d1090f8980b6a9ad9f32b247848358d909cb42b2ca4cf55e6ef1baea02b11209445f75a26a96c360b6
 MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
deleted file mode 100644
index 0f13cdb89b69..000000000000
--- a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A classical memory game"
-HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls sound"
-
-RDEPEND="
-	media-libs/libsdl[sound?,video]
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:$localedir:/usr/share/locale:' \
-		-e 's:$(localedir):/usr/share/locale:' \
-		configure po/Makefile.in.in || die
-	# gcc5 doesn't like the way inline is used.  just punt it. (bug #568684)
-	sed -i -e 's/^inline//g' lpairs/{sdl.[ch],pairs.[ch]} || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/usr \
-		$(use_enable nls) \
-		$(usex sound '' --disable-sound)
-}
-
-src_install() {
-	default
-	doicon lpairs.png
-	make_desktop_entry lpairs LPairs
-}
diff --git a/games-puzzle/lpairs/lpairs-1.0.5.ebuild b/games-puzzle/lpairs/lpairs-1.0.5.ebuild
new file mode 100644
index 000000000000..2b8156772c9e
--- /dev/null
+++ b/games-puzzle/lpairs/lpairs-1.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Classic memory game"
+HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
+SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sound"
+
+RDEPEND="
+	media-libs/libsdl[sound?,video]
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	sed -i '/^inst_dir=/s|/games||' configure || die
+}
+
+src_configure() {
+	# --enable-sound doesn't enable it, needs to be unspecified
+	econf $(usev !sound --disable-sound)
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.png
+	make_desktop_entry ${PN} LPairs
+}
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
index 5d8ab407b1ba..0c55bbe15eb3 100644
--- a/games-puzzle/tanglet/Manifest
+++ b/games-puzzle/tanglet/Manifest
@@ -1,4 +1,3 @@
-AUX tanglet-1.5.2-gentoo.patch 981 BLAKE2B a581aca772c797e31ad7bd85adf1fd1f12d2e768c9bee87139871f100eb8d4a77bfe343d86b1d29840a67338bdf5b003ff427acc6653abcd2fa4b182b8a362c4 SHA512 541d1feaf1b12acdf8ff477bf3e165d6ea6fa615eca8def32b092925dfb8902759ce29b3fe6f76d761688d298b3b452c71815e94e2cd71a9b07e6641f05386e6
-DIST tanglet-1.5.3-src.tar.bz2 8631208 BLAKE2B b7b0b913a1d862f43d4fb215a09aaba379bda95d75d3d2f59b207361efeda6573055f25db9d07d330fe0957ca774679589f87b79d0766ac669709da37d164f5f SHA512 31b7aada8b244969c2581a0879c30ca1a9b9db8e0cff5c802607dd08038af9487ba59db0e64fabb35feade9d5d700a2a1e04a0052d0ff4639c10a42189671267
-EBUILD tanglet-1.5.3.ebuild 651 BLAKE2B 774258c6c7fc8b88aebd420354b7b39a80d7f7e4ed87c29d8ee23a2f948a33b37547b126314364989fa326c94a9fe2da8ff05b12dfac47358e51926bf3ec4e43 SHA512 c00e470a200dd7dc203550d72c18833b19babe0b452c89144d029bd3a9aa22f3b9827275d468afb1b717b19a11e46513a54aac8bea5bb9e0e88d4dec7fc5adc8
+DIST tanglet-1.6.1.1-src.tar.bz2 25059666 BLAKE2B df363cf77863d3dcc77dee95aa1e4dcd20d16438f23e38286bbf5362fa9f8b17a28bc03dc480d6eaf44a443f4b7f977022b978a642d93c4f4c766b5cdd868728 SHA512 d65bc14f44ed1fa1ddae8f90c2aa62fb5d14ea964e36d544916856d9b6b93009509d4d8adf17fd4a45555732fb9b656f24661b2eec52a980bdb8f20512a38ff3
+EBUILD tanglet-1.6.1.1.ebuild 628 BLAKE2B e463be4679f0a91005a9ec851e6b1b3a2b81bf24a24b2144972b499230edeafc7f7dabcd26efe24dc4d7dcd5eea6d62048a5e2548f3950d387680e6f0d084058 SHA512 7916d1d516ee6204d33109c123e7ab9de05fb2bd8dc72b9860ce557aecf4ce578ce0be26078b79a14aa743a250378b2ca4747f9bb71a3f535d60869f388a9403
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
deleted file mode 100644
index 8409f2cc48cf..000000000000
--- a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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("/usr/share");
- 		paths.append(appdir + "/../Resources");
- 	}
- 	foreach (const QString& path, paths) {
---- 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("/usr/share/data/");
- 	paths.append(path + "/../Resources/data/");
- 	QDir::setSearchPaths("tanglet", paths);
- 
diff --git a/games-puzzle/tanglet/tanglet-1.5.3.ebuild b/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
index 0987abb49061..65f7fae82093 100644
--- a/games-puzzle/tanglet/tanglet-1.5.3.ebuild
+++ b/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,12 +7,11 @@ inherit qmake-utils xdg
 
 DESCRIPTION="Single player word finding game based on Boggle"
 HOMEPAGE="https://gottcode.org/tanglet/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
+SRC_URI="https://gottcode.org/tanglet/tanglet-1.6.1.1-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -25,10 +24,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-gentoo.patch )
-
 src_configure() {
-	eqmake5 tanglet.pro
+	eqmake5 PREFIX="${EPREFIX}/usr" tanglet.pro
 }
 
 src_install() {