gentoo resync : 16.09.2021

3 files changed, 2 insertions, 93 deletions

diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
index fee4cd86ea9e..3a404a11f1de 100644
--- a/games-emulation/hatari/Manifest
+++ b/games-emulation/hatari/Manifest
@@ -2,5 +2,4 @@ AUX hatari-2.3.1-caps5-include-path.patch 500 BLAKE2B 9462c680cf22368e06f37d313d
 AUX hatari-2.3.1-cmake-include-checksym.patch 388 BLAKE2B 45bc03fc6be8feae6d16083ea6fd5c2fbe1f63103c8a274e9e2104d39cb4050dd5cb0ac51e679fbb65c17d0e2df080245e0e5800f14578e956cbff2dd6c3e9f5 SHA512 b9afa6022e7be9dfe9ab47b791d5e7a64e835ae2098f5b04737b2ffc952598bc0e90a181609629d03f9568c8dcd4e5772cb96bd1416531ccba6c66a1d33c439e
 DIST hatari-2.3.1.tar.bz2 4334129 BLAKE2B f309a31cbf181135b02858ebefa4d70116e66d252ef5de03cffa8254c0e86e4eeebfbf626613103790fb803d08028b318721020b292ea748c79e4d008e6d503d SHA512 78a6c7d80bfcd9b3a85a82754f4180cfd906eb95c6a44c8fbb92c2a648dc9c21c74c9dd18db4783d87259a3061b39e639c54cdd6c033d83de1252afef811382f
 EBUILD hatari-2.3.1-r1.ebuild 2496 BLAKE2B 4100c61b4aadcd00138988bfefd565374237f610975d4ded8874dcf14ff2421f8eaf76897995bdd3107982aec75bd68eee3a3492c7a7f742f482e44170bd19cc SHA512 e3c32883e6d2cb967ef5f892a2656f7894f07af37d30cf5ac78fa68b09cd86229f7d7812414af5342b3b3bd7306f53a4559ce878ffe5ca46e5b7214cb4423291
-EBUILD hatari-2.3.1.ebuild 2449 BLAKE2B 32ba57e52127c2bb01541fac8178e542398e92315a68749d7decc544eee620c14a344fe1ea0c7d90286a6351ea0460d3687b365bbc16ae58cca69ddbbd929c44 SHA512 66ecbe53cc3792b1a06b6664f3480366514e2f807b6be01e5aaff7c2a304a3fb7ea1d5baf8a125cd11ae09bb74f48822a8f7d5130d08280f8638b7fbacd533ce
-MISC metadata.xml 563 BLAKE2B e3361a33fead8a835f7eebab0c8ec6be82f43a12dfb053643b82368a03b123a25841ae76e2f4c1e7046721f2b21895762603ce1b0ec6a3ca4decc4db5747d1ab SHA512 9ba66a561368fafa4298886a2a055c71ddbf4991ce114645fa9123077a32d0e0ea3b264f260f4700c9037b0710721f1bae948ede50fee2fc75ea4033ece39b6c
+MISC metadata.xml 564 BLAKE2B 1048b1c97dffd67eff94b4b244e2a2bedccf9f20e68f438f7989ed9b4812d8ac562e915c43beab4e3d42d0d989d96b3fb8c2fb58db274afae11066c3bdde00ce SHA512 d61a6d9fe1dc63dc99f9d589cec2138ee95f2e0eeab0866108864b172a0c331d468b8f1cfcb0644bcc6f01f4f632aa73db6c16922acd4f8df8a4a97a35ce4c5c
diff --git a/games-emulation/hatari/hatari-2.3.1.ebuild b/games-emulation/hatari/hatari-2.3.1.ebuild
deleted file mode 100644
index 2512ca06655f..000000000000
--- a/games-emulation/hatari/hatari-2.3.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit cmake python-single-r1 xdg
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="https://hatari.tuxfamily.org/"
-SRC_URI="https://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="capsimage gui microphone png portmidi readline udev zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	media-libs/libsdl2[sound,video]
-	capsimage? ( >=dev-libs/spsdeclib-5.1-r1 )
-	microphone? ( media-libs/portaudio )
-	png? ( media-libs/libpng:= )
-	portmidi? ( media-libs/portmidi )
-	readline? ( sys-libs/readline:= )
-	udev? ( virtual/udev )
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="
-	${DEPEND}
-	gui? (
-		$(python_gen_cond_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-		x11-libs/gtk+:3[introspection]
-	)
-	>=games-emulation/emutos-0.9.9.1"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-caps5-include-path.patch
-	"${FILESDIR}"/${P}-cmake-include-checksym.patch
-)
-DOCS=(
-	readme.txt
-	doc/{bugs,changelog,scsi-driver,thanks,video-recording}.txt
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i "s/\.1\.gz\b/.1/g;T;s/gzip[^\$]*/cat /g" {*/,}*/CMakeLists.txt || die
-	sed -i "s:doc/${PN}:doc/${PF}:" python-ui/uihelpers.py || die
-	# Note: >2.3.1 renames /python/ to /python3/, update accordingly
-	sed -i "s/python/${EPYTHON}/;s/dosfs/fs.fat/" tools/atari-hd-image.sh || die
-
-	# Use emutos package rather than bundled ROM.
-	rm src/tos.img || die
-	cat <<-EOF > hatari.cfg || die
-		[ROM]
-		szTosImageFileName = ${EPREFIX}/usr/share/emutos/etos512k.img
-	EOF
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_CapsImage=$(usex !capsimage)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PNG=$(usex !png)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PortAudio=$(usex !microphone)
-		-DCMAKE_DISABLE_FIND_PACKAGE_PortMidi=$(usex !portmidi)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Readline=$(usex !readline)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Udev=$(usex !udev)
-		-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=$(usex !zlib)
-		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-		-DETCDIR="${EPREFIX}"/etc
-		$(usex gui '' -DPYTHON_EXECUTABLE=false) # disables python-ui/
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc
-	doins hatari.cfg
-
-	python_fix_shebang "${ED}"/usr/bin
-	use gui && python_fix_shebang "${ED}"/usr/share/${PN}/${PN}ui
-}
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
index 848e8b086ce0..9257dac2b8a5 100644
--- a/games-emulation/hatari/metadata.xml
+++ b/games-emulation/hatari/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>games@gentoo.org</email>