Minetest ebuilds updated.

This commit is contained in:
Kolan Sh 2015-08-27 10:22:20 +03:00
parent 1498a5b491
commit 84cbe41fc0
4 changed files with 13 additions and 14 deletions

View File

@ -11,8 +11,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1fee7a..a72bd4a 100644 index a1fee7a..a72bd4a 100644
--- a/src/CMakeLists.txt --- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt +++ b/src/CMakeLists.txt
@@ -497,19 +497,19 @@ if(BUILD_CLIENT) @@ -427,18 +427,18 @@ if(BUILD_CLIENT)
set(client_LIBS set(minetest_LIBS
${PROJECT_NAME} ${PROJECT_NAME}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
- ${IRRLICHT_LIBRARY} - ${IRRLICHT_LIBRARY}
@ -28,7 +28,6 @@ index a1fee7a..a72bd4a 100644
${SOUND_LIBRARIES} ${SOUND_LIBRARIES}
${SQLITE3_LIBRARY} ${SQLITE3_LIBRARY}
${LUA_LIBRARY} ${LUA_LIBRARY}
${GMP_LIBRARY}
${JSON_LIBRARY} ${JSON_LIBRARY}
- ${OPENGLES2_LIBRARIES} - ${OPENGLES2_LIBRARIES}
${PLATFORM_LIBS} ${PLATFORM_LIBS}

View File

@ -1,9 +1,9 @@
# Copyright 2014 Julian Ospald <hasufell@posteo.de> # Copyright 2015 Julian Ospald <hasufell@posteo.de>
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: $ # $Id$
EAPI=5 EAPI=5
inherit eutils cmake-utils gnome2-utils vcs-snapshot user inherit cmake-utils gnome2-utils vcs-snapshot user
DESCRIPTION="An InfiniMiner/Minecraft inspired game" DESCRIPTION="An InfiniMiner/Minecraft inspired game"
HOMEPAGE="http://minetest.net/" HOMEPAGE="http://minetest.net/"
@ -12,7 +12,7 @@ SRC_URI="http://github.com/minetest/minetest/tarball/${PV} -> ${P}.tar.gz"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0" LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="+curl dedicated doc leveldb luajit nls redis +server +sound +truetype" IUSE="+curl dedicated doc leveldb luajit nls redis +server +sound spatial +truetype"
RDEPEND="dev-db/sqlite:3 RDEPEND="dev-db/sqlite:3
sys-libs/zlib sys-libs/zlib
@ -20,6 +20,7 @@ RDEPEND="dev-db/sqlite:3
!dedicated? ( !dedicated? (
app-arch/bzip2 app-arch/bzip2
>=dev-games/irrlicht-1.8-r2 >=dev-games/irrlicht-1.8-r2
dev-libs/gmp:0
media-libs/libpng:0 media-libs/libpng:0
virtual/jpeg virtual/jpeg
virtual/opengl virtual/opengl
@ -35,7 +36,8 @@ RDEPEND="dev-db/sqlite:3
leveldb? ( dev-libs/leveldb ) leveldb? ( dev-libs/leveldb )
luajit? ( dev-lang/luajit:2 ) luajit? ( dev-lang/luajit:2 )
nls? ( virtual/libintl ) nls? ( virtual/libintl )
redis? ( dev-libs/hiredis )" redis? ( dev-libs/hiredis )
spatial? ( sci-libs/libspatialindex )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
>=dev-games/irrlicht-1.8-r2 >=dev-games/irrlicht-1.8-r2
doc? ( app-doc/doxygen media-gfx/graphviz ) doc? ( app-doc/doxygen media-gfx/graphviz )
@ -53,9 +55,6 @@ src_unpack() {
} }
src_prepare() { src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.4.10-as-needed.patch
# correct gettext behavior # correct gettext behavior
if [[ -n "${LINGUAS+x}" ]] ; then if [[ -n "${LINGUAS+x}" ]] ; then
for i in $(cd po ; echo *) ; do for i in $(cd po ; echo *) ; do
@ -88,6 +87,7 @@ src_configure() {
-DENABLE_GLES=0 -DENABLE_GLES=0
$(cmake-utils_use_enable leveldb LEVELDB) $(cmake-utils_use_enable leveldb LEVELDB)
$(cmake-utils_use_enable redis REDIS) $(cmake-utils_use_enable redis REDIS)
-DENABLE_SPATIAL=$(usex spatial)
$(cmake-utils_use_enable sound SOUND) $(cmake-utils_use_enable sound SOUND)
$(cmake-utils_use !luajit DISABLE_LUAJIT) $(cmake-utils_use !luajit DISABLE_LUAJIT)
-DRUN_IN_PLACE=0 -DRUN_IN_PLACE=0
@ -104,7 +104,7 @@ src_compile() {
cmake-utils_src_compile cmake-utils_src_compile
if use doc ; then if use doc ; then
emake -C "${CMAKE_BUILD_DIR}" doc cmake-utils_src_compile doc
fi fi
} }

View File

@ -1,6 +1,6 @@
# Copyright 2014 Julian Ospald <hasufell@posteo.de> # Copyright 2015 Julian Ospald <hasufell@posteo.de>
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: $ # $Id$
EAPI=5 EAPI=5
inherit vcs-snapshot inherit vcs-snapshot