gentoo resync : 17.07.2021

3 files changed, 61 insertions, 72 deletions

diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
index b37763b18d21..d704fe965bd3 100644
--- a/games-puzzle/neverball/Manifest
+++ b/games-puzzle/neverball/Manifest
@@ -1,4 +1,4 @@
 AUX neverball-1.6.0-gcc-10.patch 1174 BLAKE2B 21c1c9ef20bea6a4912b6195ec470342a64ee0105748bffefefac49f3cc53ea21555f234c944b9ac6c3a484402cb41bb777f932f6809731d2b5407dab8b2dbf4 SHA512 b48a657ab19b3249bbc5ee556ade4b2539cacab116f2e315f53b7aba1d0d13cace4483263e0b9ccafeee03fa78190cb9ea421349f89a6ddbb58cb95b193b14f2
 DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
-EBUILD neverball-1.6.0-r1.ebuild 2034 BLAKE2B 76e6fa7b897223befeb518fd0bede2d5a266a67e815a3957b47657c1385bafd65319f5743d0512c6892bb987958a23941b8ac9d60f995992a52d31848400bca4 SHA512 259fd9d22fa30802aece13358234a69c752beadb457f6e3e8f23e7265b37894411cfc55495cabb5af676386f69372758f8f3b9eec5f2c06f1ab0f7fac49d4bc9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+EBUILD neverball-1.6.0-r1.ebuild 1872 BLAKE2B 1cc42ca4080966a2f51a13b6ba1e6f565f94e4e783f9413281279a95ddd1db0d10f57557f96661b1f92f2e583d710fd0fd6b11069094277d7587a8be0929525a SHA512 4feb3f4ac777c0a78200304387d1379f518388b275bd135685dc2c99c5dcb43d6de16b66395540372fdd64dcd6a29a5ff2c745f877b1dc91225964cf877a5e45
+MISC metadata.xml 337 BLAKE2B af32f5331f54316c7b35106589f3db6fd2c27eeda0fc741e1e9411c89711d9103fd491dff9ba28cdbda8f32f29a48a716aa5eb4c02c652faf32b43472a1a7673 SHA512 06c1c87117d2787ea80fbe0e574ce9398e586c1fbf8b581ee8851601f4c79a2a38961de51c9eec1781db43c2aefa3ca5ef28a5ffc9d1fed81aecfd65cebad73c
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
index 78274e0fa550..57ab140de1ae 100644
--- a/games-puzzle/neverball/metadata.xml
+++ b/games-puzzle/neverball/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Neverball/neverball</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
index de40b601028e..abb40a2d14ca 100644
--- a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
+++ b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop gnome2-utils
+EAPI=7
+
+inherit desktop eapi8-dosym toolchain-funcs xdg
 
 DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
 HOMEPAGE="https://neverball.org"
@@ -12,87 +13,72 @@ LICENSE="GPL-2+ IJG"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="nls"
-RESTRICT="test"
+RESTRICT="test" # not a test suite, only starts ./neverball
 
-RDEPEND="
-	media-libs/libsdl2[sound,joystick,opengl,video]
-	media-libs/sdl2-ttf
-	media-libs/libpng:0=
-	virtual/jpeg:0
+DEPEND="
+	dev-games/physfs
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,opengl,sound,video]
 	media-libs/libvorbis
+	media-libs/sdl2-ttf
+	virtual/jpeg
 	virtual/opengl
-	dev-games/physfs
+	nls? ( virtual/libintl )"
+RDEPEND="
+	${DEPEND}
 	media-fonts/dejavu
-	media-fonts/wqy-microhei
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
+	media-fonts/wqy-microhei"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
 
 src_prepare() {
 	default
-	sed -i \
-		-e 's:mapc:neverball-mapc:g' \
-		-e 's:MAPC:NEVERBALL-MAPC:g' \
-		-e '1 s/ 1 / 6 /' \
-		dist/mapc.1 || die
-	sed -i \
-		-e '/CFLAGS.*O2/s:-O2:$(E_CFLAGS):' \
-		-e '/CXXFLAGS.*O2/s:-O2:$(E_CXXFLAGS):' \
-		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
-		Makefile || die
+
+	# adjust man page for namespaced mapc executable (bug #50538)
+	sed -i "s/mapc/${PN}-mapc/;s/MAPC/${PN^^}-MAPC/;1s/1/6/" dist/mapc.1 || die
 }
 
 src_compile() {
-	emake \
-		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
-		E_CFLAGS="${CFLAGS}" \
-		E_CXXFLAGS="${CXXFLAGS}" \
-		LOCALEDIR=/usr/share/locale \
-		DATADIR="/usr/share/${PN}"
+	tc-export CC CXX
+
+	local emakeargs=(
+		DATADIR="${EPREFIX}"/usr/share/${PN}
+		LOCALEDIR="${EPREFIX}"/usr/share/locale
+		ENABLE_NLS=$(usex nls 1 0)
+		CFLAGS="${CFLAGS}"
+		CPPFLAGS="${CPPFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+	)
+	emake "${emakeargs[@]}"
 }
 
 src_install() {
-	local font
-
-	dobin ${PN}-mapc neverball neverputt
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do
-		rm -f "${ED}/usr/share/${PN}"/ttf/${font}
-		dosym /usr/share/fonts/*/${font} \
-			"/usr/share/${PN}"/ttf/${font}
-	done
-	if [[ -d locale ]] ; then
-		insinto /usr/share
-		doins -r locale
-	fi
-	dodoc doc/{authors.txt,manual.txt,release-notes.md} README.md
+	dobin neverball neverputt
+	newbin mapc ${PN}-mapc
+
+	doman dist/{neverball,neverputt}.6
+	newman dist/mapc.1 neverball-mapc.6
 
-	local res name
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	# unbundle fonts
+	dosym8 -r /usr/share/{fonts/dejavu,${PN}/ttf}/DejaVuSans-Bold.ttf
+	dosym8 -r /usr/share/{fonts/wqy-microhei,${PN}/ttf}/wqy-microhei.ttc
+
+	insinto /usr/share
+	[[ -d locale ]] && doins -r locale
+
+	dodoc README.md doc/{authors.txt,manual.txt,release-notes.md}
+
+	local name res
 	for name in ball putt; do
 		for res in 16 32 64 128 256; do
 			newicon -s ${res} dist/never${name}_${res}.png never${name}.png
 		done
 	done
-
-	doman dist/*.6
-	newman dist/mapc.1 neverball-mapc.6
-	make_desktop_entry neverball Neverball
-	make_desktop_entry neverputt Neverputt neverputt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	domenu dist/{neverball,neverputt}.desktop
 }