gentoo resync : 28.04.2021

4 files changed, 63 insertions, 67 deletions

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index a3cae580dec8..34df0d6e185b 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -5,7 +5,7 @@ DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187
 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
 DIST dosbox_glide-6a01f554fad979cf34d3ff07c9579192c88086c3.diff 97353 BLAKE2B bb95f9916d4dc8813d1fb4b61c63e50aba5d1862e5554c4af0fc2e75c105b477a6e6ef8b8941e9570860a2fe41570eca94ef36e1d594a2fb9a922b132b210e76 SHA512 b4cf2e5a335b948de94567806950c9512d81adc7687a184b6da5aae082c437af51c61950b1abd0d0c00d83ce37b5ee365ee6bb9e981854fce8bfbb0b1e93be68
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
-EBUILD dosbox-0.74.3.ebuild 1522 BLAKE2B bc38f48859f1d96aa2244924dbcf62f16ee45cd078f99161e381be6f0edb2760295e20f700d296f9408c5af109d5df86a1fda9a8458f4b6f799eb14f3db6edfd SHA512 e8123c54e12c80a67ad742c2e0c78ba4db54f992ae6e6922e265642de19e4b5ceedefc83c689e4ea7f96ca63ccd30d700b70e3eded8a575d755381d52066d318
-EBUILD dosbox-0.75_pre4302.ebuild 2275 BLAKE2B a2c75aa6878402f3fb8b554c8009ca1b9d194e160870eebf0736fba8ae8fb1995d65d9f490b1c2a132f8476bff4dc664b0a2626894bd7627adf12b183698184b SHA512 e0b3233630ebcfe2cc4f72607eb45d5f164ee09db41a5a44ceee701d5fb764cf1b5b154315f51c12abf7409e41df8ecc102707ef1b2642d072840a5b13ed71d3
-EBUILD dosbox-9999.ebuild 2205 BLAKE2B dc194b454d65fae6e925cdea982ac41ce87ebd30c3a7469c0757807595dc62e33cf48dc333e79ed0870c3477b30c233afc4393707775293f0601da1cf75812e6 SHA512 70d33b49e97239809db36040fc26a51d14eec10e16662d8e143791d2c1afdd5526f79c9cd35b3aa83259dceeb3fb4d1f1aea456be8c25cac09adcbbab3022f66
+EBUILD dosbox-0.74.3.ebuild 1522 BLAKE2B 05abcda688e1a6bd53c1494e7a9496a40f2d73acbac29e8e5c92c91d245f22f3926a7be774c053851372e3f4b5c7bbeac1ebed17dbfa0524889c77c19f25da81 SHA512 c9fcbf5fb32bfeaf7d72611b2e0764f6995049afb0e79e3d4db1a8f28d36ceb34e9918618219115a960e96b6c76bcc3276a99951d2d6b29804dec05fd9fdd25f
+EBUILD dosbox-0.75_pre4302.ebuild 2288 BLAKE2B c8308ab88550535af2055ee448f08140707cd78af02fd644d7b2b31a6061fd04ab220bca579fdc645da6e9960149022501e87733c3469ed57bf00dfb1ed664d4 SHA512 bc41da3fbbd55b4784f248fb3a7f6ec4802cd41f66d448bd0cc59d3944648383026b8e272966b5fc2f02f54c0801f33d59ab6c9ca301a982c040a9a50e0d96ad
+EBUILD dosbox-9999.ebuild 2206 BLAKE2B 066c39c10f7526ab0b54e858fbc5e82a5148a902a4a8e5a7b39289efa370bf55af91ec132a8da7a580d2834e9f9d0f7b64e416703c52d3f3a0c28dca7a6e6616 SHA512 fa2833a8de8d791b27bcecfd99b06ede3caef2caa86bb97aed541b43624c85693709a6656826022e40a5a3923c2b7d3364ef3e86de44b0a59d593f1351a67b7b
 MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index 7ed3281b1644..efeca818c009 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -1,31 +1,33 @@
-# 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
+inherit autotools desktop
 
-case "${PV}" in
-9999)
-	MY_P=${PN}
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-	;;
-*_pre*)
-	MY_PV=0-r${PV#*_pre}
-	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
-	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
-	BDEPEND="app-arch/unzip"
-	;;
-*)
-	MY_PV=$(ver_rs 2 -)
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
-	;;
+case ${PV} in
+	9999)
+		MY_P=${PN}
+		ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
+		inherit subversion
+		;;
+	*_pre*)
+		MY_PV=0-r${PV#*_pre}
+		MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+		SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+		BDEPEND="app-arch/unzip"
+		;;
+	*)
+		MY_PV=$(ver_rs 2 -)
+		MY_P=${PN}-${MY_PV}
+		SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+		;;
 esac
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
@@ -40,11 +42,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.74-ncurses.patch
 )
diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index fd00727100c9..8ae6d980d50b 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -1,27 +1,27 @@
-# 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
 
-case "${PV}" in
-9999)
-	MY_P=${PN}
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-	;;
-*_pre*)
-	MY_PV=0-r${PV#*_pre}
-	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
-	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
-	BDEPEND="app-arch/unzip"
-	;;
-*)
-	MY_PV=$(ver_rs 2 -)
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
-	;;
+case ${PV} in
+	9999)
+		MY_P=${PN}
+		ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
+		inherit subversion
+		;;
+	*_pre*)
+		MY_PV=0-r${PV#*_pre}
+		MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+		SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+		BDEPEND="app-arch/unzip"
+		;;
+	*)
+		MY_PV=$(ver_rs 2 -)
+		MY_P=${PN}-${MY_PV}
+		SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+		;;
 esac
 
 GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
@@ -29,6 +29,8 @@ SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
@@ -44,11 +46,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.74-ncurses.patch
 	"${FILESDIR}"/${PN}-0.75-detect-AR.patch
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 205ff225911c..cb63c341cf2c 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -5,23 +5,23 @@ EAPI=7
 
 inherit autotools desktop flag-o-matic
 
-case "${PV}" in
-9999)
-	MY_P=${PN}
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-	;;
-*_pre*)
-	MY_PV=0-r${PV#*_pre}
-	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
-	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
-	BDEPEND="app-arch/unzip"
-	;;
-*)
-	MY_PV=$(ver_rs 2 -)
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
-	;;
+case ${PV} in
+	9999)
+		MY_P=${PN}
+		ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
+		inherit subversion
+		;;
+	*_pre*)
+		MY_PV=0-r${PV#*_pre}
+		MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+		SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+		BDEPEND="app-arch/unzip"
+		;;
+	*)
+		MY_PV=$(ver_rs 2 -)
+		MY_P=${PN}-${MY_PV}
+		SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+		;;
 esac
 
 GLIDE_PATCH=6a01f554fad979cf34d3ff07c9579192c88086c3
@@ -29,9 +29,10 @@ SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
@@ -44,11 +45,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.75-ncurses.patch
 )