version bump

Package-Manager: portage-2.1.10.41/cvs/Linux i686

4 files changed, 185 insertions, 13 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 0315d9cd4004..f3efe93d81b8 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/wesnoth
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.197 2011/10/04 22:26:48 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.198 2012/01/23 18:41:53 mr_bones_ Exp $
+
+*wesnoth-1.10 (23 Jan 2012)
+
+  23 Jan 2012; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-1.10.ebuild,
+  +files/wesnoth-1.10-xdg-path-fix.patch:
+  version bump
 
   04 Oct 2011; Joseph Jezak <josejx@gentoo.org> wesnoth-1.8.6.ebuild:
   Marked ppc/ppc64 stable for bug #374881.
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 64ccf63b9cff..51499e52168b 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX wesnoth-1.10-xdg-path-fix.patch 1559 RMD160 7e182af6032bc25a4e9ae84651cf2e9d8d7c8720 SHA1 c8ae0f68d5c42cfbe55fcdebd84a407c06c6f082 SHA256 d4e9658d6b0886abe5ef1ded25e5cbf3baf8bed01371d387eb43e52dbdb6068a
 AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad055ea943485c0a1cf324e39a340c89b00 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065
+DIST wesnoth-1.10.tar.bz2 339946658 RMD160 39f0addc95ccc556c952f1172666a3d0b5756149 SHA1 6315c8e262fba86a98fcb8dd67d5d4d56b807c4d SHA256 4ba12b1e43761650579d563d4384c5e06674b0bff75cef2cb0abb439ecdc8ece
 DIST wesnoth-1.8.5.tar.bz2 301024033 RMD160 c2a6a9f094b862ef274838fd062c5d961f97c261 SHA1 22c6cc10dc7172daf636158dba0acac35f538597 SHA256 eca3bdce505480a0cf045d0189df7260c16af9f543a427e7de8690fff9c655fa
 DIST wesnoth-1.8.6.tar.bz2 302226547 RMD160 2190efe45d554df59052db1a58fcc3bdf766c47e SHA1 ade2f88287b5900485646f0ffe3414fa8b695afb SHA256 4fe603fa984ac76a384dc94ba28bd99fe2d1adf02ddf1706f2fa1b82b40f8081
+EBUILD wesnoth-1.10.ebuild 3263 RMD160 4615b7d333858960dffc49384a37460b01a930a8 SHA1 21f69c161ac7fae9c80bd4921c44e4e1fb648504 SHA256 99469467c6d4b06f808581bde2b0f27e6b193b010f5d726ed4150844aa354ce7
 EBUILD wesnoth-1.8.5.ebuild 3437 RMD160 189c6a4aa488a51ecfca5e685834d44498e183a2 SHA1 f9b11eb2dd0dd73d299e30c8c85602a6162b93be SHA256 cd897011f914bfbe7f1d850c56da8ef7b5ffa77bbb3a0a4284eae49a872de979
 EBUILD wesnoth-1.8.6.ebuild 3437 RMD160 2cb949cb29d0e87d0d7d008b3ad18537d5367ae1 SHA1 a7a11e9b62a9d78e4f21b1e083f23c6d128f7510 SHA256 dfde2209ec0c776636fc563c6334c86ca60c4fcd394e204fd8d6cb49a31901e5
-MISC ChangeLog 25509 RMD160 b53e644238a4bd40970420b8fce772a2e08203e7 SHA1 23de95bd03ca98e1b14b19e2efafce92ff0f566b SHA256 8fa740dcec287a954ea474e080ed457cbaa854d5986f7e0bb07ff0913e88d7a1
+MISC ChangeLog 25676 RMD160 984c01f8feebb2ccbcc7091ad23f7c29078cf033 SHA1 3a78b4625fda3813a062ccac9c6219b3aa96b0cb SHA256 5a8d69b53489b033e35b2f3ec98a86a8c265edd948a0bf5a76d627b8052ab3da
 MISC metadata.xml 330 RMD160 27f21d82f0524f02ac36acfd6116ffd979c930fd SHA1 c2ff910e780424aae4bd9d41eea083824bcdb073 SHA256 286df39ac36cc888d57c6c471a1742218ffe4b1448d410e1dba461c061841ca5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6LiC4ACgkQcsIHjyDViGSPyQCgvo6bG+l4DyZdolfRRx5fRuBV
