public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2020-01-01 22:56 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2020-01-01 22:56 UTC (permalink / raw
  To: gentoo-commits

commit:     cbf26e890327dabc3a96b1b7aa2ce98a6424aeb2
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 13:56:15 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 22:56:03 2020 +0000
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 <chewi <AT> 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 00000000000..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
+9999)
+	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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2024-08-06  0:20 Eli Schwartz
  0 siblings, 0 replies; 31+ messages in thread
From: Eli Schwartz @ 2024-08-06  0:20 UTC (permalink / raw
  To: gentoo-commits

commit:     bf241a4260954afb732b4600e8ad82e744135833
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 04:45:07 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 00:18:30 2024 +0000
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 <eschwartz <AT> gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 8 ++++++++
 games-emulation/dosbox/dosbox-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index e113bd078a84..e645b0a8b220 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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) \


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2023-09-28  1:19 Sam James
  0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2023-09-28  1:19 UTC (permalink / raw
  To: gentoo-commits

commit:     b372804bcf820713cf8a02e351a2a5ed09e3fefc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 01:19:46 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 01:19:46 2023 +0000
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 <sam <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2023-09-27  8:33 Sam James
  0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2023-09-27  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     45b557f532f5b59ec0e8f18961ce7115e553ce2a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 08:32:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 08:32:48 2023 +0000
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 <sam <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2023-09-27  6:22 Sam James
  0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2023-09-27  6:22 UTC (permalink / raw
  To: gentoo-commits

commit:     ea750b024bf9c590c752e8aa9807db85f34b5184
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 06:21:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 06:21:58 2023 +0000
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 <sam <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2021-04-04  7:22 Sam James
  0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2021-04-04  7:22 UTC (permalink / raw
  To: gentoo-commits

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

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

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-emulation/dosbox/dosbox-0.74.3.ebuild       | 43 +++++++++++------------
 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild | 41 +++++++++++----------
 games-emulation/dosbox/dosbox-9999.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
-9999)
-	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
+	9999)
+		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
-9999)
-	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
+	9999)
+		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/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 205ff225911..cb63c341cf2 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -5,23 +5,23 @@ EAPI=7
 
 inherit autotools desktop flag-o-matic
 
-case "${PV}" in
-9999)
-	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
+	9999)
+		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=6a01f554fad979cf34d3ff07c9579192c88086c3
@@ -29,9 +29,10 @@ 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=""
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
@@ -44,11 +45,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.75-ncurses.patch
 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2021-02-24 20:47 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2021-02-24 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     e002299cb5acc59c08762450ab6e44ba3fe5644b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 20:32:36 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 20:47:20 2021 +0000
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 <chewi <AT> gentoo.org>

 games-emulation/dosbox/Manifest           | 1 +
 games-emulation/dosbox/dosbox-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index e9aadb1e2ef..205ff225911 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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"


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2020-01-05 19:45 Agostino Sarubbo
  0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2020-01-05 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f94a3d5e81e102612af038bbf6acd293d2e11e09
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 19:45:01 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 19:45:01 2020 +0000
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 <ago <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2020-01-05 19:43 Agostino Sarubbo
  0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2020-01-05 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5666def56604f88ce8d883cc4961d49344068722
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 19:42:57 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 19:42:57 2020 +0000
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 <ago <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2020-01-05 18:45 Agostino Sarubbo
  0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2020-01-05 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     79e5916a69ea54f6170040a60f574bc7c4b242df
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 18:44:49 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 18:45:17 2020 +0000
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 <ago <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2020-01-01 22:56 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2020-01-01 22:56 UTC (permalink / raw
  To: gentoo-commits

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

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

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

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

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 8c4711e5620..d6c94125051 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -1,47 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools desktop flag-o-matic
 
-GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
-SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-if [[ ${PV} = 9999 ]]; then
+case "${PV}" in
+9999)
+	MY_P=${PN}
 	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
 	inherit subversion
