commit: db14f3ee319342a535b012d49a8c7a0b4b179095
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 07:00:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 07:21:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db14f3ee
games-emulation/dosbox: flag-o-matic--, style changes
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-emulation/dosbox/dosbox-0.74.3.ebuild | 43 +++++++++++------------
games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 41 +++++++++++----------
games-emulation/dosbox/dosbox-9999.ebuild | 40 ++++++++++-----------
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 7ed3281b164..efeca818c00 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 fd00727100c..8ae6d980d50 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 205ff225911..cb63c341cf2 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
)
