gentoo resync : 01.08.2021

3 files changed, 41 insertions, 47 deletions

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
+}