gentoo resync : 13.06.2020

7 files changed, 120 insertions, 45 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 30ff10ee9ffb..07412de356db 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index a02a2a1c660d..56c6b506196e 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -2,6 +2,9 @@ AUX angband-4.1.3-tinfo.patch 824 BLAKE2B cfcc662b6837c84b7758931744b446c269a7a2
 AUX angband-4.2.0-gcc-10.patch 503 BLAKE2B e020ad8ec0515d1d7163e9b0611f6501b9b0131e3756d21a1b18f82e139b5b379b58059f4800595abe8af704b28c55de4f59c8b9c7bbd3c7c0c20d1c8852ae41 SHA512 8079f63ec939f72bb14d3b41d57e3434fba9c490577cd267e5dfce6af3db2027d97dcc1ff91eeffe4cd4cfd844c638dcf5f7d290c1c0f45b1aeef1c4338401fc
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47 SHA512 7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
 DIST angband-4.2.0.tar.gz 24727127 BLAKE2B 4bdd5cfe49080fc38b988e6606eadddc2e872ca7b01f34e692ca299a420689310e9e972355986e802e654a27837ac2621eb3bc0823b7e771dc0a851a5c5a8bc6 SHA512 b5c4884ce765bc45d7c21b8be06bc29c7d84c16e48341967b5d6a847f250db104ef509fc28e8887d4f1cd9ed545e504781186936a1f38931d5113e2fb58b32c3
+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.1.3.ebuild 2229 BLAKE2B d38bbb531edaae78e632eb0d9d74dfbdc3238d89005d1c9df1cecb54c8572d3932c5209042803ad1e5d58c684360cecd8276be99a0cae6bf720d570f372e8450 SHA512 b9425cf626ce9b4c5b4dd1d525c5373a6f68c63cc7240c4ea68446ae242a7c288365c43fdf67f126134f12d0bb6aaed7d4455cdbdf4763e7aec37a56d33e1f69
 EBUILD angband-4.2.0.ebuild 2651 BLAKE2B 0dbdf4d0c22eb29341c5145b4524122b58060359ce4ccb5e04058dbfe13679a038d395ad83e3a7bec9843fee7cef10288009f3c6b6bbc5627a9a50d10971ecdf SHA512 0b156bc86b3554a383cc15ba30ba93f921fd4cb5ebc40b33b2be6a4c149dbc8dd053e35e1485cbf97ea7904b556c4e5ff82d18286652fd93b228dcf3a6c04066
+EBUILD angband-4.2.1.ebuild 2205 BLAKE2B 59b6d8be51e44c2db40b4cc9082a6e1f8bd04e6274f3b8597cae625f84769c1d2ec6e368060cdb86490dde48c0bedfd8f0036a97192c578875cabb910d4768fa SHA512 fe8e004693073996f2e7d5701f9265d8d65c350f50a69f64a7082d3f98283c75661a12ee228167313cc0f10ece561a85fd521150bfdb96a35e73e1a14e35590b
 MISC metadata.xml 487 BLAKE2B 4b3f298db150c90e551d7ce2c46b9f3929eec0cc8ebd3c0e601841afae7234ab5f7369ea2d3a7189a3f407ffec918d612f238133166f3a565c2f056d9e7f443a SHA512 16308369154cd36398eae5339bfa8c8f387919635678be9b11040a0bad027a5df6d895ff9d598dc000af46751468d9964fac636794cb3c56438d10fc99b95af3
