old

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 6 insertions, 148 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/Manifest b/games-strategy/wesnoth/Manifest
index d6c164f94290..276939eff4d6 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,10 +1,7 @@
-AUX wesnoth-1.12-cmake.patch 776 SHA256 67fbcc67dd63d24a330d5bc58e98070bc8f12718442261a013017909f159e435 SHA512 ca359b97fc803691aa4f5b19cd2084558cf8e6b0f1f3b9beebfc09122b10d2bfbb79a5d497dca7f05017eb834f06ab690b9c958c430d07fcd9a8aa02588a22d4 WHIRLPOOL ab890cd57cc8451ea6b0e23b8d336880e76b88dd63f38f965f508f3c5434a28ee73f321302271e2dc9534741e8efe3f08383f5071df7b434a164991763cba7ef
 AUX wesnothd.rc 619 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065 SHA512 b9f08d1e026ef8e970e8c7eb1533b91b9185917697bacf874970108f515b4d8af5ebc9a4ff2335f1fb19c37ca6fd281bd7153e773bcace22acf7f0772d2beb43 WHIRLPOOL fd35eeb82f6b15663194e28f301452753d8d0892df2f516dac7d579629978d5804fb277d930b0dcedf219fcd28f5389f8f6b89fd25a858c2402be4d1c19b788c
 DIST wesnoth-1.10.7.tar.bz2 347431490 SHA256 8a3b5a3409a57b646536e547094e1bb8bcd87797e00cd63184152222e377253e SHA512 3df710bfc9d5737b651dc7520d9692a6a12f8c5c41db518d36c45dfda072f42073059c2d31dc8a835b1b6d4956921ae75484750c51d9175266c96dc2297d2b8d WHIRLPOOL a190a1cae2fdb885a3ff7908a21646306eb5bca22eb4417b258cf7640fab67fb01582f8c5afac2ee9f496443686f9a9e0d1d28aaad8de30722d2669a9dcddb21
 DIST wesnoth-1.12.1.tar.bz2 384386961 SHA256 70404764370db05e496a4e033e09c26cdc47fa6558271d803a44c4ebb7b6efe8 SHA512 6b0904c90414dbd90d3916f129611ed2630940dd47cd217c929c5a93afd04e6bd9e16b7e3e8185888ae2347f5994acbcc31622a29403e932161f3f8c86223589 WHIRLPOOL 99e7c301c354b545f5c6fa7c28f39465e2806c3b09074b4ecf50aa027f47c491605944519236d0557d24af4facb1b08520b46edbfdab1bbd670b687a4bd0ec5c
-DIST wesnoth-1.12.tar.bz2 385428948 SHA256 9e2b15cf6196ae7059fc48b5483aa6973473688602958dd64211b1775b513e0a SHA512 6b39b8a27e4d86b1055bd69a8baad247acbf4c50f2b80ab4681e47e9d8e5095e9ad55d9c3fc18f8dc649ee3e72554c084d005e61799bcfc258dd5573bd07fe4e WHIRLPOOL c35abaf2346e0d3f135f8e0e7894786f30c36f5671f328043a04b507da618f7d0789451631db9ad0e5ad538adb222ffcfdc81447b278f77d7c37c3406a8bb401
 EBUILD wesnoth-1.10.7.ebuild 3559 SHA256 54ad8fb62961d5ed246d3386a6452b8ee358f34d997e1cc80eefe7c342ca83b4 SHA512 37db5038ccba06a3df1c5f6540a22521a39ff7292dca5e2ecac36d9d1b31a93268b1f3102c740e0758e0908a637a5c16dc8230ac576cbb5681289563cc1ba212 WHIRLPOOL 18e351a6aa0ed95518fc3373d7f40d44db1f10eb2cd446dbb4cd0cf1d03b1c30cc3bd74382f1779cc1c37c8b535acccc8266b82f8f51d3954030c0e276d0121f
 EBUILD wesnoth-1.12.1.ebuild 3207 SHA256 016bfaf897485bc888dc9460f6e1d19dc56494a12c556cd6213fc137a1ff8e0a SHA512 0f8790639bc7ff0e9fc22cdc654f978f46ffe9689862acb6192fc1333c864c0dc2aa3d05d13f66457796f3d660d8967e891bbce24a743f4e396037513e7a4d13 WHIRLPOOL 214c7574e632a9628754233e26dc2234c77e5f037d577a0de1aae340ab65e39081dc36e3a488de64edd6bf77e57607c31dec7d287960c9201a1d7184a7cbf739
-EBUILD wesnoth-1.12.ebuild 3265 SHA256 01aaab109b4532cd902c4077ab15c91afb2a5f2b7325ee7f90291ec8028152c6 SHA512 88ddc38239fc23461e9505d118e3ad1940fa1dd60cf8a4a7188a89539a6ae9121ecd3b62554e0b3616629b4862af222481d7215dba063c4ec6b53c871e086b4c WHIRLPOOL 0a1c4bfd88a9cbea9c04a069d0efae124c801a4ba4980e63a2e5a1950fffbbde42381f697a45baf88801e135f06ddf73c08ac7b8406d54267bd53f026843ac37
-MISC ChangeLog 30596 SHA256 de7061fb4f81ba01c435f3e47d2362c7e28bee3d6dbffda02b2dc417324dbbf8 SHA512 4559b0ef036f009c9ebdfcc9284002cd78c431b325dd5f8fcdaffd593fc917b5253d2f25c0108df88e98304de432b09519c82b6a6804c28db2468cb0b4c5bf09 WHIRLPOOL 37ad6e0e86129360ca2cd3bd78edd62d67454106078726ff854288af03cd9dd6a07783a3c715fd73bf4bde54e06092a0a0da09adc77a05c37795f2b2199b763a
+MISC ChangeLog 30715 SHA256 1397987e44866d286318e940506c94ec6d9a17356303b963f6b4928c1915710e SHA512 0403c1e5bc3c7fad9e41fd5157d8218e56e95e6442bf6a6c2f9975ed006707f44bfffc341559dfafd132c5ae553514f186c80ac47ca4e9008c8a481c21d17676 WHIRLPOOL ec8a83e729fed17055ec3092fd562de8d5872781a70bc08e46f1a9c01e381a13f12697daddcd9c2140c66afbc520b935aff53e9480490c68c408fee015652577
 MISC metadata.xml 302 SHA256 afd1ff335c3bb72bc79f1dd4129c02ef626dbc6014a707eee751423617c7ea95 SHA512 748c7f5671781c960c364a103fc1a8ecc1a0816f2096ced4a67cda1fd19506387845fc76b1b52af226147797ba08edc8a335beec0febaded243efadfc2e31f9e WHIRLPOOL a654cec8b79da00f18046a8fcf5755603bf9dcff2be8abfd0b869d3afa659dfbd78964388a5ae425aae30ff621119895c649eaef421db5fbc4bb08f7c6c835b9
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
-}