From 6051083a35f39976b4200bdb69f0c6c0d38ea1b3 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sat, 22 Feb 2020 22:09:03 +0000 Subject: games-action/minetest: Drop old 5.1.0-r1 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: James Le Cuirot --- games-action/minetest/Manifest | 1 - games-action/minetest/files/5.1.0-FindJson.patch | 31 ----- games-action/minetest/minetest-5.1.0-r1.ebuild | 140 ----------------------- 3 files changed, 172 deletions(-) delete mode 100644 games-action/minetest/files/5.1.0-FindJson.patch delete mode 100644 games-action/minetest/minetest-5.1.0-r1.ebuild (limited to 'games-action') diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest index 32bddbc98b7e..c808144d7b00 100644 --- a/games-action/minetest/Manifest +++ b/games-action/minetest/Manifest @@ -1,2 +1 @@ -DIST minetest-5.1.0.tar.gz 8939376 BLAKE2B 5c56bd74a573632636937c5e5a45eb864ec627962b73573a763be7326c2a3fa95ad87683d655725b29d29d91270812beef33c21b3eb100627f21befeb2dbfac5 SHA512 f2cad4720c1003536cc3c619c18234a95cae1dee8fb54b46a2ef5fd24108a4c945efcb0a461926ef3ede7b8bec41ed6620806212fe11f4142bbf31fe4f0f659e DIST minetest-5.1.1.tar.gz 9002025 BLAKE2B 8258850a0f45125a09e0a4cf5eda7a8860be4f0a5e564767952e27fc8509593bf0615c1457a0ee168f6eeedcf1065e288b787d74e1d0a2180870bc1bae818bfc SHA512 4a36a86a3e5f8f5246ff3410e9ab182631f38292bea077e7dbc25fdc1520e5a479ffbd5ec447000fb4999ab252a59bf976299e6fecda1f8cd47f40549885766b diff --git a/games-action/minetest/files/5.1.0-FindJson.patch b/games-action/minetest/files/5.1.0-FindJson.patch deleted file mode 100644 index 3d48b0a0924c..000000000000 --- a/games-action/minetest/files/5.1.0-FindJson.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 706b6aad06a112f55105f08b6acd130b276a06ca Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Sat, 16 Nov 2019 13:14:24 -0500 -Subject: [PATCH] Fix find_path for newer jsoncpp installations - -The upstream JsonCpp project has renamed the `json/features.h` file to -`json/json_features.h`. This patch fixes the JsonCpp installation search -by looking for `json/allocator.h` which has not been renamed on newer -versions of JsonCpp. - -Fixes: https://github.com/minetest/minetest/issues/9119 ---- - cmake/Modules/FindJson.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake -index 26339a29..53ddf459 100644 ---- a/cmake/Modules/FindJson.cmake -+++ b/cmake/Modules/FindJson.cmake -@@ -8,7 +8,7 @@ option(ENABLE_SYSTEM_JSONCPP "Enable using a system-wide JSONCPP. May cause seg - - if(ENABLE_SYSTEM_JSONCPP) - find_library(JSON_LIBRARY NAMES jsoncpp) -- find_path(JSON_INCLUDE_DIR json/features.h PATH_SUFFIXES jsoncpp) -+ find_path(JSON_INCLUDE_DIR json/allocator.h PATH_SUFFIXES jsoncpp) - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(JSONCPP DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR) --- -2.24.0 - diff --git a/games-action/minetest/minetest-5.1.0-r1.ebuild b/games-action/minetest/minetest-5.1.0-r1.ebuild deleted file mode 100644 index 018526a2e715..000000000000 --- a/games-action/minetest/minetest-5.1.0-r1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="A free open-source voxel game engine with easy modding and game creation" -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 ncurses nls postgres redis +server +sound spatial +truetype" -REQUIRED_USE="|| ( client server )" - -RDEPEND=" - dev-db/sqlite:3 - dev-games/irrlicht - dev-lang/luajit:2 - dev-libs/gmp:0= - dev-libs/jsoncpp:= - sys-libs/zlib - client? ( - app-arch/bzip2 - 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:= ) - ncurses? ( sys-libs/ncurses:0= ) - nls? ( virtual/libintl ) - postgres? ( >=dev-db/postgresql-9.5:= ) - redis? ( dev-libs/hiredis:= ) - server? ( - acct-group/minetest - acct-user/minetest - ) - spatial? ( sci-libs/libspatialindex:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( sys-devel/gettext )" - -PATCHES="${FILESDIR}/${PV}-FindJson.patch" - -src_prepare() { - cmake_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 libraries - rm -rf lib || 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=1 - -DENABLE_POSTGRESQL=$(usex postgres) - -DENABLE_REDIS=$(usex redis) - -DENABLE_SPATIAL=$(usex spatial) - -DENABLE_SOUND=$(usex sound) - -DENABLE_SYSTEM_GMP=1 - -DENABLE_SYSTEM_JSONCPP=1 - -DRUN_IN_PLACE=0 - ) - - use server && mycmakeargs+=( - -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht" - ) - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc ; then - cmake_src_compile doc - HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - fi -} - -src_install() { - cmake_src_install - - if use server ; then - keepdir /var/log/minetest - fowners minetest:minetest /var/log/minetest - - newconfd "${T}"/minetestserver.confd minetest-server - newinitd "${FILESDIR}"/minetestserver.initd minetest-server - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - if use server ; then - elog - elog "Configure your server via /etc/conf.d/minetest-server" - 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 -} -- cgit v1.2.3-65-gdbad