subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-emulation\/dosbox\/"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2024-08-05 Thread Eli Schwartz

commit: bf241a4260954afb732b4600e8ad82e744135833
Author: Eli Schwartz  gentoo  org>
AuthorDate: Mon Aug  5 04:45:07 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Tue Aug  6 00:18:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf241a42

games-emulation/dosbox: mark as LTO-unsafe, strict-aliasing unsafe

Closes: https://bugs.gentoo.org/858638
Signed-off-by: Eli Schwartz  gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 8 
 games-emulation/dosbox/dosbox-.ebuild | 8 
 2 files changed, 16 insertions(+)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 8ec0aed21784..f3b61cd5fc75 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -60,6 +60,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing, -Weror=odr
+   # https://bugs.gentoo.org/858638
+   #
+   # Upstream is kinda dead. Just use dosbox-staging... where I reported
+   # similar issues and they were fixed. ;)
+   append-flags -fno-strict-aliasing
+   filter-lto
+
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
 
ac_cv_lib_X11_main=$(usex X yes no) \

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index e113bd078a84..e645b0a8b220 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -58,6 +58,14 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=strict-aliasing, -Weror=odr
+   # https://bugs.gentoo.org/858638
+   #
+   # Upstream is kinda dead. Just use dosbox-staging... where I reported
+   # similar issues and they were fixed. ;)
+   append-flags -fno-strict-aliasing
+   filter-lto
+
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
 
ac_cv_lib_X11_main=$(usex X yes no) \

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2024-06-14 Thread Bernard Cafarelli

commit: e7aa35a88d9de3daaed1a3ff551f416665809a61
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Jun 14 10:00:07 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Jun 14 10:40:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7aa35a8

games-emulation/dosbox-staging: add 0.81.1 (actual release)

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.81.1.ebuild| 71 ++
 2 files changed, 72 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 9da9930aaf7f..a404b3b32746 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B 
bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b
 SHA512 
8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
 DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 
088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494
 SHA512 
96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797
+DIST dosbox-staging-0.81.1.tar.gz 7021582 BLAKE2B 
dfee4255db923aba1be2941e0c70fbd0bccc894a245c68907b25d111209cdac3c8cf7854427197915f55a37bdf32b3450e7afa048ee4200ea36de11facfefbae
 SHA512 
6856612dc45ec768cd5bb73a1e5d9a351ff779e1c74de2389675c0f5fe4276037eea4e953d1d38387d5e8c8d88f109805ec0fdeed144d0814662b0c5de2ae287

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
new file mode 100644
index ..8dc276da8126
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/926078
+   # https://github.com/dosbox-staging/dosbox-staging/issues/3519
+   filter-lto
+
+   # xinput2 comes with libsdl2[X]
+   local emesonargs=(
+   -Duse_xinput2=true
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2024-04-14 Thread Bernard Cafarelli

commit: 3e9e2f1c6cd65eba7999c12c92c97a3ecffbe3eb
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr 14 10:05:43 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr 14 21:09:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9e2f1c

games-emulation/dosbox-staging: drop 0.81.1, this was not released yet

Closes: https://bugs.gentoo.org/929245
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 -
 .../dosbox-staging/dosbox-staging-0.81.1.ebuild| 71 --
 2 files changed, 72 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 4b545fff4caf..9da9930aaf7f 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1,2 @@
 DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B 
bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b
 SHA512 
8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
 DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 
088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494
 SHA512 
96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797
-DIST dosbox-staging-0.81.1.tar.gz 7013870 BLAKE2B 
60416ba06a4e003f50ccc56a4623450e604db7bb6d3d19f9127558c155c645f96b604556550b1ecb3de029b8f16ee485ba06b2dd4bd31373577b477989c40fb5
 SHA512 
61d3aec8234c90b01671d346b705c2b920370cc42bafd5aeb4d0810622e347249fa66e0cb9fba574645cef473331a9f2d33fdb87f41e8e053ef6034618544ba6

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
deleted file mode 100644
index 8dc276da8126..
--- a/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   fluidsynth? (
-   media-sound/fluid-soundfont
-   media-sound/fluidsynth
-   )
-   mt-32? ( media-libs/munt-mt32emu )
-   network? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   slirp? ( net-libs/libslirp )
-   media-libs/iir1
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   media-libs/opusfile
-   media-libs/speexdsp
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS README THANKS )
-
-src_prepare() {
-   default
-
-   # We do not have default.sf2, use actual name from fluid-soundfont
-   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
-   -i src/midi/midi_fluidsynth.cpp || die
-
-   # Disable license and docs install (handled by ebuild)
-   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
-}
-
-src_configure() {
-   # -Werror=odr
-   # https://bugs.gentoo.org/926078
-   # https://github.com/dosbox-staging/dosbox-staging/issues/3519
-   filter-lto
-
-   # xinput2 comes with libsdl2[X]
-   local emesonargs=(
-   -Duse_xinput2=true
-   $(meson_use alsa use_alsa)
-   $(meson_use debug)
-   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
-   $(meson_use fluidsynth use_fluidsynth)
-   $(meson_use mt-32 use_mt32emu)
-   $(meson_use network use_sdl2_net)
-   $(meson_use opengl use_opengl)
-   $(meson_use slirp use_slirp)
-   $(meson_feature test unit_tests)
-   )
-   meson_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2024-04-07 Thread Bernard Cafarelli

commit: 7d057b5b0f02040d9cbe4ad7ea8d30003c97565f
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr  7 19:07:03 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr  7 19:07:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d057b5b

games-emulation/dosbox-staging: drop 0.79.1, 0.80.0

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  2 -
 .../dosbox-staging/dosbox-staging-0.79.1.ebuild| 64 -
 .../dosbox-staging/dosbox-staging-0.80.0.ebuild| 66 --
 3 files changed, 132 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index b82ea21f7dde..9da9930aaf7f 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,4 +1,2 @@
-DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
-DIST dosbox-staging-0.80.0.tar.gz 3871686 BLAKE2B 
169f06bdaa2eec8490deb58d315c8ee05a165678d35e42f7970d0339d97a34e672cb5bf5f7252d35ec9a995dfb169927ace6e0a949da673dd8d36b545eef32aa
 SHA512 
f1de336a6c996dc1bff23520d1f865b4aa16c8702200abf2c604084f846c00f1aa31d1940be817a307326ccdcc2f07c7f7e6c8c6fdbb61b331fe6428ed2ff9d6
 DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B 
bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b
 SHA512 
8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
 DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 
088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494
 SHA512 
96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild
deleted file mode 100644
index 0a3180cceb83..
--- a/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   fluidsynth? (
-   media-sound/fluid-soundfont
-   media-sound/fluidsynth
-   )
-   mt-32? ( media-libs/munt-mt32emu )
-   network? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   slirp? ( net-libs/libslirp )
-   media-libs/iir1
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   media-libs/opusfile
-   media-libs/speexdsp
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS README THANKS )
-
-src_prepare() {
-   default
-
-   # We do not have default.sf2, use actual name from fluid-soundfont
-   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
-   -i src/midi/midi_fluidsynth.cpp || die
-
-   # Disable license and docs install (handled by ebuild)
-   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
-}
-
-src_configure() {
-   local emesonargs=(
-   $(meson_use alsa use_alsa)
-   $(meson_use debug)
-   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
-   $(meson_use fluidsynth use_fluidsynth)
-   $(meson_use mt-32 use_mt32emu)
-   $(meson_use network use_sdl2_net)
-   $(meson_use opengl use_opengl)
-   $(meson_use slirp use_slirp)
-   $(meson_feature test unit_tests)
-   )
-   meson_src_configure
-}

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
deleted file mode 100644
index 0b11b68c3d99..
--- a/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.githu

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2024-04-07 Thread Bernard Cafarelli

commit: bb637748419985ef527006d34532929c65e8c723
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Apr  7 19:09:47 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Apr  7 19:09:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb637748

games-emulation/dosbox-staging: add 0.81.1

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.81.1.ebuild| 71 ++
 2 files changed, 72 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 9da9930aaf7f..4b545fff4caf 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B 
bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b
 SHA512 
8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
 DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 
088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494
 SHA512 
96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797
+DIST dosbox-staging-0.81.1.tar.gz 7013870 BLAKE2B 
60416ba06a4e003f50ccc56a4623450e604db7bb6d3d19f9127558c155c645f96b604556550b1ecb3de029b8f16ee485ba06b2dd4bd31373577b477989c40fb5
 SHA512 