-else
-	SRC_URI+=" mirror://sourceforge/dosbox/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-fi
+	;;
+*_pre*)
+	MY_PV=0-r${PV#*_pre}
+	MY_P=${PN}-code-${MY_PV}-${PN}-trunk
+	SRC_URI="https://sourceforge.net/code-snapshots/svn/d/do/dosbox/code-0/${MY_P}.zip"
+	BDEPEND="app-arch/unzip"
+	;;
+*)
+	MY_PV=$(ver_rs 2 -)
+	MY_P=${PN}-${MY_PV}
+	SRC_URI="mirror://sourceforge/dosbox/${MY_P}.tar.gz"
+	;;
+esac
+
+GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
+SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="https://www.dosbox.com/"
-
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS=""
 IUSE="alsa +core-inline debug glide hardened opengl X"
 
-DEPEND="alsa? ( media-libs/alsa-lib )
+RDEPEND="alsa? ( media-libs/alsa-lib )
 	glide? ( media-libs/openglide )
 	opengl? ( virtual/glu virtual/opengl )
-	debug? ( sys-libs/ncurses:0 )
+	debug? ( sys-libs/ncurses:0= )
 	X? ( x11-libs/libX11 )
 	media-libs/libpng:0=
-	media-libs/libsdl[joystick,opengl?,video,X]
+	media-libs/libsdl[joystick,opengl?,video,X?]
 	media-libs/sdl-net
 	media-libs/sdl-sound
 	sys-libs/zlib"
-RDEPEND=${DEPEND}
 
-if [[ ${PV} = 9999 ]]; then
-	S=${WORKDIR}/${PN}
-fi
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.74-gcc46.patch
-)
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2020-01-01 22:56 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2020-01-01 22:56 UTC (permalink / raw
  To: gentoo-commits

commit:     f4b21c579680b27f1a80d7c86408d659a36a6b7b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  1 22:33:36 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Jan  1 22:56:06 2020 +0000
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 <chewi <AT> 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 00000000000..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
+9999)
+	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
+}
+
+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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2019-06-09 19:22 Sergei Trofimovich
  0 siblings, 0 replies; 31+ messages in thread
From: Sergei Trofimovich @ 2019-06-09 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     fc404b95fd1c609072e654bfbde2a9bfca66d27c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 19:21:23 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 19:21:23 2019 +0000
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 <slyfox <AT> 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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2019-01-05 19:43 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2019-01-05 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2c6bbf2361a86ef354e16ff2cc08a496abcb1f4b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  5 19:42:51 2019 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jan  5 19:43:36 2019 +0000
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 <chewi <AT> 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..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-12-29 12:16 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2018-12-29 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     510ee00b28d609f9072944886fbba9047e4a6128
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:11:36 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:15:53 2018 +0000
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 <chewi <AT> gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 3 ++-
 games-emulation/dosbox/dosbox-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 4c6bd555931..421603aa2fd 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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 @@
 	<remote-id type="sourceforge">dosbox</remote-id>
 </upstream>
 <use>
+	<flag name="core-inline">Enable memory-increasing inlines for better performance but requiring more build time</flag>
 	<flag name="glide">Enable unofficial Glide emulation via media-libs/openglide</flag>
 </use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-12-29 12:16 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2018-12-29 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     442ebfd45c180c360a6cfb1a27d4ff941284c784
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 11:47:07 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:15:49 2018 +0000
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 <chewi <AT> gentoo.org>

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

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
similarity index 67%
copy from games-emulation/dosbox/dosbox-9999.ebuild
copy to games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index 786b1f78688..d9dccc1aa6a 100644
--- a/games-emulation/dosbox/dosbox-9999.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} = 9999 ]]; 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} = 9999 ]]; 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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 786b1f78688..a5bfff9c4f3 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-12-29 12:16 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2018-12-29 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     87fdf8119b682d2e3c57830270b60b7a823fd27a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:07:13 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:15:52 2018 +0000
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 <chewi <AT> gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 5 +++--
 games-emulation/dosbox/dosbox-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index c8d3998bd01..4c6bd555931 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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} = 9999 ]]; then


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-12-29 12:16 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2018-12-29 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     b765dc5d03b45bba1756ef66a5350d3e87deb16c
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:01:55 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:15:50 2018 +0000
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 <chewi <AT> gentoo.org>

 games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild | 6 ++++--
 games-emulation/dosbox/dosbox-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index a5bfff9c4f3..c8d3998bd01 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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) \


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-12-29 12:16 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2018-12-29 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     6a9b287a6343e3f35f242c7704311d0107498b44
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 29 12:12:18 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 29 12:15:54 2018 +0000
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 <chewi <AT> 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..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-08-27 21:16 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2018-08-27 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     85efdc28e53232143b851da4e274889e01f9876c
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Aug  3 01:43:32 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 21:16:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85efdc28

