From 63b2cfbcff0cb9c548f3c1714006da64c25d016e Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Thu, 29 Mar 2018 11:33:29 +0300 Subject: [PATCH] Old ebuilds removed. --- games-action/minetest/Manifest | 1 - .../files/minetest-0.4.10-as-needed.patch | 35 ---- .../minetest/files/minetest-json.patch | 69 -------- .../minetest/files/minetestserver.confd | 16 -- .../minetest/files/minetestserver.initd | 36 ----- games-action/minetest/minetest-0.4.13.ebuild | 150 ------------------ games-action/minetest_game/Manifest | 1 - .../minetest_game/minetest_game-0.4.13.ebuild | 25 --- 8 files changed, 333 deletions(-) delete mode 100644 games-action/minetest/Manifest delete mode 100644 games-action/minetest/files/minetest-0.4.10-as-needed.patch delete mode 100644 games-action/minetest/files/minetest-json.patch delete mode 100644 games-action/minetest/files/minetestserver.confd delete mode 100644 games-action/minetest/files/minetestserver.initd delete mode 100644 games-action/minetest/minetest-0.4.13.ebuild delete mode 100644 games-action/minetest_game/Manifest delete mode 100644 games-action/minetest_game/minetest_game-0.4.13.ebuild diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest deleted file mode 100644 index a1a405bc..00000000 --- a/games-action/minetest/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST minetest-0.4.13.tar.gz 8366306 SHA256 40bafab13e20e7a550ceaa25ef82dd7b4b8188ee8e8080e1ae9295b82603d5e1 SHA512 e2228f540d3b982515de85635a84e5f157894b5eb1c654da76e1f69e398c69ff0d4d569a5035146b5c80130e9353e020c86c6acc20813075cfd7c9e5c2df2652 WHIRLPOOL 4048db2da06cfb161b794359e4a24573c51553ec98a022295d8de4623c64ac9d235d4cf8ec7a842bdafc91aa147d244ed4aed3991064b5dcb42932fafa42da7b diff --git a/games-action/minetest/files/minetest-0.4.10-as-needed.patch b/games-action/minetest/files/minetest-0.4.10-as-needed.patch deleted file mode 100644 index 83d1ca7b..00000000 --- a/games-action/minetest/files/minetest-0.4.10-as-needed.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd -Author: hasufell -Date: Mon Nov 25 00:28:55 2013 +0100 - - CMAKE: fix linking order - - this also fixes linking with as-needed wrt - https://github.com/minetest/minetest/issues/617 - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a1fee7a..a72bd4a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -427,18 +427,18 @@ if(BUILD_CLIENT) - set(minetest_LIBS - ${PROJECT_NAME} - ${ZLIB_LIBRARIES} -- ${IRRLICHT_LIBRARY} -+ ${X11_LIBRARIES} - ${OPENGL_LIBRARIES} -+ ${OPENGLES2_LIBRARIES} - ${JPEG_LIBRARIES} - ${BZIP2_LIBRARIES} - ${PNG_LIBRARIES} -- ${X11_LIBRARIES} -+ ${IRRLICHT_LIBRARY} - ${GETTEXT_LIBRARY} - ${SOUND_LIBRARIES} - ${SQLITE3_LIBRARY} - ${LUA_LIBRARY} - ${JSON_LIBRARY} -- ${OPENGLES2_LIBRARIES} - ${PLATFORM_LIBS} - ${CLIENT_PLATFORM_LIBS} - ) diff --git a/games-action/minetest/files/minetest-json.patch b/games-action/minetest/files/minetest-json.patch deleted file mode 100644 index d3964bcb..00000000 --- a/games-action/minetest/files/minetest-json.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- cmake/Modules/FindJson.cmake -+++ cmake/Modules/FindJson.cmake -@@ -1,18 +1,18 @@ - # Look for json, use our own if not found - --#FIND_PATH(JSON_INCLUDE_DIR json.h) -+FIND_PATH(JSON_INCLUDE_DIR json.h PATHS /usr/include/jsoncpp/json) - --#FIND_LIBRARY(JSON_LIBRARY NAMES json) -+FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp json) - --#IF(JSON_LIBRARY AND JSON_INCLUDE_DIR) --# SET( JSON_FOUND TRUE ) --#ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR) -+IF(JSON_LIBRARY AND JSON_INCLUDE_DIR) -+ SET( JSON_FOUND TRUE ) -+ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR) - --#IF(JSON_FOUND) --# MESSAGE(STATUS "Found system json header file in ${JSON_INCLUDE_DIR}") --# MESSAGE(STATUS "Found system json library ${JSON_LIBRARY}") --#ELSE(JSON_FOUND) -+IF(JSON_FOUND) -+ MESSAGE(STATUS "Found system json header file in ${JSON_INCLUDE_DIR}") -+ MESSAGE(STATUS "Found system json library ${JSON_LIBRARY}") -+ELSE(JSON_FOUND) - SET(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json) - SET(JSON_LIBRARY json) - MESSAGE(STATUS "Using project json library") --#ENDIF(JSON_FOUND) -+ENDIF(JSON_FOUND) ---- src/serverlist.cpp -+++ src/serverlist.cpp -@@ -27,7 +27,15 @@ - #include "filesys.h" - #include "porting.h" - #include "log.h" --#include "json/json.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #if USE_CURL - #include - #endif ---- src/serverlist.h -+++ src/serverlist.h -@@ -19,7 +19,15 @@ - - #include - #include "config.h" --#include "json/json.h" -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - - #ifndef SERVERLIST_HEADER - #define SERVERLIST_HEADER diff --git a/games-action/minetest/files/minetestserver.confd b/games-action/minetest/files/minetestserver.confd deleted file mode 100644 index ec3d0138..00000000 --- a/games-action/minetest/files/minetestserver.confd +++ /dev/null @@ -1,16 +0,0 @@ -# /etc/conf.d/minetest-server: config file for /etc/init.d/minetest-server - -# user -USER="minetest" - -# group -GROUP="@GROUP@" - -# pidfile -PIDFILE="/var/run/minetest.pid" - -# executable -MINETESTBIN="@BINDIR@/minetestserver" - -# additional arguments for the server -ARGS="--logfile /var/lib/minetest/minetest-server.log" diff --git a/games-action/minetest/files/minetestserver.initd b/games-action/minetest/files/minetestserver.initd deleted file mode 100644 index e0a33d96..00000000 --- a/games-action/minetest/files/minetestserver.initd +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -description="Minetest dedicated server" - -depend() { - need net -} - -start() { - ebegin "starting server" - start-stop-daemon \ - --start \ - --quiet \ - --make-pidfile \ - --pidfile "${PIDFILE}" \ - --background \ - --user ${USER} \ - --group ${GROUP} \ - --exec "${MINETESTBIN}" -- ${ARGS} - - eend $? -} - -stop() { - ebegin "stopping server" - start-stop-daemon \ - --stop \ - --signal 15 \ - --quiet \ - --pidfile "${PIDFILE}" - - eend $? -} diff --git a/games-action/minetest/minetest-0.4.13.ebuild b/games-action/minetest/minetest-0.4.13.ebuild deleted file mode 100644 index 35353f3b..00000000 --- a/games-action/minetest/minetest-0.4.13.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 2015 Julian Ospald -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils gnome2-utils vcs-snapshot user - -DESCRIPTION="An InfiniMiner/Minecraft inspired game" -HOMEPAGE="http://minetest.net/" -SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="LGPL-2.1+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+curl dedicated doc leveldb luajit nls 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 - 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 ) - nls? ( virtual/libintl ) - 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_unpack() { - vcs-snapshot_src_unpack -} - -src_prepare() { - # correct gettext behavior - if [[ -n "${LINGUAS+x}" ]] ; then - for i in $(cd po ; echo *) ; do - if ! has ${i} ${LINGUAS} ; then - rm -r po/${i} || die - fi - done - fi - - # jthread is modified - # json is modified - - # set paths - sed \ - -e "s#@BINDIR@#/usr/bin#g" \ - -e "s#@GROUP@#${PN}#g" \ - "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die -} - -src_configure() { - local mycmakeargs=( - $(usex dedicated "-DBUILD_SERVER=ON -DBUILD_CLIENT=OFF" "$(cmake-utils_use_build server SERVER) -DBUILD_CLIENT=ON") - -DCUSTOM_BINDIR="/usr/bin" - -DCUSTOM_DOCDIR="/usr/share/doc/${PF}" - -DCUSTOM_LOCALEDIR="/usr/share/locale" - -DCUSTOM_SHAREDIR="/usr/share/${PN}" - $(cmake-utils_use_enable curl CURL) - $(cmake-utils_use_enable truetype FREETYPE) - $(cmake-utils_use_enable nls GETTEXT) - -DENABLE_GLES=0 - $(cmake-utils_use_enable leveldb LEVELDB) - $(cmake-utils_use_enable redis REDIS) - -DENABLE_SPATIAL=$(usex spatial) - $(cmake-utils_use_enable sound SOUND) - $(cmake-utils_use !luajit DISABLE_LUAJIT) - -DRUN_IN_PLACE=0 - $(use dedicated && { - echo "-DIRRLICHT_SOURCE_DIR=/the/irrlicht/source" - echo "-DIRRLICHT_INCLUDE_DIR=/usr/include/irrlicht" - }) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc ; then - cmake-utils_src_compile doc - 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 - - if use doc ; then - cd "${CMAKE_BUILD_DIR}"/doc || die - dodoc -r html - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -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_game/Manifest b/games-action/minetest_game/Manifest deleted file mode 100644 index 451a2a20..00000000 --- a/games-action/minetest_game/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST minetest_game-0.4.13.tar.gz 1371339 SHA256 13a8b474b439da326f627290b06065f7f5adff12d8462f29114ba818653ec604 SHA512 41f48e0abda47fb45750ff21128fb8249b5f2da9bd63dfa52ce438fe482725190a1161faf76c43664e38916f61615be4b9b8914efd88cd02d6ba498b2f69dd62 WHIRLPOOL 02836d6d9a2fe9b66f49983ac2caf88825808b340033cdecfcf84b2ebaee76e772604fd9537403059208fb7bf0ced6f3533356b87e0868a73a64f6d5436cacd8 diff --git a/games-action/minetest_game/minetest_game-0.4.13.ebuild b/games-action/minetest_game/minetest_game-0.4.13.ebuild deleted file mode 100644 index 757b1419..00000000 --- a/games-action/minetest_game/minetest_game-0.4.13.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2015 Julian Ospald -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit vcs-snapshot - -DESCRIPTION="The main game for the Minetest game engine" -HOMEPAGE="http://github.com/minetest/minetest_game" -SRC_URI="http://github.com/minetest/minetest_game/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2 CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=games-action/minetest-${PV}" - -src_install() { - insinto /usr/share/minetest/games/${PN} - doins -r mods menu - doins game.conf minetest.conf - - dodoc README.txt game_api.txt -}