gentoo resync : 16.09.2020

4 files changed, 21 insertions, 56 deletions

diff --git a/games-emulation/dosbox-staging/Manifest b/games-emulation/dosbox-staging/Manifest
index c8f8b33ce1d8..331befe04312 100644
--- a/games-emulation/dosbox-staging/Manifest
+++ b/games-emulation/dosbox-staging/Manifest
@@ -1,7 +1,6 @@
+AUX dosbox-staging-0.75.1-ar.patch 370 BLAKE2B 8df10e9efd58665f6918b80f3b3ab4c1a601e460223a8d1737b02fba854f297a3f7b79f45b759dad12303fe23be511be2939367a56a211b7af3ba1b051518f47 SHA512 f12ee40e1124fb796465c8860052c6ca79e726cc0b3f30a4dd106d584638eb92b20a26d8c7219ebb5c5492a98520d528db4d67120b1c3065530a7565e2c8dbb9
 AUX dosbox-staging-0.75.1-pthread.patch 378 BLAKE2B d0b5fe1e9927592fac4d87863587f8a5e53089e1f52db234ceca975034768e8b84ca3976ddf66943fa42ed2c9644f109b015ba35677151bc70b6ffa9ffee80c8 SHA512 8decb24a22fdceeebe45fcff73d99ae1eeebf8f9c679f25cb049c804c5ea74ed297593839aef509ea63afc0a36f5821750be93c14cb5872af163f5c815156b30
-DIST dosbox-staging-0.75.0.tar.gz 1805354 BLAKE2B e376006a2c3890d98efdaa8041634bfca8b95f6c6471f36f8fdd53e319aad8d37f20bd195a20264bade1e6974327f1f888dec6050da493fc8a6e6bb6c5739150 SHA512 2e049ed44928ad4adeaca73d328cf8f415bcb8c1a399306b1e8a5fd2b7cd7c3d3fe10017b47e5d2f3e54c34042ee901b98486f5b47a3d2eaf43f4e13891f8b70
 DIST dosbox-staging-0.75.1.tar.gz 1806471 BLAKE2B 5f9f8038327eb46c2c2b5035ca8e2cc93660bb6ce1dfa9572bf67278f14455db723104c0ab4e90b805cc7dbf253f61528ad6a31edb574af57e106f613958aede SHA512 3e14354e4eb697514c4348af2e73e9f2fb84cc3796b5cfea37faac355bd93a54b0f9c717bf0ab75d824cf34e3ee0d40546e2bbf80bc924a37bd8f981f054e4e9
-EBUILD dosbox-staging-0.75.0.ebuild 1049 BLAKE2B 177b6ea5ff84054f8c1d8fff96c9285dcd568eb16cc3dac46e4300640cd2e95813a3cae882096dbf1d0c389cfc2245265dc1d13105a6f13aed71fb98ab40c3f1 SHA512 89b941f8bb32a7a6143f6d73ed5237c17bd6329aa0db52b8aed2f7cc4ee61bd2e372eb6ad09ae6aaf1ac9d382eed0d4ae7030e7a45fc82aec2e68cbaa6f21eb9
 EBUILD dosbox-staging-0.75.1-r1.ebuild 1143 BLAKE2B 1f33243b1456d1d2fb5115e5df6dbac30e3a64a0878da6959e0bacc5e432a8d4e2c87cef20fe60ca0336cf80600c0e530aac72711beaea3b02796e2e8052b046 SHA512 269e2f0cb924dac13326a916c24039a94b467da5599c84584253811d1911810d9bd57c010ff430f7a2fc3f909113dc9e9d8cadd8a060f5c7f91982470c05b8dd
