gentoo resync : 31.12.2018

5 files changed, 22 insertions, 13 deletions

diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 637b1fc9c7f6..0a011ed7b2fb 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index f956d42c7a00..c02778f1614d 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -2,7 +2,7 @@ AUX dosbox-0.74-gcc46.patch 274 BLAKE2B 6375a8c0752eed6481cfc987ac3b7c7f699d7454
 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
-EBUILD dosbox-0.74_p20160629-r1.ebuild 1789 BLAKE2B a823bc4514785e0356b3b71f4b235ad54c2ce01c9b5615f8c32835f2f0b00dac2bb46399afd7cad07de5eec5594dbc2517a07887cd3080d7bfb37e897d3535fb SHA512 593c5d5fe80cc7faf2a33183dfb5787bcaba9eeaf72d077419f6d25e7d360cc2e0ed488d7707d0c8a58e51ed38be3dbdafc2e8746dff6a552f2de81dcb285ad2
+EBUILD dosbox-0.74_p20160629-r2.ebuild 1919 BLAKE2B f5602bbcea7b32d71584aa1efaef2b0a9e2d305467329ee4fcf8a9ec2e83f4fc885cd12c19abd9c5d4c9ac5a511074fa8286d04c5dd4077e6601eef0a94c79b3 SHA512 2f854b566e89795f2126d687b5d9597a8142ef5d328a4dd87a8fa65529b3b5855ac0a38ff1f114f137f329a52db34a17b19f703e64131cf062a4fdbf57397382
 EBUILD dosbox-0.74_p20160629.ebuild 1076 BLAKE2B e0ca5a03e6817622ef09305464a4a98661fe97d94ffe0ddb021073af2d1fe4bb31ae3fd967e4fc03c08848e2abb2a6465364bcbee1a09f0a415b0077144a9724 SHA512 ba8f55ede135d0e8a024d72b8db79db0816f845452b54e71cc7ad3460e0b1152bad67f0800b5c8a0a506a26959a606f8f57159b37b0a4dc465fd95897a083529
-EBUILD dosbox-9999.ebuild 1886 BLAKE2B 148de20f0dcc217b8434754454e08434cd1e2e4133d5318eb74d6b10c48f7064e12afdeeaea9c1f5729a94a61948817f1f881ef8c5413c0e964d7b911e559c5e SHA512 388a13afbe20a7c7e05f22f77796035015e46d58789829d7f40b5e8046a0f4e30279e37b6780b447b74be82c770bc5f8d952271c49b9b930a9cfc119b7291fb9
-MISC metadata.xml 623 BLAKE2B 2ff1106b2288c775d3bcff26145af604b63edd350f28ff3fd9c8407a738910d080425fa635b6b03436b0b8c24dde9c7dbd342df1f1bacdfacc391246db565ac0 SHA512 a7aff1ef1c4c2c97e8287b3aec84c1c270b8d052e12d4719704a6732575f1f62e4f9024af3d4e1f234e18c3d47aec863bdf6e6472e03cabd24124e7473c28e87
+EBUILD dosbox-9999.ebuild 2015 BLAKE2B d874dfcce054cfe4bf10de764e1a4aad40bf90a74532d6f7e6d97d233871aa53779a601ce2487bd625686ff4a8123b1294d3005091add6e7b70bf832d5593202 SHA512 3352352a8cc3d623184066a5ccbca680defa7e2103986266092be93e4f91cbaf15dd7125112b97a28cf719b27b88b5862e8e7649df289a1315b40a2589a239c1
+MISC metadata.xml 742 BLAKE2B 1b36ebc57b143b7fb214632f79c3f51f812ac96de39e6f8886efd5c13cf1ee86d905c2cef3d46e58171ee00cc8515852bfb177726aaab196415e47b876d28a12 SHA512 0c9ad19d1512236023a349545c8bb8790388ac49ef62b30d03a81f84407aae2b9b199f7041a513af5b34a61bc5a439d663be2cdb3cd59a7e23830f78633285b5
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.ebuild
index d7fd016f2ca3..f6a503b6b2a4 100644
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
+++ b/games-emulation/dosbox/dosbox-0.74_p20160629-r2.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
@@ -16,16 +16,18 @@ 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 +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 )
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video,X]
+	X? ( x11-libs/libX11 )
+	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"
 
@@ -44,8 +46,10 @@ 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 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 786b1f786887..421603aa2fd0 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
@@ -21,16 +21,18 @@ HOMEPAGE="http://dosbox.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug glide hardened opengl"
+IUSE="alsa +core-inline 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 )
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video,X]
+	X? ( x11-libs/libX11 )
+	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
@@ -50,8 +52,10 @@ 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 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 4c30301896f0..791f145ba089 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>