diff --git a/games-roguelike/angband/angband-4.2.1.ebuild b/games-roguelike/angband/angband-4.2.1.ebuild
new file mode 100644
index 000000000000..2582bae99159
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 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
+	https://dev.gentoo.org/~steils/distfiles/${P}-man.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ncurses sdl sound +X"
+
+REQUIRED_USE="sound? ( sdl )
+	|| ( X ncurses )"
+
+RDEPEND="X? (
+		media-fonts/font-misc-misc
+		x11-libs/libX11
+	)
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	sdl? (
+		media-libs/libsdl2[video,X]
+		media-libs/sdl2-image
+		media-libs/sdl2-ttf
+		sound? (
+			media-libs/libsdl2[sound]
+			media-libs/sdl2-mixer[mp3]
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
+	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
+
+	if use !sound ; then
+		sed -i -e 's/sounds//' lib/Makefile || die
+	fi
+
+	# Game constant files are now system config files in Angband, but
+	# users will be hidden from applying updates by default
+	{
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
+		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
+	} > "${T}"/99${PN} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/usr/bin
+		--with-private-dirs
+		$(use_enable X x11)
+		$(use_enable ncurses curses)
+	)
+	if use sdl; then
+		myconf+=(
+			--enable-sdl2
+			$(use_enable sound sdl2-mixer)
+		)
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc changes.txt README.md
+	doman "${WORKDIR}"/${PN}.1
+	doenvd "${T}"/99${PN}
+
+	if use X || use sdl; then
+		use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
+		use sdl && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}"
+
+		local s
+		for s in 16 32 128 256 512; do
+			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
+		done
+		newicon -s scalable lib/icons/att.svg "${PN}.svg"
+	fi
+}
+
+pkg_postinst() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use X || use sdl; then
+		xdg_icon_cache_update
+	fi
+}
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
index 8853d7a1b589..33924e7560c9 100644
--- a/games-roguelike/moria/Manifest
+++ b/games-roguelike/moria/Manifest
@@ -1,6 +1,5 @@
-AUX moria-5.7.10-gentoo-paths.patch 1823 BLAKE2B 74ae8ba961a1dbd0ee42426d0cbae960a35175e5dea792ac5930524e78b6382f9e52c629bb30c02c64e31a42374b7c0c20f7ab6fb5cea9045eb0bf9f04c384d8 SHA512 8c03251777e230fe60751a107864da5c06aea6a4aa4fe8daf4373bc18dce672d1e798163837587992ef85107dd3e838d38e2d033bb7eec85be8a928cd74beed0
-AUX moria-5.7.10-tinfo.patch 700 BLAKE2B da5668f85f1e83af86332ced8d6f76d2cc16ea20fc8b2c4713fc375222c13a3d1d44ef1aaa88a7206ad831813b257a2ef8b780d8803375ad34a08327a1eea5eb SHA512 89003bf4c7a6a416817a017ca332c7e0a9dea6d4abc849fb61381e5382975c37aa0025cb9301e2a1e2ed4a9c4463bcf64e49c1d48fddf37f4bd71988d76ba0ab
+AUX moria-5.7.12-gentoo-paths.patch 1842 BLAKE2B bb5460110dd86feff51ab50a66cf54c6ae2b98c81af590205da9c361278396da109dc9443ee14f6697944b59b9b17f404bf904d91e84dc46ac1b9a8e7196f041 SHA512 cdd4e7161799204c9d99e7c52f69430aae0e8b96aa9622f89bdfe6288899133cd836af04ed0a5593a01539c4762e527630f2d8ffa9081deb7df991a5c3d82c7d
 AUX moria.6 2996 BLAKE2B ee20dc08b849eccf3860736b401a500f50598c340c0098d6cd820eb65ecbe13467b09ef23ab4982204b394ca8e0ef644bfbff4c8dd9df07ff15cb2b635d6af5e SHA512 54d4914f4c9bf364ef8539079d0a3cf91257309a479818e106c5ee41bbf2dab608074988d12529fd726e4cafd5c48baed4793f32a2a254593a928c5b6d1b9bd5
-DIST moria-5.7.10.tar.gz 392842 BLAKE2B 6b1f372d2c5503c708428b119e2c0333d3134eab3bd76ad8453ee062764b41d9dccca31c1512bd9561b5ba48b59dac32a447bb058c26c1cd9595cdc2e06cb9fc SHA512 f81754f03ae36ab5a8737fb0ae18da422b87da8684d00c88c934afa2c0b42e429c23a475751c506b499f809a421d1d3dfcc729e0d64d901b2e6c74e444d0f06f
-EBUILD moria-5.7.10.ebuild 1343 BLAKE2B a706f0551f139430f9c2b55bbad7887f86139c1e10658f165cf8c15abb2eef4b6eab1a13dc658d30da4ac5f5bd70cf6bbeec5733996e8c19308d84e1aff62256 SHA512 eaf9d9b3401ada996b79eaa4202472a238860be78d374fd847c4a528b46452f7debfedb31b0b72c4bc553455b337b56eae73b673208fc5baa8cc767c82233c2e
+DIST moria-5.7.12.tar.gz 394633 BLAKE2B a73213809ee2f68249cd6c91b9b90a68b91fb1ffb40609c62becd05fd8f874bc6ce7ede97e76dcaab6f8081203f42c5295a1f5613d2d47644b5c585b4e96f2e1 SHA512 007768586e5a8fe11a6f65981fa1fe0071b00c53730b309883710a8f1f6bb8f812926467ec2947be7f582228f6d2e5d3d7306ee5504f2ffc056d3ed343d7a9cb
+EBUILD moria-5.7.12-r1.ebuild 1174 BLAKE2B 6b05b83caa86efe9c25e6aaba348a37611baf1a77966132ef15c14de0a9a894266c5df7c720fd5578af6125f4b5b43a7617f544d66a2e0473ec5a87e1fa856dc SHA512 de737e95cf29315a04c4d69dc7370b29f83746657a740bb446acb3455a507e1098d8f306ef39568fb628cf4889df430250c939276ce52bfdeddbd4433fbd4f2d
 MISC metadata.xml 342 BLAKE2B f53651879ccf3a26ac770d9746a76f5d59eb4403db9bdd4ae5f222f1a8e26c8a0c1ff86c47f087381d49229c1bc9473c7415072fd716ba0ba57f88c21198e5f2 SHA512 f6c4db0374588d0ba1070fdba2e38d647de66378fccc6a59e96c27cd50b4e2f9071259202cb1b33fe99d57332230dc68d450df2017ee1124f6b505d40f9f9843
