version bump wrt bug #423413

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

4 files changed, 156 insertions, 1 deletions

diff --git a/games-rpg/mana/ChangeLog b/games-rpg/mana/ChangeLog
index e15e09b49111..1e75ba5e5a36 100644
--- a/games-rpg/mana/ChangeLog
+++ b/games-rpg/mana/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/mana
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/ChangeLog,v 1.10 2012/06/29 12:47:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/ChangeLog,v 1.11 2012/06/30 20:57:14 hasufell Exp $
+
+*mana-0.6.1 (30 Jun 2012)
+
+  30 Jun 2012; Julian Ospald <hasufell@gentoo.org> +mana-0.6.1.ebuild,
+  +files/mana-0.6.1-gentoo.patch:
+  version bump wrt bug #423413
 
   29 Jun 2012; Brent Baude <ranger@gentoo.org> mana-0.6.0.ebuild:
   Marking mana-0.6.0 ppc for bug 420143
diff --git a/games-rpg/mana/files/mana-0.6.1-gentoo.patch b/games-rpg/mana/files/mana-0.6.1-gentoo.patch
new file mode 100644
index 000000000000..561336e421c5
--- /dev/null
+++ b/games-rpg/mana/files/mana-0.6.1-gentoo.patch
@@ -0,0 +1,71 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sat Jun 30 20:48:23 UTC 2012
+Subject: build system
+
+use system fonts
+
+make datadir and bindir paths modifiable
+https://github.com/mana/mana/commit/02a7b2aa739cd0cf5a855f0a78b91d9fd5ad4385
+don't overwrite system/environment CXXFLAGS
+https://github.com/mana/mana/commit/2305ca095bee6b32c930f71b99d4c1205ceb561b
+add option to use system enet headers
+https://github.com/mana/mana/commit/d754a64e3839b3888d489046546195792e4ecc34
+
+--- data/CMakeLists.txt.old	2011-08-02 12:15:38.520030381 +0200
++++ data/CMakeLists.txt	2011-08-02 12:15:44.971029615 +0200
+@@ -1,6 +1,5 @@
+ SET(DATA_DIR ${PKG_DATADIR}/data)
+ 
+-ADD_SUBDIRECTORY(fonts)
+ ADD_SUBDIRECTORY(graphics)
+ ADD_SUBDIRECTORY(help)
+ ADD_SUBDIRECTORY(icons)
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -42,9 +42,9 @@
+     IF (NOT OSX AND NOT BEOS)
+         OPTION(USE_X11 "Use X11 Clipboard functionality" ON)
+     ENDIF ()
+-    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana)
++    SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/mana CACHE PATH "Mana datadir")
+     SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
+-    SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
++    SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "Mana bindir")
+ ENDIF (WIN32)
+ 
+ ADD_SUBDIRECTORY(data)
+--- src/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -12,7 +12,7 @@
+ 
+ IF (CMAKE_COMPILER_IS_GNUCXX)
+     # Help getting compilation warnings
+-    SET(CMAKE_CXX_FLAGS "-Wall")
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+     IF (WIN32)
+         # This includes enough debug information to get something useful
+         # from Dr. Mingw while keeping binary size down. Almost useless
+--- libs/enet/CMakeLists.txt
++++ libs/enet/CMakeLists.txt
+@@ -1,3 +1,7 @@
++INCLUDE(FindPkgConfig)
++
++OPTION(WITH_BUNDLEDHEADERS "Use bundled enet headers" ON)
++
+ INCLUDE(CheckFunctionExists)
+ CHECK_FUNCTION_EXISTS(gethostbyaddr_r HAS_GETHOSTBYNAME_R)
+ IF(HAS_GETHOSTBYNAME_R EQUAL 1)
+@@ -49,7 +53,12 @@
+   win32.c
+   )
+ 
+-INCLUDE_DIRECTORIES("include")
++IF (WITH_BUNDLEDHEADERS)
++	INCLUDE_DIRECTORIES("include")
++ELSE (WITH_BUNDLEDHEADERS)
++	PKG_CHECK_MODULES(ENET REQUIRED libenet)
++	INCLUDE_DIRECTORIES("${ENET_INCLUDEDIR}")
++ENDIF()
+ 
+ ADD_LIBRARY(enet STATIC ${SRCS})
+ IF (BEOS)
diff --git a/games-rpg/mana/mana-0.6.1.ebuild b/games-rpg/mana/mana-0.6.1.ebuild
new file mode 100644
index 000000000000..07a39b52dcba
--- /dev/null
+++ b/games-rpg/mana/mana-0.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/mana/mana-0.6.1.ebuild,v 1.1 2012/06/30 20:57:14 hasufell Exp $
+
+EAPI=2
+inherit eutils cmake-utils games
+
+DESCRIPTION="A fully free and open source MMORPG game client"
+HOMEPAGE="http://manasource.org/"
+SRC_URI="http://manasource.org/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls opengl server"
+
+RDEPEND="!=games-rpg/tmw-0.5.2
+	>=dev-games/physfs-1.0.0
+	dev-libs/libxml2
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-image[png]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	net-misc/curl
+	sys-libs/zlib
+	media-libs/libpng:0
+	media-fonts/dejavu
+	>=dev-games/guichan-0.8.1[sdl]
+	media-libs/libsdl[X,opengl?,video]
+	media-libs/sdl-gfx
+	x11-libs/libX11
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	server? ( net-libs/enet )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	base_src_prepare
+
+	if [[ ${LINGUAS+set} ]]; then
+		for lang in $(grep -v ^# po/LINGUAS); do
+			has $lang $LINGUAS || sed -i "s:^${lang}:#${lang}:" po/LINGUAS
+		done
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with opengl)
+		$(cmake-utils_use_enable nls)
+		$(cmake-utils_use_enable server MANASERV)
+		-DPKG_DATADIR="${GAMES_DATADIR}/${PN}"
+		-DPKG_BINDIR="${GAMES_BINDIR}"
+		-DWITH_BUNDLEDHEADERS=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-mono.ttf
+	insinto "${GAMES_DATADIR}"/${PN}/data
+	prepgamesdirs
+}
diff --git a/games-rpg/mana/metadata.xml b/games-rpg/mana/metadata.xml
index 01a746edb196..0c0ac8769ac3 100644
--- a/games-rpg/mana/metadata.xml
+++ b/games-rpg/mana/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
+	<use>
+		<flag name="server">Enable Manaserv support</flag>
+	</use>
 </pkgmetadata>