gentoo resync : 08.07.2021

3 files changed, 5 insertions, 60 deletions

diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index b62d58c61f90..ae27b1b90fba 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,5 +1,4 @@
-AUX angband-4.2.1-sdl2-sound.patch 1637 BLAKE2B b922eb6399fdd9f49b6a716a11b84101385f132ce46f8e6c30298f6c80a0a86fb09f0a55192d0cc927d2ea0ccc5d435900664757b47688cb2edafd4920e0a23c SHA512 1f35ad9480120112c78cd251710a40e70148f33e2edddcf4ce144b83ca6ed958a9d47a905a0c14c19633d8edee9410c9f9e929919380d0584ebb944b3d555268
-DIST angband-4.2.1-man.tar.gz 104660 BLAKE2B ac7a413b1ec29cb3740fb1e57c238a5f87b9bc6965c4180a62e4089eb4b2cf7fa8f4eb2017d605255eacbb2856e64449745144ce0d9848a3b5cfd123fa1e39da SHA512 2dd9e40e6bd4804162fb810d40a81932c65d01b8c8f019e73194f83b222e3ae319fe4b22ad8f59f88cb473426ad59efd4988d0bfaf289726453fa83d678e9ae8
-DIST angband-4.2.1.tar.gz 24938593 BLAKE2B ecacf4bd3681f205a3eb0a5b5ddf0fb7ff92600c26dffec3fc8addaccf7da26fd4f805e5fc11803c165c35e8adff9ae6bced08381ddde0e39bc914fac043e11c SHA512 e13681bcd74fa56fe5c606d62f1e9761c9fc5367194e0e46894a5ebf108e1553a1f96191e139f1574238b72c635436c3108c80bc656aba8e328fe4e5b301c6bc
-EBUILD angband-4.2.1-r1.ebuild 2254 BLAKE2B 899ab9227e709e61a7d1208c4cbd6924371fa67e7d51c0c79132db0c740ea211332cc88633f6fa342b5517443b251a5b7425a824d1ec16be37b3f0a190e1676b SHA512 f0529dc562613f961e087a39e59676eb8f9a5b5cb4da62dbec8206872ffdeb5b962e3514b73151ca064b490c71ed6ab9a8d9dc58c07f5e6d9f31706b9c59d27d
+DIST angband-4.2.2-man.tar.gz 105892 BLAKE2B 226210bd45f463e2b6bc099f889393832b5ce9bf5f95b5de1bc38fbcef61287515435ceef83a717bd62220fe01d5acf33e3fe240c08e3cf7d04e9d59fee132f1 SHA512 f373ea55c5f2349c615c47207c1dbbcc6a77246fbb0615d00a1fcb2a2a0cdf839bb5d57c2e29a2f2698f2d6b72698fbaec6bb221994566be04046ce03ea6253a
+DIST angband-4.2.2.tar.gz 24992436 BLAKE2B 6beab7d0481167538714f540e9825e930d57457c923b77e2a9be71e8a6e382b70f375e85e68f0ebf9a65b61b835d62df0a5958a21198d9049088cdbe32c81efc SHA512 07a9b6a10a47afafde8f5db1e463c70198d386e07737666e044de291eab4b425d76bc8124153b7c371248f0c9aedc01578a90e513d744e3f30d26ab22c940698
+EBUILD angband-4.2.2.ebuild 2207 BLAKE2B dbb9e7ae1ec5237a3a1da044e2c78e0509b758ab113f6483a8f3688da804ab9d5576e5838c7800d610632069718121aabb654c3ec59746af088ed0d94c55fa71 SHA512 53095f279ee117123d2025f305b5dcb63a077ca71d9e84d37775f53775fdc5958aa3f9aff0991f15cf52667e3034cb06d72814b1c0989f4e572188cfed2fd8d8
 MISC metadata.xml 430 BLAKE2B 7245504be968d4ce51d4a782520dd8e8b1acda9c16aeeea78674b350df8a15f88a6338ad8fe3852c5f8290c1198af0b32372fce2f3e13f7dac8063d0816f5431 SHA512 4cb61f2b253a390e59abb74f1d67171f73ec30cf38a3d05bdd23f36faf2b4a639f8dd117ec87b69a19faed0e7d117060c4aabae543aef988348591dd4c01a0f6
diff --git a/games-roguelike/angband/angband-4.2.1-r1.ebuild b/games-roguelike/angband/angband-4.2.2.ebuild
index 5261fcba1660..e4bebd7a3816 100644
--- a/games-roguelike/angband/angband-4.2.1-r1.ebuild
+++ b/games-roguelike/angband/angband-4.2.2.ebuild
@@ -1,15 +1,13 @@
-# 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 xdg-utils
 
-MAJOR_PV=$(ver_cut 1-2)
-
 DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
 HOMEPAGE="https://rephial.org/"
-SRC_URI="https://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz
+SRC_URI="https://github.com/angband/angband/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz"
 
 LICENSE="GPL-2"
@@ -37,8 +35,6 @@ RDEPEND="X? (
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-sdl2-sound.patch" )
-
 src_prepare() {
 	default
 
diff --git a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch b/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
deleted file mode 100644
index accbc8355579..000000000000
--- a/games-roguelike/angband/files/angband-4.2.1-sdl2-sound.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bbfe78654e2f67da264d81d25fe1e6332302e51a Mon Sep 17 00:00:00 2001
-From: Eric Branlund <ebranlund@fastmail.com>
-Date: Sat, 11 Jul 2020 11:07:24 -0700
-Subject: [PATCH] Adjusted so "./configure --enable-sdl2-mixer" and then
- compiling generates an executable where "angband --help" lists the SDL sound
- module as available.
-
-Upstream-Status: Accepted
-[https://github.com/angband/angband/commit/bbfe78654e2f67da264d81d25fe1e6332302e51a]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- configure.ac     | 2 +-
- src/sound-core.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 968aaa914..9d0b1e600 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -337,7 +337,7 @@ if test "$enable_sdl2_mixer" = "yes"; then
- 			SDL2_LIBS=`sdl2-config --libs`
- 			LIBS="${LIBS} ${SDL2_LIBS} -lSDL2_mixer"
- 		fi
--		MAINFILES="${MAINFILES} \$(SNDSDL2FILES)"
-+		MAINFILES="${MAINFILES} \$(SNDSDLFILES)"
- 	fi
- fi
- 
-diff --git a/src/sound-core.c b/src/sound-core.c
-index 261009429..8b8ef7ffd 100644
---- a/src/sound-core.c
-+++ b/src/sound-core.c
-@@ -20,7 +20,7 @@
- #include "sound.h"
- #include "main.h"
- #include "ui-prefs.h"
--#ifdef SOUND_SDL
-+#if defined(SOUND_SDL) || defined(SOUND_SDL2)
- #include "snd-sdl.h"
- #endif
- 
-@@ -55,7 +55,7 @@ static struct msg_snd_data message_sounds[MSG_MAX];
-  */
- static const struct sound_module sound_modules[] =
- {
--#ifdef SOUND_SDL
-+#if defined(SOUND_SDL) || defined(SOUND_SDL2)
- 	{ "sdl", "SDL_mixer sound module", init_sound_sdl },
- #endif /* SOUND_SDL */
- #if (!defined(WIN32_CONSOLE_MODE) && defined(WINDOWS) && !defined(USE_SDL) && !defined(USE_SDL2))