-EBUILD dosbox-staging-0.75.1.ebuild 1095 BLAKE2B d5c6bf5e1c7bec8e04a9582cc1f97e108e4d40fdaf5673004e839ef0174b092d5368a6a725665eb80f9c035b061f35d255035c8853091806cd75db57cc817310 SHA512 ab5b0baf7f037c143db13a01002f1ba6672d6c64c3dd1a5f783aea509ecc2d5f22c53b6d8b331156c719fc2111ead5fa5718a9c944f3ba5419f1acfc667eaf53
+EBUILD dosbox-staging-0.75.1-r2.ebuild 1185 BLAKE2B fbcb61faa5d6afd97bb8c6c89f40058cf88eef869a3dcd3650dd424ee5a70a195aec384cb60916a003eb87183b2fd3b8033cfc2e6cc6a3b537a85cdd6c0ad5d1 SHA512 b3246d917c3b2da8d3767d45620245dd481591541ea7ace985c4e0b1142efc05f3219a354c62c95eaca09f6eb44b600615666ecbd2e6c8e4120cfd5424404673
 MISC metadata.xml 620 BLAKE2B 6d3e457fdeda6a756be2a0e8360af6c680fa29f24979bb838330a427c637d29d908fd42711dd561be823b726a94db2de29f0772118f30146638d48c8bfd2722b SHA512 630dbd73aa1f06464bcfd44bec97b1dda5afe21de38876d6cbfb2a506e3fbe461766d2eec6d8df4afdc8ec9badc2239da91b589e08425f91f4bc0ea99455bb9e
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
deleted file mode 100644
index 45521a91d417..000000000000
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop
-
-DESCRIPTION="Modernized DOSBox soft-fork"
-HOMEPAGE="https://dosbox-staging.github.io/"
-SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec opengl opus"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	debug? ( sys-libs/ncurses:0= )
-	opengl? ( virtual/opengl )
-	opus? ( media-libs/opusfile )
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,opengl?,video,X]
-	media-libs/sdl-net
-	sys-libs/zlib
-	!games-emulation/dosbox"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable debug) \
-		$(use_enable !dynrec dynamic-x86) \
-		$(use_enable dynrec) \
-		$(use_enable opengl) \
-		$(use_enable opus opus-cdda)
-}
-
-src_install() {
-	default
-	doicon contrib/icons/${PN}.svg
-	make_desktop_entry dosbox DOSBox-staging ${PN}
-}
diff --git a/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
index 3ace52dd1429..12e1e2970308 100644
--- a/games-emulation/dosbox-staging/dosbox-staging-0.75.1.ebuild
+++ b/games-emulation/dosbox-staging/dosbox-staging-0.75.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop
+inherit autotools desktop xdg
 
 DESCRIPTION="Modernized DOSBox soft-fork"
 HOMEPAGE="https://dosbox-staging.github.io/"
@@ -11,21 +11,22 @@ SRC_URI="https://github.com/dosbox-staging/dosbox-staging/archive/v${PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dynrec opengl opus"
+IUSE="alsa debug dynrec network opengl opus"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	debug? ( sys-libs/ncurses:0= )
+	network? ( media-libs/sdl2-net )
 	opengl? ( virtual/opengl )
 	opus? ( media-libs/opusfile )
 	media-libs/libpng:0=
 	media-libs/libsdl2[joystick,opengl?,video,X]
-	media-libs/sdl-net
 	sys-libs/zlib
 	!games-emulation/dosbox"
 DEPEND="${RDEPEND}"
 BDEPEND=""
 
-PATCHES=( "${FILESDIR}"/${P}-pthread.patch )
+PATCHES=( "${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-pthread.patch )
 
 src_prepare() {
 	default
@@ -38,12 +39,13 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable !dynrec dynamic-x86) \
 		$(use_enable dynrec) \
+		$(use_enable network) \
 		$(use_enable opengl) \
 		$(use_enable opus opus-cdda)
 }
 
 src_install() {
 	default
-	doicon contrib/icons/${PN}.svg
-	make_desktop_entry dosbox DOSBox-staging ${PN}
+	doicon -s scalable contrib/icons/${PN}.svg
+	domenu contrib/linux/dosbox-staging.desktop
 }
diff --git a/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
new file mode 100644
index 000000000000..fb2c24267f05
--- /dev/null
+++ b/games-emulation/dosbox-staging/files/dosbox-staging-0.75.1-ar.patch
@@ -0,0 +1,11 @@
+diff -Naur dosbox-staging-0.75.1.orig/configure.ac dosbox-staging-0.75.1/configure.ac
+--- dosbox-staging-0.75.1.orig/configure.ac	2020-08-19 10:49:45.000000000 +0200
++++ dosbox-staging-0.75.1/configure.ac	2020-09-04 23:03:11.375920481 +0200
+@@ -17,6 +17,7 @@
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Checks for programs.
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_CPP