61d3aec8234c90b01671d346b705c2b920370cc42bafd5aeb4d0810622e347249fa66e0cb9fba574645cef473331a9f2d33fdb87f41e8e053ef6034618544ba6

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
new file mode 100644
index ..8dc276da8126
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.81.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/926078
+   # https://github.com/dosbox-staging/dosbox-staging/issues/3519
+   filter-lto
+
+   # xinput2 comes with libsdl2[X]
+   local emesonargs=(
+   -Duse_xinput2=true
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2024-03-17 Thread Sam James

commit: 718fed0a681f14841a17a084e70c212135c845f0
Author: Eli Schwartz  gmail  com>
AuthorDate: Mon Mar 18 03:51:30 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 18 05:30:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718fed0a

games-emulation/dosbox-staging: mark as LTO-unsafe

Closes: https://bugs.gentoo.org/926078
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild
index 859fcaaa1816..8dc276da8126 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit meson xdg
+inherit flag-o-matic meson xdg
 
 DESCRIPTION="Modernized DOSBox soft-fork"
 HOMEPAGE="https://dosbox-staging.github.io/";
@@ -49,6 +49,11 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/926078
+   # https://github.com/dosbox-staging/dosbox-staging/issues/3519
+   filter-lto
+
# xinput2 comes with libsdl2[X]
local emesonargs=(
-Duse_xinput2=true

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2024-02-14 Thread Bernard Cafarelli

commit: 56922b70744a893607f6da9ec461c710afe530e3
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Feb 14 13:16:59 2024 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Feb 14 13:17:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56922b70

games-emulation/dosbox-staging: add 0.81.0

screenshot feature is now enabled by default (it only uses libpng now
which is a hard dependency)

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.81.0.ebuild| 66 ++
 2 files changed, 67 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 5b8c1c27587a..b82ea21f7dde 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1,4 @@
 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
 DIST dosbox-staging-0.80.0.tar.gz 3871686 BLAKE2B 
169f06bdaa2eec8490deb58d315c8ee05a165678d35e42f7970d0339d97a34e672cb5bf5f7252d35ec9a995dfb169927ace6e0a949da673dd8d36b545eef32aa
 SHA512 
f1de336a6c996dc1bff23520d1f865b4aa16c8702200abf2c604084f846c00f1aa31d1940be817a307326ccdcc2f07c7f7e6c8c6fdbb61b331fe6428ed2ff9d6
 DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B 
bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b
 SHA512 
8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561
+DIST dosbox-staging-0.81.0.tar.gz 6943457 BLAKE2B 
088fef12a6e0627a146b47f6b581af39f07d4acd47098650aa18a61d5b77d6255196838036037f1df2b61dc288163dc8c1da57b0669a3a8e9ceea8a9ec275494
 SHA512 
96257602b0133ec78fbc7bd5803404d91abf673172e97319067a0f3f97db8860ae6d4771bb03cff5b73e033f220cb4fa6cd778cf549a9bc63e3550def9aa8797

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild
new file mode 100644
index ..859fcaaa1816
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.81.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   # xinput2 comes with libsdl2[X]
+   local emesonargs=(
+   -Duse_xinput2=true
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2023-09-27 Thread Sam James

commit: b372804bcf820713cf8a02e351a2a5ed09e3fefc
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 28 01:19:46 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 28 01:19:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b372804b

games-emulation/dosbox: Stabilize 0.75_pre4302 x86, #914807

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 699f8f26b546..46dad86e1fb1 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2023-09-27 Thread Sam James

commit: 45b557f532f5b59ec0e8f18961ce7115e553ce2a
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 08:32:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 08:32:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b557f5

games-emulation/dosbox: Stabilize 0.75_pre4302 ppc64, #914807

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 0f3e35130e9c..699f8f26b546 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 ~x86"
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2023-09-26 Thread Sam James

commit: ea750b024bf9c590c752e8aa9807db85f34b5184
Author: Sam James  gentoo  org>
AuthorDate: Wed Sep 27 06:21:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Sep 27 06:21:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea750b02

games-emulation/dosbox: Stabilize 0.75_pre4302 amd64, #914807

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 4cf2a4a4d981..0f3e35130e9c 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2023-01-11 Thread Bernard Cafarelli

commit: 788626c4bd20c96b0418450a3f6eb30c40cef63e
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Jan 11 21:49:51 2023 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Jan 11 21:50:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=788626c4

games-emulation/dosbox-staging: add 0.80.1

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.80.1.ebuild| 68 ++
 2 files changed, 69 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 804b04cfc411..5b8c1c27587a 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
 DIST dosbox-staging-0.80.0.tar.gz 3871686 BLAKE2B 
169f06bdaa2eec8490deb58d315c8ee05a165678d35e42f7970d0339d97a34e672cb5bf5f7252d35ec9a995dfb169927ace6e0a949da673dd8d36b545eef32aa
 SHA512 
f1de336a6c996dc1bff23520d1f865b4aa16c8702200abf2c604084f846c00f1aa31d1940be817a307326ccdcc2f07c7f7e6c8c6fdbb61b331fe6428ed2ff9d6
+DIST dosbox-staging-0.80.1.tar.gz 3876041 BLAKE2B 
bfc260cb4d2ff01ac8538bbb2de65847ac32e81873dae42d2d4e84f1b9be5370be5d19bd2d209e7b1bc92f03f072ecd349df615869dcefde2f27074a6712874b
 SHA512 
8d28761e998c033b0cad5ca49c1a094d0ff2ca8a45183101c31805dda6a8e6861805739e723492329cab525af782849ec34ae97d29449d6c50e781475a011561

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.80.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.80.1.ebuild
new file mode 100644
index ..fcc5f3f64734
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.80.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl screenshot slirp 
test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   screenshot? ( media-libs/sdl2-image )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   # xinput2 comes with libsdl2[X]
+   local emesonargs=(
+   -Duse_xinput2=true
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use screenshot use_sdl2_image)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2022-12-26 Thread Mike Gilbert

commit: c9aa5c4917d889bc064cb700610b616e9b0665fd
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Dec 26 23:17:07 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Dec 26 23:17:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9aa5c49

games-emulation/dosbox-staging: update Manifest

Upstream modified the v0.80.0 tag to correct the version in meson.build.

Closes: https://bugs.gentoo.org/888539
Signed-off-by: Mike Gilbert  gentoo.org>

 games-emulation/dosbox-staging/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 9a7fea044300..804b04cfc411 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,2 @@
 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
-DIST dosbox-staging-0.80.0.tar.gz 3871598 BLAKE2B 
59cb6515f17b9a661f5e9d7787b01ecef4fe047dfd0ca4573cc12c73af1f9fe433f4c20a1c42e1fcd259c31af3922738c057aa64fc777a513a7881a86436a1fa
 SHA512 
aed548df29d5d4aa6593f0b589d7548caaf02be31668dc2c6bcbb0eb324a73d9344ce471a8449e90706b379ed6794e6584e5ebc6b3628274f5ec6667c14a3d8a
+DIST dosbox-staging-0.80.0.tar.gz 3871686 BLAKE2B 
169f06bdaa2eec8490deb58d315c8ee05a165678d35e42f7970d0339d97a34e672cb5bf5f7252d35ec9a995dfb169927ace6e0a949da673dd8d36b545eef32aa
 SHA512 
f1de336a6c996dc1bff23520d1f865b4aa16c8702200abf2c604084f846c00f1aa31d1940be817a307326ccdcc2f07c7f7e6c8c6fdbb61b331fe6428ed2ff9d6

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2022-12-22 Thread Bernard Cafarelli

commit: f717b63dbc1f7a073ec5154fbe66a3b039ca9dec
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Dec 22 20:35:08 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Dec 22 20:35:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f717b63d

games-emulation/dosbox-staging: add 0.80.0

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.80.0.ebuild| 66 ++
 games-emulation/dosbox-staging/metadata.xml|  1 +
 3 files changed, 68 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 74eb0a4d9231..9a7fea044300 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1 +1,2 @@
 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7
+DIST dosbox-staging-0.80.0.tar.gz 3871598 BLAKE2B 
59cb6515f17b9a661f5e9d7787b01ecef4fe047dfd0ca4573cc12c73af1f9fe433f4c20a1c42e1fcd259c31af3922738c057aa64fc777a513a7881a86436a1fa
 SHA512 
aed548df29d5d4aa6593f0b589d7548caaf02be31668dc2c6bcbb0eb324a73d9344ce471a8449e90706b379ed6794e6584e5ebc6b3628274f5ec6667c14a3d8a

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
new file mode 100644
index ..0b11b68c3d99
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.80.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl screenshot slirp 
test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   screenshot? ( media-libs/sdl2-image )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use screenshot use_sdl2_image)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
index bcf5208f4d03..5f790a376160 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -10,6 +10,7 @@
use media-sound/fluidsynth 
for MIDI emulation
use media-libs/munt-mt32emu for 
MT-32 emulation
Enable networking features (modem, 
ipx)
+   Enable screenshots of rendered output 
using media-libs/sdl2-image
Enable Ethernet emulation using 
net-libs/libslirp

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/files/, games-emulation/dosbox-staging/

2022-12-22 Thread Bernard Cafarelli

commit: 31ddefb3d752579421f8142b17a8497400c0bc5d
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Dec 22 20:15:21 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Dec 22 20:35:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ddefb3

games-emulation/dosbox-staging: drop 0.78.1, 0.79.0

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  2 -
 .../dosbox-staging/dosbox-staging-0.78.1.ebuild| 68 --
 .../dosbox-staging/dosbox-staging-0.79.0.ebuild| 68 --
 .../files/dosbox-staging-0.78.1-musl.patch | 16 -
 4 files changed, 154 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 0996dcb1264d..74eb0a4d9231 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1 @@
-DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 
7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca
 SHA512 
3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c
-DIST dosbox-staging-0.79.0.tar.gz 3114176 BLAKE2B 
1206aed3d87ead0315a1e7e4ff814c4a787026521653b68532cb231590417c9124511ad8f39132d8d595b227675cfafdec4236a6f8dece43c139a401b7e9d11a
 SHA512 
573365258d2fdc82ad8a803ce8f2b7f47b7219eeba9bc3253447ad48b9df793bc459947dbaa7a484bcce7e23ed3d0385438335dcdd2790c7eba6723960dfc890
 DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
deleted file mode 100644
index a882bcb7b4a8..
--- a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   fluidsynth? (
-   media-sound/fluid-soundfont
-   media-sound/fluidsynth
-   )
-   mt-32? ( media-libs/munt-mt32emu )
-   network? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   slirp? ( net-libs/libslirp )
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   media-libs/opusfile
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( AUTHORS README THANKS )
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-src_prepare() {
-   default
-
-   # We do not have default.sf2, use actual name from fluid-soundfont
-   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
-   -i src/midi/midi_fluidsynth.cpp || die
-
-   # Disable license and docs install (handled by ebuild)
-   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
-
-   # Test failing on some platforms, bug #817908
-   # https://github.com/dosbox-staging/dosbox-staging/issues/1230
-   sed -i 's/.*soft_limit.*//' tests/meson.build || die
-}
-
-src_configure() {
-   local emesonargs=(
-   $(meson_use alsa use_alsa)
-   $(meson_use debug)
-   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
-   $(meson_use fluidsynth use_fluidsynth)
-   $(meson_use mt-32 use_mt32emu)
-   $(meson_use network use_sdl2_net)
-   $(meson_use opengl use_opengl)
-   $(meson_use slirp use_slirp)
-   $(meson_feature test unit_tests)
-   )
-   meson_src_configure
-}

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild
deleted file mode 100644
index a22e5df9f7cb..
--- a/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit meson xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2022-10-20 Thread Bernard Cafarelli

commit: 20fa9f51828736eb5ca1293e587bfbb9f34ada80
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Oct 20 21:35:43 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Oct 20 21:35:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20fa9f51

games-emulation/dosbox-staging: add 0.79.1

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.79.1.ebuild| 64 ++
 2 files changed, 65 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index eabfa050e8e3..0996dcb1264d 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 
7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca
 SHA512 
3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c
 DIST dosbox-staging-0.79.0.tar.gz 3114176 BLAKE2B 
1206aed3d87ead0315a1e7e4ff814c4a787026521653b68532cb231590417c9124511ad8f39132d8d595b227675cfafdec4236a6f8dece43c139a401b7e9d11a
 SHA512 
573365258d2fdc82ad8a803ce8f2b7f47b7219eeba9bc3253447ad48b9df793bc459947dbaa7a484bcce7e23ed3d0385438335dcdd2790c7eba6723960dfc890
+DIST dosbox-staging-0.79.1.tar.gz 3280884 BLAKE2B 
48fd371df026392d59db2c9874f81b772b6595e2471a7ad1200e27e94fc87892f8e1c51288c1b0a430d8c3260535e35a00025047248551569f402b32a1ca3cf8
 SHA512 
6d7212229b58936cd1c4382f5e5cad45066e92f6a5b3bb2e97177ff7122dd527496a16dcefbfa84c3ad031d805c804c7872ec6eeaef9d695b0b8c4309f58acc7

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild
new file mode 100644
index ..0a3180cceb83
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.79.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2022-09-20 Thread Bernard Cafarelli

commit: 9ff9a345144f6d436e67713f2b775c2d0626cfa6
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Sep 20 20:09:51 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Sep 20 20:17:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff9a345

games-emulation/dosbox-staging: add 0.79.0

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.79.0.ebuild| 68 ++
 2 files changed, 69 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 28ec09329a13..f8a8410222e4 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -3,3 +3,4 @@ DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 
2a8381451ec110ca5350afc70c45f1
 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B 
c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff
 SHA512 
fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
 DIST dosbox-staging-0.78.0.tar.gz 2908118 BLAKE2B 
77dd6afd7c8f62e2936c2ed1545faf1f2700b7bceba4afd6f77eff6b2bd1ea7b7693e3975d38098774f4f6076099251e7aa53cd20a5dec7daefb34a3533fdf40
 SHA512 
e56b4735f1a741f2c160646f205776e2407abd4d13ce918ff447a08817862a32167afa47b3c7e35bc942bc06aea7d14e25bfe64fce9ee88a843488733746
 DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 
7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca
 SHA512 
3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c
+DIST dosbox-staging-0.79.0.tar.gz 3114176 BLAKE2B 
1206aed3d87ead0315a1e7e4ff814c4a787026521653b68532cb231590417c9124511ad8f39132d8d595b227675cfafdec4236a6f8dece43c139a401b7e9d11a
 SHA512 
573365258d2fdc82ad8a803ce8f2b7f47b7219eeba9bc3253447ad48b9df793bc459947dbaa7a484bcce7e23ed3d0385438335dcdd2790c7eba6723960dfc890

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild
new file mode 100644
index ..a22e5df9f7cb
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.79.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
+   media-libs/iir1
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   media-libs/speexdsp
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   # Do not look for static libraries
+   # speexdsp system flag needs to be manually enabled
+   local emesonargs=(
+   -Ddefault_library=shared
+   -Dsystem_libraries=speexdsp
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/files/, games-emulation/dosbox-staging/

2022-09-20 Thread Bernard Cafarelli

commit: e50e4bd6ebdbbb0f3f2f09b75870cfd929c6a523
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Sep 20 20:17:01 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Sep 20 20:17:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50e4bd6

games-emulation/dosbox-staging: drop 0.76.0, 0.77.0-r1, 0.77.1, 0.78.0

Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  4 --
 .../dosbox-staging/dosbox-staging-0.76.0.ebuild| 59 ---
 .../dosbox-staging/dosbox-staging-0.77.0-r1.ebuild | 57 --
 .../dosbox-staging/dosbox-staging-0.77.1.ebuild| 64 
 .../dosbox-staging/dosbox-staging-0.78.0.ebuild| 68 --
 .../files/dosbox-staging-0.78.0-fix_tests.patch| 31 --
 games-emulation/dosbox-staging/metadata.xml|  1 -
 7 files changed, 284 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index f8a8410222e4..eabfa050e8e3 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,6 +1,2 @@
-DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142
 SHA512 
8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
-DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 
2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6
 SHA512 
37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
-DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B 
c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff
 SHA512 
fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
-DIST dosbox-staging-0.78.0.tar.gz 2908118 BLAKE2B 
77dd6afd7c8f62e2936c2ed1545faf1f2700b7bceba4afd6f77eff6b2bd1ea7b7693e3975d38098774f4f6076099251e7aa53cd20a5dec7daefb34a3533fdf40
 SHA512 
e56b4735f1a741f2c160646f205776e2407abd4d13ce918ff447a08817862a32167afa47b3c7e35bc942bc06aea7d14e25bfe64fce9ee88a843488733746
 DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 
7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca
 SHA512 
3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c
 DIST dosbox-staging-0.79.0.tar.gz 3114176 BLAKE2B 
1206aed3d87ead0315a1e7e4ff814c4a787026521653b68532cb231590417c9124511ad8f39132d8d595b227675cfafdec4236a6f8dece43c139a401b7e9d11a
 SHA512 
573365258d2fdc82ad8a803ce8f2b7f47b7219eeba9bc3253447ad48b9df793bc459947dbaa7a484bcce7e23ed3d0385438335dcdd2790c7eba6723960dfc890

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild
deleted file mode 100644
index 7e127ad865ea..
--- a/games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop flag-o-matic xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   fluidsynth? (
-   media-sound/fluid-soundfont
-   media-sound/fluidsynth
-   )
-   network? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   opus? ( media-libs/opusfile )
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-src_prepare() {
-   default
-
-   # We do not have default.sf2, use actual name from fluid-soundfont
-   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
-   -i src/midi/midi_fluidsynth.cpp || die
-
-   eautoreconf
-}
-
-src_configure() {
-   use debug || append-cppflags -DNDEBUG
-   econf \
-   $(use_enable alsa alsa-midi) \
-   $(use_enable debug) \
-   $(use_enable !dynrec dynamic-x86) \
-   $(use_enable dynrec) \
-   $(use_enable fluidsynth) \
-   $(use_enable network) \
-   $(use_enable opengl) \
-   $(use_enable opus

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/, games-emulation/dosbox-staging/files/

2022-01-15 Thread Bernard Cafarelli

commit: 0784ac677157c9940fe45091321c9939a9daa559
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sat Jan 15 09:59:46 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sat Jan 15 10:01:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0784ac67

games-emulation/dosbox-staging: fix compilation with musl

Closes: https://bugs.gentoo.org/830930
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../dosbox-staging/dosbox-staging-0.78.1.ebuild  |  2 ++
 .../files/dosbox-staging-0.78.1-musl.patch   | 16 
 2 files changed, 18 insertions(+)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
index 462a9abd8870..a882bcb7b4a8 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
@@ -35,6 +35,8 @@ BDEPEND="test? ( dev-cpp/gtest )"
 
 DOCS=( AUTHORS README THANKS )
 
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
 src_prepare() {
default
 

diff --git 
a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch 
b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch
new file mode 100644
index ..a1f4fe3ca654
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.1-musl.patch
@@ -0,0 +1,16 @@
+diff --git a/src/libs/loguru/loguru.cpp b/src/libs/loguru/loguru.cpp
+index 9675cc1d..c4b5c0e3 100644
+--- a/src/libs/loguru/loguru.cpp
 b/src/libs/loguru/loguru.cpp
+@@ -83,7 +83,7 @@
+   #ifndef LOGURU_STACKTRACES
+   #define LOGURU_STACKTRACES 0
+   #endif
+-#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__)
++#elif defined(__rtems__) || defined(__ANDROID__) || defined(__FreeBSD__) || 
!defined(__GLIBC__)
+   #define LOGURU_PTHREADS1
+   #define LOGURU_WINTHREADS  0
+   #ifndef LOGURU_STACKTRACES
+-- 
+2.34.1
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2022-01-12 Thread Bernard Cafarelli

commit: cd74f6c382c758058bdb65d684066ea4beeadfdd
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Jan 12 11:33:55 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Jan 12 11:44:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd74f6c3

games-emulation/dosbox-staging: 0.78.1 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.78.1.ebuild| 66 ++
 2 files changed, 67 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index fe6a745c58bb..28ec09329a13 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -2,3 +2,4 @@ DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea
 DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 
2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6
 SHA512 
37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B 
c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff
 SHA512 
fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
 DIST dosbox-staging-0.78.0.tar.gz 2908118 BLAKE2B 
77dd6afd7c8f62e2936c2ed1545faf1f2700b7bceba4afd6f77eff6b2bd1ea7b7693e3975d38098774f4f6076099251e7aa53cd20a5dec7daefb34a3533fdf40
 SHA512 
e56b4735f1a741f2c160646f205776e2407abd4d13ce918ff447a08817862a32167afa47b3c7e35bc942bc06aea7d14e25bfe64fce9ee88a843488733746
+DIST dosbox-staging-0.78.1.tar.gz 2968448 BLAKE2B 
7b48763d10338d36e61696331358f7572a528c10d48e473dfaba6a8c96dd5d3ca2b9e1f5c595d653fbbe64f2b5f1d9f1ff8279dfab8f2cb49ac6faba697e97ca
 SHA512 
3179e8eac00e22e35b36623c11688b8c60408bf487a56683269ff065988fbdf4319c16097232cc191695cf2e10c05f4c4eee15e92d9887ebf03a23f808d5db7c

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
new file mode 100644
index ..462a9abd8870
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+
+   # Test failing on some platforms, bug #817908
+   # https://github.com/dosbox-staging/dosbox-staging/issues/1230
+   sed -i 's/.*soft_limit.*//' tests/meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/, games-emulation/dosbox-staging/files/

2022-01-01 Thread Bernard Cafarelli

commit: 7bc3e53fa241aea8d83673da95d9665f22fdecee
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sat Jan  1 18:25:33 2022 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sat Jan  1 18:27:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bc3e53f

games-emulation/dosbox-staging: add upstream fix for failing tests

With some compilers/linkers, dosbox main() function would be used in
tests instead of gmock's one

Closes: https://bugs.gentoo.org/830237
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../dosbox-staging/dosbox-staging-0.78.0.ebuild|  4 ++-
 .../files/dosbox-staging-0.78.0-fix_tests.patch| 31 ++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
index 35528cd3b10a..ec44d977dad6 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,8 @@ BDEPEND="test? ( dev-cpp/gtest )"
 
 DOCS=( AUTHORS README THANKS )
 
+PATCHES=( "${FILESDIR}"/${P}-fix_tests.patch )
+
 src_prepare() {
default
 

diff --git 
a/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch 
b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch
new file mode 100644
index ..d75aad0275ff
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.78.0-fix_tests.patch
@@ -0,0 +1,31 @@
+From 4499e4566d2e488be1c0e0a20328b13652ed14cb Mon Sep 17 00:00:00 2001
+From: kcgen 
+Date: Sat, 1 Jan 2022 07:48:27 -0800
+Subject: [PATCH] Remove the project's main to prevent masking gmock's main
+ (#1476)
+
+clang/llvm ensure gmock's main() function always overrides the main
+function coming from the dosbox library, however sometimes with
+gcc/ld, gmock's main() doesn't take precedent and instead dosbox's
+main is run.
+
+This fixes an issue reported on Fedora and Gentoo where unit tests
+were popping up SDL's graphical window, and then either timing our
+failing.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d885da1b9..59f677b59 100644
+--- a/meson.build
 b/meson.build
+@@ -444,7 +444,7 @@ executable('dosbox', dosbox_sources,
+include_directories : incdir,
+install : true)
+ # create a library so we can test things inside DOSBOX dep path
+-libdosbox = static_library('dosbox', ['src/main.cpp', 'src/dosbox.cpp', 
version_file],
++libdosbox = static_library('dosbox', ['src/dosbox.cpp', version_file],
+ include_directories : incdir,
+ dependencies : [atomic_dep,
+ threads_dep,

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-12-29 Thread Bernard Cafarelli

commit: d50b874f3b3d2c69e613bda5b7f8bac32c1c759c
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Dec 29 18:35:12 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Dec 29 18:35:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50b874f

games-emulation/dosbox-staging: add missing flag for libslirp support

This is used in this new version for Ethernet emulation

Closes: https://bugs.gentoo.org/830229
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild | 4 +++-
 games-emulation/dosbox-staging/metadata.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
index 652dbe698a9a..35528cd3b10a 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl slirp test"
 
 RESTRICT="!test? ( test )"
 
@@ -24,6 +24,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
mt-32? ( media-libs/munt-mt32emu )
network? ( media-libs/sdl2-net )
opengl? ( virtual/opengl )
+   slirp? ( net-libs/libslirp )
media-libs/libpng:0=
media-libs/libsdl2[joystick,opengl?,video,X]
media-libs/opusfile
@@ -58,6 +59,7 @@ src_configure() {
$(meson_use mt-32 use_mt32emu)
$(meson_use network use_sdl2_net)
$(meson_use opengl use_opengl)
+   $(meson_use slirp use_slirp)
$(meson_feature test unit_tests)
)
meson_src_configure

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
index 639809d4af9f..f4c7e89956af 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -11,6 +11,7 @@
use media-libs/munt-mt32emu for 
MT-32 emulation
Enable networking features (modem, 
ipx)
Support compressed audio tracks (.opus) used 
with CDROM images
+   Enable Ethernet emulation using 
net-libs/libslirp


dosbox-staging/dosbox-staging

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-12-29 Thread Bernard Cafarelli

commit: 899c36149c3c096840fecd4cbde55f588e6eb226
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Dec 29 11:05:43 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Dec 29 11:16:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899c3614

games-emulation/dosbox-staging: 0.78.0 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.78.0.ebuild| 64 ++
 2 files changed, 65 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 0ef607994d30..fe6a745c58bb 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1,4 @@
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142
 SHA512 
8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
 DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 
2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6
 SHA512 
37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
 DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B 
c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff
 SHA512 
fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac
+DIST dosbox-staging-0.78.0.tar.gz 2908118 BLAKE2B 
77dd6afd7c8f62e2936c2ed1545faf1f2700b7bceba4afd6f77eff6b2bd1ea7b7693e3975d38098774f4f6076099251e7aa53cd20a5dec7daefb34a3533fdf40
 SHA512 
e56b4735f1a741f2c160646f205776e2407abd4d13ce918ff447a08817862a32167afa47b3c7e35bc942bc06aea7d14e25bfe64fce9ee88a843488733746

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
new file mode 100644
index ..652dbe698a9a
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.78.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+
+   # Test failing on some platforms, bug #817908
+   # https://github.com/dosbox-staging/dosbox-staging/issues/1230
+   sed -i 's/.*soft_limit.*//' tests/meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   $(meson_feature test unit_tests)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-10-31 Thread Sam James

commit: 66ee878e844204ffde2a84ae7209836912535ce3
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 17:51:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 17:51:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ee878e

games-emulation/dosbox-staging: Keyword 0.77.1 ppc, #813930

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
index 21a9a75fb1a..652dbe698a9 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test"
 
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2021-10-26 Thread James Le Cuirot

commit: 1fb68a666be96f0ceaedd843d4c5437fab14e1a5
Author: James Le Cuirot  gentoo  org>
AuthorDate: Tue Oct 26 12:11:29 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Oct 26 12:11:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb68a66

games-emulation/dosbox: Fix 0.75_pre4302 with USE="-alsa glide"

Closes: https://bugs.gentoo.org/780015
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild  |  2 +-
 .../dosbox/files/dosbox-0.75-glide-libdl.patch | 18 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 8ae6d980d50..4cf2a4a4d98 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -54,7 +54,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
+   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff 
"${FILESDIR}"/${PN}-0.75-glide-libdl.patch
default
eautoreconf
 }

diff --git a/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch 
b/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch
new file mode 100644
index 000..524c5839672
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch
@@ -0,0 +1,18 @@
+https://github.com/voyageur/openglide/pull/25
+
+diff -Naur dosbox.orig/configure.ac dosbox/configure.ac
+--- dosbox.orig/configure.ac   2021-10-26 13:06:35.585761330 +0100
 dosbox/configure.ac2021-10-26 13:07:31.641323631 +0100
+@@ -20,6 +20,12 @@
+ AC_PROG_RANLIB
+ AM_PROG_AR
+
++dnl The dlopen() function is in the C library for *BSD and in
++dnl libdl on GLIBC-based systems
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++  AC_MSG_ERROR([unable to find the dlopen() function])
++])
++
+ dnl Some needed libaries for OS2
+ dnl perharps join this with the other target depended checks. move them 
upwards
+ if test x$host = xi386-pc-os2-emx ; then

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-10-22 Thread Bernard Cafarelli

commit: 1f301fcff1c8b4aaf145df303d5cdf7f4d2a67e9
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Oct 22 21:29:07 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Oct 22 21:29:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f301fcf

games-emulation/dosbox-staging: fix MissingTestRestrict

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
index 1f48dd089fc..21a9a75fb1a 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -13,6 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test"
 
+RESTRICT="!test? ( test )"
+
 RDEPEND="alsa? ( media-libs/alsa-lib )
debug? ( sys-libs/ncurses:0= )
fluidsynth? (

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-10-22 Thread Bernard Cafarelli

commit: e404d6818cb47382e09284a27b576830f1d01175
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Oct 22 20:59:28 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Oct 22 20:59:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e404d681

games-emulation/dosbox-staging: skip test failing on some platforms

Also add USE=test logic for gtest dependency

Closes: https://bugs.gentoo.org/817908
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
index 1cb6c2e10ce..1f48dd089fc 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl test"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
debug? ( sys-libs/ncurses:0= )
@@ -28,7 +28,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
sys-libs/zlib
!games-emulation/dosbox"
 DEPEND="${RDEPEND}"
-BDEPEND=""
+BDEPEND="test? ( dev-cpp/gtest )"
 
 DOCS=( AUTHORS README THANKS )
 
@@ -41,6 +41,10 @@ src_prepare() {
 
# Disable license and docs install (handled by ebuild)
sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+
+   # Test failing on some platforms, bug #817908
+   # https://github.com/dosbox-staging/dosbox-staging/issues/1230
+   sed -i 's/.*soft_limit.*//' tests/meson.build || die
 }
 
 src_configure() {
@@ -52,6 +56,7 @@ src_configure() {
$(meson_use mt-32 use_mt32emu)
$(meson_use network use_sdl2_net)
$(meson_use opengl use_opengl)
+   $(meson_feature test unit_tests)
)
meson_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-10-10 Thread Sam James

commit: 5c2f9c27c4e40a843e93c1e45116c5be9970f3b8
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 11 03:16:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 11 03:16:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2f9c27

games-emulation/dosbox-staging: Keyword 0.77.1 ppc64, #813930

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
index 5815a612b2b..1cb6c2e10ce 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-08-30 Thread Bernard Cafarelli

commit: a30252e5a66bf4551c9598841f7027237ff34369
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Aug 30 10:59:25 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Aug 30 10:59:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30252e5

games-emulation/dosbox-staging: 0.77.1 bump

Bugfixes release

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.77.1.ebuild| 57 ++
 2 files changed, 58 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index ebdefbfb3fc..0ef607994d3 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142
 SHA512 
8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
 DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 
2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6
 SHA512 
37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0
+DIST dosbox-staging-0.77.1.tar.gz 2622418 BLAKE2B 
c56020d263ceac199266a5c458c192441f836ea2e71e1564da175b7ae522286ca1b6a07062498ccea795bbf330beecb5ef99a0130637b1df26603315d48ea6ff
 SHA512 
fe5d6150a88f5c276aee5672f98c15b5ffee702fe9934919d3e78068efd1a85f08a8f04352bc6a8fe850324e33f3227340c59242db6cbae0475b12a58b749cac

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
new file mode 100644
index 000..5815a612b2b
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   mt-32? ( media-libs/munt-mt32emu )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   )
+   meson_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-07-06 Thread Bernard Cafarelli

commit: 16252277dadb60844d14558cffa42e9d7dda1c42
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Jul  6 07:34:27 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Jul  6 07:51:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16252277

games-emulation/dosbox-staging: add missing mt32emu dependency

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../{dosbox-staging-0.77.0.ebuild => dosbox-staging-0.77.0-r1.ebuild}| 1 +
 1 file changed, 1 insertion(+)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.0-r1.ebuild
similarity index 97%
rename from games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild
rename to games-emulation/dosbox-staging/dosbox-staging-0.77.0-r1.ebuild
index 956b471e690..5815a612b2b 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.0-r1.ebuild
@@ -19,6 +19,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
media-sound/fluid-soundfont
media-sound/fluidsynth
)
+   mt-32? ( media-libs/munt-mt32emu )
network? ( media-libs/sdl2-net )
opengl? ( virtual/opengl )
media-libs/libpng:0=

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-07-06 Thread Bernard Cafarelli

commit: 0f3a156165af5c0c05310b44b7ac1658b0807780
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Jul  6 07:51:44 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Jul  6 07:51:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3a1561

games-emulation/dosbox-staging: fix metadata  reference

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
index 7cf856695f3..02a2086f27a 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -8,7 +8,7 @@

Use recompiling cpu core instead of dynamic 
x86/x64 specific cpu core
use media-sound/fluidsynth 
for MIDI emulation
-   use media-sound/munt for MT-32 
emulation
+   use media-libs/munt-mt32emu for 
MT-32 emulation
Enable networking features (modem, 
ipx)
Support compressed audio tracks (.opus) used 
with CDROM images

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2021-07-05 Thread Bernard Cafarelli

commit: 0d69c655bbd5f419194c8f4c7a1753100447ce62
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jul  5 18:10:18 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jul  5 18:11:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d69c655

games-emulation/dosbox-staging: 0.77 bump

Switch to meson, integrated support for FluidSynth and MT-32

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.77.0.ebuild| 56 ++
 games-emulation/dosbox-staging/metadata.xml|  1 +
 3 files changed, 58 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 23fae2ca126..ebdefbfb3fc 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1 +1,2 @@
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142
 SHA512 
8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
+DIST dosbox-staging-0.77.0.tar.gz 2579927 BLAKE2B 
2a8381451ec110ca5350afc70c45f158329bd273b381ff61856ab721a0b194c7d501402453e9a36b90663ee8f6697dce8f64b05adf56efa8df2fd68161e420b6
 SHA512 
37259fecc091f1e318c2385d6e6fdc3b4ad0905ce63a7db1fc812c924bf8c01640692aca4f08b87d06e6001e50f3f2f4bb63c3715aa9cdfeebd205ed345558a0

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild
new file mode 100644
index 000..956b471e690
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.77.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth mt-32 network opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/opusfile
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+DOCS=( AUTHORS README THANKS )
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   # Disable license and docs install (handled by ebuild)
+   sed -e "/licenses_dir\|doc_dir/d" -i meson.build || die
+}
+
+src_configure() {
+   local emesonargs=(
+   $(meson_use alsa use_alsa)
+   $(meson_use debug)
+   -Ddynamic_core=$(usex dynrec dynrec dyn-x86)
+   $(meson_use fluidsynth use_fluidsynth)
+   $(meson_use mt-32 use_mt32emu)
+   $(meson_use network use_sdl2_net)
+   $(meson_use opengl use_opengl)
+   )
+   meson_src_configure
+}

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
index f9ff028304d..7cf856695f3 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -8,6 +8,7 @@

Use recompiling cpu core instead of dynamic 
x86/x64 specific cpu core
use media-sound/fluidsynth 
for MIDI emulation
+   use media-sound/munt for MT-32 
emulation
Enable networking features (modem, 
ipx)
Support compressed audio tracks (.opus) used 
with CDROM images

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/files/, games-emulation/dosbox-staging/

2021-07-05 Thread Bernard Cafarelli

commit: a0febe5bd2001fb3dc2f17e632b1d82212529511
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jul  5 17:59:49 2021 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jul  5 18:11:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0febe5b

games-emulation/dosbox-staging: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  2 -
 .../dosbox-staging/dosbox-staging-0.75.1-r1.ebuild | 50 -
 .../dosbox-staging/dosbox-staging-0.75.1-r2.ebuild | 51 --
 .../dosbox-staging/dosbox-staging-0.75.2.ebuild| 49 -
 .../files/dosbox-staging-0.75.1-ar.patch   | 11 -
 .../files/dosbox-staging-0.75.1-pthread.patch  | 11 -
 6 files changed, 174 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index ddd2c12b6a4..23fae2ca126 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,3 +1 @@
-DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 
5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede
 SHA512 
3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
-DIST dosbox-staging-0.75.2.tar.gz 1816233 BLAKE2B 
0cb3224a1fe0e01e5069b78c91191f33b6d84dfb21b00ed8cd832225e68e5f66e841506bc7c887da462727b931a6c72b84dbf5e48e4dde21dbf62ffa3da4edc6
 SHA512 
2988b2cc44d041193d900efc4c6fa516aca6246e51c1dece9b207bd3549a8c76c5bcb2f3f5a90da6bb2b573663bddd0020274f17130548aef9cef1f4adf79220
 DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142
 SHA512 
8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
deleted file mode 100644
index afdf9f7951f..000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   network? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   opus? ( media-libs/opusfile )
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable alsa alsa-midi) \
-   $(use_enable debug) \
-   $(use_enable !dynrec dynamic-x86) \
-   $(use_enable dynrec) \
-   $(use_enable network) \
-   $(use_enable opengl) \
-   $(use_enable opus opus-cdda)
-}
-
-src_install() {
-   default
-   doicon contrib/icons/${PN}.svg
-   make_desktop_entry dosbox DOSBox-staging ${PN}
-}

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
deleted file mode 100644
index bdedc780583..000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop xdg
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec network opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   network? ( media-libs/sdl2-net )
-   opengl? ( virtual/opengl )
-   opus? ( media-libs/opusfile )
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-ar.patch
-   "${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-   default
-   eautoreconf

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2021-04-04 Thread Sam James

commit: db14f3ee319342a535b012d49a8c7a0b4b179095
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr  4 07:00:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  4 07:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db14f3ee

games-emulation/dosbox: flag-o-matic--, style changes

Signed-off-by: Sam James  gentoo.org>

 games-emulation/dosbox/dosbox-0.74.3.ebuild   | 43 +++
 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 41 +++--
 games-emulation/dosbox/dosbox-.ebuild | 40 ++---
 3 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild 
b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index 7ed3281b164..efeca818c00 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop flag-o-matic
+inherit autotools desktop
 
-case "${PV}" in
-)
-   MY_P=${PN}
-   ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk";
-   inherit subversion
-   ;;
-*_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"
-   ;;
+case ${PV} in
+   )
+   MY_P=${PN}
+   
ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk";
+   inherit subversion
+   ;;
+   *_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
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/";
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
@@ -40,11 +42,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
media-libs/sdl-net
media-libs/sdl-sound
sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-0.74-ncurses.patch
 )

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index fd00727100c..8ae6d980d50 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit autotools desktop flag-o-matic
 
-case "${PV}" in
-)
-   MY_P=${PN}
-   ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk";
-   inherit subversion
-   ;;
-*_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"
-   ;;
+case ${PV} in
+   )
+   MY_P=${PN}
+   
ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk";
+   inherit subversion
+   ;;
+   *_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
@@ -29,6 +29,8 @@ SRC_URI+=" glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/";
+S="${WORKDIR}/${MY_P}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
@@ -44,11 +46,8 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
media-libs/sdl-net
media-libs/sdl-sound
sys-libs/zlib"
-
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
"${FILESDIR}"/${PN}-0.74-ncurses.patch
"${FILESDIR}"/${PN}-0.75-detect-AR.patch

