From bb4afe574ee726a6d9188d7fd492b03df5af8afe Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Mon, 23 Jan 2012 18:41:53 +0000 Subject: version bump (Portage version: 2.1.10.41/cvs/Linux i686) --- games-strategy/wesnoth/ChangeLog | 10 +- .../wesnoth/files/wesnoth-1.10-xdg-path-fix.patch | 54 ++++++++++ games-strategy/wesnoth/wesnoth-1.10.ebuild | 119 +++++++++++++++++++++ 3 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 games-strategy/wesnoth/files/wesnoth-1.10-xdg-path-fix.patch create mode 100644 games-strategy/wesnoth/wesnoth-1.10.ebuild (limited to 'games-strategy') 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 +wesnoth-1.10.ebuild, + +files/wesnoth-1.10-xdg-path-fix.patch: + version bump 04 Oct 2011; Joseph Jezak wesnoth-1.8.6.ebuild: Marked ppc/ppc64 stable for bug #374881. 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 +} -- cgit v1.2.3-65-gdbad