| 1 |
commit: 5edb412a63031c0372093d5e5fb038e5da4f52f1 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 29 19:41:26 2016 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 20:05:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edb412a |
| 7 |
|
| 8 |
games-emulation/dosbox: [qa]: create a snapshot release to fix multiple bugs |
| 9 |
|
| 10 |
This snapshot release fixes the following bugs: |
| 11 |
|
| 12 |
https://bugs.gentoo.org/show_bug.cgi?id=449060 |
| 13 |
https://bugs.gentoo.org/show_bug.cgi?id=586650 |
| 14 |
https://bugs.gentoo.org/show_bug.cgi?id=587382 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.28 |
| 17 |
|
| 18 |
.../{dosbox-3989.ebuild => dosbox-0.74_p20160629.ebuild} | 14 +++++++++----- |
| 19 |
games-emulation/dosbox/files/dosbox-0.74-gcc46.patch | 4 ++-- |
| 20 |
2 files changed, 11 insertions(+), 7 deletions(-) |
| 21 |
|
| 22 |
diff --git a/games-emulation/dosbox/dosbox-3989.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild |
| 23 |
similarity index 86% |
| 24 |
rename from games-emulation/dosbox/dosbox-3989.ebuild |
| 25 |
rename to games-emulation/dosbox/dosbox-0.74_p20160629.ebuild |
| 26 |
index 50488ee..f638a1e 100644 |
| 27 |
--- a/games-emulation/dosbox/dosbox-3989.ebuild |
| 28 |
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild |
| 29 |
@@ -2,8 +2,8 @@ |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
# $Id$ |
| 32 |
|
| 33 |
-EAPI=5 |
| 34 |
-inherit autotools eutils games |
| 35 |
+EAPI=6 |
| 36 |
+inherit autotools eutils |
| 37 |
|
| 38 |
PATCH=3989 |
| 39 |
DESCRIPTION="DOS emulator" |
| 40 |
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip" |
| 41 |
|
| 42 |
LICENSE="GPL-2" |
| 43 |
SLOT="0" |
| 44 |
-KEYWORDS="" |
| 45 |
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" |
| 46 |
IUSE="alsa debug hardened opengl" |
| 47 |
|
| 48 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
| 49 |
@@ -27,12 +27,17 @@ DEPEND="${RDEPEND} |
| 50 |
|
| 51 |
S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk |
| 52 |
|
| 53 |
+PATCHES=( |
| 54 |
+"${FILESDIR}"/dosbox-0.74-gcc46.patch |
| 55 |
+) |
| 56 |
+ |
| 57 |
src_prepare() { |
| 58 |
+ default |
| 59 |
eautoreconf |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
- egamesconf \ |
| 64 |
+ econf \ |
| 65 |
$(use_enable alsa alsa-midi) \ |
| 66 |
$(use_enable !hardened dynamic-core) \ |
| 67 |
$(use_enable !hardened dynamic-x86) \ |
| 68 |
@@ -44,5 +49,4 @@ src_install() { |
| 69 |
default |
| 70 |
make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico |
| 71 |
doicon src/dosbox.ico |
| 72 |
- prepgamesdirs |
| 73 |
} |
| 74 |
|
| 75 |
diff --git a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch |
| 76 |
index 16811d4..98b4508 100644 |
| 77 |
--- a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch |
| 78 |
+++ b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch |
| 79 |
@@ -1,5 +1,5 @@ |
| 80 |
---- include/dos_inc.h.old 2011-04-28 08:46:04.505011354 +0200 |
| 81 |
-+++ include/dos_inc.h 2011-04-28 08:46:27.104408178 +0200 |
| 82 |
+--- a/include/dos_inc.h 2011-04-28 08:46:04.505011354 +0200 |
| 83 |
++++ b/include/dos_inc.h 2011-04-28 08:46:27.104408178 +0200 |
| 84 |
@@ -21,6 +21,7 @@ |
| 85 |
#ifndef DOSBOX_DOS_INC_H |
| 86 |
#define DOSBOX_DOS_INC_H |
Archives