diff --git a/games-roguelike/moria/files/moria-5.7.10-tinfo.patch b/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
deleted file mode 100644
index 5173a7d00f4e..000000000000
--- a/games-roguelike/moria/files/moria-5.7.10-tinfo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From aa3ebbd2eb4b4a6ab92833060c212255d90c68b4 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Mon, 11 Feb 2019 01:53:10 +0200
-Subject: [PATCH] Find NCurses library on Linux/Mac
-
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 372d838..f39ebcd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -261,6 +261,7 @@ elseif ((MSYS OR MINGW) AND NOT "$ENV{MINGW}" STREQUAL "")
-     set(CURSES_LIBRARIES "/$ENV{MINGW}/lib/libncurses.a")
- else ()
-     message(STATUS "NOTE: Configuring build for macOS/Linux release...")
-+    set(CURSES_NEED_NCURSES TRUE)
-     find_package(Curses REQUIRED)
- endif ()
- 
--- 
-2.20.1
-
diff --git a/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch b/games-roguelike/moria/files/moria-5.7.12-gentoo-paths.patch
index 0d17c549e773..a5ae834413d7 100644
--- a/games-roguelike/moria/files/moria-5.7.10-gentoo-paths.patch
+++ b/games-roguelike/moria/files/moria-5.7.12-gentoo-paths.patch
@@ -1,8 +1,8 @@
 diff --git a/src/config.cpp b/src/config.cpp
-index 09528f7..1c299ed 100644
+index 36f565b..bfe1b18 100644
 --- a/src/config.cpp
 +++ b/src/config.cpp
-@@ -12,17 +12,17 @@ namespace config {
+@@ -13,17 +13,17 @@ namespace config {
      // Data files used by Umoria
      // NOTE: use relative paths to the executable binary.
      namespace files {
@@ -19,7 +19,7 @@ index 09528f7..1c299ed 100644
 -        const std::string scores = "scores.dat";
 +        const std::string splash_screen = "/usr/share/moria/splash.txt";
 +        const std::string welcome_screen = "/usr/share/moria/welcome.txt";
-+        const std::string license = "/usr/share/doc/@PF@/LICENSE";
++        const std::string license = "/usr/portage/licenses/GPL-2";
 +        const std::string versions_history = "/usr/share/moria/versions.txt";
 +        const std::string help = "/usr/share/moria/help.txt";
 +        const std::string help_wizard = "/usr/share/moria/help_wizard.txt";
@@ -29,5 +29,5 @@ index 09528f7..1c299ed 100644
 +        const std::string death_royal = "/usr/share/moria/death_royal.txt";
 +        const std::string scores = "/var/lib/moria/scores.dat";
          std::string save_game = "game.sav";
-     }
+     } // namespace files
  
diff --git a/games-roguelike/moria/moria-5.7.10.ebuild b/games-roguelike/moria/moria-5.7.12-r1.ebuild
index 39187828c506..4e425eb4de66 100644
--- a/games-roguelike/moria/moria-5.7.10.ebuild
+++ b/games-roguelike/moria/moria-5.7.12-r1.ebuild
@@ -22,14 +22,10 @@ BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/umoria-${PV}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo-paths.patch"
-	"${FILESDIR}/${P}-tinfo.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-5.7.12-gentoo-paths.patch" )
 
 src_prepare() {
 	cmake_src_prepare
-	sed -i "s/@PF@/${PF}/" src/config.cpp || die
 	hprefixify src/config.cpp
 }
 
@@ -37,20 +33,15 @@ src_install() {
 	newbin umoria/umoria moria
 
 	insinto /usr/share/moria
-	doins data/*.txt
+	doins umoria/data/*.txt
 
 	insinto /var/lib/moria
-	doins data/scores.dat
+	doins umoria/scores.dat
 	fowners root:gamestat /var/lib/moria/scores.dat
 	fperms g+w /var/lib/moria/scores.dat
 
 	doman "${FILESDIR}"/${PN}.6
-	dodoc -r AUTHORS README.md docs
-
-	# The game binary will look for plain text LICENSE
-	insinto /usr/share/doc/${PF}
-	doins LICENSE
-	docompress -x /usr/share/doc/${PF}/LICENSE
+	dodoc -r AUTHORS CHANGELOG.md CONTRIBUTING.md README.md historical
 }
 
 pkg_postinst() {