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 EE421138334 for ; Wed, 1 Jan 2020 22:56:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18393E0BCD; Wed, 1 Jan 2020 22:56:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E045CE0BCD for ; Wed, 1 Jan 2020 22:56:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6604634DE42 for ; Wed, 1 Jan 2020 22:56:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8304736 for ; Wed, 1 Jan 2020 22:56:50 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1577919359.6dd1f87ff5b8caffc8eb4254fe904fa4d82b6a3c.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dosbox/dosbox-9999.ebuild X-VCS-Directories: games-emulation/dosbox/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 6dd1f87ff5b8caffc8eb4254fe904fa4d82b6a3c X-VCS-Branch: master Date: Wed, 1 Jan 2020 22:56:50 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 750b7b04-e8fd-4c96-bf6f-6d3a373e81a0 X-Archives-Hash: e4081beeb0f19a40c2e1119973c541e8 commit: 6dd1f87ff5b8caffc8eb4254fe904fa4d82b6a3c Author: James Le Cuirot gentoo org> AuthorDate: Wed Jan 1 12:14:56 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Wed Jan 1 22:55:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd1f87f games-emulation/dosbox: EAPI 7 and clean up for 9999 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: James Le Cuirot gentoo.org> games-emulation/dosbox/dosbox-9999.ebuild | 48 +++++++++++++++++-------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild index 8c4711e5620..d6c94125051 100644 --- a/games-emulation/dosbox/dosbox-9999.ebuild +++ b/games-emulation/dosbox/dosbox-9999.ebuild @@ -1,47 +1,53 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools desktop flag-o-matic -GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6 -SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" - -if [[ ${PV} = 9999 ]]; then +case "${PV}" in +9999) + MY_P=${PN} ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk" inherit subversion -else - SRC_URI+=" mirror://sourceforge/dosbox/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" -fi + ;; +*_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 +SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" DESCRIPTION="DOS emulator" HOMEPAGE="https://www.dosbox.com/" - LICENSE="GPL-2" SLOT="0" +KEYWORDS="" IUSE="alsa +core-inline debug glide hardened opengl X" -DEPEND="alsa? ( media-libs/alsa-lib ) +RDEPEND="alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) - debug? ( sys-libs/ncurses:0 ) + debug? ( sys-libs/ncurses:0= ) X? ( x11-libs/libX11 ) media-libs/libpng:0= - media-libs/libsdl[joystick,opengl?,video,X] + media-libs/libsdl[joystick,opengl?,video,X?] media-libs/sdl-net media-libs/sdl-sound sys-libs/zlib" -RDEPEND=${DEPEND} -if [[ ${PV} = 9999 ]]; then - S=${WORKDIR}/${PN} -fi +DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-0.74-gcc46.patch -) +S="${WORKDIR}/${MY_P}" src_prepare() { use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff