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 AB93E138334 for ; Mon, 27 Aug 2018 21:16:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAE3CE0867; Mon, 27 Aug 2018 21:16:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 6B7FAE0867 for ; Mon, 27 Aug 2018 21:16:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A1181335C7D for ; Mon, 27 Aug 2018 21:16:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F4523A4 for ; Mon, 27 Aug 2018 21:16:23 +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: <1535404575.85efdc28e53232143b851da4e274889e01f9876c.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-0.74_p20160629-r1.ebuild games-emulation/dosbox/dosbox-0.74_p20160629.ebuild 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: 85efdc28e53232143b851da4e274889e01f9876c X-VCS-Branch: master Date: Mon, 27 Aug 2018 21:16:23 +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: d9c5af9d-9155-4cf9-a4c9-340d3e20e44d X-Archives-Hash: 8b31d01549f0ba184b3ef46200ffb79f commit: 85efdc28e53232143b851da4e274889e01f9876c Author: Marty E. Plummer startmail com> AuthorDate: Fri Aug 3 01:43:32 2018 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Aug 27 21:16:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85efdc28 games-emulation/dosbox: eutils->desktop Only has eutils for the implicit desktop inheritance for doicon and make_desktop_entry. Package-Manager: Portage-2.3.44, Repoman-2.3.10 Closes: https://github.com/gentoo/gentoo/pull/9429 games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild | 7 ++++--- games-emulation/dosbox/dosbox-0.74_p20160629.ebuild | 7 ++++--- games-emulation/dosbox/dosbox-9999.ebuild | 8 +++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild index f622d980d34..d7fd016f2ca 100644 --- a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild +++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils flag-o-matic + +inherit autotools desktop flag-o-matic PATCH=3989 GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b @@ -31,7 +32,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk PATCHES=( -"${FILESDIR}"/dosbox-0.74-gcc46.patch + "${FILESDIR}"/${PN}-0.74-gcc46.patch ) src_prepare() { diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild index 45b0b0fdb71..a7b41d8d34e 100644 --- a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild +++ b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils + +inherit autotools desktop PATCH=3989 DESCRIPTION="DOS emulator" @@ -27,7 +28,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk PATCHES=( -"${FILESDIR}"/dosbox-0.74-gcc46.patch + "${FILESDIR}"/${PN}-0.74-gcc46.patch ) src_prepare() { diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild index bceaab9e815..786b1f78688 100644 --- a/games-emulation/dosbox/dosbox-9999.ebuild +++ b/games-emulation/dosbox/dosbox-9999.ebuild @@ -3,6 +3,8 @@ EAPI=6 +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 )" @@ -14,8 +16,6 @@ else KEYWORDS="~amd64 ~arm ~ppc64 ~x86" fi -inherit autotools eutils flag-o-matic - DESCRIPTION="DOS emulator" HOMEPAGE="http://dosbox.sourceforge.net/" @@ -37,7 +37,9 @@ if [[ ${PV} = 9999 ]]; then S=${WORKDIR}/${PN} fi -PATCHES=( "${FILESDIR}/${PN}-0.74-gcc46.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-0.74-gcc46.patch +) src_prepare() { use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff