version bump

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

3 files changed, 137 insertions, 12 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index ff098869c098..2d8f096e3dd1 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,12 @@
 # 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.184 2010/07/19 19:17:14 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.185 2010/08/08 22:56:39 mr_bones_ Exp $
+
+*wesnoth-1.8.4 (08 Aug 2010)
+
+  08 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +wesnoth-1.8.4.ebuild:
+  version bump
 
   19 Jul 2010; Joseph Jezak <josejx@gentoo.org> wesnoth-1.8.2.ebuild:
   Marked ppc/ppc64 stable for bug #326369.
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 79d1ca976386..ec65ea2f4da9 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wesnothd.rc 619 RMD160 b3d7a303f27ce3cc1886fd7791ab58f58356ac39 SHA1 8ba6dad055ea943485c0a1cf324e39a340c89b00 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065
 DIST wesnoth-1.6.5.tar.bz2 230239169 RMD160 7fe957d7eeb61956252d0fc6e9ead74572be43a1 SHA1 232dac3a4327555bf52212cf4420c9ea823220e4 SHA256 7ef047ae364278a5bf9bdc69228f77d825f793f1c4d9adae8b47f0882e7f30d7
 DIST wesnoth-1.8.2.tar.bz2 298752358 RMD160 ae0d9cfc3f6dae2359bc1aa16f5e7341cfee350f SHA1 772e4847b5c99cef06872ea35c43f4cad2eb622e SHA256 af51389decb431ce5a6c6ef8781c8d23a5415a59d6cb2abb57144b487ef53ef6
 DIST wesnoth-1.8.3.tar.bz2 298923248 RMD160 dc38fc6dbb3c7c7b69831b1fabd0fb64caa0d2b2 SHA1 85adf119509ac15c19536736dfbc04931280cf1c SHA256 985d40ff04cf95bb6f8abb3353ec955c3286a6f9edb1bd29b6f26f8b12280928
+DIST wesnoth-1.8.4.tar.bz2 300557790 RMD160 86b6f6ca39cf87134d89e989ed20840836aeac28 SHA1 30b82e06523f9a82b770a6fc4e2d4251bd358eca SHA256 af29ddf40f83ee016972d6edb8761d7323f8ed5d6bf15005659bff4fd7190eb9
 EBUILD wesnoth-1.6.5.ebuild 2597 RMD160 c7c79698115547087ef5a87c85337503912b2263 SHA1 3495fc361d214db98faff4a0e3adb3bce64b5c79 SHA256 d85f60c43de30810ba10ef2036996efc93016838680d3d4811d163cf108e51d4
 EBUILD wesnoth-1.8.2.ebuild 3444 RMD160 d9dc60a610c8f843a8b6b8ad31e0ff35f15eb0ec SHA1 4d41f5acc4c0614ce92a3902f187c0c99868ef29 SHA256 850a455f3903409e9c04663ad0e48876daf7f74edcc890d9296c10b5c14b9194
 EBUILD wesnoth-1.8.3.ebuild 3451 RMD160 cc7243d812013b9164f487e6dfd0f32162f73c61 SHA1 6015b4437c730ef51a8dd7cb25fe39fc76a96c26 SHA256 e9e334caa085330fdd8202031092927bf2092b4abe5151b4d86f3631fa4c79e0
-MISC ChangeLog 23997 RMD160 5a276c5cb6d9aba4b8b687bddf13c12ae419e13c SHA1 a27bf81f8b7e38ae1e446e5df55a9637f6ea686a SHA256 0df209d6460cec051661c39d628b675a83a55ab445e59fe4a9bd0aacea206f83
+EBUILD wesnoth-1.8.4.ebuild 3451 RMD160 1eb95726cfa3104f093b1142bd933e768fa8240c SHA1 ae519f12560a01fb249886ec02cb99a9fef0d265 SHA256 46e6ce6cc31c900ff0172efe7f51a765156fc7b2287662ff9b7f21a376514344
+MISC ChangeLog 24126 RMD160 bf0ea007f1efe099275b4930cb23fc89b7d9eba5 SHA1 94afa0cbe1fa269be909542c4cf5ef1b0d19448b SHA256 4f335b13ab6c572eefacc7efcb35a178e2778385850e62419ec000ff3d7e0a9d
 MISC metadata.xml 330 RMD160 27f21d82f0524f02ac36acfd6116ffd979c930fd SHA1 c2ff910e780424aae4bd9d41eea083824bcdb073 SHA256 286df39ac36cc888d57c6c471a1742218ffe4b1448d410e1dba461c061841ca5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxEpLkACgkQcsIHjyDViGTwaACeJA8Ir9YVkDd23+P6+0T3FYk6
-zCoAoKz6xy/oq3VLGfE2O06Bq+GhEwW4
-=w/9K
------END PGP SIGNATURE-----
diff --git a/games-strategy/wesnoth/wesnoth-1.8.4.ebuild b/games-strategy/wesnoth/wesnoth-1.8.4.ebuild
new file mode 100644
index 000000000000..21ee23f23567
--- /dev/null
+++ b/games-strategy/wesnoth/wesnoth-1.8.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.4.ebuild,v 1.1 2010/08/08 22:56:39 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 ~sparc ~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
+}