games-emulation/dosbox: eutils->desktop

Only has eutils for the implicit desktop inheritance for doicon and
make_desktop_entry.

Package-Manager: Portage-2.3.44, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9429

 games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild | 7 ++++---
 games-emulation/dosbox/dosbox-0.74_p20160629.ebuild    | 7 ++++---
 games-emulation/dosbox/dosbox-9999.ebuild              | 8 +++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
index f622d980d34..d7fd016f2ca 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils flag-o-matic
+
+inherit autotools desktop flag-o-matic
 
 PATCH=3989
 GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
@@ -31,7 +32,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
 
 PATCHES=(
-"${FILESDIR}"/dosbox-0.74-gcc46.patch
+	"${FILESDIR}"/${PN}-0.74-gcc46.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
index 45b0b0fdb71..a7b41d8d34e 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils
+
+inherit autotools desktop
 
 PATCH=3989
 DESCRIPTION="DOS emulator"
@@ -27,7 +28,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
 
 PATCHES=(
-"${FILESDIR}"/dosbox-0.74-gcc46.patch
+	"${FILESDIR}"/${PN}-0.74-gcc46.patch
 )
 
 src_prepare() {

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index bceaab9e815..786b1f78688 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit autotools desktop flag-o-matic
+
 GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
 SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
 
@@ -14,8 +16,6 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 fi
 
-inherit autotools eutils flag-o-matic
-
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/"
 
@@ -37,7 +37,9 @@ if [[ ${PV} = 9999 ]]; then
 	S=${WORKDIR}/${PN}
 fi
 
-PATCHES=( "${FILESDIR}/${PN}-0.74-gcc46.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.74-gcc46.patch
+)
 
 src_prepare() {
 	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2018-01-11 14:54 Bernard Cafarelli
  0 siblings, 0 replies; 31+ messages in thread
From: Bernard Cafarelli @ 2018-01-11 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7e320bc722fd130f33b000a4c8f963ebf584447b
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 14:53:59 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 14:54:07 2018 +0000
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-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 82456d41531..bceaab9e815 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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} = 9999 ]]; then


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2017-01-20 16:21 David Seifert
  0 siblings, 0 replies; 31+ messages in thread
From: David Seifert @ 2017-01-20 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     537dbb5ff24488a98c1b5b4dc3de94f44df25439
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 15:45:05 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 16:20:55 2017 +0000
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..00000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-12-14 23:12 James Le Cuirot
  0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2016-12-14 23:12 UTC (permalink / raw
  To: gentoo-commits

commit:     afb75000f39479197a6d1acaa9e21d8107d68547
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 23:12:14 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 23:12:44 2016 +0000
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-9999.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 00000000..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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index 4ea5725..c27f7cc 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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 )"
+
 if [[ ${PV} = 9999 ]]; 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"
+	SRC_URI+=" mirror://sourceforge/dosbox/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug hardened opengl"
+IUSE="alsa debug glide hardened opengl"
 
 DEPEND="alsa? ( media-libs/alsa-lib )
+	glide? ( media-libs/openglide )
 	opengl? ( virtual/glu virtual/opengl )
 	debug? ( sys-libs/ncurses:0 )
 	media-libs/libpng:0
@@ -37,11 +41,14 @@ fi
 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) \
