gentoo resync : 20.03.2022

5 files changed, 62 insertions, 60 deletions

diff --git a/games-emulation/nestopia/Manifest b/games-emulation/nestopia/Manifest
index e683057e783f..56afeef7dad3 100644
--- a/games-emulation/nestopia/Manifest
+++ b/games-emulation/nestopia/Manifest
@@ -1,4 +1,4 @@
-DIST nestopia-1.50.tar.gz 1529804 BLAKE2B ef2fdf6ffb6ff9bb5f222730869d6deadb892c0a3996e97750afee692ec1d3b997e2bfe353a4fe26b9771781f659de83dda5e4676e221f4b9beaa512d6873ca4 SHA512 6ea389d4891c7cfa36517495735ea0f34ba9427e51757113d0fe2b72d5ce5b11d7e6b7c02fd1e4e347a13bba06823e334800ff15036872e09b8561c10c7cb568
-EBUILD nestopia-1.50.ebuild 916 BLAKE2B ff9e3110417dc77a4edd3c8d12f2d12d148fb83241a67420b0b94fe95a0a3f7272ca78d0e0f08cb8616499a6efbd6b3dbef4c27055405811e0b8bc6ebeda4ab0 SHA512 77855ee12a890cc5293f08686616f80cf384bb2bdccd0e00b907188039ffff4e4f5d7f9fb66d881f585ad9c5f9323699464e5f667926601092d5efed81e03e15
-EBUILD nestopia-9999.ebuild 779 BLAKE2B 2a242f3ce4b6b3005cc336103044b641a3cd25f27600c565c542edd6329e4beb187ca7a106a93370f34acc8762eefbef193cb1e79ec753ea8add9c0bd6363327 SHA512 46ebaf1a1ee09238d26154003be235ff840ef9076c331602c4e08ce3d87c3219630523f3de843991c4f4a1015ca9a05cfedc8d3316884b60bd08d35401512e26
-MISC metadata.xml 392 BLAKE2B 57f9de0581c66772bcadb104d845f59945f78856fa12cba959e4905b719ff30bb5c9ac38d826c94b1ae4b9c9ef321bf7aaac645803f12b095d80df62771f27f4 SHA512 a9ead3d8c3c265f20ad7813aea66aeb0c2710b0f9b0f8f0c5448b8ce98d0242159f38894a171c397f2b24a262f437d66e733516ed15a79c5b4637ee01254bade
+DIST nestopia-1.51.1.tar.gz 1578970 BLAKE2B 5db7a380239c207843d5edadf5a174059d4566cd7b68aca01515db4940be3a6f6d02421f1499df28d4ac026ec435650452eb43306d1e49487063a06bce16b961 SHA512 68da5e9ab7b848d895a8893a18ef50d90758258fbf7f86ca5df0fe95e74bad761aa436dca79b402439a12fd4dd1430b22e45ee202168be3f9f751190a7ae6131
+EBUILD nestopia-1.51.1.ebuild 910 BLAKE2B 238ed320de4c45cf6407d53af3bc527c8c9ddc0f49b56d353f31cd010a25341bcead6dbdca62666d1540b5771d0459a40c0dbfd35db7a6ec7dc696650a1b8dd2 SHA512 c6755c63518cda53f4aa18f785233dcf91713c309ce4a7096eb138b0388330d201f5e60d21c526e349e155c5bdbb986a0dce005fe3f94d497d93652dc403decf
+EBUILD nestopia-9999.ebuild 811 BLAKE2B c0a41d59d5fc01a5dc482db6bcfe9168c1ff0712970b689ef3d50cb99579948e42a8adfe93657a4ff02a65e19741023ea8b0befcffa4a4f79518488f6200d6f9 SHA512 a1de1ff37dd2c334233c059cf2671310129d3fab9275ae1dc15ec33713cad6e6f867ae99b23d608b91db7b459b9dee7739aa65857b47e9882605acb50210105e
+MISC metadata.xml 336 BLAKE2B a4797bc2d4937f6e37f6f8136a35e4088d9682e1b8571e13f5a84e7300c2533b74b237a8a9c983ce75ac073b0d261e9a0fcd35ce7acd6c1e2fac30a7a5aaade3 SHA512 9ee7bf3a223dea8e590bf8f9d9776a3a88c63ae74e78e02b0a79a30a220417639920e004c8078dca2cc9bbdee95546e703aa3a93891bf388f9c7d998c8c6bd5f
diff --git a/games-emulation/nestopia/metadata.xml b/games-emulation/nestopia/metadata.xml
index 29276c3824a5..57d2149abd0f 100644
--- a/games-emulation/nestopia/metadata.xml
+++ b/games-emulation/nestopia/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">rdanbrook/nestopia</remote-id>
-		<remote-id type="sourceforge">nestopiaue</remote-id>
+		<remote-id type="github">0ldsk00l/nestopia</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-emulation/nestopia/nestopia-1.50.ebuild b/games-emulation/nestopia/nestopia-1.50.ebuild
deleted file mode 100644
index a6d4fc185a4e..000000000000
--- a/games-emulation/nestopia/nestopia-1.50.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
-HOMEPAGE="http://0ldsk00l.ca/nestopia/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
-else
-	SRC_URI="https://github.com/0ldsk00l/nestopia/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ao doc gui jack"
-
-RDEPEND="
-	app-arch/libarchive:=
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	ao? ( media-libs/libao )
-	gui? ( x11-libs/gtk+:3 )
-	jack? ( virtual/jack )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ao) \
-		$(use_with jack) \
-		$(use_enable doc) \
-		$(use_enable gui)
-}
diff --git a/games-emulation/nestopia/nestopia-1.51.1.ebuild b/games-emulation/nestopia/nestopia-1.51.1.ebuild
new file mode 100644
index 000000000000..ebab0b9b149b
--- /dev/null
+++ b/games-emulation/nestopia/nestopia-1.51.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic xdg
+
+DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++"
+HOMEPAGE="http://0ldsk00l.ca/nestopia/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
+else
+	SRC_URI="https://github.com/0ldsk00l/nestopia/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	app-arch/libarchive:=
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,sound]
+	sys-libs/zlib:=
+	x11-libs/fltk:1[opengl]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# silence the narrowing warnings on clang (#830469)
+	append-cxxflags -Wno-narrowing
+
+	econf $(use_enable doc)
+}
diff --git a/games-emulation/nestopia/nestopia-9999.ebuild b/games-emulation/nestopia/nestopia-9999.ebuild
index 98f2f70517d9..c6bdbe0d6fb8 100644
--- a/games-emulation/nestopia/nestopia-9999.ebuild
+++ b/games-emulation/nestopia/nestopia-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools xdg
 
-DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
+DESCRIPTION="Portable Nintendo Entertainment System emulator written in C++"
 HOMEPAGE="http://0ldsk00l.ca/nestopia/"
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
 else
@@ -22,15 +22,18 @@ IUSE="doc"
 
 RDEPEND="
 	app-arch/libarchive:=
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	x11-libs/gtk+:3"
+	media-libs/libglvnd
+	media-libs/libsdl2[joystick,sound]
+	sys-libs/zlib:=
+	x11-libs/fltk:1[opengl]"
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
+
 	eautoreconf
 }