| 1 |
commit: 85efdc28e53232143b851da4e274889e01f9876c |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Fri Aug 3 01:43:32 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 27 21:16:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85efdc28 |
| 7 |
|
| 8 |
games-emulation/dosbox: eutils->desktop |
| 9 |
|
| 10 |
Only has eutils for the implicit desktop inheritance for doicon and |
| 11 |
make_desktop_entry. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/9429 |
| 15 |
|
| 16 |
games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild | 7 ++++--- |
| 17 |
games-emulation/dosbox/dosbox-0.74_p20160629.ebuild | 7 ++++--- |
| 18 |
games-emulation/dosbox/dosbox-9999.ebuild | 8 +++++--- |
| 19 |
3 files changed, 13 insertions(+), 9 deletions(-) |
| 20 |
|
| 21 |
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild |
| 22 |
index f622d980d34..d7fd016f2ca 100644 |
| 23 |
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild |
| 24 |
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild |
| 25 |
@@ -1,8 +1,9 @@ |
| 26 |
-# Copyright 1999-2016 Gentoo Foundation |
| 27 |
+# Copyright 1999-2018 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=6 |
| 31 |
-inherit autotools eutils flag-o-matic |
| 32 |
+ |
| 33 |
+inherit autotools desktop flag-o-matic |
| 34 |
|
| 35 |
PATCH=3989 |
| 36 |
GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b |
| 37 |
@@ -31,7 +32,7 @@ DEPEND="${RDEPEND} |
| 38 |
S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk |
| 39 |
|
| 40 |
PATCHES=( |
| 41 |
-"${FILESDIR}"/dosbox-0.74-gcc46.patch |
| 42 |
+ "${FILESDIR}"/${PN}-0.74-gcc46.patch |
| 43 |
) |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
|
| 47 |
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild |
| 48 |
index 45b0b0fdb71..a7b41d8d34e 100644 |
| 49 |
--- a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild |
| 50 |
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild |
| 51 |
@@ -1,8 +1,9 @@ |
| 52 |
-# Copyright 1999-2017 Gentoo Foundation |
| 53 |
+# Copyright 1999-2018 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
-inherit autotools eutils |
| 58 |
+ |
| 59 |
+inherit autotools desktop |
| 60 |
|
| 61 |
PATCH=3989 |
| 62 |
DESCRIPTION="DOS emulator" |
| 63 |
@@ -27,7 +28,7 @@ DEPEND="${RDEPEND} |
| 64 |
S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk |
| 65 |
|
| 66 |
PATCHES=( |
| 67 |
-"${FILESDIR}"/dosbox-0.74-gcc46.patch |
| 68 |
+ "${FILESDIR}"/${PN}-0.74-gcc46.patch |
| 69 |
) |
| 70 |
|
| 71 |
src_prepare() { |
| 72 |
|
| 73 |
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild |
| 74 |
index bceaab9e815..786b1f78688 100644 |
| 75 |
--- a/games-emulation/dosbox/dosbox-9999.ebuild |
| 76 |
+++ b/games-emulation/dosbox/dosbox-9999.ebuild |
| 77 |
@@ -3,6 +3,8 @@ |
| 78 |
|
| 79 |
EAPI=6 |
| 80 |
|
| 81 |
+inherit autotools desktop flag-o-matic |
| 82 |
+ |
| 83 |
GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6 |
| 84 |
SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )" |
| 85 |
|
| 86 |
@@ -14,8 +16,6 @@ else |
| 87 |
KEYWORDS="~amd64 ~arm ~ppc64 ~x86" |
| 88 |
fi |
| 89 |
|
| 90 |
-inherit autotools eutils flag-o-matic |
| 91 |
- |
| 92 |
DESCRIPTION="DOS emulator" |
| 93 |
HOMEPAGE="http://dosbox.sourceforge.net/" |
| 94 |
|
| 95 |
@@ -37,7 +37,9 @@ if [[ ${PV} = 9999 ]]; then |
| 96 |
S=${WORKDIR}/${PN} |
| 97 |
fi |
| 98 |
|
| 99 |
-PATCHES=( "${FILESDIR}/${PN}-0.74-gcc46.patch" ) |
| 100 |
+PATCHES=( |
| 101 |
+ "${FILESDIR}"/${PN}-0.74-gcc46.patch |
| 102 |
+) |
| 103 |
|
| 104 |
src_prepare() { |
| 105 |
use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff |
Archives