diff --git a/games-emulation/dosbo

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2021-02-24 Thread James Le Cuirot

commit: e002299cb5acc59c08762450ab6e44ba3fe5644b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Feb 24 20:32:36 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Feb 24 20:47:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e002299c

games-emulation/dosbox: Update glide patch for latest trunk

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/Manifest   | 1 +
 games-emulation/dosbox/dosbox-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index b3d80b76ede..43fd6fb2644 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,3 +1,4 @@
 DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B 
bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d
 SHA512 
3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 
91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b
 SHA512 
57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
+DIST dosbox_glide-6a01f554fad979cf34d3ff07c9579192c88086c3.diff 97353 BLAKE2B 
bb95f9916d4dc8813d1fb4b61c63e50aba5d1862e5554c4af0fc2e75c105b477a6e6ef8b8941e9570860a2fe41570eca94ef36e1d594a2fb9a922b132b210e76
 SHA512 
b4cf2e5a335b948de94567806950c9512d81adc7687a184b6da5aae082c437af51c61950b1abd0d0c00d83ce37b5ee365ee6bb9e981854fce8bfbb0b1e93be68
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B 
d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad
 SHA512 
4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index e9aadb1e2ef..205ff225911 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -24,7 +24,7 @@ case "${PV}" in
;;
 esac
 
-GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
+GLIDE_PATCH=6a01f554fad979cf34d3ff07c9579192c88086c3
 SRC_URI+=" glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
 DESCRIPTION="DOS emulator"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2021-02-14 Thread James Le Cuirot

commit: da178bdead5d0db0310504d979ebeac17377f81c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Feb 14 12:21:09 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 14 12:21:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da178bde

games-emulation/dosbox: Update ncurses patch for latest trunk

Closes: https://bugs.gentoo.org/760642
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-.ebuild  |  4 +-
 .../dosbox/files/dosbox-0.75-ncurses.patch | 78 ++
 2 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 3292eebd77d..e9aadb1e2ef 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.74-ncurses.patch
+   "${FILESDIR}"/${PN}-0.75-ncurses.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/dosbox/files/dosbox-0.75-ncurses.patch 
b/games-emulation/dosbox/files/dosbox-0.75-ncurses.patch
new file mode 100644
index 000..67c23c70532
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.75-ncurses.patch
@@ -0,0 +1,78 @@
+https://sourceforge.net/p/dosbox/patches/286/
+
+--- a/configure.ac 2019-11-12 17:55:51.0 +
 b/configure.ac 2020-01-02 21:26:27.551856431 +
+@@ -235,39 +235,41 @@
+ #Features to enable/disable
+ AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires 
libcurses])
+ AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have 
to enable C_DEBUG])
+-AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[
+-   AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
+-   AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
+-   AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
+-   AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
++AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug 
mode]),,enable_debug=no)
++AC_MSG_CHECKING(whether debug will be enabled)
++  
++if test x$enable_debug = xno; then
++  AC_MSG_RESULT(no)
++else
++  AC_MSG_RESULT(yes)
+ 
+-   if test x$enable_debug = xno; then
+- AC_MSG_RESULT([Debugger not enabled])
+-   elif test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
+- LIBS="$LIBS -lncurses"
+- if test x$host = xi386-pc-os2-emx ; then
+-  LIBS="$LIBS -ltinfo"
+- fi
+- AC_DEFINE(C_DEBUG,1)
+- if test x$enable_debug = xheavy ; then 
+-   AC_DEFINE(C_HEAVY_DEBUG,1)
+- fi
+-   elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
+- LIBS="$LIBS -lcurses"
+- AC_DEFINE(C_DEBUG,1)
+- if test x$enable_debug = xheavy ; then 
+-   AC_DEFINE(C_HEAVY_DEBUG,1)
+- fi
+-   elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
+- LIBS="$LIBS -lpdcurses"
+- AC_DEFINE(C_DEBUG,1)
+- if test x$enable_debug = xheavy ; then 
+-   AC_DEFINE(C_HEAVY_DEBUG,1)
+- fi
+-   else 
+- AC_MSG_ERROR([Can't find curses, which is required for debug mode])
+-   fi
+-],)
++  PKG_CHECK_MODULES(NCURSES, ncurses, [
++LIBS="$LIBS $NCURSES_LIBS"; CFLAGS="$CFLAGS $NCURSES_CFLAGS"
++  ], [
++AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
++AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
++AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
++AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
++
++if test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
++  LIBS="$LIBS -lncurses"
++  if test x$host = xi386-pc-os2-emx ; then
++LIBS="$LIBS -ltinfo"
++  fi
++elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
++  LIBS="$LIBS -lcurses"
++elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
++  LIBS="$LIBS -lpdcurses"
++else 
++  AC_MSG_ERROR([Can't find curses, which is required for debug mode])
++fi
++  ])
++
++  AC_DEFINE(C_DEBUG,1)
++  if test x$enable_debug = xheavy; then 
++AC_DEFINE(C_HEAVY_DEBUG,1)
++  fi
++fi
+ 
+ AH_TEMPLATE(C_CORE_INLINE,[Define to 1 to use inlined memory functions in cpu 
core])
+ AC_ARG_ENABLE(core-inline,AC_HELP_STRING([--disable-core-inline],[Disable 
inlined memory handling in CPU Core]),,enable_core_inline=yes)

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2020-12-04 Thread Bernard Cafarelli

commit: 55f43470369cb639b280de81d56b9e4b00d3bd0a
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Dec  4 14:29:49 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Dec  4 14:30:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f43470

games-emulation/dosbox-staging: 0.76.0 bump

Add support for fluidsynth MIDI with USE flag

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.76.0.ebuild| 59 ++
 games-emulation/dosbox-staging/metadata.xml|  1 +
 3 files changed, 61 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index b6c0a4be8d9..ddd2c12b6a4 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 
5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede
 SHA512 
3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
 DIST dosbox-staging-0.75.2.tar.gz 1816233 BLAKE2B 
0cb3224a1fe0e01e5069b78c91191f33b6d84dfb21b00ed8cd832225e68e5f66e841506bc7c887da462727b931a6c72b84dbf5e48e4dde21dbf62ffa3da4edc6
 SHA512 
2988b2cc44d041193d900efc4c6fa516aca6246e51c1dece9b207bd3549a8c76c5bcb2f3f5a90da6bb2b573663bddd0020274f17130548aef9cef1f4adf79220
+DIST dosbox-staging-0.76.0.tar.gz 1908605 BLAKE2B 
71b3c3d6a6444e2442d54b1db365ea66c9ee3db703be876facb8425355d82d817c080e005cefd103714e15fc7d1c17d6329c28d67bf74c143d0428e4f58e5142
 SHA512 
8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild
new file mode 100644
index 000..7e127ad865e
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.76.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop flag-o-matic xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa debug dynrec +fluidsynth network opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   fluidsynth? (
+   media-sound/fluid-soundfont
+   media-sound/fluidsynth
+   )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   opus? ( media-libs/opusfile )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_prepare() {
+   default
+
+   # We do not have default.sf2, use actual name from fluid-soundfont
+   sed -e "s/default.sf2/FluidR3_GM.sf2/" \
+   -i src/midi/midi_fluidsynth.cpp || die
+
+   eautoreconf
+}
+
+src_configure() {
+   use debug || append-cppflags -DNDEBUG
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable debug) \
+   $(use_enable !dynrec dynamic-x86) \
+   $(use_enable dynrec) \
+   $(use_enable fluidsynth) \
+   $(use_enable network) \
+   $(use_enable opengl) \
+   $(use_enable opus opus-cdda)
+}
+
+src_install() {
+   default
+   doicon -s scalable contrib/icons/${PN}.svg
+   domenu contrib/linux/dosbox-staging.desktop
+}

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
index 91406d636bc..f9ff028304d 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -7,6 +7,7 @@


Use recompiling cpu core instead of dynamic 
x86/x64 specific cpu core
+   use media-sound/fluidsynth 
for MIDI emulation
Enable networking features (modem, 
ipx)
Support compressed audio tracks (.opus) used 
with CDROM images

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2020-10-27 Thread Bernard Cafarelli

commit: 2c948b7b0c4666e0760eb7833f92abb3a6e884a8
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Oct 27 13:13:24 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Oct 27 13:13:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c948b7b

games-emulation/dosbox-staging: 0.75.2 bump

Set -DNDEBUG preprocessor flag for release build
Fix license (GPL-2+) in current ebuilds

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest   | 1 +
 games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild| 2 +-
 games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild| 2 +-
 ...sbox-staging-0.75.1-r2.ebuild => dosbox-staging-0.75.2.ebuild} | 8 +++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 8e11b738031..b6c0a4be8d9 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1 +1,2 @@
 DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 
5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede
 SHA512 
3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
+DIST dosbox-staging-0.75.2.tar.gz 1816233 BLAKE2B 
0cb3224a1fe0e01e5069b78c91191f33b6d84dfb21b00ed8cd832225e68e5f66e841506bc7c887da462727b931a6c72b84dbf5e48e4dde21dbf62ffa3da4edc6
 SHA512 
2988b2cc44d041193d900efc4c6fa516aca6246e51c1dece9b207bd3549a8c76c5bcb2f3f5a90da6bb2b573663bddd0020274f17130548aef9cef1f4adf79220

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
index dbebde3b22e..afdf9f7951f 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Modernized DOSBox soft-fork"
 HOMEPAGE="https://dosbox-staging.github.io/";
 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dynrec network opengl opus"

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
index 12e1e297030..bdedc780583 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Modernized DOSBox soft-fork"
 HOMEPAGE="https://dosbox-staging.github.io/";
 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dynrec network opengl opus"

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
similarity index 89%
copy from games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
copy to games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
index 12e1e297030..75de6e5a03a 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.2.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop xdg
+inherit autotools desktop flag-o-matic xdg
 
 DESCRIPTION="Modernized DOSBox soft-fork"
 HOMEPAGE="https://dosbox-staging.github.io/";
 
SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug dynrec network opengl opus"
@@ -25,15 +25,13 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 DEPEND="${RDEPEND}"
 BDEPEND=""
 
-PATCHES=( "${FILESDIR}"/${P}-ar.patch
-   "${FILESDIR}"/${P}-pthread.patch )
-
 src_prepare() {
default
eautoreconf
 }
 
 src_configure() {
+   use debug || append-cppflags -DNDEBUG
econf \
$(use_enable alsa alsa-midi) \
$(use_enable debug) \

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2020-09-04 Thread Bernard Cafarelli

commit: 9b4bfacc4f2cf6b0fd04c6a7ef442b3ab042885e
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Sep  4 21:26:10 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Sep  4 21:26:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4bfacc

games-emulation/dosbox-staging: drop old

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 -
 .../dosbox-staging/dosbox-staging-0.75.0.ebuild| 47 -
 .../dosbox-staging/dosbox-staging-0.75.1.ebuild| 49 --
 3 files changed, 97 deletions(-)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index e93eac01c1e..8e11b738031 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,2 +1 @@
-DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B 
e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150
 SHA512 
2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70
 DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 
5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede
 SHA512 
3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
deleted file mode 100644
index 45521a91d41..000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   opengl? ( virtual/opengl )
-   opus? ( media-libs/opusfile )
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   media-libs/sdl-net
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable alsa alsa-midi) \
-   $(use_enable debug) \
-   $(use_enable !dynrec dynamic-x86) \
-   $(use_enable dynrec) \
-   $(use_enable opengl) \
-   $(use_enable opus opus-cdda)
-}
-
-src_install() {
-   default
-   doicon contrib/icons/${PN}.svg
-   make_desktop_entry dosbox DOSBox-staging ${PN}
-}

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
deleted file mode 100644
index 3ace52dd142..000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/";
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   debug? ( sys-libs/ncurses:0= )
-   opengl? ( virtual/opengl )
-   opus? ( media-libs/opusfile )
-   media-libs/libpng:0=
-   media-libs/libsdl2[joystick,opengl?,video,X]
-   media-libs/sdl-net
-   sys-libs/zlib
-   !games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   $(use_enable alsa alsa-midi) \
-   $(use_enable debug) \
-   $(use_enable !dynrec dynamic-x86) \
-   $(use_enable dynrec) \
-   $(use_enable opengl) \
-   $(use_enable opus opus-cdda)
-}
-
-src_install() {
-   default
-   doicon contrib/icons/${PN}.svg
-   make_desktop_entry dosbox DOSBox-staging ${PN}
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/, games-emulation/dosbox-staging/files/

2020-09-04 Thread Bernard Cafarelli

commit: 0d7dc6ce882f0189e8340630c9bd1fdf75f02d10
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Sep  4 21:25:48 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Sep  4 21:26:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7dc6ce

games-emulation/dosbox-staging: small fixes

Do not call ar directly
Fix icon installation
Use provided desktop file

Closes: https://bugs.gentoo.org/738116
Closes: https://bugs.gentoo.org/738470
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../dosbox-staging/dosbox-staging-0.75.1-r2.ebuild | 51 ++
 .../files/dosbox-staging-0.75.1-ar.patch   | 11 +
 2 files changed, 62 insertions(+)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
new file mode 100644
index 000..12e1e297030
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop xdg
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dynrec network opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   opus? ( media-libs/opusfile )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-ar.patch
+   "${FILESDIR}"/${P}-pthread.patch )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable debug) \
+   $(use_enable !dynrec dynamic-x86) \
+   $(use_enable dynrec) \
+   $(use_enable network) \
+   $(use_enable opengl) \
+   $(use_enable opus opus-cdda)
+}
+
+src_install() {
+   default
+   doicon -s scalable contrib/icons/${PN}.svg
+   domenu contrib/linux/dosbox-staging.desktop
+}

diff --git 
a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch 
b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
new file mode 100644
index 000..fb2c24267f0
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
@@ -0,0 +1,11 @@
+diff -Naur dosbox-staging-0.75.1.orig/configure.ac 
dosbox-staging-0.75.1/configure.ac
+--- dosbox-staging-0.75.1.orig/configure.ac2020-08-19 10:49:45.0 
+0200
 dosbox-staging-0.75.1/configure.ac 2020-09-04 23:03:11.375920481 +0200
+@@ -17,6 +17,7 @@
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Checks for programs.
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_CPP

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2020-08-21 Thread Bernard Cafarelli

commit: b543b99a457e15cff0389a7954fa9641cb5eac10
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Aug 21 13:17:45 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Aug 21 13:19:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b543b99a

games-emulation/dosbox-staging: fix sdl2-net dep

Also add a USE-flag for it

Closes: https://bugs.gentoo.org/738360
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../dosbox-staging/dosbox-staging-0.75.1-r1.ebuild | 50 ++
 games-emulation/dosbox-staging/metadata.xml|  1 +
 2 files changed, 51 insertions(+)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
