gentoo resync : 06.08.2019

4 files changed, 131 insertions, 1 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 79b558d4b57d..b40a5e84515c 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
index 899797c3ba66..42b2c9c7f225 100644
--- a/games-roguelike/angband/Manifest
+++ b/games-roguelike/angband/Manifest
@@ -1,4 +1,6 @@
 AUX angband-4.1.3-tinfo.patch 824 BLAKE2B cfcc662b6837c84b7758931744b446c269a7a2958c183a3cf86368231116aaed065b37d93aca2a1d6e42af5a04c2bbf4db96a0aa2f188cd96eb81b01bcbcadc2 SHA512 00770084dcbab766384cbb5617efd8ae73191c46b59e64658b063c51c49d8d82c9d03e9b995bab8a609a67b5f9e92c77fa92aff987fdc2ecfbcfae38b6d7f638
 DIST angband-4.1.3.tar.gz 19924395 BLAKE2B 573181ab9b3a01abdc34cfac9e69a757eb7558c67c9490240890bc920c6c2a8ebea6268b733f06a6e421829d807fa135131c1512edfc344610a269139cc5ac47 SHA512 7810e1f04e337c1b5d1ddb6013785c953e0149dfa536c75dd8816fdfd304c37a09103d653cee0c150225c6ba702e121300a65012d8034079cd41f86a730f9c2a
+DIST angband-4.2.0.tar.gz 24727127 BLAKE2B 4bdd5cfe49080fc38b988e6606eadddc2e872ca7b01f34e692ca299a420689310e9e972355986e802e654a27837ac2621eb3bc0823b7e771dc0a851a5c5a8bc6 SHA512 b5c4884ce765bc45d7c21b8be06bc29c7d84c16e48341967b5d6a847f250db104ef509fc28e8887d4f1cd9ed545e504781186936a1f38931d5113e2fb58b32c3
 EBUILD angband-4.1.3.ebuild 2229 BLAKE2B d38bbb531edaae78e632eb0d9d74dfbdc3238d89005d1c9df1cecb54c8572d3932c5209042803ad1e5d58c684360cecd8276be99a0cae6bf720d570f372e8450 SHA512 b9425cf626ce9b4c5b4dd1d525c5373a6f68c63cc7240c4ea68446ae242a7c288365c43fdf67f126134f12d0bb6aaed7d4455cdbdf4763e7aec37a56d33e1f69
-MISC metadata.xml 430 BLAKE2B 7245504be968d4ce51d4a782520dd8e8b1acda9c16aeeea78674b350df8a15f88a6338ad8fe3852c5f8290c1198af0b32372fce2f3e13f7dac8063d0816f5431 SHA512 4cb61f2b253a390e59abb74f1d67171f73ec30cf38a3d05bdd23f36faf2b4a639f8dd117ec87b69a19faed0e7d117060c4aabae543aef988348591dd4c01a0f6
+EBUILD angband-4.2.0.ebuild 2608 BLAKE2B 80906623c96b7130985d04e919abe35731b6d204215c30d4f50e757fb0972868fb719b9b8f42ce61440a043e1eae0561d0687a192ca390e7e72b8c28c374dd8f SHA512 a4ccbb2cd36206024c4a28d8ab4e0f6c3f75bb538c89dc2481991e2c286f4d82c59a12b4a596f64da0a15dfc71b545f6f0259647e633330095dfc14efc7b5e8a
+MISC metadata.xml 487 BLAKE2B 4b3f298db150c90e551d7ce2c46b9f3929eec0cc8ebd3c0e601841afae7234ab5f7369ea2d3a7189a3f407ffec918d612f238133166f3a565c2f056d9e7f443a SHA512 16308369154cd36398eae5339bfa8c8f387919635678be9b11040a0bad027a5df6d895ff9d598dc000af46751468d9964fac636794cb3c56438d10fc99b95af3
diff --git a/games-roguelike/angband/angband-4.2.0.ebuild b/games-roguelike/angband/angband-4.2.0.ebuild
new file mode 100644
index 000000000000..acb1f3d093ca
--- /dev/null
+++ b/games-roguelike/angband/angband-4.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ncurses sdl sdl2 sound +X"
+
+REQUIRED_USE="sdl2? ( sdl )
+	sound? ( sdl )
+	|| ( X ncurses )"
+
+RDEPEND="X? (
+		media-fonts/font-misc-misc
+		x11-libs/libX11
+	)
+	ncurses? ( sys-libs/ncurses:0=[unicode] )
+	sdl? (
+		!sdl2? (
+			media-libs/libsdl[video,X]
+			media-libs/sdl-image
+			media-libs/sdl-ttf
+			sound? (
+				media-libs/libsdl[sound]
+				media-libs/sdl-mixer[mp3]
+			)
+		)
+		sdl2? (
+			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
+		if use sdl2; then
+			myconf+=(
+				--enable-sdl2
+				$(use_enable sound sdl2-mixer)
+			)
+		else
+			myconf+=(
+				--enable-sdl
+				$(use_enable sound sdl-mixer)
+			)
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc changes.txt readme.txt
+	dodoc docs/{a-quick-demo,attack,birth,command,customize,dungeon,faq,guide}.rst
+	doenvd "${T}"/99${PN}
+
+	if use X || use sdl; then
+		use X && make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
+		if use sdl; then
+			use sdl2 && make_desktop_entry "angband -msdl2" "Angband (SDL2)" "${PN}" \
+				 || make_desktop_entry "angband -msdl" "Angband (SDL)" "${PN}"
+		fi
+
+		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/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index 3f75f809dba5..a3f5689683f2 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Stefan Strogin</name>
 	</maintainer>
 	<use>
+		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
 		<flag name="sound">Enable and install sounds</flag>
 	</use>
 </pkgmetadata>