gentoo resync : 15.12.2019

5 files changed, 5 insertions, 125 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 2ed439b3e5da..f3eab139e277 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index f57a772c3bec..99ea9b6bfc90 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -1,10 +1,6 @@
-AUX Makefile 1169 BLAKE2B 79ffa48adf56ae2233d9e10e6bb20acb55984cf969d50d2d2a73a31783b6692517062a1960eb01f1c9dd56c0d8ed38dd1612745e26101349f54e878941e2c605 SHA512 94baa1189e6a01415d46c475a0d1e40c785ded0473fd7dd89f136df36c07d58f718fee23b7d885e5ee8774a62063c9d92a1d26b02643f36ad5562e3e168e86bf
 AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c57200bd272ae37d5871793d5a0308cde8b4c3be9824b5549a23429d465f874e0ca018862f3072dc3b SHA512 d390c65f406cf8b43f3d493cd6513167c122a5811e3bc8614a66dc080eac21df9fc1d5f110503c8f6815f683eaeb5ddcdd833d310400ccc2426ae81c2b8159f8
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
-DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be SHA512 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
-DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
 DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
 DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
-EBUILD dwarf-fortress-0.43.05.ebuild 2340 BLAKE2B 7a7f1e620345917ec3f3bd50718ac70c3542dcfa1efa68dc6af4e258bda1c89103265fdd5906507297a807504f03502260a8f5a49fd130c7d9ee6a139b415a11 SHA512 dea3a21f4b69854a6ef8eaf5fd7688c67595a8b4bebef745c85ae8a32786fd37200723113b644b87da1af16ecbba91b25af768519ba719ec24ee4181a2d24526
 EBUILD dwarf-fortress-0.44.12.ebuild 2340 BLAKE2B 7a7f1e620345917ec3f3bd50718ac70c3542dcfa1efa68dc6af4e258bda1c89103265fdd5906507297a807504f03502260a8f5a49fd130c7d9ee6a139b415a11 SHA512 dea3a21f4b69854a6ef8eaf5fd7688c67595a8b4bebef745c85ae8a32786fd37200723113b644b87da1af16ecbba91b25af768519ba719ec24ee4181a2d24526
-MISC metadata.xml 244 BLAKE2B b555c02e321a80c79408860928b5218ead8d9d3f3a9062305b74aeee30f22bef5ff0efaddc7fbfc0ca845c0a71bc0dc7c055d58686b6c335d33c23ff1bdc81e6 SHA512 becc8f40ea3cff7e5b8d752c3c521601207e37cbc5936dcb5e923ac43050009773ed1dc260725e1f1da38f81082c6aeb6e8cf4f3c092b54d9c32b704064e0789
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
deleted file mode 100644
index 1407c994deae..000000000000
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
-MY_PN=df
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
-	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
-
-LICENSE="free-noncomm BSD BitstreamVera"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="media-libs/glew:0
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/gtk+:2"
-# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
-# dlopens them at runtime if requested.
-DEPEND="${RDEPEND}
-	media-libs/libsndfile
-	media-libs/openal
-	sys-libs/ncurses-compat:5[unicode]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}_linux
-
-gamesdir="/opt/${PN}"
-QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
-RESTRICT="strip"
-
-src_prepare() {
-	rm -f libs/*.so* || die
-	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
-	default
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
-}
-
-src_compile() {
-	emake -f "${FILESDIR}/Makefile.native"
-	sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
-}
-
-src_install() {
-	# install data-files and libs
-	insinto "${gamesdir}"
-	doins -r raw data libs
-
-	# install our wrapper
-	dobin dwarf-fortress
-
-	# install docs
-	dodoc README.linux *.txt
-
-	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
-}
-
-pkg_postinst() {
-	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
-	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
-	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
-	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
-	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
-	elog
-	elog "Optional runtime dependencies:"
-	elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
-	elog "Install media-libs/openal and media-libs/libsndfile for audio output"
-	elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
-}
diff --git a/games-roguelike/dwarf-fortress/files/Makefile b/games-roguelike/dwarf-fortress/files/Makefile
deleted file mode 100644
index 856670b6a67e..000000000000
--- a/games-roguelike/dwarf-fortress/files/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2014-2016 Alex Xu (Hello71)
-# Distributed under the terms of the GNU General Public License v2
-
-PKG_CONFIG ?= pkg-config
-PKG_CONFIG_PATH ?= /usr/lib32/pkgconfig:/usr/lib/pkgconfig
-PKG_CONFIG := PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG)
-
-SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
-	g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \
-	g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \
-	g_src/music_and_sound_openal.cpp g_src/random.cpp g_src/textlines.cpp \
-	g_src/enabler_input.cpp g_src/KeybindingScreen.cpp \
-	g_src/win32_compat.cpp g_src/textures.cpp g_src/resize++.cpp \
-	g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp g_src/ViewBase.cpp
-OBJS := $(SRCS:.cpp=.o)
-
-BLIBS := ncursesw openal sndfile
-LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
-CXXFLAGS ?= -O2 -pipe -Wall -Wextra
-CXXFLAGS += -m32 $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
-LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
-
-LG := libs/libgraphics.so
-
-all: $(LG)
-$(LG): $(OBJS)
-	$(LINK.cpp) -shared $^ $(LDLIBS) -o $@
-
-clean:
-	$(RM) $(LG) $(OBJS)
-
-.PHONY: clean
diff --git a/games-roguelike/dwarf-fortress/metadata.xml b/games-roguelike/dwarf-fortress/metadata.xml
index 3d014ad3a9b6..26079e608bed 100644
--- a/games-roguelike/dwarf-fortress/metadata.xml
+++ b/games-roguelike/dwarf-fortress/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>creffett@gentoo.org</email>
-	<name>Chris Reffett</name>
-</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 </pkgmetadata>