new file mode 100644
index 000..dbebde3b22e
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dynrec network opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   network? ( media-libs/sdl2-net )
+   opengl? ( virtual/opengl )
+   opus? ( media-libs/opusfile )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable debug) \
+   $(use_enable !dynrec dynamic-x86) \
+   $(use_enable dynrec) \
+   $(use_enable network) \
+   $(use_enable opengl) \
+   $(use_enable opus opus-cdda)
+}
+
+src_install() {
+   default
+   doicon contrib/icons/${PN}.svg
+   make_desktop_entry dosbox DOSBox-staging ${PN}
+}

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
index ea78ea742a7..91406d636bc 100644
--- a/games-emulation/dosbox-staging/metadata.xml
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -7,6 +7,7 @@


Use recompiling cpu core instead of dynamic 
x86/x64 specific cpu core
+   Enable networking features (modem, 
ipx)
Support compressed audio tracks (.opus) used 
with CDROM images

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/, games-emulation/dosbox-staging/files/

2020-08-20 Thread Bernard Cafarelli

commit: 5b94739c84fec1e575996b979cdbda9bd7cb462b
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Aug 20 12:35:29 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Aug 20 12:35:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b94739c

games-emulation/dosbox-staging: 0.75.1 bump

Also fix compilation with USE=-alsa

Closes: https://bugs.gentoo.org/736234
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.75.1.ebuild| 49 ++
 .../files/dosbox-staging-0.75.1-pthread.patch  | 11 +
 3 files changed, 61 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
index 099aa872432..e93eac01c1e 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1 +1,2 @@
 DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B 
e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150
 SHA512 
2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70
+DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 
5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede
 SHA512 
3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
new file mode 100644
index 000..3ace52dd142
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dynrec opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   opengl? ( virtual/opengl )
+   opus? ( media-libs/opusfile )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/sdl-net
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable debug) \
+   $(use_enable !dynrec dynamic-x86) \
+   $(use_enable dynrec) \
+   $(use_enable opengl) \
+   $(use_enable opus opus-cdda)
+}
+
+src_install() {
+   default
+   doicon contrib/icons/${PN}.svg
+   make_desktop_entry dosbox DOSBox-staging ${PN}
+}

diff --git 
a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch 
b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
new file mode 100644
index 000..1aa7de682bd
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-pthread.patch
@@ -0,0 +1,11 @@
+--- dosbox-staging-0.75.1/configure.ac.orig2020-08-20 14:25:41.295432272 
+0200
 dosbox-staging-0.75.1/configure.ac 2020-08-20 14:26:00.614461707 +0200
+@@ -37,7 +37,7 @@
+ :,
+   AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
+ )
+-LIBS="$LIBS $SDL_LIBS"
++LIBS="$LIBS -lpthread $SDL_LIBS"
+ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+ 
+ dnl Checks for header files.

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2020-08-19 Thread Bernard Cafarelli

commit: f0eeb1bebea041aca6565f2893e0c5f423fffb90
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Tue Aug 18 11:51:15 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Aug 19 10:02:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0eeb1be

games-emulation/dosbox-staging: add missing dep

also fix dekstop file to adhere to theme specs

Closes: https://bugs.gentoo.org/733314
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Andrew Ammerlaan  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/17158
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
index fb71bdee846..45521a91d41 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
@@ -16,7 +16,7 @@ IUSE="alsa debug dynrec opengl opus"
 RDEPEND="alsa? ( media-libs/alsa-lib )
debug? ( sys-libs/ncurses:0= )
opengl? ( virtual/opengl )
-   opus? ( media-libs/opus )
+   opus? ( media-libs/opusfile )
media-libs/libpng:0=
media-libs/libsdl2[joystick,opengl?,video,X]
media-libs/sdl-net
@@ -43,5 +43,5 @@ src_configure() {
 src_install() {
default
doicon contrib/icons/${PN}.svg
-   make_desktop_entry dosbox DOSBox-staging ${PN}.svg
+   make_desktop_entry dosbox DOSBox-staging ${PN}
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2020-06-06 Thread Sergei Trofimovich

commit: 680f0c670f44a3ff27ae623441ab453256283725
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun  6 08:46:55 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun  6 08:47:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680f0c67

games-emulation/dosbox: respect user's AR

Reported-by: Agostino Sarubbo
Closes: https://bugs.gentoo.org/724412
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild|  1 +
 games-emulation/dosbox/files/dosbox-0.75-detect-AR.patch | 11 +++
 2 files changed, 12 insertions(+)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 4a25d8ebdb4..fd00727100c 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -51,6 +51,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.74-ncurses.patch
+   "${FILESDIR}"/${PN}-0.75-detect-AR.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/dosbox/files/dosbox-0.75-detect-AR.patch 
b/games-emulation/dosbox/files/dosbox-0.75-detect-AR.patch
new file mode 100644
index 000..c403d8e8983
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.75-detect-AR.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/724412
+--- a/configure.ac
 b/configure.ac
+@@ -18,6 +18,7 @@ AC_PROG_CPP
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl Some needed libaries for OS2
+ dnl perharps join this with the other target depended checks. move them 
upwards

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox-staging/

2020-05-09 Thread Bernard Cafarelli

commit: 45fb4facbf6f7dd1f9f02ea215a5395eed52c7e6
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sat May  9 15:38:33 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sat May  9 15:38:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45fb4fac

games-emulation/dosbox-staging: initial import

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Bernard Cafarelli  gentoo.org>

 games-emulation/dosbox-staging/Manifest|  1 +
 .../dosbox-staging/dosbox-staging-0.75.0.ebuild| 47 ++
 games-emulation/dosbox-staging/metadata.xml| 15 +++
 3 files changed, 63 insertions(+)

diff --git a/games-emulation/dosbox-staging/Manifest 
b/games-emulation/dosbox-staging/Manifest
new file mode 100644
index 000..099aa872432
--- /dev/null
+++ b/games-emulation/dosbox-staging/Manifest
@@ -0,0 +1 @@
+DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B 
e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150
 SHA512 
2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70

diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild 
b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
new file mode 100644
index 000..fb71bdee846
--- /dev/null
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION="Modernized DOSBox soft-fork"
+HOMEPAGE="https://dosbox-staging.github.io/";
+SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug dynrec opengl opus"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   debug? ( sys-libs/ncurses:0= )
+   opengl? ( virtual/opengl )
+   opus? ( media-libs/opus )
+   media-libs/libpng:0=
+   media-libs/libsdl2[joystick,opengl?,video,X]
+   media-libs/sdl-net
+   sys-libs/zlib
+   !games-emulation/dosbox"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable debug) \
+   $(use_enable !dynrec dynamic-x86) \
+   $(use_enable dynrec) \
+   $(use_enable opengl) \
+   $(use_enable opus opus-cdda)
+}
+
+src_install() {
+   default
+   doicon contrib/icons/${PN}.svg
+   make_desktop_entry dosbox DOSBox-staging ${PN}.svg
+}

diff --git a/games-emulation/dosbox-staging/metadata.xml 
b/games-emulation/dosbox-staging/metadata.xml
new file mode 100644
index 000..ea78ea742a7
--- /dev/null
+++ b/games-emulation/dosbox-staging/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   voyag...@gentoo.org
+   Bernard Cafarelli
+   
+   
+   Use recompiling cpu core instead of dynamic 
x86/x64 specific cpu core
+   Support compressed audio tracks (.opus) used 
with CDROM images
+   
+   
+   dosbox-staging/dosbox-staging
+   
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2020-01-05 Thread James Le Cuirot

commit: 5b2a38c07085789e66ef3301403ede20b02e0719
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Jan  5 20:57:43 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Jan  5 20:57:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2a38c0

games-emulation/dosbox: Drop old and vulnerable 0.74_p20160629

Bug: https://bugs.gentoo.org/704414
Closes: https://bugs.gentoo.org/701688
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/Manifest|  1 -
 .../dosbox/dosbox-0.74_p20160629.ebuild| 52 --
 .../dosbox/files/dosbox-0.74-gcc46.patch   | 10 -
 3 files changed, 63 deletions(-)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 2287035a699..b3d80b76ede 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,4 +1,3 @@
 DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B 
bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d
 SHA512 
3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
-DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 
7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376
 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 
91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b
 SHA512 
57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B 
d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad
 SHA512 
4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
deleted file mode 100644
index a7b41d8d34e..000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-PATCH=3989
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/";
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
-IUSE="alsa debug hardened opengl"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses:0 )
-   media-libs/libpng:0
-   media-libs/libsdl[joystick,video,X]
-   media-libs/sdl-net
-   media-libs/sdl-sound"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.74-gcc46.patch
-)
-
-src_prepare() {
-   default
-   eautoreconf
-}
-
-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/files/dosbox-0.74-gcc46.patch 
b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
deleted file mode 100644
index 98b4508f519..000
--- a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/include/dos_inc.h2011-04-28 08:46:04.505011354 +0200
-+++ b/include/dos_inc.h2011-04-28 08:46:27.104408178 +0200
-@@ -21,6 +21,7 @@
- #ifndef DOSBOX_DOS_INC_H
- #define DOSBOX_DOS_INC_H
- 
-+#include 
- #ifndef DOSBOX_DOS_SYSTEM_H
- #include "dos_system.h"
- #endif

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2020-01-05 Thread Agostino Sarubbo

commit: f94a3d5e81e102612af038bbf6acd293d2e11e09
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan  5 19:45:01 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan  5 19:45:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94a3d5e

games-emulation/dosbox: ppc64 stable wrt bug #704767

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-emulation/dosbox/dosbox-0.74.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild 
b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index 933de5aa269..7ed3281b164 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -28,7 +28,7 @@ DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
 IUSE="alsa +core-inline debug hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2020-01-05 Thread Agostino Sarubbo

commit: 5666def56604f88ce8d883cc4961d49344068722
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan  5 19:42:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan  5 19:42:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5666def5

games-emulation/dosbox: x86 stable wrt bug #704767

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-emulation/dosbox/dosbox-0.74.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild 
b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index caf5bc2ee91..933de5aa269 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -28,7 +28,7 @@ DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="alsa +core-inline debug hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2020-01-05 Thread Agostino Sarubbo

commit: 79e5916a69ea54f6170040a60f574bc7c4b242df
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan  5 18:44:49 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan  5 18:45:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e5916a

games-emulation/dosbox: amd64 stable wrt bug #704767

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 games-emulation/dosbox/dosbox-0.74.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild 
b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index 418766f8d96..caf5bc2ee91 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -28,7 +28,7 @@ DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/";
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="alsa +core-inline debug hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/, games-emulation/dosbox/files/

2020-01-04 Thread James Le Cuirot

commit: 0146cd428adeb9fc3404a1869af788cbba1576ef
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  4 12:55:29 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  4 14:30:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0146cd42

games-emulation/dosbox: Patch to fix USE=debug with ncurses[tinfo]

Bug: https://bugs.gentoo.org/701688
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-0.74.3.ebuild|  4 ++
 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild  |  4 ++
 games-emulation/dosbox/dosbox-.ebuild  |  4 ++
 .../dosbox/files/dosbox-0.74-ncurses.patch | 72 ++
 4 files changed, 84 insertions(+)

diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild 
b/games-emulation/dosbox/dosbox-0.74.3.ebuild
index 167f646d360..418766f8d96 100644
--- a/games-emulation/dosbox/dosbox-0.74.3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.74-ncurses.patch
+)
+
 src_prepare() {
default
eautoreconf

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index ebcdda7b522..4a25d8ebdb4 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.74-ncurses.patch
+)
+
 src_prepare() {
use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
default

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index d6c94125051..3292eebd77d 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -49,6 +49,10 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.74-ncurses.patch
+)
+
 src_prepare() {
use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
default

diff --git a/games-emulation/dosbox/files/dosbox-0.74-ncurses.patch 
b/games-emulation/dosbox/files/dosbox-0.74-ncurses.patch
new file mode 100644
index 000..dd7016f8c92
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.74-ncurses.patch
@@ -0,0 +1,72 @@
+https://sourceforge.net/p/dosbox/patches/286/
+
+--- a/configure.ac 2019-11-12 17:55:51.0 +
 b/configure.ac 2020-01-02 21:26:27.551856431 +
+@@ -235,36 +235,38 @@
+ #Features to enable/disable
+ AH_TEMPLATE(C_DEBUG,[Define to 1 to enable internal debugger, requires 
libcurses])
+ AH_TEMPLATE(C_HEAVY_DEBUG,[Define to 1 to enable heavy debugging, also have 
to enable C_DEBUG])
+-AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug mode]),[
+-   AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
+-   AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
+-   AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
+-   AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
++AC_ARG_ENABLE(debug,AC_HELP_STRING([--enable-debug],[Enable debug 
mode]),,enable_debug=no)
++AC_MSG_CHECKING(whether debug will be enabled)
++  
++if test x$enable_debug = xno; then
++  AC_MSG_RESULT(no)
++else
++  AC_MSG_RESULT(yes)
+ 
+-   if test x$enable_debug = xno; then
+- AC_MSG_RESULT([Debugger not enabled])
+-   elif test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
+- LIBS="$LIBS -lncurses"
+- AC_DEFINE(C_DEBUG,1)
+- if test x$enable_debug = xheavy ; then 
+-   AC_DEFINE(C_HEAVY_DEBUG,1)
+- fi
+-   elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
+- LIBS="$LIBS -lcurses"
+- AC_DEFINE(C_DEBUG,1)
+- if test x$enable_debug = xheavy ; then 
+-   AC_DEFINE(C_HEAVY_DEBUG,1)
+- fi
+-   elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
+- LIBS="$LIBS -lpdcurses"
+- AC_DEFINE(C_DEBUG,1)
+- if test x$enable_debug = xheavy ; then 
+-   AC_DEFINE(C_HEAVY_DEBUG,1)
+- fi
+-   else 
+- AC_MSG_ERROR([Can't find curses, which is required for debug mode])
+-   fi
+-],)
++  PKG_CHECK_MODULES(NCURSES, ncurses, [
++LIBS="$LIBS $NCURSES_LIBS"; CFLAGS="$CFLAGS $NCURSES_CFLAGS"
++  ], [
++AC_CHECK_HEADER(curses.h,have_curses_h=yes,)
++AC_CHECK_LIB(curses, initscr, have_curses_lib=yes, , )
++AC_CHECK_LIB(ncurses, initscr, have_ncurses_lib=yes, , )
++AC_CHECK_LIB(pdcurses, initscr, have_pdcurses_lib=yes, , )
++
++if test x$have_ncurses_lib = xyes -a x$have_curses_h = xyes ; then
++  LIBS="$LIBS -lncurses"
++elif test x$have_curses_lib = xyes -a x$have_curses_h = xyes ; then
++  LIBS="$LIBS -lcurses"
++elif test x$have_pdcurses_lib = xyes -a x$have_curses_h = xyes ; then
++  LIBS="$LIBS -lpdcurses"
++else 
++  AC_MSG_ERROR([Can't

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2020-01-01 Thread James Le Cuirot

commit: 26934bf2b1ca06f45df3f6f51c05f6bd2196dfbe
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan  1 22:36:25 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan  1 22:56:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26934bf2

games-emulation/dosbox: Drop old and vulnerable 0.74_p20160629-r3

Bug: https://bugs.gentoo.org/704414
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/Manifest|  1 -
 .../dosbox/dosbox-0.74_p20160629-r3.ebuild | 75 --
 .../dosbox/files/dosbox-0.74.2_events.patch| 37 ---
 3 files changed, 113 deletions(-)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 0d2c34d52aa..2287035a699 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,5 +1,4 @@
 DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B 
bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d
 SHA512 
3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 
7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376
 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 
91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b
 SHA512 
57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
-DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B 
c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585
 SHA512 
d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B 
d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad
 SHA512 
4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
deleted file mode 100644
index 4223e8728e9..000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic
-
-PATCH=3989
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="https://www.dosbox.com/";
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
-   glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="alsa +core-inline debug glide hardened opengl X"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   glide? ( media-libs/openglide )
-   opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses:0 )
-   X? ( x11-libs/libX11 )
-   media-libs/libpng:0=
-   media-libs/libsdl[joystick,opengl?,video,X?]
-   media-libs/sdl-net
-   media-libs/sdl-sound
-   sys-libs/zlib"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.74-gcc46.patch"
-   "${FILESDIR}/${PN}-0.74.2_events.patch"
-)
-
-src_prepare() {
-   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
-   default
-   eautoreconf
-}
-
-src_configure() {
-   use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
-
-   ac_cv_lib_X11_main=$(usex X yes no) \
-   econf \
-   $(use_enable alsa alsa-midi) \
-   $(use_enable core-inline) \
-   $(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
-}
-
-pkg_postinst() {
-   if use glide; then
-   elog "You have enabled unofficial Glide emulation. To use this, 
symlink"
-   elog "or copy ${EPREFIX}/usr/share/openglide/glide

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2020-01-01 Thread James Le Cuirot

commit: 6dd1f87ff5b8caffc8eb4254fe904fa4d82b6a3c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan  1 12:14:56 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan  1 22:55:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd1f87f

games-emulation/dosbox: EAPI 7 and clean up for 

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-.ebuild | 48 +--
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 8c4711e5620..d6c94125051 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.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} =  ]]; then
+case "${PV}" in
+)
+   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} =  ]]; 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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2020-01-01 Thread James Le Cuirot

