gentoo resync : 29.06.2021

2 files changed, 40 insertions, 39 deletions

diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
index 68c89231df8c..c4ad69bd5aa7 100644
--- a/games-arcade/lbreakout2/Manifest
+++ b/games-arcade/lbreakout2/Manifest
@@ -2,5 +2,5 @@ AUX lbreakout2-2.6.5-gentoo.patch 2134 BLAKE2B ba98ce2153009499c8ab1f59674a2e762
 DIST lbreakout2-2.6.5.tar.gz 3491519 BLAKE2B b382b391f3aa12f975ed52ec9f7de21f864c2171e0b6d1469ae1224b3cb240ff8a680ebae9ea37a85aa95c432c164058e8a9a0a1d094bbef572670bdbd17ca4e SHA512 45c54bc9401131c96eba5fdcc08ca1324904fb50d3967acf7f29034045cbcd4c1d0b65f38eb33d8aace4cfe35f2a2e7a6c2319e4a6d6a1b41274dbe293a1747b
 DIST lbreakout2-levelsets-20141220.tar.gz 372221 BLAKE2B 16da9ee84e856734645a2ddf1665a8ebf8a52aa63be5d91e20f359bfb270d7bed16e7a4903c0847543141120d8d633bf84ceda867000354eedf201e389faf0db SHA512 482c1e95a37735f7bca510fa34d0f046e89b5aa9528b9af9dfff5bcb3fe656140285a95670caae2565cc9ebd30c3dc87a1fe77a6b75061ce9349ee7e36aa13d5
 DIST lbreakout2-themes-20141220.tar.gz 34006503 BLAKE2B 5262e04368d1c77b2690f70ded0c3da17b7ce31175271f22142b0418dfabb840561f4dbd97d16a12da6addb9d15e22e5ca97f96c8380bd0e7983642ee55fd1e3 SHA512 6088ff4bd9dfbbeb91c74e4adb500593af88ea6796bdec577afb43fc4ea9819c4f2dae76b6b7a8ad1ce2ec32ef575e41a6fa924463107a5dcd211f50bb94a906
-EBUILD lbreakout2-2.6.5-r1.ebuild 2055 BLAKE2B db034b277b8db6b0f86a6333d96fcdb6d5cde48a21fd4851d28b4112282d58f899efbfd1154998c7fdea76461e09382b55f94a6f0b15f36d1cfd5fe97ac5b3c8 SHA512 51cf1392f60e00fc68494bfddefefcc26829f128707b10574e86f0f5072b56a4fed2910258efd6252c902aea3d8a2a424b76ed14429693223a4a0ab90dfcf5ca
+EBUILD lbreakout2-2.6.5-r2.ebuild 2080 BLAKE2B 938e33d030e38dc8694bcf861e0a4c8594185cba0623bf97ff1c4794646980d342dccd771f12469469aeb09b09223e5a1a82545b04cbbb66173efb049aac7d3d SHA512 2674ddc4477cf43392daba9e8469a75d3953ea2245a0c76194438252fb06b50b3781012377bd46e48d2d7eebf08e6865998920bc5be5acd3e5a035e1cb50f561
 MISC metadata.xml 413 BLAKE2B 483149bf4aab9f2a8fea8fbaa6cdcf8ea0c029750acc79b8c4203f27f139a96bf80f5c73c972802ac9eea89f29e98c71214d7a723b82d81290a776fd49480ad7 SHA512 152c0d0d5ac6e3babb26c8eba16c31ed687e0a39ee7b6a86442a1a1efcb4f2d63ccd7f6062857df78047dca8466f548548d40c8baf8359cbaf1758ac03eb1661
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r2.ebuild
index 4f0c9cc48e96..d96256696ace 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r2.ebuild
@@ -1,94 +1,95 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop flag-o-matic gnome2-utils
+inherit autotools desktop
 
-levels_V=20141220
-themes_V=20141220
+LB_LEVELS_V="20141220"
+LB_THEMES_V="20141220"
 
 DESCRIPTION="Breakout clone written with the SDL library"
 HOMEPAGE="http://lgames.sourceforge.net/LBreakout2/"
-SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
-	mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${levels_V}.tar.gz
-	themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${levels_V}.tar.gz )"
+SRC_URI="
+	mirror://sourceforge/lgames/${P}.tar.gz
+	mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${LB_LEVELS_V}.tar.gz
+	themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${LB_LEVELS_V}.tar.gz )"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls themes"
 
 RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-net
+	acct-group/gamestat
+	media-libs/libpng:=
+	media-libs/libsdl[joystick,sound,video]
 	media-libs/sdl-mixer
+	media-libs/sdl-net
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="
+	${RDEPEND}
+	sys-libs/zlib"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	themes? ( app-arch/unzip )"
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd "${S}/client/levels" || die
-	unpack ${PN}-levelsets-${levels_V}.tar.gz
+	unpack ${PN}-levelsets-${LB_LEVELS_V}.tar.gz
 
 	if use themes; then
 		mkdir "${WORKDIR}"/themes || die
 		cd "${WORKDIR}"/themes || die
-		unpack ${PN}-themes-${themes_V}.tar.gz
+		unpack ${PN}-themes-${LB_THEMES_V}.tar.gz
 
 		# Delete a few duplicate themes (already shipped with lbreakout2
 		# tarball). Some of them have different case than built-in themes, so it
 		# is harder to just compare if the filename is the same.
-		rm -f absoluteB.zip oz.zip moiree.zip || die
+		rm absoluteB.zip oz.zip moiree.zip || die
 		local f
 		for f in *.zip; do
-			unzip -q "${f}" || die
-			rm -f "${f}" || die
+			unpack ./${f}
+			rm ${f} || die
 		done
 	fi
 }
 
 src_prepare() {
 	default
+
 	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	filter-flags -O?
-	econf \
-		--enable-sdl-net \
-		--with-docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+	local econfargs=(
 		$(use_enable nls)
+		--enable-sdl-net
+		--localstatedir="${EPREFIX}"/var/games
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
+	)
+	econf "${econfargs[@]}"
 }
 
 src_install() {
 	default
 
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}.hscr
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}.hscr
+
 	if use themes; then
 		insinto /usr/share/lbreakout2/gfx
 		doins -r "${WORKDIR}"/themes/.
 	fi
 
 	newicon client/gfx/win_icon.png ${PN}.png
-	newicon -s 32 client/gfx/win_icon.png ${PN}.png
-	make_desktop_entry lbreakout2 LBreakout2
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	make_desktop_entry ${PN} LBreakout2
 }