@@ -55,3 +62,14 @@ src_install() {
 	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/metadata.xml b/games-emulation/dosbox/metadata.xml
index a8a2df5..ef87777 100644
--- a/games-emulation/dosbox/metadata.xml
+++ b/games-emulation/dosbox/metadata.xml
@@ -16,4 +16,7 @@
 	<upstream>
 		<remote-id type="sourceforge">dosbox</remote-id>
 	</upstream>
+	<use>
+	  <flag name="glide">Enable unofficial Glide emulation via media-libs/openglide</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-10-30 20:05 Sven Wegener
  0 siblings, 0 replies; 31+ messages in thread
From: Sven Wegener @ 2016-10-30 20:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9579e9656423f17d9912652950fb5398c2408cc4
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 21 10:48:29 2016 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 20:04:21 2016 +0000
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-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index d362814..4ea5725 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 if [[ ${PV} = 9999 ]]; 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"


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-08-24 19:07 NP Hardass
  0 siblings, 0 replies; 31+ messages in thread
From: NP Hardass @ 2016-08-24 19:07 UTC (permalink / raw
  To: gentoo-commits

commit:     23bde80a5c773c2e53e3cffd3df9f25be31aae81
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 20:23:22 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 19:07:47 2016 +0000
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 )


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-08-24 19:07 NP Hardass
  0 siblings, 0 replies; 31+ messages in thread
From: NP Hardass @ 2016-08-24 19:07 UTC (permalink / raw
  To: gentoo-commits

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

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

Package-Manager: portage-2.3.0

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

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


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-06-29 22:23 William Hubbs
  0 siblings, 0 replies; 31+ messages in thread
From: William Hubbs @ 2016-06-29 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     b252a3bd07e923b507c7eddb72656834033b5ba4
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 22:13:11 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 22:13:37 2016 +0000
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-9999.ebuild | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index f0caa33..97c581f 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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} = 9999 ]]; 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} = 9999 ]]; then
+	S=${WORKDIR}/${PN}
+fi
 
 src_prepare() {
-	subversion_src_prepare
+	default
+	if [[ ${PV} = 9999 ]]; 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
 }


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-06-28 17:35 Michael Sterrett
  0 siblings, 0 replies; 31+ messages in thread
From: Michael Sterrett @ 2016-06-28 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     df7759af13d413bc7d24255b6c5dc91504372313
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 15:49:27 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 17:33:01 2016 +0000
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 0000000..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
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-06-28 14:51 Michael Sterrett
  0 siblings, 0 replies; 31+ messages in thread
From: Michael Sterrett @ 2016-06-28 14:51 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2016-06-28 13:59 Patrice Clement
  0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2016-06-28 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     3d239d4e470c8f0c99339649ec74c4bdf86cf98f
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 08:43:09 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 13:31:36 2016 +0000
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 <monsieurp <AT> gentoo.org>

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

diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-0.74-r2.ebuild
similarity index 69%
copy from games-emulation/dosbox/dosbox-9999.ebuild
copy to games-emulation/dosbox/dosbox-0.74-r2.ebuild
index f0caa33..165707b 100644
--- a/games-emulation/dosbox/dosbox-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index f0caa33..1c5c700 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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
 }


^ permalink raw reply related	[flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/
@ 2015-11-22  3:35 Michael Sterrett
  0 siblings, 0 replies; 31+ messages in thread
From: Michael Sterrett @ 2015-11-22  3:35 UTC (permalink / raw
  To: gentoo-commits

commit:     84cdfc9edf08535a3e2e0dd177f2456b5174a308
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 03:31:11 2015 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 03:31:11 2015 +0000
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-9999.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-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index f01034e..f0caa33 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.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


^ permalink raw reply related	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2024-08-06  0:20 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-01 22:56 [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2024-08-06  0:20 Eli Schwartz
2023-09-28  1:19 Sam James
2023-09-27  8:33 Sam James
2023-09-27  6:22 Sam James
2021-04-04  7:22 Sam James
2021-02-24 20:47 James Le Cuirot
2020-01-05 19:45 Agostino Sarubbo
2020-01-05 19:43 Agostino Sarubbo
2020-01-05 18:45 Agostino Sarubbo
2020-01-01 22:56 James Le Cuirot
2020-01-01 22:56 James Le Cuirot
2019-06-09 19:22 Sergei Trofimovich
2019-01-05 19:43 James Le Cuirot
2018-12-29 12:16 James Le Cuirot
2018-12-29 12:16 James Le Cuirot
2018-12-29 12:16 James Le Cuirot
2018-12-29 12:16 James Le Cuirot
2018-12-29 12:16 James Le Cuirot
2018-08-27 21:16 James Le Cuirot
2018-01-11 14:54 Bernard Cafarelli
2017-01-20 16:21 David Seifert
2016-12-14 23:12 James Le Cuirot
2016-10-30 20:05 Sven Wegener
2016-08-24 19:07 NP Hardass
2016-08-24 19:07 NP Hardass
2016-06-29 22:23 William Hubbs
2016-06-28 17:35 Michael Sterrett
2016-06-28 14:51 Michael Sterrett
2016-06-28 13:59 Patrice Clement
2015-11-22  3:35 Michael Sterrett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox