[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

[Patrice Clement]

commit:     3d239d4e470c8f0c99339649ec74c4bdf86cf98f
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 08:43:09 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 13:31:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d239d4e

games-emulation/dosbox: remove games eclass and convert to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/566498
Gentoo-Bug: https://bugs.gentoo.org/587382

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1777

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../{dosbox-9999.ebuild => dosbox-0.74-r2.ebuild}  | 31 +++++++++-------------
 games-emulation/dosbox/dosbox-9999.ebuild          | 12 ++++-----
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-0.74-r2.ebuild
similarity index 69%
copy from games-emulation/dosbox/dosbox-9999.ebuild
copy to games-emulation/dosbox/dosbox-0.74-r2.ebuild
index f0caa33..165707b 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74-r2.ebuild
@@ -1,41 +1,37 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk"
-inherit autotools eutils subversion games
+EAPI=6
+inherit eutils
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/"
+SRC_URI="mirror://sourceforge/dosbox/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
-	opengl? ( virtual/glu virtual/opengl )
 	debug? ( sys-libs/ncurses:0 )
+	opengl? ( virtual/glu virtual/opengl )
 	media-libs/libpng:0
 	media-libs/libsdl[joystick,video,X]
 	media-libs/sdl-net
 	media-libs/sdl-sound"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	subversion_src_unpack
-}
-
-src_prepare() {
-	subversion_src_prepare
-	eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-gcc46.patch
+	"${FILESDIR}"/${P}-wine-drive-z.patch
+	"${FILESDIR}"/${P}-wine-filenames.patch
+)
 
 src_configure() {
-	egamesconf \
+	econf \
 		$(use_enable alsa alsa-midi) \
 		$(use_enable !hardened dynamic-core) \
 		$(use_enable !hardened dynamic-x86) \
@@ -47,5 +43,4 @@ src_install() {
 	default
 	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
 	doicon src/dosbox.ico
-	prepgamesdirs
 }

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index f0caa33..1c5c700 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk"
-inherit autotools eutils subversion games
+inherit autotools eutils subversion
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/"
@@ -15,8 +15,8 @@ KEYWORDS=""
 IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
-	opengl? ( virtual/glu virtual/opengl )
 	debug? ( sys-libs/ncurses:0 )
+	opengl? ( virtual/glu virtual/opengl )
 	media-libs/libpng:0
 	media-libs/libsdl[joystick,video,X]
 	media-libs/sdl-net
@@ -30,12 +30,13 @@ src_unpack() {
 }
 
 src_prepare() {
+	default
 	subversion_src_prepare
 	eautoreconf
 }
 
 src_configure() {
-	egamesconf \
+	econf \
 		$(use_enable alsa alsa-midi) \
 		$(use_enable !hardened dynamic-core) \
 		$(use_enable !hardened dynamic-x86) \
@@ -47,5 +48,4 @@ src_install() {
 	default
 	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
 	doicon src/dosbox.ico
-	prepgamesdirs
 }