games-action/minetest: Fix ignored server flag

The 'dedicated' flag is removed and the 'client' flag is introduced.

Closes: https://bugs.gentoo.org/687048
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12140
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index c302c3ff8ee8635b7234335a7edd52acf5cc4d76..f23df1a68b7578f111547a2172e3823b1fe023c8 100644 (file)
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -38,15 +38,16 @@
                <name>Proxy Maintainers</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="server">Build Minetest server</flag>
                <flag name="spatial">Enable SpatialIndex AreaStore backend
                </flag>
-               <flag name="server">Build minetest server</flag>
        </use>
        <upstream>
                <bugs-to>https://github.com/minetest/minetest/issues</bugs-to>

diff --git a/games-action/minetest/minetest-5.0.1-r2.ebuild b/games-action/minetest/minetest-5.0.1-r2.ebuild
new file mode 100644 (file)
index 0000000..072c5ed
--- /dev/null
+++ b/games-action/minetest/minetest-5.0.1-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils user xdg
+
+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="+client +curl doc +leveldb luajit ncurses nls postgres redis +server +sound spatial +truetype"
+REQUIRED_USE="|| ( client server )"
+
+RDEPEND="
+       dev-db/sqlite:3
+       dev-libs/gmp:0=
+       dev-libs/jsoncpp:=
+       sys-libs/zlib
+       client? (
+               app-arch/bzip2
+               dev-games/irrlicht
+               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 )
+       )
+       curl? ( net-misc/curl )
+       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}"
+BDEPEND="
+       doc? (
+               app-doc/doxygen
+               media-gfx/graphviz
+       )
+       nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+       if use server ; 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
+
+       # remove bundled gmp/jsoncpp
+       rm -rf lib/{gmp,jsoncpp} || die
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -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}"
+               -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=1
+               -DRUN_IN_PLACE=0
+       )
+
+       use server && 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=( "${BUILD_DIR}"/doc/html/. )
+       fi
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       if use server ; then
+               newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+               newconfd "${T}"/minetestserver.confd minetest-server
+       fi
+}
+
+pkg_postinst() {
+       xdg_pkg_postinst
+
+       if use client ; then
+               elog
+               elog "optional dependencies:"
+               elog "  games-action/minetest_game (official mod)"
+               elog
+       fi
+
+       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."
+               elog "Default logfile is ~/minetest-server.log"
+               elog
+       fi
+
+       elog
+       elog "The version 5.x series is not compatible to the version 0.4 series."
+       elog "This applies to clients and servers, other content such as mods,"
+       elog "texture packs and worlds is unaffected and backwards-compatible"
+       elog "as usual."
+       elog
+}
+
+pkg_postrm() {
+       xdg_pkg_postrm
+}