-Z9kAoM4rX439mU9T16PS+/H0nQVMrZKm
-=5Hri
------END PGP SIGNATURE-----
diff --git a/games-strategy/wesnoth/files/wesnoth-1.10-xdg-path-fix.patch b/games-strategy/wesnoth/files/wesnoth-1.10-xdg-path-fix.patch
new file mode 100644
index 000000000000..965195a5c699
--- /dev/null
+++ b/games-strategy/wesnoth/files/wesnoth-1.10-xdg-path-fix.patch
@@ -0,0 +1,54 @@
+Index: src/filesystem.cpp
+===================================================================
+--- src/filesystem.cpp	(Revision 52751)
++++ src/filesystem.cpp	(Revision 52752)
+@@ -63,6 +63,7 @@
+ #include "loadscreen.hpp"
+ #include "scoped_resource.hpp"
+ #include "serialization/string_utils.hpp"
++#include "version.hpp"
+ 
+ static lg::log_domain log_filesystem("filesystem");
+ #define DBG_FS LOG_STREAM(debug, log_filesystem)
+@@ -501,6 +502,23 @@
+ 
+ static void setup_user_data_dir();
+ 
++static const std::string& get_version_path_suffix()
++{
++	static std::string suffix;
++
++	// We only really need to generate this once since
++	// the version number cannot change during runtime.
++
++	if(suffix.empty()) {
++		std::ostringstream s;
++		s << game_config::wesnoth_version.major_version() << '.'
++		  << game_config::wesnoth_version.minor_version();
++		suffix = s.str();
++	}
++
++	return suffix;
++}
++
+ void set_preferences_dir(std::string path)
+ {
+ #ifdef _WIN32
+@@ -537,7 +555,7 @@
+ 	if (path.empty()) path = PREFERENCES_DIR;
+ #endif
+ 
+-	std::string path2 = ".wesnoth" + game_config::version.substr(0,3);
++	std::string path2 = ".wesnoth" + get_version_path_suffix();
+ 
+ #ifdef _X11
+ 	const char *home_str = getenv("HOME");
+@@ -553,7 +571,7 @@
+ 			user_data_dir += "/.local/share";
+ 		} else user_data_dir = xdg_data;
+ 		user_data_dir += "/wesnoth/";
+-		user_data_dir += game_config::version.substr(0,3);
++		user_data_dir += get_version_path_suffix();
+ 		create_directory_if_missing_recursive(user_data_dir);
+ 		game_config::preferences_dir = user_data_dir;
+ 	} else {
diff --git a/games-strategy/wesnoth/wesnoth-1.10.ebuild b/games-strategy/wesnoth/wesnoth-1.10.ebuild
new file mode 100644
index 000000000000..409a1199ecb8
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.10.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.10.ebuild,v 1.1 2012/01/23 18:41:53 mr_bones_ Exp $
+
+EAPI=2
+inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
+
+DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
+HOMEPAGE="http://www.wesnoth.org/"
+SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc nls server"
+
+RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
+	media-libs/sdl-net
+	>=media-libs/sdl-ttf-2.0.8
+	>=media-libs/sdl-mixer-1.2[vorbis]
+	>=media-libs/sdl-image-1.2[jpeg,png]
+	!dedicated? (
+		dbus? ( sys-apps/dbus )
+	)
+	>=dev-libs/boost-1.36
+	sys-libs/zlib
+	x11-libs/pango
+	dev-lang/lua
+	media-libs/fontconfig
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+src_prepare() {
+	if use dedicated || use server ; then
+		sed \
+			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
+			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
+			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
+			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
+			> "${T}"/wesnothd \
+			|| die "sed failed"
+	fi
+	if ! use doc ; then
+		sed -i \
+			-e '/manual/d' \
+			doc/CMakeLists.txt \
+			|| die "sed failed"
+	fi
+	# how do I hate boost? Let me count the ways...
+	local boost_ver=$(best_version ">=dev-libs/boost-1.36")
+
+	boost_ver=${boost_ver/*boost-/}
+	boost_ver=${boost_ver%.*}
+	boost_ver=${boost_ver/./_}
+
+	einfo "Using boost version ${boost_ver}"
+	append-cxxflags \
+		-I/usr/include/boost-${boost_ver}
+	append-ldflags \
+		-L/usr/$(get_libdir)/boost-${boost_ver}
+	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
+	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
+
+	epatch "${FILESDIR}"/${P}-xdg-path-fix.patch
+}
+
+src_configure() {
+	filter-flags -ftracer -fomit-frame-pointer
+	if [[ $(gcc-major-version) -eq 3 ]] ; then
+		filter-flags -fstack-protector
+		append-flags -fno-stack-protector
+	fi
+	if use dedicated || use server ; then
+		mycmakeargs=(
+			"-DENABLE_CAMPAIGN_SERVER=TRUE"
+			"-DENABLE_SERVER=TRUE"
+			"-DSERVER_UID=${GAMES_USER_DED}"
+			"-DSERVER_GID=${GAMES_GROUP}"
+			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
+			)
+	else
+		mycmakeargs=(
+			"-DENABLE_CAMPAIGN_SERVER=FALSE"
+			"-DENABLE_SERVER=FALSE"
+			)
+	fi
+	mycmakeargs+=(
+		$(cmake-utils_use_enable !dedicated GAME)
+		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
+		$(cmake-utils_use_enable nls NLS)
+		$(cmake-utils_use_enable dbus NOTIFICATIONS)
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
+		"-DENABLE_FRIBIDI=FALSE"
+		"-DENABLE_STRICT_COMPILATION=FALSE"
+		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-DDATAROOTDIR=${GAMES_DATADIR}"
+		"-DBINDIR=${GAMES_BINDIR}"
+		"-DICONDIR=/usr/share/pixmaps"
+		"-DDESKTOPDIR=/usr/share/applications"
+		"-DMANDIR=/usr/share/man"
+		"-DDOCDIR=/usr/share/doc/${PF}"
+		)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	DOCS="README changelog players_changelog" cmake-utils_src_install
+	if use dedicated || use server; then
+		keepdir "${GAMES_STATEDIR}/run/wesnothd"
+		doinitd "${T}"/wesnothd || die "doinitd failed"
+	fi
+	prepgamesdirs
+}