old

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 5 insertions, 144 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index 2e34cd61da7c..af50c8362164 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.239 2015/01/24 07:49:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.240 2015/01/26 16:55:19 mr_bones_ Exp $
+
+  26 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/wesnoth-1.12-cmake.patch, -wesnoth-1.12.ebuild:
+  old
 
 *wesnoth-1.12.1 (24 Jan 2015)
 
diff --git a/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch b/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch
deleted file mode 100644
index 767dd6c8a3ae..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- CMakeLists.txt.orig	2015-01-19 18:46:51.019420318 -0500
-+++ CMakeLists.txt	2015-01-19 18:47:15.977567447 -0500
-@@ -590,13 +590,14 @@
- 		endif(LIBDBUS_FOUND)
- 	endif(ENABLE_NOTIFICATIONS)
- 
--	if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
--		find_package( Boost 1.44 REQUIRED COMPONENTS filesystem )
--		find_package( Boost 1.48 REQUIRED COMPONENTS locale )
--	endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
--
- endif(ENABLE_GAME)
- 
-+if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
-+	find_package( Boost 1.44 REQUIRED COMPONENTS filesystem )
-+	find_package( Boost 1.48 REQUIRED COMPONENTS locale )
-+endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA)
-+
-+
- if(ENABLE_POT_UPDATE_TARGET)
- 	find_package(TranslationTools REQUIRED)
- endif(ENABLE_POT_UPDATE_TARGET)
diff --git a/games-strategy/wesnoth/wesnoth-1.12.ebuild b/games-strategy/wesnoth/wesnoth-1.12.ebuild
deleted file mode 100644
index 8891d825fc64..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.12.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.12.ebuild,v 1.2 2015/01/20 01:25:36 mr_bones_ Exp $
-
-EAPI=5
-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 fribidi nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7:0[joystick,video,X]
-	media-libs/sdl-net
-	!dedicated? (
-		>=media-libs/sdl-ttf-2.0.8
-		>=media-libs/sdl-mixer-1.2[vorbis]
-		>=media-libs/sdl-image-1.2[jpeg,png]
-		fribidi? ( dev-libs/fribidi )
-		dbus? ( sys-apps/dbus )
-		sys-libs/zlib
-		x11-libs/pango
-		dev-lang/lua
-		media-libs/fontconfig
-	)
-	>=dev-libs/boost-1.48[nls,threads]
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${P}.0
-
-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
-	fi
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-	# bug #472994
-	mv icons/wesnoth-icon-Mac.png icons/wesnoth-icon.png || die
-	mv icons/map-editor-icon-Mac.png icons/wesnoth_editor-icon.png || die
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
-		done
-		echo "$langs" > po/LINGUAS || die
-	fi
-	epatch "${FILESDIR}/${P}-cmake.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
-	# Work around eclass
-	append-flags -UNDEBUG
-	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=(
-			$(cmake-utils_use_enable fribidi FRIBIDI)
-			"-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_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DDATAROOTDIR=${GAMES_DATADIR}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DLOCALEDIR=/usr/share/locale"
-		"-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
-	fi
-	prepgamesdirs
-}