games-emulation/dosbox: flag-o-matic--, style changes

Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 60 insertions, 64 deletions

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
 )