version bump

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

6 files changed, 252 insertions, 1 deletions

diff --git a/games-action/minetest/ChangeLog b/games-action/minetest/ChangeLog
index 0d539361c0a4..cd6815114d03 100644
--- a/games-action/minetest/ChangeLog
+++ b/games-action/minetest/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-action/minetest
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/ChangeLog,v 1.10 2014/04/05 11:11:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/ChangeLog,v 1.11 2014/07/07 13:35:56 hasufell Exp $
+
+*minetest-0.4.10 (07 Jul 2014)
+
+  07 Jul 2014; Julian Ospald <hasufell@gentoo.org> +minetest-0.4.10.ebuild,
+  +files/minetest-0.4.10-as-needed.patch,
+  +files/minetest-0.4.10-shared-irrlicht.patch,
+  +files/minetest-0.4.10-system-lua.patch, metadata.xml:
+  version bump
 
   05 Apr 2014; Agostino Sarubbo <ago@gentoo.org> minetest-0.4.9.ebuild:
   Stable for x86, wrt bug #504358
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
new file mode 100644
index 000000000000..83d1ca7b0b9e
--- /dev/null
+++ b/games-action/minetest/files/minetest-0.4.10-as-needed.patch
@@ -0,0 +1,35 @@
+commit a88bfd5b77fa0b5c60e438c0011dbdcee5e14dfd
+Author: hasufell <hasufell@gentoo.org>
+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-0.4.10-shared-irrlicht.patch b/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch
new file mode 100644
index 000000000000..b552c0937039
--- /dev/null
+++ b/games-action/minetest/files/minetest-0.4.10-shared-irrlicht.patch
@@ -0,0 +1,23 @@
+commit 11d35e62fe13b47c5b34139559e650dfe6ebbd84
+Author: hasufell <julian.ospald@googlemail.com>
+Date:   Sat Jun 8 13:40:30 2013 +0200
+
+    CMAKE: use shared lib from Irrlicht
+
+diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
+index bd00422..4632993 100644
+--- a/cmake/Modules/FindIrrlicht.cmake
++++ b/cmake/Modules/FindIrrlicht.cmake
+@@ -50,10 +50,11 @@ else()
+ 		/usr/include/irrlicht
+ 	)
+ 
+-	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht
++	FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
+ 		PATHS
+ 		/usr/local/lib
+ 		/usr/lib
++		/usr/lib64
+ 	)
+ endif()
+ 
diff --git a/games-action/minetest/files/minetest-0.4.10-system-lua.patch b/games-action/minetest/files/minetest-0.4.10-system-lua.patch
new file mode 100644
index 000000000000..c31c8514ea29
--- /dev/null
+++ b/games-action/minetest/files/minetest-0.4.10-system-lua.patch
@@ -0,0 +1,37 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -215,8 +215,6 @@
+ 	message (STATUS "LuaJIT headers: ${LUA_INCLUDE_DIR}")
+ else (NOT ${DISABLE_LUAJIT} MATCHES "1")
+ 	message (STATUS "LuaJIT detection disabled! (DISABLE_LUAJIT=1)")
+-	set(LUA_LIBRARY "")
+-	set(LUA_INCLUDE_DIR "")
+ endif (NOT DISABLE_LUAJIT)
+ 
+ set(USE_LUAJIT 0)
+@@ -267,11 +265,22 @@
+ 	endif (VALID_LUAJIT_VERSION)
+ endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
+ 
++OPTION(WITH_BUNDLED_LUA "Use bundled lua")
++
+ if(NOT USE_LUAJIT)
+ 	message (STATUS "LuaJIT not found, using bundled Lua.")
+-	set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
+-	set(LUA_LIBRARY "lua")
+-	add_subdirectory(lua)
++	if (WITH_BUNDLED_LUA)
++		set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
++		set(LUA_LIBRARY "lua")
++		add_subdirectory(lua)
++	else (WITH_BUNDLED_LUA)
++		find_package(Lua51)
++		if(LUA51_FOUND)
++			message (STATUS "Lua51 found")
++		else(LUA51_FOUND)
++			message (FATAL_ERROR "Lua51 not found!")
++		endif(LUA51_FOUND)
++	endif(WITH_BUNDLED_LUA)
+ endif(NOT USE_LUAJIT)
+ 
+ mark_as_advanced(LUA_LIBRARY)
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 48fafea909ad..5cc5d38b298e 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -47,6 +47,9 @@
 			Use <pkg>dev-lang/luajit</pkg>
 			instead of <pkg>dev-lang/lua</pkg>
 		</flag>
+		<flag name="redis">Enable redis backend via
+			<pkg>dev-libs/hiredis</pkg>
+		</flag>
 		<flag name="server">Build minetest server</flag>
 	</use>
 	<upstream>
diff --git a/games-action/minetest/minetest-0.4.10.ebuild b/games-action/minetest/minetest-0.4.10.ebuild
new file mode 100644
index 000000000000..bbd0ca04e332
--- /dev/null
+++ b/games-action/minetest/minetest-0.4.10.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/minetest/minetest-0.4.10.ebuild,v 1.1 2014/07/07 13:35:56 hasufell Exp $
+
+EAPI=5
+inherit eutils cmake-utils gnome2-utils vcs-snapshot user games
+
+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 leveldb luajit nls redis +server +sound +truetype"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-games/irrlicht-1.8-r2
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	!dedicated? (
+		app-arch/bzip2
+		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 )
+	!luajit? ( >=dev-lang/lua-5.1.4[deprecated] )
+	nls? ( virtual/libintl )
+	redis? ( dev-libs/hiredis )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	games_pkg_setup
+
+	if use server || use dedicated ; then
+		enewuser ${PN} -1 -1 /var/lib/${PN} ${GAMES_GROUP}
+	fi
+}
+
+src_unpack() {
+	vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-shared-irrlicht.patch \
+		"${FILESDIR}"/${P}-as-needed.patch \
+		"${FILESDIR}"/${P}-system-lua.patch
+
+	# 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
+	rm -r src/{lua,sqlite} || die
+
+	# set paths
+	sed \
+		-e "s#@BINDIR@#${GAMES_BINDIR}#g" \
+		-e "s#@GROUP@#${GAMES_GROUP}#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="${GAMES_BINDIR}"
+		-DCUSTOM_DOCDIR="/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="/usr/share/locale"
+		-DCUSTOM_SHAREDIR="${GAMES_DATADIR}/${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)
+		$(cmake-utils_use_enable sound SOUND)
+		$(cmake-utils_use !luajit DISABLE_LUAJIT)
+		-DRUN_IN_PLACE=0
+		-DWITH_BUNDLED_LUA=0
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+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
+
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_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
+}