commit: cbf26e890327dabc3a96b1b7aa2ce98a6424aeb2
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan  1 13:56:15 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan  1 22:56:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf26e89

games-emulation/dosbox: Add version 0.74.3

Despite being released in 2019, this is actually older than our 2016
snapshot in some respects as it was not cut from trunk. It does
include important security fixes though. It does not include Glide
support as that will not build.

Bug: https://bugs.gentoo.org/704414
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/Manifest |  1 +
 games-emulation/dosbox/dosbox-0.74.3.ebuild | 68 +
 2 files changed, 69 insertions(+)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 7f4c5a65201..a06402a5d87 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,3 +1,4 @@
+DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B 
bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d
 SHA512 
3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 
7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376
 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B 
c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585
 SHA512 
d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B 
d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad
 SHA512 
4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2

diff --git a/games-emulation/dosbox/dosbox-0.74.3.ebuild 
b/games-emulation/dosbox/dosbox-0.74.3.ebuild
new file mode 100644
index 000..167f646d360
--- /dev/null
+++ b/games-emulation/dosbox/dosbox-0.74.3.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic
+
+case "${PV}" in
+)
+   MY_P=${PN}
+   ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk";
+   inherit subversion
+   ;;
+*_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
+
+DESCRIPTION="DOS emulator"
+HOMEPAGE="https://www.dosbox.com/";
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="alsa +core-inline debug hardened opengl X"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   opengl? ( virtual/glu virtual/opengl )
+   debug? ( sys-libs/ncurses:0= )
+   X? ( x11-libs/libX11 )
+   media-libs/libpng:0=
+   media-libs/libsdl[joystick,opengl?,video,X?]
+   media-libs/sdl-net
+   media-libs/sdl-sound
+   sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   ac_cv_lib_X11_main=$(usex X yes no) \
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable core-inline) \
+   $(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
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2020-01-01 Thread James Le Cuirot

commit: f4b21c579680b27f1a80d7c86408d659a36a6b7b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Jan  1 22:33:36 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Jan  1 22:56:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4b21c57

games-emulation/dosbox: New trunk snapshot to address vulnerabilities

Bug: https://bugs.gentoo.org/704414
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/Manifest   |  1 +
 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 86 +++
 2 files changed, 87 insertions(+)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index a06402a5d87..0d2c34d52aa 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,4 +1,5 @@
 DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B 
bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d
 SHA512 
3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 
7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376
 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
+DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 
91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b
 SHA512 
57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B 
c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585
 SHA512 
d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B 
d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad
 SHA512 
4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild 
b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
new file mode 100644
index 000..ebcdda7b522
--- /dev/null
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic
+
+case "${PV}" in
+)
+   MY_P=${PN}
+   ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk";
+   inherit subversion
+   ;;
+*_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="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="alsa +core-inline debug glide hardened opengl X"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   glide? ( media-libs/openglide )
+   opengl? ( virtual/glu virtual/opengl )
+   debug? ( sys-libs/ncurses:0= )
+   X? ( x11-libs/libX11 )
+   media-libs/libpng:0=
+   media-libs/libsdl[joystick,opengl?,video,X?]
+   media-libs/sdl-net
+   media-libs/sdl-sound
+   sys-libs/zlib"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
+   default
+   eautoreconf
+}
+
+src_configure() {
+   use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
+
+   ac_cv_lib_X11_main=$(usex X yes no) \
+   econf \
+   $(use_enable alsa alsa-midi) \
+   $(use_enable core-inline) \
+   $(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
+

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2019-06-09 Thread Sergei Trofimovich

commit: fc404b95fd1c609072e654bfbde2a9bfca66d27c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun  9 19:21:23 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun  9 19:21:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc404b95

games-emulation/dosbox: keyworded 0.74_p20160629-r3 for ppc, bug #687632

Package-Manager: Portage-2.3.67, Repoman-2.3.14
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
index 140ff29f6f0..4223e8728e9 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/, games-emulation/dosbox/files/

2019-01-05 Thread James Le Cuirot

commit: e17dcd37000234ba0ae79246a09d5c09ff33a16e
Author: Azamat H. Hackimov  gmail  com>
AuthorDate: Sat Jan  5 18:11:13 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  5 19:43:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17dcd37

games-emulation/dosbox: fix for xorg 1.20 issue

* Added patch for xorg 1.20 issue
(https://sourceforge.net/p/dosbox/code-0/4177/).
* Changed HOMEPAGE

Signed-off-by: Azamat H. Hackimov  gmail.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10747
Signed-off-by: James Le Cuirot  gentoo.org>

 ....ebuild => dosbox-0.74_p20160629-r3.ebuild} | 33 ---
 games-emulation/dosbox/dosbox-.ebuild  |  4 +--
 .../dosbox/files/dosbox-0.74.2_events.patch| 37 ++
 3 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
similarity index 65%
copy from games-emulation/dosbox/dosbox-.ebuild
copy to games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
index 421603aa2fd..140ff29f6f0 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r3.ebuild
@@ -1,46 +1,41 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 )"
-
-if [[ ${PV} =  ]]; then
-   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
+PATCH=3989
+GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
 
 DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/";
+HOMEPAGE="https://www.dosbox.com/";
+SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
+   glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 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 )
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}
+DEPEND="${RDEPEND}
+   app-arch/unzip"
 
