From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 888A91382DE for ; Tue, 28 Jun 2016 14:51:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B370D1425B; Tue, 28 Jun 2016 14:51:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B5A31425A for ; Tue, 28 Jun 2016 14:51:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10B683409D0 for ; Tue, 28 Jun 2016 14:51:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41CAAB3D for ; Tue, 28 Jun 2016 14:51:08 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1467125369.7efcd72291ba745978e8a02ca0ac6f8c07434a38.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dosbox/dosbox-0.74-r2.ebuild games-emulation/dosbox/dosbox-9999.ebuild X-VCS-Directories: games-emulation/dosbox/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: 7efcd72291ba745978e8a02ca0ac6f8c07434a38 X-VCS-Branch: master Date: Tue, 28 Jun 2016 14:51:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1e5014b3-d983-4bed-b262-5bbee9e74678 X-Archives-Hash: 202349a316f1babecb83f320ee77c881 commit: 7efcd72291ba745978e8a02ca0ac6f8c07434a38 Author: Michael Sterrett gentoo org> AuthorDate: Tue Jun 28 14:49:29 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Tue Jun 28 14:49:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7efcd722 Revert "games-emulation/dosbox: remove games eclass and convert to EAPI 6" This reverts commit 3d239d4e470c8f0c99339649ec74c4bdf86cf98f. games-emulation/dosbox/dosbox-0.74-r2.ebuild | 46 ---------------------------- games-emulation/dosbox/dosbox-9999.ebuild | 12 ++++---- 2 files changed, 6 insertions(+), 52 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74-r2.ebuild b/games-emulation/dosbox/dosbox-0.74-r2.ebuild deleted file mode 100644 index 165707b..0000000 --- a/games-emulation/dosbox/dosbox-0.74-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa debug hardened opengl" - -DEPEND="alsa? ( media-libs/alsa-lib ) - 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} - -PATCHES=( - "${FILESDIR}"/${P}-clang.patch - "${FILESDIR}"/${P}-gcc46.patch - "${FILESDIR}"/${P}-wine-drive-z.patch - "${FILESDIR}"/${P}-wine-filenames.patch -) - -src_configure() { - econf \ - $(use_enable alsa alsa-midi) \ - $(use_enable !hardened dynamic-core) \ - $(use_enable !hardened dynamic-x86) \ - $(use_enable debug) \ - $(use_enable opengl) -} - -src_install() { - default - make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico - doicon src/dosbox.ico -} diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild index 1c5c700..f0caa33 100644 --- a/games-emulation/dosbox/dosbox-9999.ebuild +++ b/games-emulation/dosbox/dosbox-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=5 ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk" -inherit autotools eutils subversion +inherit autotools eutils subversion games DESCRIPTION="DOS emulator" HOMEPAGE="http://dosbox.sourceforge.net/" @@ -15,8 +15,8 @@ KEYWORDS="" IUSE="alsa debug hardened opengl" DEPEND="alsa? ( media-libs/alsa-lib ) - debug? ( sys-libs/ncurses:0 ) opengl? ( virtual/glu virtual/opengl ) + debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net @@ -30,13 +30,12 @@ src_unpack() { } src_prepare() { - default subversion_src_prepare eautoreconf } src_configure() { - econf \ + egamesconf \ $(use_enable alsa alsa-midi) \ $(use_enable !hardened dynamic-core) \ $(use_enable !hardened dynamic-x86) \ @@ -48,4 +47,5 @@ src_install() { default make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico doicon src/dosbox.ico + prepgamesdirs }