version bump

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

3 files changed, 137 insertions, 3 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 5b98e8d32197..67ddb9111b33 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/wesnoth
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.192 2010/12/05 16:27:54 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.193 2011/05/12 18:43:40 mr_bones_ Exp $
+
+*wesnoth-1.8.6 (12 May 2011)
+
+  12 May 2011; Michael Sterrett <mr_bones_@gentoo.org> +wesnoth-1.8.6.ebuild:
+  version bump
 
   05 Dec 2010; Markos Chandras <hwoarang@gentoo.org> wesnoth-1.8.5.ebuild:
   Stable on amd64 wrt bug #345267
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 60cac38c50c1..8bfaaec17d54 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,5 +1,7 @@
 AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad055ea943485c0a1cf324e39a340c89b00 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065
 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.8.5.ebuild 3441 RMD160 9cc344388ba389c135e49a524cabd3da61740188 SHA1 0c4692b9dc0e1e66d8a40b0327e27e7a6d7bc37b SHA256 3a15b2f9ab7d1a3e407f91d810de085664ac122469966d0f05200ea038908814
-MISC ChangeLog 24952 RMD160 652beaf5e64a0f130b4cccb24dfa98b5b885b656 SHA1 10a0c6469e75d2abdec54da0415ad14d58415afb SHA256 e48193c3b726665fc61e80ff5b61365974be9a9907af6c01aa4800ee84927a83
+EBUILD wesnoth-1.8.6.ebuild 3444 RMD160 59cf5cfec750c75bb73ce72559476fc0ece090bb SHA1 ab5f5ac30e972bbaa24396b78b1af962eac5aa91 SHA256 e452127b2de1efb82c58b301c491fa7a4cd1f1de8e658e987a802432ef58777c
+MISC ChangeLog 25077 RMD160 9e206d784e2d922991542e8045919d99bf5e38ca SHA1 a76e5f38798372af8cd2612217032771be9e49f5 SHA256 6010fc633b52bf38a138b70e654e753e31ada7d501732412065a349b51195c81
 MISC metadata.xml 330 RMD160 27f21d82f0524f02ac36acfd6116ffd979c930fd SHA1 c2ff910e780424aae4bd9d41eea083824bcdb073 SHA256 286df39ac36cc888d57c6c471a1742218ffe4b1448d410e1dba461c061841ca5
diff --git a/games-strategy/wesnoth/wesnoth-1.8.6.ebuild b/games-strategy/wesnoth/wesnoth-1.8.6.ebuild
new file mode 100644
index 000000000000..5be39c2503b8
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.8.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.6.ebuild,v 1.1 2011/05/12 18:43:40 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 tinygui"
+
+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.35
+	sys-libs/zlib
+	x11-libs/pango
+	dev-lang/lua
+	media-libs/fontconfig
+	virtual/libintl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	!dedicated? (
+		tinygui? (
+			|| (
+				media-gfx/imagemagick[jpeg,png]
+				media-gfx/graphicsmagick[imagemagick,jpeg,png]
+			)
+		)
+	)
+	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.35")
+
+	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}"
+}
+
+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)
+		"-DGUI=$(use tinygui && echo tiny || echo normal)"
+		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
+		"-DENABLE_FRIBIDI=FALSE"
+		"-DENABLE_STRICT_COMPILATION=FALSE"
+		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
+		"-DPREFERENCES_DIR=.wesnoth"
+		"-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
+}