-if [[ ${PV} =  ]]; then
-   S=${WORKDIR}/${PN}
-fi
+S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-0.74-gcc46.patch
+   "${FILESDIR}/${PN}-0.74-gcc46.patch"
+   "${FILESDIR}/${PN}-0.74.2_events.patch"
 )
 
 src_prepare() {

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 421603aa2fd..8c4711e5620 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ else
 fi
 
 DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/";
+HOMEPAGE="https://www.dosbox.com/";
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/games-emulation/dosbox/files/dosbox-0.74.2_events.patch 
b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch
new file mode 100644
index 000..fee09a65a4c
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.74.2_events.patch
@@ -0,0 +1,37 @@
+Index: src/gui/sdlmain.cpp
+===
+--- a/src/gui/sdlmain.cpp  (revision 4177)
 b/src/gui/sdlmain.cpp  (working copy)
+@@ -1426,6 +1426,12 @@
+ #define DB_POLLSKIP 1
+ #endif
+ 
++#if defined(LINUX)
++#define SDL_XORG_FIX 1
++#else
++#define SDL_XORG_FIX 0
++#endif
++
+ void GFX_Events() {
+   //Don't poll too often. This can be heavy on the OS, especially Macs.
+   //In idle mode 3000-4000 polls are done per second without this check.
+@@ -1449,6 +1455,19 @@
+   }
+ #endif
+   while (SDL_PollEvent(&event)) {
++#if SDL_XORG_FIX
++  // Special code for broken SDL with Xorg 1.20.1, where pairs of 
inputfocus gain and loss events are generated
++  // when locking the mouse in windowed mode.
++  if (event.type

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2019-01-05 Thread James Le Cuirot

commit: 2c6bbf2361a86ef354e16ff2cc08a496abcb1f4b
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Jan  5 19:42:51 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Jan  5 19:43:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6bbf23

games-emulation/dosbox: Drop old 0.74_p20160629-r2

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 .../dosbox/dosbox-0.74_p20160629-r2.ebuild | 74 --
 1 file changed, 74 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
deleted file mode 100644
index f6a503b6b2a..000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic
-
-PATCH=3989
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/";
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
-   glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa +core-inline debug glide hardened opengl X"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   glide? ( media-libs/openglide )
-   opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses:0 )
-   X? ( x11-libs/libX11 )
-   media-libs/libpng:0=
-   media-libs/libsdl[joystick,opengl?,video,X?]
-   media-libs/sdl-net
-   media-libs/sdl-sound
-   sys-libs/zlib"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.74-gcc46.patch
-)
-
-src_prepare() {
-   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
-   default
-   eautoreconf
-}
-
-src_configure() {
-   use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
-
-   ac_cv_lib_X11_main=$(usex X yes no) \
-   econf \
-   $(use_enable alsa alsa-midi) \
-   $(use_enable core-inline) \
-   $(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
-}
-
-pkg_postinst() {
-   if use glide; then
-   elog "You have enabled unofficial Glide emulation. To use this, 
symlink"
-   elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl 
to your game's"
-   elog "directory and add the following to your DOSBox 
configuration."
-   elog ""
-   elog "[glide]"
-   elog "glide=true"
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-12-29 Thread James Le Cuirot

commit: b765dc5d03b45bba1756ef66a5350d3e87deb16c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 29 12:01:55 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 29 12:15:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b765dc5d

games-emulation/dosbox: Make X11 dependency optional

The x11-libs/libX11 dependency was missing although this was
transitively covered by libsdl[X]. It's not really required though and
DOSBox detects it somewhat automagically. If libX11 is present but
libsdl was not built with X support then the build actually fails. For
these reasons, we have to forcibly disable X11 using an autoconf cache
variable.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 6 --
 games-emulation/dosbox/dosbox-.ebuild  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index d9dccc1aa6a..14138bcda6d 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
@@ -16,14 +16,15 @@ 
SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa debug glide hardened opengl"
+IUSE="alsa debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
glide? ( media-libs/openglide )
opengl? ( virtual/glu virtual/opengl )
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"
 DEPEND="${RDEPEND}
@@ -44,6 +45,7 @@ src_prepare() {
 src_configure() {
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
 
+   ac_cv_lib_X11_main=$(usex X yes no) \
econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index a5bfff9c4f3..c8d3998bd01 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -21,12 +21,13 @@ HOMEPAGE="http://dosbox.sourceforge.net/";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug glide hardened opengl"
+IUSE="alsa debug glide hardened opengl X"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
glide? ( media-libs/openglide )
opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
+   X? ( x11-libs/libX11 )
media-libs/libpng:0
media-libs/libsdl[joystick,opengl?,video,X]
media-libs/sdl-net
@@ -50,6 +51,7 @@ src_prepare() {
 src_configure() {
use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
 
+   ac_cv_lib_X11_main=$(usex X yes no) \
econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-12-29 Thread James Le Cuirot

commit: 87fdf8119b682d2e3c57830270b60b7a823fd27a
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 29 12:07:13 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 29 12:15:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87fdf811

games-emulation/dosbox: Fix libpng and zlib dependencies

libpng needs a SLOT operator. zlib was missing and appears to always
be used, despite configure.ac suggesting it is only a transitive
dependency of libpng.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 5 +++--
 games-emulation/dosbox/dosbox-.ebuild  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index 14138bcda6d..e10196bb2d2 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
@@ -23,10 +23,11 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
X? ( x11-libs/libX11 )
-   media-libs/libpng:0
+   media-libs/libpng:0=
media-libs/libsdl[joystick,opengl?,video,X?]
media-libs/sdl-net
-   media-libs/sdl-sound"
+   media-libs/sdl-sound
+   sys-libs/zlib"
 DEPEND="${RDEPEND}
app-arch/unzip"
 

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index c8d3998bd01..4c6bd555931 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -28,10 +28,11 @@ DEPEND="alsa? ( media-libs/alsa-lib )
opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
X? ( x11-libs/libX11 )
-   media-libs/libpng:0
+   media-libs/libpng:0=
media-libs/libsdl[joystick,opengl?,video,X]
media-libs/sdl-net
-   media-libs/sdl-sound"
+   media-libs/sdl-sound
+   sys-libs/zlib"
 RDEPEND=${DEPEND}
 
 if [[ ${PV} =  ]]; then

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-12-29 Thread James Le Cuirot

commit: 510ee00b28d609f9072944886fbba9047e4a6128
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 29 12:11:36 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 29 12:15:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510ee00b

games-emulation/dosbox: Add core-inline USE flag for performance

Closes: https://bugs.gentoo.org/673932
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 3 ++-
 games-emulation/dosbox/dosbox-.ebuild  | 3 ++-
 games-emulation/dosbox/metadata.xml| 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index e10196bb2d2..f6a503b6b2a 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa debug glide hardened opengl X"
+IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
glide? ( media-libs/openglide )
@@ -49,6 +49,7 @@ src_configure() {
ac_cv_lib_X11_main=$(usex X yes no) \
econf \
$(use_enable alsa alsa-midi) \
+   $(use_enable core-inline) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
$(use_enable debug) \

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 4c6bd555931..421603aa2fd 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://dosbox.sourceforge.net/";
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug glide hardened opengl X"
+IUSE="alsa +core-inline debug glide hardened opengl X"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
glide? ( media-libs/openglide )
@@ -55,6 +55,7 @@ src_configure() {
ac_cv_lib_X11_main=$(usex X yes no) \
econf \
$(use_enable alsa alsa-midi) \
+   $(use_enable core-inline) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
$(use_enable debug) \

diff --git a/games-emulation/dosbox/metadata.xml 
b/games-emulation/dosbox/metadata.xml
index 4c30301896f..791f145ba08 100644
--- a/games-emulation/dosbox/metadata.xml
+++ b/games-emulation/dosbox/metadata.xml
@@ -14,6 +14,7 @@
dosbox
 
 
+   Enable memory-increasing inlines for better 
performance but requiring more build time
Enable unofficial Glide emulation via 
media-libs/openglide

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-12-29 Thread James Le Cuirot

commit: 6a9b287a6343e3f35f242c7704311d0107498b44
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 29 12:12:18 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 29 12:15:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9b287a

games-emulation/dosbox: Drop old 0.74_p20160629-r1

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 .../dosbox/dosbox-0.74_p20160629-r1.ebuild | 70 --
 1 file changed, 70 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
deleted file mode 100644
index d7fd016f2ca..000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop flag-o-matic
-
-PATCH=3989
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/";
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
-   glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa debug glide hardened opengl"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-   glide? ( media-libs/openglide )
-   opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses:0 )
-   media-libs/libpng:0
-   media-libs/libsdl[joystick,video,X]
-   media-libs/sdl-net
-   media-libs/sdl-sound"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-0.74-gcc46.patch
-)
-
-src_prepare() {
-   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
-   default
-   eautoreconf
-}
-
-src_configure() {
-   use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
-
-   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
-}
-
-pkg_postinst() {
-   if use glide; then
-   elog "You have enabled unofficial Glide emulation. To use this, 
symlink"
-   elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl 
to your game's"
-   elog "directory and add the following to your DOSBox 
configuration."
-   elog ""
-   elog "[glide]"
-   elog "glide=true"
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-12-29 Thread James Le Cuirot

commit: 442ebfd45c180c360a6cfb1a27d4ff941284c784
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Dec 29 11:47:07 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Dec 29 12:15:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442ebfd4

games-emulation/dosbox: opengl USE flag should require libsdl[opengl]

Closes: https://bugs.gentoo.org/608366
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: James Le Cuirot  gentoo.org>

 ....ebuild => dosbox-0.74_p20160629-r2.ebuild} | 28 +-
 games-emulation/dosbox/dosbox-.ebuild  |  4 ++--
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
similarity index 67%
copy from games-emulation/dosbox/dosbox-.ebuild
copy to games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index 786b1f78688..d9dccc1aa6a 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
@@ -1,41 +1,35 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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 )"
-
-if [[ ${PV} =  ]]; then
-   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
+PATCH=3989
+GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/";
+SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
+   glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE="alsa debug glide hardened opengl"
 
-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 )
media-libs/libpng:0
-   media-libs/libsdl[joystick,video,X]
+   media-libs/libsdl[joystick,opengl?,video,X]
media-libs/sdl-net
media-libs/sdl-sound"
-RDEPEND=${DEPEND}
+DEPEND="${RDEPEND}
+   app-arch/unzip"
 
-if [[ ${PV} =  ]]; then
-   S=${WORKDIR}/${PN}
-fi
+S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
 
 PATCHES=(
"${FILESDIR}"/${PN}-0.74-gcc46.patch

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 786b1f78688..a5bfff9c4f3 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ DEPEND="alsa? ( media-libs/alsa-lib )
opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
media-libs/libpng:0
-   media-libs/libsdl[joystick,video,X]
+   media-libs/libsdl[joystick,opengl?,video,X]
media-libs/sdl-net
media-libs/sdl-sound"
 RDEPEND=${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-08-27 Thread James Le Cuirot

commit: 85efdc28e53232143b851da4e274889e01f9876c
Author: Marty E. Plummer  startmail  com>
AuthorDate: Fri Aug  3 01:43:32 2018 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Mon Aug 27 21:16:15 2018 +
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-.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-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index bceaab9e815..786b1f78688 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.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} =  ]]; 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

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2018-01-11 Thread Bernard Cafarelli

commit: 7e320bc722fd130f33b000a4c8f963ebf584447b
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Thu Jan 11 14:53:59 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Jan 11 14:54:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e320bc7

games-emulation/dosbox: update glide patch ref in live ebuild

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 games-emulation/dosbox/Manifest   | 1 +
 games-emulation/dosbox/dosbox-.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index af6cd04c481..7f4c5a65201 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 
7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376
 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B 
c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585
 SHA512 
d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
+DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B 
d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad
 SHA512 
4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 82456d41531..bceaab9e815 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -1,9 +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
 
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
+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} =  ]]; then

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2017-01-20 Thread David Seifert

commit: 537dbb5ff24488a98c1b5b4dc3de94f44df25439
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan 20 15:45:05 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 20 16:20:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=537dbb5f

games-emulation/dosbox: Remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3564

 games-emulation/dosbox/Manifest   |  1 -
 games-emulation/dosbox/dosbox-0.74.ebuild | 44 ---
 2 files changed, 45 deletions(-)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 311ce6e..7a800b4 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,3 +1,2 @@
-DIST dosbox-0.74.tar.gz 1265711 SHA256 
13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05 SHA512 
4a6ff4c658997a495119d200ec6ad37649da940814a4b14fca0dd29a99142026e324695b7aa9d2946efc2abf9067a819d911e43778efe905ed10ddf9b9f2dd3d
 WHIRLPOOL 
abc94770c732f8b73bedffbcca778f249c2fdc09353c3f484e2fc23f910602cc60b3abfcc22a9dbf3d3c4e77535fc488cd476217fe6498cab786a8024a257ff3
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 SHA256 
32f2cfff1be9f9bd2b0e246f9c0486f050714fdaba0bc47b66f3983eb7f55965 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 WHIRLPOOL 
1272c5a8d8480fa0dede2e78941a1cc78938407ab86d3720e18762fe2c749de89eea3db2811426f43eb57efa762a4ff55aa44d8e624c05bcb82b2404dad86f49
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 SHA256 
b51b86ca81b1642f50b8c0b0d74e4e230c858dbaf0c193afe15a040481e6d70b SHA512 
d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 WHIRLPOOL 
2bf74a6a6d7afccbd1d6002b48ab04c00672342829607c99ef4efd9ad8e3186c08aff971b52c6e4357c2e94e85cf08e049eb593d0a9f2253935f7e3cbe8b2a8a

diff --git a/games-emulation/dosbox/dosbox-0.74.ebuild 
b/games-emulation/dosbox/dosbox-0.74.ebuild
deleted file mode 100644
index 522a461..
--- a/games-emulation/dosbox/dosbox-0.74.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils games
-
-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 )
-   opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses:0 )
-   media-libs/libpng:0
-   media-libs/libsdl[joystick,video,X]
-   media-libs/sdl-net
-   media-libs/sdl-sound"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-gcc46.patch
-}
-
-src_configure() {
-   egamesconf \
-   $(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
-   prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-12-14 Thread James Le Cuirot

commit: afb75000f39479197a6d1acaa9e21d8107d68547
Author: James Le Cuirot  gentoo  org>
AuthorDate: Wed Dec 14 23:12:14 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Wed Dec 14 23:12:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb75000

games-emulation/dosbox: Add Glide emulation, closes bug #593686

Package-Manager: portage-2.3.3

 games-emulation/dosbox/Manifest|  1 +
 .../dosbox/dosbox-0.74_p20160629-r1.ebuild | 70 ++
 games-emulation/dosbox/dosbox-.ebuild  | 24 +++-
 games-emulation/dosbox/metadata.xml|  3 +
 4 files changed, 95 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 539ba17..311ce6e 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,2 +1,3 @@
 DIST dosbox-0.74.tar.gz 1265711 SHA256 
13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05 SHA512 
4a6ff4c658997a495119d200ec6ad37649da940814a4b14fca0dd29a99142026e324695b7aa9d2946efc2abf9067a819d911e43778efe905ed10ddf9b9f2dd3d
 WHIRLPOOL 
abc94770c732f8b73bedffbcca778f249c2fdc09353c3f484e2fc23f910602cc60b3abfcc22a9dbf3d3c4e77535fc488cd476217fe6498cab786a8024a257ff3
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 SHA256 
32f2cfff1be9f9bd2b0e246f9c0486f050714fdaba0bc47b66f3983eb7f55965 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 WHIRLPOOL 
1272c5a8d8480fa0dede2e78941a1cc78938407ab86d3720e18762fe2c749de89eea3db2811426f43eb57efa762a4ff55aa44d8e624c05bcb82b2404dad86f49
+DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 SHA256 
b51b86ca81b1642f50b8c0b0d74e4e230c858dbaf0c193afe15a040481e6d70b SHA512 
d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
 WHIRLPOOL 
2bf74a6a6d7afccbd1d6002b48ab04c00672342829607c99ef4efd9ad8e3186c08aff971b52c6e4357c2e94e85cf08e049eb593d0a9f2253935f7e3cbe8b2a8a

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
new file mode 100644
index ..5cb2847
--- /dev/null
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils flag-o-matic
+
+PATCH=3989
+GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
+
+DESCRIPTION="DOS emulator"
+HOMEPAGE="http://dosbox.sourceforge.net/";
+SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
+   glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug glide hardened opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   glide? ( media-libs/openglide )
+   opengl? ( virtual/glu virtual/opengl )
+   debug? ( sys-libs/ncurses:0 )
+   media-libs/libpng:0
+   media-libs/libsdl[joystick,video,X]
+   media-libs/sdl-net
+   media-libs/sdl-sound"
+DEPEND="${RDEPEND}
+   app-arch/unzip"
+
+S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
+
+PATCHES=(
+"${FILESDIR}"/dosbox-0.74-gcc46.patch
+)
+
+src_prepare() {
+   use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
+   default
+   eautoreconf
+}
+
+src_configure() {
+   use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
+
+   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
+}
+
+pkg_postinst() {
+   if use glide; then
+   elog "You have enabled unofficial Glide emulation. To use this, 
symlink"
+   elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl 
to your game's"
+   elog "directory and add the following to your DOSBox 
configuration."
+   elog ""
+   elog "[glide]"
+   elog "glide=true"
+   fi
+}

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 4ea5725..c27f7cc 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -4,24 +4,28 @@
 
 EAPI=6
 
+GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
+SRC_URI="glide? ( 
https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff
 -> dosbox_glide-${GLIDE_PATCH}.diff )"
+
 i

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-10-30 Thread Sven Wegener

commit: 9579e9656423f17d9912652950fb5398c2408cc4
Author: Sven Wegener  gentoo  org>
AuthorDate: Sun Aug 21 10:48:29 2016 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Sun Oct 30 20:04:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9579e965

games-emulation/dosbox: Update SourceForge SVN URLs

Package-Manager: portage-2.2.28

 games-emulation/dosbox/dosbox-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index d362814..4ea5725 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 if [[ ${PV} =  ]]; then
-   
ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
+   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"

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-08-24 Thread NP Hardass

commit: 0fbcccb7f4715e4f00aac2f0e8fcb937792ca762
Author: NP-Hardass  gentoo  org>
AuthorDate: Tue Aug 23 19:58:10 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Wed Aug 24 19:07:46 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fbcccb7

games-emulation/dosbox: Update  for EAPI=6 changes in svn eclass, #591642

Package-Manager: portage-2.3.0

 games-emulation/dosbox/dosbox-.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 97c581f..d362814 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -34,11 +34,10 @@ if [[ ${PV} =  ]]; then
S=${WORKDIR}/${PN}
 fi
 
+PATCHES=( "${FILESDIR}/${PN}-0.74-gcc46.patch" )
+
 src_prepare() {
default
-   if [[ ${PV} =  ]]; then
-   subversion_src_prepare
-   fi
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-08-24 Thread NP Hardass

commit: 23bde80a5c773c2e53e3cffd3df9f25be31aae81
Author: NP-Hardass  gentoo  org>
AuthorDate: Tue Aug 23 20:23:22 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Wed Aug 24 19:07:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23bde80a

games-emulation/dosbox: stabilize amd64 x86 wrt #591154

Package-Manager: portage-2.3.0

 games-emulation/dosbox/dosbox-0.74_p20160629.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
index f638a1e..46bd28b 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa debug hardened opengl"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-06-29 Thread William Hubbs

commit: b252a3bd07e923b507c7eddb72656834033b5ba4
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Jun 29 22:13:11 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jun 29 22:13:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b252a3bd

games-emulation/dosbox: sync live ebuild and make it copyable

Package-Manager: portage-2.2.28

 games-emulation/dosbox/dosbox-.ebuild | 33 +++
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index f0caa33..97c581f 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -1,17 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
-inherit autotools eutils subversion games
+EAPI=6
+
+if [[ ${PV} =  ]]; then
+   
ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
+   inherit subversion
+else
+   SRC_URI="mirror://sourceforge/dosbox/${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit autotools eutils
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
@@ -23,19 +30,20 @@ DEPEND="alsa? ( media-libs/alsa-lib )
media-libs/sdl-sound"
 RDEPEND=${DEPEND}
 
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-   subversion_src_unpack
-}
+if [[ ${PV} =  ]]; then
+   S=${WORKDIR}/${PN}
+fi
 
 src_prepare() {
-   subversion_src_prepare
+   default
+   if [[ ${PV} =  ]]; then
+   subversion_src_prepare
+   fi
eautoreconf
 }
 
 src_configure() {
-   egamesconf \
+   econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
@@ -47,5 +55,4 @@ src_install() {
default
make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
doicon src/dosbox.ico
-   prepgamesdirs
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/, games-emulation/dboxfe/

2016-06-29 Thread Austin English

commit: 255abaa802ab8078625e8484f7c01809fd728301
Author: Austin English  gentoo  org>
AuthorDate: Wed Jun 29 19:24:42 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Wed Jun 29 21:51:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255abaa8

games-emulation/{dboxfe,dosbox}: add Wine project as co-maintainers

 games-emulation/dboxfe/metadata.xml | 4 
 games-emulation/dosbox/metadata.xml | 5 +
 2 files changed, 9 insertions(+)

diff --git a/games-emulation/dboxfe/metadata.xml 
b/games-emulation/dboxfe/metadata.xml
index 18b423b..fb66d2d 100644
--- a/games-emulation/dboxfe/metadata.xml
+++ b/games-emulation/dboxfe/metadata.xml
@@ -5,6 +5,10 @@
ga...@gentoo.org
Gentoo Games Project

+   
+   w...@gentoo.org
+   Gentoo Wine Project
+   

dboxfe.berlios


diff --git a/games-emulation/dosbox/metadata.xml 
b/games-emulation/dosbox/metadata.xml
index e6f83ba..a8a2df5 100644
--- a/games-emulation/dosbox/metadata.xml
+++ b/games-emulation/dosbox/metadata.xml
@@ -8,6 +8,11 @@
ga...@gentoo.org
Gentoo Games Project

+   
+   w...@gentoo.org
+   Gentoo Wine Project
+Should be cc'ed for issues with dosbox-0.74-_p* snapshot 
versions
+   

dosbox

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2016-06-29 Thread William Hubbs

commit: 5edb412a63031c0372093d5e5fb038e5da4f52f1
Author: William Hubbs  gentoo  org>
AuthorDate: Wed Jun 29 19:41:26 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Jun 29 20:05:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edb412a

games-emulation/dosbox: [qa]: create a snapshot release to fix multiple bugs

This snapshot release fixes the following bugs:

https://bugs.gentoo.org/show_bug.cgi?id=449060
https://bugs.gentoo.org/show_bug.cgi?id=586650
https://bugs.gentoo.org/show_bug.cgi?id=587382

Package-Manager: portage-2.2.28

 .../{dosbox-3989.ebuild => dosbox-0.74_p20160629.ebuild}   | 14 +-
 games-emulation/dosbox/files/dosbox-0.74-gcc46.patch   |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-3989.ebuild 
b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
similarity index 86%
rename from games-emulation/dosbox/dosbox-3989.ebuild
rename to games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
index 50488ee..f638a1e 100644
--- a/games-emulation/dosbox/dosbox-3989.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit autotools eutils games
+EAPI=6
+inherit autotools eutils
 
 PATCH=3989
 DESCRIPTION="DOS emulator"
@@ -12,7 +12,7 @@ 
SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa debug hardened opengl"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
@@ -27,12 +27,17 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
 
+PATCHES=(
+"${FILESDIR}"/dosbox-0.74-gcc46.patch
+)
+
 src_prepare() {
+   default
eautoreconf
 }
 
 src_configure() {
-   egamesconf \
+   econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
@@ -44,5 +49,4 @@ src_install() {
default
make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
doicon src/dosbox.ico
-   prepgamesdirs
 }

diff --git a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch 
b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
index 16811d4..98b4508 100644
--- a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
+++ b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
@@ -1,5 +1,5 @@
 include/dos_inc.h.old  2011-04-28 08:46:04.505011354 +0200
-+++ include/dos_inc.h  2011-04-28 08:46:27.104408178 +0200
+--- a/include/dos_inc.h2011-04-28 08:46:04.505011354 +0200
 b/include/dos_inc.h2011-04-28 08:46:27.104408178 +0200
 @@ -21,6 +21,7 @@
  #ifndef DOSBOX_DOS_INC_H
  #define DOSBOX_DOS_INC_H

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-06-28 Thread Michael Sterrett

commit: df7759af13d413bc7d24255b6c5dc91504372313
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Jun 28 15:49:27 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jun 28 17:33:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df7759af

games-emulation/dosbox: add snapshot ebuild from upstream svn to provide a 
non-moving-target for situations where the upstream release doesn't work (bugs 
#586650 and #449060)

Package-Manager: portage-2.2.28

 games-emulation/dosbox/Manifest   |  1 +
 games-emulation/dosbox/dosbox-3989.ebuild | 48 +++
 2 files changed, 49 insertions(+)

diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index aa7079d..539ba17 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1 +1,2 @@
 DIST dosbox-0.74.tar.gz 1265711 SHA256 
13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05 SHA512 
4a6ff4c658997a495119d200ec6ad37649da940814a4b14fca0dd29a99142026e324695b7aa9d2946efc2abf9067a819d911e43778efe905ed10ddf9b9f2dd3d
 WHIRLPOOL 
abc94770c732f8b73bedffbcca778f249c2fdc09353c3f484e2fc23f910602cc60b3abfcc22a9dbf3d3c4e77535fc488cd476217fe6498cab786a8024a257ff3
+DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 SHA256 
32f2cfff1be9f9bd2b0e246f9c0486f050714fdaba0bc47b66f3983eb7f55965 SHA512 
625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 WHIRLPOOL 
1272c5a8d8480fa0dede2e78941a1cc78938407ab86d3720e18762fe2c749de89eea3db2811426f43eb57efa762a4ff55aa44d8e624c05bcb82b2404dad86f49

diff --git a/games-emulation/dosbox/dosbox-3989.ebuild 
b/games-emulation/dosbox/dosbox-3989.ebuild
new file mode 100644
index 000..50488ee
--- /dev/null
+++ b/games-emulation/dosbox/dosbox-3989.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils games
+
+PATCH=3989
+DESCRIPTION="DOS emulator"
+HOMEPAGE="http://dosbox.sourceforge.net/";
+SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa debug hardened opengl"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+   opengl? ( virtual/glu virtual/opengl )
+   debug? ( sys-libs/ncurses:0 )
+   media-libs/libpng:0
+   media-libs/libsdl[joystick,video,X]
+   media-libs/sdl-net
+   media-libs/sdl-sound"
+DEPEND="${RDEPEND}
+   app-arch/unzip"
+
+S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
+
+src_prepare() {
+   eautoreconf
+}
+
+src_configure() {
+   egamesconf \
+   $(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
+   prepgamesdirs
+}

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2016-06-28 Thread Michael Sterrett

commit: a87623b1beff702e5f50319a28b3a7cbf5eca2b6
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Jun 28 14:49:48 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jun 28 14:49:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87623b1

Revert "games-emulation/dosbox: fix compiling with clang (#449060)"

This reverts commit 143e036505e2b27b1aa5037d52a5f999391b4168.

 games-emulation/dosbox/dosbox-0.74-r1.ebuild   |  51 ---
 .../dosbox/files/dosbox-0.74-clang.patch   |  48 ---
 .../dosbox/files/dosbox-0.74-gcc46.patch   |   4 +-
 .../dosbox/files/dosbox-0.74-wine-drive-z.patch| 151 -
 .../dosbox/files/dosbox-0.74-wine-filenames.patch  |  89 
 5 files changed, 2 insertions(+), 341 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74-r1.ebuild 
b/games-emulation/dosbox/dosbox-0.74-r1.ebuild
deleted file mode 100644
index 80989ea..000
--- a/games-emulation/dosbox/dosbox-0.74-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils games
-
-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_prepare() {
-   epatch -p1 "${PATCHES[@]}"
-}
-
-src_configure() {
-   egamesconf \
-   $(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
-   prepgamesdirs
-}

diff --git a/games-emulation/dosbox/files/dosbox-0.74-clang.patch 
b/games-emulation/dosbox/files/dosbox-0.74-clang.patch
deleted file mode 100644
index df2923f..000
--- a/games-emulation/dosbox/files/dosbox-0.74-clang.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=449060
-
-Two backports from Dosbox SVN needed for clang support:
-src/fpu/fpu_instructions_x86.h changes are revision 3841
-src/cpu/core_dynrec/risc_x64.h changes are revision 3894
-
-Index: src/fpu/fpu_instructions_x86.h
-===
 a/src/fpu/fpu_instructions_x86.h   (revision 3840)
-+++ b/src/fpu/fpu_instructions_x86.h   (revision 3841)
-@@ -1161,12 +1161,12 @@
- 
- static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
-   fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
--  FPUD_LOAD(fild,WORD,)
-+  FPUD_LOAD(fild,WORD,s)
- }
- 
- static void FPU_FLD_I16_EA(PhysPt addr) {
-   fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
--  FPUD_LOAD_EA(fild,WORD,)
-+  FPUD_LOAD_EA(fild,WORD,s)
- }
- 
- static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
-@@ -1211,7 +1211,7 @@
- }
- 
- static void FPU_FST_I16(PhysPt addr) {
--  FPUD_STORE(fistp,WORD,)
-+  FPUD_STORE(fistp,WORD,s)
-   mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
- }
- 
-Index: src/cpu/core_dynrec/risc_x64.h
-===
 a/src/cpu/core_dynrec/risc_x64.h   (revision 3893)
-+++ b/src/cpu/core_dynrec/risc_x64.h   (revision 3894)
-@@ -85,7 +85,8 @@
- 
- static INLINE void gen_reg_memaddr(HostReg reg,void* data) {
-   Bit64s diff = (Bit64s)data-((Bit64s)cache.pos+5);
--  if ((diff<0x8000LL) && (diff>-0x8000LL)) {
-+//if ((diff<0x8000LL) && (diff>-0x8000LL)) { //clang messes 
itself up on this...
-+  if ( (diff>>63) == (diff>>31) ) { //signed bit extend, test to see if 
value fits in a Bit32s
-   cache_addb(0x05+(reg<<3));
-   // RIP-relative addressing is offset after the instruction 
-   cache_addd((Bit32u)(((Bit64u)diff)&0xLL)); 

diff --git a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch 
b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
index 54cd51b..16811d4 100644
--- a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
+++ b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
@@ -1,5 +1,5 @@
 a/include/dos_inc.h.old2011-04-28 08:46:04.505011354 +0200
-+++ b/include/dos_inc.h2011-04-28 08:46:27.104408178 +0200
+--- include/dos_inc.h

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-06-28 Thread Michael Sterrett

commit: 7efcd72291ba745978e8a02ca0ac6f8c07434a38
Author: Michael Sterrett  gentoo  org>
AuthorDate: Tue Jun 28 14:49:29 2016 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Tue Jun 28 14:49:29 2016 +
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-.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..000
--- 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-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index 1c5c700..f0caa33 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.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
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2016-06-28 Thread Patrice Clement

commit: 3d239d4e470c8f0c99339649ec74c4bdf86cf98f
Author: Austin English  gentoo  org>
AuthorDate: Tue Jun 28 08:43:09 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jun 28 13:31:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d239d4e

games-emulation/dosbox: remove games eclass and convert to EAPI 6

Gentoo-Bug: https://bugs.gentoo.org/566498
Gentoo-Bug: https://bugs.gentoo.org/587382

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1777

Signed-off-by: Patrice Clement  gentoo.org>

 .../{dosbox-.ebuild => dosbox-0.74-r2.ebuild}  | 31 +-
 games-emulation/dosbox/dosbox-.ebuild  | 12 -
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-0.74-r2.ebuild
similarity index 69%
copy from games-emulation/dosbox/dosbox-.ebuild
copy to games-emulation/dosbox/dosbox-0.74-r2.ebuild
index f0caa33..165707b 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74-r2.ebuild
@@ -1,41 +1,37 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
-inherit autotools eutils subversion games
+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=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
-   opengl? ( virtual/glu virtual/opengl )
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}
 
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-   subversion_src_unpack
-}
-
-src_prepare() {
-   subversion_src_prepare
-   eautoreconf
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-clang.patch
+   "${FILESDIR}"/${P}-gcc46.patch
+   "${FILESDIR}"/${P}-wine-drive-z.patch
+   "${FILESDIR}"/${P}-wine-filenames.patch
+)
 
 src_configure() {
-   egamesconf \
+   econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
@@ -47,5 +43,4 @@ src_install() {
default
make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
doicon src/dosbox.ico
-   prepgamesdirs
 }

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index f0caa33..1c5c700 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 ESVN_REPO_URI="https://dosbox.svn.sourceforge.net/svnroot/dosbox/dosbox/trunk";
-inherit autotools eutils subversion games
+inherit autotools eutils subversion
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/";
@@ -15,8 +15,8 @@ KEYWORDS=""
 IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
-   opengl? ( virtual/glu virtual/opengl )
debug? ( sys-libs/ncurses:0 )
+   opengl? ( virtual/glu virtual/opengl )
media-libs/libpng:0
media-libs/libsdl[joystick,video,X]
media-libs/sdl-net
@@ -30,12 +30,13 @@ src_unpack() {
 }
 
 src_prepare() {
+   default
subversion_src_prepare
eautoreconf
 }
 
 src_configure() {
-   egamesconf \
+   econf \
$(use_enable alsa alsa-midi) \
$(use_enable !hardened dynamic-core) \
$(use_enable !hardened dynamic-x86) \
@@ -47,5 +48,4 @@ src_install() {
default
make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
doicon src/dosbox.ico
-   prepgamesdirs
 }

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/

2016-06-28 Thread Austin English

commit: 143e036505e2b27b1aa5037d52a5f999391b4168
Author: Austin English  gentoo  org>
AuthorDate: Fri Jun  3 04:03:24 2016 +
Commit: Austin English  gentoo  org>
CommitDate: Tue Jun 28 08:16:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143e0365

games-emulation/dosbox: fix compiling with clang (#449060)

Also apply two patches needed by Wine using DOSBox (#586650)

Gentoo-Bug: https://bugs.gentoo.org/449060
Gentoo-Bug: https://bugs.gentoo.org/586650

Upstream-Bug: https://bugs.winehq.org/show_bug.cgi?id=18118
Upstream-Bug: https://bugs.winehq.org/show_bug.cgi?id=25887
Upstream-Bug: https://bugs.winehq.org/show_bug.cgi?id=26423

Package-Manager: portage-2.2.26

 games-emulation/dosbox/dosbox-0.74-r1.ebuild   |  51 +++
 .../dosbox/files/dosbox-0.74-clang.patch   |  48 +++
 .../dosbox/files/dosbox-0.74-gcc46.patch   |   4 +-
 .../dosbox/files/dosbox-0.74-wine-drive-z.patch| 151 +
 .../dosbox/files/dosbox-0.74-wine-filenames.patch  |  89 
 5 files changed, 341 insertions(+), 2 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74-r1.ebuild 
b/games-emulation/dosbox/dosbox-0.74-r1.ebuild
new file mode 100644
index 000..80989ea
--- /dev/null
+++ b/games-emulation/dosbox/dosbox-0.74-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils games
+
+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_prepare() {
+   epatch -p1 "${PATCHES[@]}"
+}
+
+src_configure() {
+   egamesconf \
+   $(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
+   prepgamesdirs
+}

diff --git a/games-emulation/dosbox/files/dosbox-0.74-clang.patch 
b/games-emulation/dosbox/files/dosbox-0.74-clang.patch
new file mode 100644
index 000..df2923f
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.74-clang.patch
@@ -0,0 +1,48 @@
+Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=449060
+
+Two backports from Dosbox SVN needed for clang support:
+src/fpu/fpu_instructions_x86.h changes are revision 3841
+src/cpu/core_dynrec/risc_x64.h changes are revision 3894
+
+Index: src/fpu/fpu_instructions_x86.h
+===
+--- a/src/fpu/fpu_instructions_x86.h   (revision 3840)
 b/src/fpu/fpu_instructions_x86.h   (revision 3841)
+@@ -1161,12 +1161,12 @@
+ 
+ static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
+   fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
+-  FPUD_LOAD(fild,WORD,)
++  FPUD_LOAD(fild,WORD,s)
+ }
+ 
+ static void FPU_FLD_I16_EA(PhysPt addr) {
+   fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
+-  FPUD_LOAD_EA(fild,WORD,)
++  FPUD_LOAD_EA(fild,WORD,s)
+ }
+ 
+ static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
+@@ -1211,7 +1211,7 @@
+ }
+ 
+ static void FPU_FST_I16(PhysPt addr) {
+-  FPUD_STORE(fistp,WORD,)
++  FPUD_STORE(fistp,WORD,s)
+   mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
+ }
+ 
+Index: src/cpu/core_dynrec/risc_x64.h
+===
+--- a/src/cpu/core_dynrec/risc_x64.h   (revision 3893)
 b/src/cpu/core_dynrec/risc_x64.h   (revision 3894)
+@@ -85,7 +85,8 @@
+ 
+ static INLINE void gen_reg_memaddr(HostReg reg,void* data) {
+   Bit64s diff = (Bit64s)data-((Bit64s)cache.pos+5);
+-  if ((diff<0x8000LL) && (diff>-0x8000LL)) {
++//if ((diff<0x8000LL) && (diff>-0x8000LL)) { //clang messes 
itself up on this...
++  if ( (diff>>63) == (diff>>31) ) { //signed bit extend, test to see if 
value fits in a Bit32s
+   cache_addb(0x05+(reg<<3));
+   // RIP-relative addressing is offset after the instruction 
+   cache_addd((Bit32u)(((Bit64u)diff)&0xLL)); 

diff --git a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch 
b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
index 16811d4..54cd51b 100644
--- a/games-e

[gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/

2015-11-21 Thread Michael Sterrett

commit: 84cdfc9edf08535a3e2e0dd177f2456b5174a308
Author: Michael Sterrett  gentoo  org>
AuthorDate: Sun Nov 22 03:31:11 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Sun Nov 22 03:31:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cdfc9e

use epatch to apply patch

Package-Manager: portage-2.2.20.1

 games-emulation/dosbox/dosbox-0.74.ebuild | 8 +---
 games-emulation/dosbox/dosbox-.ebuild | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74.ebuild 
b/games-emulation/dosbox/dosbox-0.74.ebuild
index 56a0bb8..522a461 100644
--- a/games-emulation/dosbox/dosbox-0.74.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74.ebuild
@@ -16,14 +16,16 @@ IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses )
+   debug? ( sys-libs/ncurses:0 )
media-libs/libpng:0
media-libs/libsdl[joystick,video,X]
media-libs/sdl-net
media-libs/sdl-sound"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
 
-PATCHES=( "${FILESDIR}"/${P}-gcc46.patch )
+src_prepare() {
+   epatch "${FILESDIR}"/${P}-gcc46.patch
+}
 
 src_configure() {
egamesconf \

diff --git a/games-emulation/dosbox/dosbox-.ebuild 
b/games-emulation/dosbox/dosbox-.ebuild
index f01034e..f0caa33 100644
--- a/games-emulation/dosbox/dosbox-.ebuild
+++ b/games-emulation/dosbox/dosbox-.ebuild
@@ -16,7 +16,7 @@ IUSE="alsa debug hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
opengl? ( virtual/glu virtual/opengl )
-   debug? ( sys-libs/ncurses )
+   debug? ( sys-libs/ncurses:0 )
media-libs/libpng:0
media-libs/libsdl[joystick,video,X]
media-libs/sdl-net

77 matches

Mail list logo