gentoo resync : 30.06.2019

5 files changed, 19 insertions, 294 deletions

diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 20bb8ef6ebda..3252cc178038 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1,12 +1,8 @@
 AUX minetestserver.confd 313 BLAKE2B 67e0b20c320d93323affd63b58085c7e0371f2ac68a541cd59a5327811bb420a42951b12396fe9c73e83be38c1a9affa25f5257e9e8488cdf9074498c1664d60 SHA512 96fe764d78b383f294bce81e8631861057f309fd9d13f9397ca0c715396f3793f201f313a3507c0b190f41891441eb4fe418b5888cb73ffdea0d27969d0172c3
 AUX minetestserver.initd 558 BLAKE2B 70557c32b4aaff21ea8e8101b90bb2f1278dfbaa684152024130603a1c69ac93790983777eed666069bfe8898a4b3d20fca4f8dba6a93018e238bc6274ca1c41 SHA512 0be59fb3b42632d3a6badd01362bf62519da9cf4a1a726f304167c7ecd52c7643c04cc410bbfd3096ebd6413242cb28e3d149b06858b25344fd5a2412b6f0907
-DIST minetest-0.4.16.tar.gz 7753044 BLAKE2B a35a0bcab00393fc72e5d932a86ebacdd1b3aa5a850e36f7b788599086c65f549341fa05fcbc0c6a09540df79d840611ec352d79e673ba63575a9f51fd5e22af SHA512 c124a997d9eb242885551e5c68948158cbd172ccd44fb1feb4d7aea487f876a2421bc990528dbfb6baf2033bfd4759d17138ed95b077e0ba80785a6e7ff521a2
 DIST minetest-0.4.17.1.tar.gz 7758675 BLAKE2B 93f5f1ce32b98bb78a6ae5bc2ab9110902e118480b37b8c9cf87f1c6aa986f379e1191e82d4a764fb2aa0a0747c113e80cd014e6a06e0a485a59e516c4644fc6 SHA512 9f84ae45ebe181cb1cd2dff6b71b558eb276472efdfcd73bd02a111b2761793d49681bdfbbeaccc28f4a2f49e15b80d04b78db2f2f728c852c188b0c96aae618
-DIST minetest-0.4.17.tar.gz 7757149 BLAKE2B 9ee908990224da800e7f0f4fc5e28d5bde03f4486d43ad58225d8ec056f8209fde94597798c977e1d3f3f8cbeadeb0bcdae6eb2aac2b8572fcbcfa28bbd62eba SHA512 3015f5a03be37c5395b55b6dc9f883f9270b19f709a47250f36bc7b1ce6d04a0e89e4366d86da33bbebbfb64f04ff008aec66c96930d7314991a21160265bafe
 DIST minetest-5.0.1.tar.gz 8761122 BLAKE2B 888e29b956d66543dd506b8e7eadd2e9d37324aebd4f84989745090fe927e97355c2baa7d615f5e0f8e2a074724b89bdf5f807c297cce1bc8483e500b0248e22 SHA512 00f0c77c19eb9619387285e5dad690c8aa9969ff11c4de0bdae99ee6e9a4508a8c2f977837fc2e01aebc5d4c1a5191d4f56acb131182d73c8f50da1458695607
-EBUILD minetest-0.4.16-r1.ebuild 3226 BLAKE2B 917e9af650a0e760804a2247b516565864390686141c67293aa38fd3ef52a0f6a68dd8713f9b6d48fb38b006c3dbcc4c2251373daf9e92bc53758a3a4dcc769d SHA512 0e5bbfc042b0951b7bd1fa589b91a280372bceaec7703046a0e124eb0c81d4572b821a72733c2ad30eed56dc7d2ff42f6d41d8e4670f1fa8551391acec3ce414
-EBUILD minetest-0.4.17-r1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
 EBUILD minetest-0.4.17.1.ebuild 3296 BLAKE2B e659a638177d0f1435352476393e71c6aef503fb8ce83b0bef7144c6d8c29b55955fa9e73e01f3e4954fb6eec0eaba0bcc351dce27dbe8879d8184d4ea9be206 SHA512 6024a9de7ce3ee7372f7ced01a40b0b060a351fce506d506a9fd1f225ba8cf858ca031851aeb11da351d3dac75624bcce1da924f239d83b12f79e85604ddf9ca
