gentoo resync : 03.03.2021

4 files changed, 62 insertions, 84 deletions

diff --git a/games-emulation/nestopia/Manifest b/games-emulation/nestopia/Manifest
index a8e9e63c1801..d22004c17644 100644
--- a/games-emulation/nestopia/Manifest
+++ b/games-emulation/nestopia/Manifest
@@ -1,4 +1,4 @@
-DIST nestopia-1.47_p20170105.tar.gz 1283456 BLAKE2B 50e70f6f952e3b11b056e398b1b83ffd9458e89a877a8a05c4f9360f047c3a8e1edff2a1316a5d3967db050705dee066bae3452743985b7ce438294fe31d6b78 SHA512 58d1a932a6b90589c66503b2013b1a8162072e77e0416851a1430fa146e7fd85ff7363b70292c69d4c4513e3750aa53436a312c0240a843e42fbb89b554e7a70
-EBUILD nestopia-1.47_p20170105.ebuild 1082 BLAKE2B 6e30ba349b4995b866a9f4fde1b5fe497e5031e6e61556310baa68cdf91cc5acd40c173fb62377d5f9e0dc18f17c344c80c1fdd3517c709c680555ad5fa925a1 SHA512 4b15b0fa719b37017cd6cb06bea788ab3a573d2c6ff94c1b63f753d1cff0ce37d8adae034c387dcb76cbefd65234fda5d4da9fdc9c3eff0d896a663b47e3c91f
-EBUILD nestopia-9999.ebuild 1082 BLAKE2B 6e30ba349b4995b866a9f4fde1b5fe497e5031e6e61556310baa68cdf91cc5acd40c173fb62377d5f9e0dc18f17c344c80c1fdd3517c709c680555ad5fa925a1 SHA512 4b15b0fa719b37017cd6cb06bea788ab3a573d2c6ff94c1b63f753d1cff0ce37d8adae034c387dcb76cbefd65234fda5d4da9fdc9c3eff0d896a663b47e3c91f
+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 391 BLAKE2B 988fee94de3ce9ae6e85186e39a4505c5dd6366dedb0b912e77556471c27b2fe6752e6d58001b37464e0906c34041bd8e0e3439035255269a2bee6bf307c60f7 SHA512 13f5927adfcb88e3a1fcb02de6deb376547d58b2c35ca9c3d759359d0913471ac68b90ade1cc23e9ef5161888d2589ab54cf32e5d072bbaf30166ec1e7938f26
diff --git a/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild b/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
deleted file mode 100644
index 932f8edc7412..000000000000
--- a/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-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/rdanbrook/nestopia.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/rdanbrook/${PN}/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc gui"
-
-RDEPEND="
-	app-arch/libarchive:=
-	media-libs/libao
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	gui? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GTK=$(usex gui)
-		-DENABLE_DOC=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/nestopia/nestopia-1.50.ebuild b/games-emulation/nestopia/nestopia-1.50.ebuild
new file mode 100644
index 000000000000..a6d4fc185a4e
--- /dev/null
+++ b/games-emulation/nestopia/nestopia-1.50.ebuild
@@ -0,0 +1,45 @@
+# 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-9999.ebuild b/games-emulation/nestopia/nestopia-9999.ebuild
index 932f8edc7412..98f2f70517d9 100644
--- a/games-emulation/nestopia/nestopia-9999.ebuild
+++ b/games-emulation/nestopia/nestopia-9999.ebuild
@@ -1,53 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils
+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/rdanbrook/nestopia.git"
+	EGIT_REPO_URI="https://github.com/0ldsk00l/nestopia.git"
 else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/rdanbrook/${PN}/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> ${P}.tar.gz"
+	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 gui"
+IUSE="doc"
 
 RDEPEND="
 	app-arch/libarchive:=
-	media-libs/libao
 	media-libs/libepoxy
 	media-libs/libsdl2[sound,joystick,video]
 	sys-libs/zlib
-	gui? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GTK=$(usex gui)
-		-DENABLE_DOC=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+src_prepare() {
+	default
+	eautoreconf
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+src_configure() {
+	econf $(use_enable doc)
 }