version bump (bug #409101)

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 13 insertions, 144 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 41b6cec6582e..142b66ff7289 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.201 2012/03/08 08:46:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.202 2012/03/22 00:35:59 mr_bones_ Exp $
+
+*wesnoth-1.10.1 (22 Mar 2012)
+
+  22 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> -wesnoth-1.8.5.ebuild,
+  -wesnoth-1.8.6.ebuild, +wesnoth-1.10.1.ebuild:
+  version bump (bug #409101)
 
   08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> wesnoth-1.10.ebuild:
   x86 stable wrt bug #405359
diff --git a/games-strategy/wesnoth/wesnoth-1.8.5.ebuild b/games-strategy/wesnoth/wesnoth-1.10.1.ebuild
index 87b917de37cc..7346df279298 100644
--- a/games-strategy/wesnoth/wesnoth-1.8.5.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.8.5.ebuild,v 1.5 2011/10/04 01:27:59 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.10.1.ebuild,v 1.1 2012/03/22 00:35:59 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
@@ -11,8 +11,8 @@ 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"
+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
@@ -22,7 +22,7 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	>=dev-libs/boost-1.35
+	>=dev-libs/boost-1.36
 	sys-libs/zlib
 	x11-libs/pango
 	dev-lang/lua
@@ -30,14 +30,6 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
 	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() {
@@ -57,7 +49,7 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.35")
+	local boost_ver=$(best_version ">=dev-libs/boost-1.36")
 
 	boost_ver=${boost_ver/*boost-/}
 	boost_ver=${boost_ver%.*}
@@ -97,12 +89,10 @@ src_configure() {
 		$(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"
diff --git a/games-strategy/wesnoth/wesnoth-1.8.6.ebuild b/games-strategy/wesnoth/wesnoth-1.8.6.ebuild
deleted file mode 100644
index c3f86e952d4e..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.8.6.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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.4 2011/10/04 22:26:48 josejx 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
-}