-EBUILD minetest-5.0.1-r1.ebuild 3518 BLAKE2B 5fe7cdd41d77c57043a028ab548d6d2ff6baa466971330d11f603fee5071cd0d448da1c577920e335c0948cf7e4457b289b8d443ec898c52a1f012304910c616 SHA512 412facd744106ea1496c1b471056479e6ce38953efa9ad2bf0b7ed7cc2d451bdf673de9e6c83ff258ff8a46392ba21c53a07607d6684ee82992ff08db4fd51b2
 EBUILD minetest-5.0.1-r2.ebuild 3517 BLAKE2B 2d1e9f190a174175414c425c287622f1df602fb5be8592fa91fc62e56cd40d975eb284414387064f4be510e3afbbc3df1489168b6353b2edb577d6aa147e5a69 SHA512 0d6807cbfccdf1d3e6b414b83b937b1b2a2350fccae5cf098203831723c15ae898b8281102f89dbd13a98b3e1d1574aada6e21a71cad36c17acd602f234f8eb3
-MISC metadata.xml 2267 BLAKE2B b03bb79a231ef1cb5ae32ac59af11f3b19bf82fbd8c443dc3a028a7414bf09bf8eff90c14fbec64a369ba02d5b996001f03c5e7c5fe426d4506dadfb088a62bc SHA512 9aa15538ab9b6e99edca42bf61bb2395dec41e055cf9887d60d72193a06c2a8378c025d0b819ffee67dc340640b78e3f5485d22144b5ba4ef05c1745d481550b
+EBUILD minetest-5.0.1-r3.ebuild 3482 BLAKE2B 732d29a9aa58e847ebb8bec326696ab41f06ae76143e877e51445d7acd22001f469c36ad6d1a23c7f5e27c7c3856d934a304271b5e9c9c7ae5494bebb59fa616 SHA512 42637b6bae4046b4096a803cfb0f9c4c78958dd2094dbeabe0ac7e00f89da508c0d623cf63ffebe872df70ef344d32dd9689376d729b51994f28605dca5e1f09
+MISC metadata.xml 2303 BLAKE2B 37bcfc74b9694d78509eaf30e0b3bf13e5cc956d6d0389157239c857f9d999ad72c58d52637a276d3fac4a291e788d1572f7c4d60e9176f809dd70829a6f3cb3 SHA512 ebbc2d4dacd8f3cce1863c2dd3ef9eee024631544cbe251efa56a417dd5e1f440f95eb1aee812bff8a9a5a1a8aee5b3833efca84f2fdbd756bcb1daa662f9ea6
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index f23df1a68b75..be715192bea9 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -37,14 +37,15 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build Minetest client</flag>
 		<flag name="jsoncpp">Enable using a system-wide JSONCPP</flag>
 		<flag name="leveldb">Enable LevelDB backend</flag>
-		<flag name="postgres">Optionally use PostgreSQL as map backend</flag>
-		<flag name="redis">Enable redis backend via
-			<pkg>dev-libs/hiredis</pkg>
-		</flag>
+		<flag name="redis">Enable redis backend via <pkg>dev-libs/hiredis</pkg></flag>
 		<flag name="server">Build Minetest server</flag>
 		<flag name="spatial">Enable SpatialIndex AreaStore backend
 		</flag>
