gentoo resync : 15.01.2020

6 files changed, 93 insertions, 123 deletions

diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
index 1f0946fbc919..e8ee3c941efa 100644
--- a/games-strategy/dunelegacy/Manifest
+++ b/games-strategy/dunelegacy/Manifest
@@ -1,5 +1,4 @@
-AUX dunelegacy-0.96.3-build.patch 1942 BLAKE2B 8a230ae20884b11b4608437c03466a856b66e49136574ee5c55c5e90de34efbbb0bab7ed4fe90e2653b44fa1f5adb94d002e7d51912732d22bc5e891e593515c SHA512 fa3ffaa26ba1d85bc65d646347ef9c725bfb4f8b7e78c3ca13429356def201bb255d31c6ec684ca99dd0928bf9a3b83af547a7cb865ba1c2475ce03401fa91bb
-DIST dunelegacy-0.96.3-no-autoreconf.patch.xz 8908 BLAKE2B eb1c0a5a155851e199ad2c1f0cbd8f7c583ac148f92e1b2829607c0960bf09a6d8bea8e34749df726f394b3cf796f0c457086d993ace2b3336ce99ed36fb77e1 SHA512 fc17c771a19611057b2990b76eda0eea08e011dcac455bdf7e26bba1f2e2aa6cec120f2dcbce488a2318553f9e58b4a2b5ea24c7e1e27ada9ec5740f2b66ca4c
-DIST dunelegacy-0.96.3-src.tar.bz2 1652302 BLAKE2B 4502300f1364027f1734a0738a648a9ac473a142e8091d08f5c44996fa41a26e91ab030f90d3f961b95b44e7e2bcb72a376915dc014aafee5e3d0dc4f6c8915b SHA512 c84281b44bdac4eec360d90e2f23aa75468cf08c6edd6a5002c539e609312fd39e3284518ef5498201f2b0433d11cf2478cd13a2159af7c6bbef326e680fa241
-EBUILD dunelegacy-0.96.3.ebuild 1392 BLAKE2B 38f15a59aa1cbded27c61a6f5250e494228c2c1591cebe3abfaab5b27ea024d92ed6d9f7b5c0f0f82e71af305a4455cb99cbf35a6b60fa8538b74f81d77e5e32 SHA512 29ec490705192497ca8e4d27a491d70afb56af253e3e73f230a37255dc0f263de3e3acf75b3836931ae96da73f0fa3e061a9d545c6fa9d6851abc0563cbfc240
-MISC metadata.xml 1103 BLAKE2B 0c07587dff0530955a552cf5dee9835ab0c8b3478e994c0b75524ceb6914a4714e02ad13ab52fba10b401a98a068aae9990ea936333014e8c7226c07aef8983c SHA512 de8920f2cb074e969cb3b8310bf2fb111c52c90a2675833fdefc895cafac79091cee0696b52a40065cd81289d80796cb0b0e40bd8db0e349ba92ec180091edcb
+AUX dunelegacy-0.96.4-init-mid.patch 1926 BLAKE2B 47c2f502e9428f0534a1684db50aa1a41103464770f8da66f69b0add7687f42e07e4f5e612f3c425f3d0f932da29d7a6049342b6bbd0b0166cbec4d5076703c6 SHA512 a10fb87b3bceb367e53dd3687354871fc8bec3dff2025b37c4426994a206c7afbd416c003f2eddfe3d1cef7e845942d2a8db4529e84c38d4b29d75d016fa8729
+DIST dunelegacy-0.96.4-src.tar.bz2 2513167 BLAKE2B 119ccabc319a54fbc85906a215ccb44079dabf82568dbd446447bbc6fade873c4760da83a50351acf63aec49bf8364c50386eef2b0681bc7a895db870673340f SHA512 d6e152da4bc526ed05ac89fafc2e3467b1a95b3670987eeca262b7207e7dbe67dd228483cb5a432fe08232e34a52d4cb500b42cd186adb4bcde5da17419f7db0
+EBUILD dunelegacy-0.96.4.ebuild 806 BLAKE2B 03ba909beb05d2eae3aff020116b962189cd4ef4497154f3050100127912cdf33a33481ee09334c9564f772883ccca4c11baed1519d7d17b61458c87d2b57501 SHA512 c17ad6aa55d7698361ad6ce55906e8e97cb8e90d2b4564a8d161a21416269163ace3ddcb1851ab26b3a23678fa789400a20c1790f90999ed78c576409bcbb365
+MISC metadata.xml 989 BLAKE2B bfaf381dc676d28e93858a0322e8f5aa8453fd7aa0d8c832cc9aa4d5857dd6abfe9ba1b545f419732c0d15cca724dabe3799f45532645be08c5adcfd95b8e3dd SHA512 b0863ae1a4847b6c9b6486666328f3a97bba2a360c16bc219ca4a2099c3c6eebea64c51b9253c9fba2c3e4431b7254932ec5ba44072e6f80b52ac965729c4e79
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
deleted file mode 100644
index ee94d40caa60..000000000000
--- a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# do not use autotools related stuff in stable ebuilds
-# unless you like random breakage: 469796, 469798, 424041
-
-EAPI=5
-inherit eutils gnome2-utils games # STABLE ARCH
-#inherit autotools eutils gnome2-utils games # UNSTABLE ARCH
-
-DESCRIPTION="Updated clone of Westood Studios' Dune2"
-HOMEPAGE="http://dunelegacy.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf.patch.xz" # STABLE ARCH
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+alsa pulseaudio"
-
-RDEPEND="media-libs/libsdl[X,alsa?,sound,pulseaudio?,video]
-	media-libs/sdl-mixer[midi,mp3,vorbis]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# exits on start without libsdl[alsa] or libsdl[pulseaudio]
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-no-autoreconf.patch.xz # STABLE ARCH
-#	epatch "${FILESDIR}"/${P}-build.patch # UNSTABLE ARCH
-#	eautoreconf # UNSTABLE ARCH
-}
-
-src_install() {
-	default
-
-	doicon -s scalable ${PN}.svg
-	doicon -s 48 ${PN}.png
-	make_desktop_entry ${PN} "Dune Legacy"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild
new file mode 100644
index 000000000000..5270312de457
--- /dev/null
+++ b/games-strategy/dunelegacy/dunelegacy-0.96.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="Updated clone of Westood Studios' Dune II"
+HOMEPAGE="http://dunelegacy.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="media-libs/libsdl2[sound,threads,video]
+	media-libs/sdl2-mixer[midi]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-init-mid.patch
+)
+
+src_prepare() {
+	default
+
+	# Prepend upstream flags.
+	sed -i -r 's/^(C.*FLAGS)=[^$]+$/\0" ${\1}"/' configure || die
+}
+
+src_install() {
+	default
+
+	doicon -s scalable ${PN}.svg
+	doicon -s 48 ${PN}.png
+	newicon -s 128 ${PN}-128x128.png ${PN}.png
+	make_desktop_entry ${PN} "Dune Legacy"
+}
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
deleted file mode 100644
index 93dd907738bc..000000000000
--- a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Aug 9 18:57:40 2012 +0200
-
-    respect flags
-    use pkg-config
-    use LDADD instead of LDFLAGS for libs
-
---- configure.ac
-+++ configure.ac
-@@ -16,14 +16,6 @@
- 
- AC_SUBST(dunelegacydatadir)
- 
--dnl Some flags for gcc
--CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG"
--dnl Additional flags: -Wconversion -Wno-sign-conversion
--
--dnl Some flags for clang
--dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter"
--
--
- dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead
- oldCFLAGS="$CFLAGS"
- CFLAGS="-ffp-contract=off"
-@@ -33,34 +25,14 @@
- )
- CFLAGS="$oldCFLAGS"
- 
--case "$target_cpu" in
--i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
--esac
--
--AC_ARG_ENABLE([debug],
--            [AS_HELP_STRING([--enable-debug],
--              [compile with debug information @<:@default=disabled@:>@])],
--            [],
--            [])
--
--if test "$enable_debug" = "yes" ; then
--	CXXFLAGS="$CXXFLAGS -g"
--fi
- 
- dnl Check for SDL library
- SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer])
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- 
--dnl Check for SDL_mixer library.
--AC_CHECK_LIB(SDL_mixer, 
--       Mix_OpenAudio, 
--       LIBS="$LIBS -lSDL_mixer", 
--       AC_MSG_ERROR([*** SDL_mixer library not found!]) 
--)
--
- dnl enet defines
- AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
- AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
diff --git a/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch
new file mode 100644
index 000000000000..46966269dcad
--- /dev/null
+++ b/games-strategy/dunelegacy/files/dunelegacy-0.96.4-init-mid.patch
@@ -0,0 +1,50 @@
+From e227fc26ffff199a6a659dbe954ff7b764658d4d Mon Sep 17 00:00:00 2001
+From: Richard Schaller <richard.schaller@gmx.de>
+Date: Sat, 30 Mar 2019 18:07:28 +0100
+Subject: [PATCH] Support for SDL_mixer 2.0.2 or higher: MIX_INIT_FLUIDSYNTH
+ was renamed to MIX_INIT_MID
+
+---
+ src/FileClasses/music/DirectoryPlayer.cpp | 4 ++++
+ src/FileClasses/music/XMIPlayer.cpp       | 6 ++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/src/FileClasses/music/DirectoryPlayer.cpp b/src/FileClasses/music/DirectoryPlayer.cpp
+index 531d971..05d800c 100644
+--- a/src/FileClasses/music/DirectoryPlayer.cpp
++++ b/src/FileClasses/music/DirectoryPlayer.cpp
+@@ -59,7 +59,11 @@ DirectoryPlayer::DirectoryPlayer() : MusicPlayer(settings.audio.playMusic, setti
+ 
+     music = nullptr;
+ 
++#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2)
++    Mix_Init(MIX_INIT_MID | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
++#else
+     Mix_Init(MIX_INIT_FLUIDSYNTH | MIX_INIT_FLAC | MIX_INIT_MP3 | MIX_INIT_OGG);
++#endif
+ }
+ 
+ DirectoryPlayer::~DirectoryPlayer() {
+diff --git a/src/FileClasses/music/XMIPlayer.cpp b/src/FileClasses/music/XMIPlayer.cpp
+index a7e5150..0fcfa8f 100644
+--- a/src/FileClasses/music/XMIPlayer.cpp
++++ b/src/FileClasses/music/XMIPlayer.cpp
+@@ -30,9 +30,15 @@
+ XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) {
+     music = nullptr;
+ 
++#if SDL_VERSIONNUM(SDL_MIXER_MAJOR_VERSION, SDL_MIXER_MINOR_VERSION, SDL_MIXER_PATCHLEVEL) >= SDL_VERSIONNUM(2,0,2)
++    if((Mix_Init(MIX_INIT_MID) & MIX_INIT_MID) == 0) {
++        SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError());
++    }
++#else
+     if((Mix_Init(MIX_INIT_FLUIDSYNTH) & MIX_INIT_FLUIDSYNTH) == 0) {
+         SDL_Log("XMIPlayer: Failed to init required midi support: %s", SDL_GetError());
+     }
++#endif
+ }
+ 
+ XMIPlayer::~XMIPlayer() {
+-- 
+2.24.1
+
diff --git a/games-strategy/dunelegacy/metadata.xml b/games-strategy/dunelegacy/metadata.xml
index 4dc56b2c71f1..54f6bacf4aab 100644
--- a/games-strategy/dunelegacy/metadata.xml
+++ b/games-strategy/dunelegacy/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<bugs-to>https://sourceforge.net/apps/mediawiki/dunelegacy/index.php?title=Development/Reporting_Bugs</bugs-to>
 		<remote-id type="sourceforge">dunelegacy</remote-id>
 	</upstream>
 	<longdescription lang="en">