diff --git a/games-action/minetest/minetest-0.4.16-r1.ebuild b/games-action/minetest/minetest-0.4.16-r1.ebuild
deleted file mode 100644
index 8291b16dba14..000000000000
--- a/games-action/minetest/minetest-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils gnome2-utils user vcs-snapshot
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
-
-RDEPEND="dev-db/sqlite:3
-	sys-libs/zlib
-	curl? ( net-misc/curl )
-	!dedicated? (
-		app-arch/bzip2
-		>=dev-games/irrlicht-1.8-r2
-		dev-libs/gmp:0=
-		media-libs/libpng:0=
-		virtual/jpeg:0
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXxf86vm
-		sound? (
-			media-libs/libogg:=
-			media-libs/libvorbis:=
-			media-libs/openal:=
-		)
-		truetype? ( media-libs/freetype:2 )
-	)
-	leveldb? ( dev-libs/leveldb )
-	luajit? ( dev-lang/luajit:2 )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	postgres? ( >=dev-db/postgresql-9.5:= )
-	redis? ( dev-libs/hiredis )
-	spatial? ( sci-libs/libspatialindex )"
-DEPEND="${RDEPEND}
-	>=dev-games/irrlicht-1.8-r2
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use server || use dedicated ; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# set paths
-	sed \
-		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
-		-e "s#@GROUP@#${PN}#g" \
-		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex !dedicated)
-		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
-		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
-		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
-		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_FREETYPE=$(usex truetype)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GLES=0
-		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_POSTGRESQL=$(usex postgres)
-		-DENABLE_REDIS=$(usex redis)
-		-DENABLE_SPATIAL=$(usex spatial)
-		-DENABLE_SOUND=$(usex sound)
-		-DENABLE_LUAJIT=$(usex luajit)
-		-DENABLE_CURSES=$(usex ncurses)
-		-DRUN_IN_PLACE=0
-	)
-
-	use dedicated && mycmakeargs+=(
-		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_src_compile doc
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server || use dedicated ; then
-		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-		newconfd "${T}"/minetestserver.confd minetest-server
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use dedicated ; then
-		elog
-		elog "optional dependencies:"
-		elog "	games-action/minetest_game (official mod)"
-		elog
-	fi
-
-	if use server || use dedicated ; then
-		elog
-		elog "Configure your server via /etc/conf.d/minetest-server"
-		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
-		elog "Default logfile is ~/minetest-server.log"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/minetest/minetest-0.4.17-r1.ebuild b/games-action/minetest/minetest-0.4.17-r1.ebuild
deleted file mode 100644
index b71ccc4d1979..000000000000
--- a/games-action/minetest/minetest-0.4.17-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils user
-
-DESCRIPTION="An InfiniMiner/Minecraft inspired game"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated doc jsoncpp +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
-
-RDEPEND="dev-db/sqlite:3
-	sys-libs/zlib
-	curl? ( net-misc/curl )
-	!dedicated? (
-		app-arch/bzip2
-		>=dev-games/irrlicht-1.8-r2
-		dev-libs/gmp:0=
-		media-libs/libpng:0=
-		virtual/jpeg:0
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXxf86vm
-		sound? (
-			media-libs/libogg:=
-			media-libs/libvorbis:=
-			media-libs/openal:=
-		)
-		truetype? ( media-libs/freetype:2 )
-	)
-	jsoncpp? ( dev-libs/jsoncpp )
-	leveldb? ( dev-libs/leveldb:= )
-	luajit? ( dev-lang/luajit:2 )
-	ncurses? ( sys-libs/ncurses:0= )
-	nls? ( virtual/libintl )
-	postgres? ( >=dev-db/postgresql-9.5:= )
-	redis? ( dev-libs/hiredis )
-	spatial? ( sci-libs/libspatialindex )"
-DEPEND="${RDEPEND}
-	>=dev-games/irrlicht-1.8-r2
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use server || use dedicated ; then
-		enewgroup ${PN}
-		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	# set paths
-	sed \
-		-e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
-		-e "s#@GROUP@#${PN}#g" \
-		"${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex !dedicated)
-		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
-		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
-		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
-		-DENABLE_CURL=$(usex curl)
-		-DENABLE_CURSES=$(usex ncurses)
-		-DENABLE_FREETYPE=$(usex truetype)
-		-DENABLE_GETTEXT=$(usex nls)
-		-DENABLE_GLES=0
-		-DENABLE_LEVELDB=$(usex leveldb)
-		-DENABLE_LUAJIT=$(usex luajit)
-		-DENABLE_POSTGRESQL=$(usex postgres)
-		-DENABLE_REDIS=$(usex redis)
-		-DENABLE_SPATIAL=$(usex spatial)
-		-DENABLE_SOUND=$(usex sound)
-		-DENABLE_SYSTEM_JSONCPP=$(usex jsoncpp)
-		-DRUN_IN_PLACE=0
-	)
-
-	use dedicated && mycmakeargs+=(
-		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_src_compile doc
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/doc/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server || use dedicated ; then
-		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-		newconfd "${T}"/minetestserver.confd minetest-server
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use dedicated ; then
-		elog
-		elog "optional dependencies:"
-		elog "	games-action/minetest_game (official mod)"
-		elog
-	fi
-
-	if use server || use dedicated ; then
-		elog
-		elog "Configure your server via /etc/conf.d/minetest-server"
-		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
-		elog "Default logfile is ~/minetest-server.log"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-action/minetest/minetest-5.0.1-r1.ebuild b/games-action/minetest/minetest-5.0.1-r3.ebuild
index 8147fcf53adb..044a72c0e999 100644
--- a/games-action/minetest/minetest-5.0.1-r1.ebuild
+++ b/games-action/minetest/minetest-5.0.1-r3.ebuild
@@ -12,17 +12,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+IUSE="+client +curl doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+REQUIRED_USE="|| ( client server )"
 
 RDEPEND="
 	dev-db/sqlite:3
+	dev-games/irrlicht
 	dev-libs/gmp:0=
 	dev-libs/jsoncpp:=
 	sys-libs/zlib
-	curl? ( net-misc/curl )
-	!dedicated? (
+	client? (
 		app-arch/bzip2
-		dev-games/irrlicht
 		media-libs/libpng:0=
 		virtual/jpeg:0
 		virtual/opengl
@@ -35,6 +35,7 @@ RDEPEND="
 		)
 		truetype? ( media-libs/freetype:2 )
 	)
+	curl? ( net-misc/curl )
 	leveldb? ( dev-libs/leveldb:= )
 	luajit? ( dev-lang/luajit:2 )
 	ncurses? ( sys-libs/ncurses:0= )
@@ -51,7 +52,7 @@ BDEPEND="
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-	if use server || use dedicated ; then
+	if use server ; then
 		enewgroup ${PN}
 		enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	fi
@@ -71,7 +72,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_CLIENT=$(usex !dedicated)
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_SERVER=$(usex server)
 		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
 		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
@@ -92,7 +94,7 @@ src_configure() {
 		-DRUN_IN_PLACE=0
 	)
 
-	use dedicated && mycmakeargs+=(
+	use server && mycmakeargs+=(
 		-DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
 	)
 
@@ -111,7 +113,7 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	if use server || use dedicated ; then
+	if use server ; then
 		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
 		newconfd "${T}"/minetestserver.confd minetest-server
 	fi
@@ -120,14 +122,14 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	if ! use dedicated ; then
+	if use client ; then
 		elog
 		elog "optional dependencies:"
 		elog "	games-action/minetest_game (official mod)"
 		elog
 	fi
 
-	if use server || use dedicated ; then
+	if use server ; then
 		elog
 		elog "Configure your server via /etc/conf.d/minetest-server"
 		elog "The user \"minetest\" is created with /var/lib/${PN} homedir."
@@ -142,7 +144,3 @@ pkg_postinst() {
 	elog "as usual."
 	elog
 }
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}