old

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

5 files changed, 7 insertions, 279 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index d65602bee01c..492aa1eb08b9 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/wesnoth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.235 2013/12/24 12:47:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.236 2013/12/31 07:29:23 mr_bones_ Exp $
+
+  31 Dec 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/wesnoth-1.10.4-boost.patch, -wesnoth-1.10.4.ebuild,
+  -wesnoth-1.10.6.ebuild:
+  old
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> wesnoth-1.10.7.ebuild:
   Stable for x86, wrt bug #490648
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 827b31b039cf..55f606322d7b 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,30 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX wesnoth-1.10.4-boost.patch 541 SHA256 98d7a146fde0f684c58d74abefb4c35c2331151791898eeaa58983be75002054 SHA512 6566f584c673ccf3e9ff96bd3e97dfd4dd272e4e155d044bed9dc5bba09eddca0a4e6b9b1c65288db59f8ec50ec409c3dbfe75b78928291024bbdf94e4b667e9 WHIRLPOOL a8319f10096e0974a857c46085114be758c23b1b533fbceac6ad4006d03116d749564c3aadd9580d66921d9cc87c092c970c186982b5ce6fdeaca35de2407e3a
 AUX wesnothd.rc 619 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065 SHA512 b9f08d1e026ef8e970e8c7eb1533b91b9185917697bacf874970108f515b4d8af5ebc9a4ff2335f1fb19c37ca6fd281bd7153e773bcace22acf7f0772d2beb43 WHIRLPOOL fd35eeb82f6b15663194e28f301452753d8d0892df2f516dac7d579629978d5804fb277d930b0dcedf219fcd28f5389f8f6b89fd25a858c2402be4d1c19b788c
-DIST wesnoth-1.10.4.tar.bz2 342665460 SHA256 97131daf6e52175abe1c84ff55dbbf0f6b102b99f29d32490f5e89ee02cfebc3 SHA512 363f67805538450c693702add4790d7ec6ceb38c22fe79acd22c6ebb74ecacc1035b5dab2940ce88bb85d2d13c6fb24ec485d23c2ffc10e79778c57cf373c590 WHIRLPOOL c43f8e2e07eda50202d8f893c7b4593356a545d8f9cde07eac463cdf685e71c2d2667f7704ced0f9e8e8b45eaf42f05baa006611fe6190bac26eb95e48bc9d4e
-DIST wesnoth-1.10.6.tar.bz2 346125796 SHA256 05f3b47dcec4d2c3e2aaa05be270bc1505948d0311f2508d2bf8ece5741d2081 SHA512 185f5df617fcd7aa4e206caf09705e3679735bb0fb4fef25bdd20b4d354e043d66ec2988ec9d7f92c864a31cf8ee0b4ff13cc621175c44b4f756825d98fb6d63 WHIRLPOOL 8ba208fa9b8533aed899e51544cdcba67f895e50c111b406324703e3474215840ea37652967f81517d67f889242e094e085055b2bde7839113eadda5820be01b
 DIST wesnoth-1.10.7.tar.bz2 347431490 SHA256 8a3b5a3409a57b646536e547094e1bb8bcd87797e00cd63184152222e377253e SHA512 3df710bfc9d5737b651dc7520d9692a6a12f8c5c41db518d36c45dfda072f42073059c2d31dc8a835b1b6d4956921ae75484750c51d9175266c96dc2297d2b8d WHIRLPOOL a190a1cae2fdb885a3ff7908a21646306eb5bca22eb4417b258cf7640fab67fb01582f8c5afac2ee9f496443686f9a9e0d1d28aaad8de30722d2669a9dcddb21
-EBUILD wesnoth-1.10.4.ebuild 3261 SHA256 7401fc9fa7dbd9331bc825ba548139388abe87597da9fa4e5e75c89158747918 SHA512 1c17aae0b16c71251e35c9054ece7b9d87dca519e6985d6e340022e1c82681e4d9ca3bfb31d6c663d1c5b14d45ece76535d4cf1052ed8c2c5aa181c75c48b7ef WHIRLPOOL cbe8c4faf61ab92f294157fb69ae4bf8fc9868067030449c25946b551d7b37d63706468f6bce0656351a9e46fa166634343ac17be41383b859e12b4e98a78652
-EBUILD wesnoth-1.10.6.ebuild 3325 SHA256 f22fbfb9b46b48d27109979feed3bafb061694c884e4973d19238ab8e65b8bc9 SHA512 34891c64d12b5cca1ba18ccd871c2ea66f93ebd05a615cebd2cefdea00c67a70209d831317a39951c4af80f5c80a3ac7e0f18006b04988d52bb73ff55e948590 WHIRLPOOL 0253f39985b8bf11c7c11b7810e0d405a30465cbdd3bc984b80b4f7a1c80c9ad959d78fabedb3d70311dfb7a906b873b27c5874095b1f0133059c1f87a00438b
 EBUILD wesnoth-1.10.7.ebuild 3559 SHA256 54ad8fb62961d5ed246d3386a6452b8ee358f34d997e1cc80eefe7c342ca83b4 SHA512 37db5038ccba06a3df1c5f6540a22521a39ff7292dca5e2ecac36d9d1b31a93268b1f3102c740e0758e0908a637a5c16dc8230ac576cbb5681289563cc1ba212 WHIRLPOOL 18e351a6aa0ed95518fc3373d7f40d44db1f10eb2cd446dbb4cd0cf1d03b1c30cc3bd74382f1779cc1c37c8b535acccc8266b82f8f51d3954030c0e276d0121f
-MISC ChangeLog 30020 SHA256 a43249e1ccf180eec560a135684d3f17ffe4d35c16c8d9642275b0c5ec25964c SHA512 d983fd90171f1b64202054aa65301a6b0041f484f4b31a544e4dcbc7cdf7937473bf992d246b7b587c9095aab6baaf69ab3b4d4f16514386ab535987f9d3b559 WHIRLPOOL daff791d81afcd89d68a34f3d28e81fb2694dbd574e98624e24b00ca7b1b35b6e9aec0a549b6daa8e36a2e7f36f852a989cc5dbd54155d51856c912ea3ffb6ed
+MISC ChangeLog 30175 SHA256 cd91519624bfc02a05c17eb1db3d3f0e3b84692127b1d2e060fcd91225da1d89 SHA512 9382f0bd2d3c04237215b9b1fbb858402f586bbe73f4d62ca4f730910d108dfcbe1e6228c4ded3cd55a77e5871d6cd2b5cc110c4c95bfa6fa2697bc688a749b3 WHIRLPOOL c70dea9fbd18fc61393c9bacd1879925c440eb9c843c4d3e2d9d6e6a417f6640db9bf27f1e21e0f841faf653747610c7eab53f3378972550fabf023f7f325949
 MISC metadata.xml 237 SHA256 6ae15c0944026e6b0783ac18e715f1e15f130734c023091ce9c74fb933b698e0 SHA512 915c574b3e3ce7924d302e6e89156c5caa86d386114a90a52864a4bec4a30db8fe7546488e6054ba60308d819d281c707edf9f71c9e9ca6d42731d33ef9ee5be WHIRLPOOL 472c9ff5f9249832faf765771953fee5ee7dfdc2b95de74be6c71292fc278ee88b0c2e6d6b08665de6f7f25a9822f16158b7d6c0e14f4aa7d8fcf4a7692b5578
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSuYJ4AAoJELp701BxlEWffTUQAIDSoKYiy0fccWHw3C5Abojg
-Q1eJotbZPzKPMdnlyeKvdUPkL02ViU/iFHjLXPVlUMmUu5YX7jc72wStH1pZ1GF+
-LwUuBPJczT9KzcLMH4kkI0WD9QjhAKVKbyocguP43PndSil7/iBhaf4AwjAjovHx
-SVGjzGgjix/77AWBIpGRc2O30A0lFuoBZKFRu3g8SczKG5x5gDcXMhKsO0zfscVu
-7IOVFaV9wF7oF5kA2mspVmEyB1g4rs2qz3SYpAKoG1BGgBoiM/pGFEQY9Z9Biyrd
-41DGODJioLtfdjRb+UyxyNn+dAE1Z3qXT9gRBnbOS2j1fjP4bAcnxkrV6YUrWqRg
-LEYaAiVaq5RDDm5rz4HvRXBMwDyL27mItTFlh01bvMxmuJuQRKresYtptVONoC+2
-yq+BxhbJZJayHutAbkZM+qtADbubrK3QWqvdzaPQtn9msWI3Kg3kP6Ho7zip2Ck4
-GzuAd37+aibavwXQVJT7tn1nw+fSHwODcgJJzTEXx9tqucIS2KVA1U9A2X8jm0G/
-ufejgzZCWSZSg9Iare6hTjlXFHdjlQb9uuz97LnqO97nD8VX/wJGmTENPA71ZD4O
-zOQJB6npG7zvz1Mdk5XfV++7HAPPKNW17MbUpW/N4Lc6i/VUXdUcu7u4H9uTWbKL
-8N8KaUXl+RVE+iTng5Wi
-=nhyB
------END PGP SIGNATURE-----
diff --git a/games-strategy/wesnoth/files/wesnoth-1.10.4-boost.patch b/games-strategy/wesnoth/files/wesnoth-1.10.4-boost.patch
deleted file mode 100644
index 51f467400d86..000000000000
--- a/games-strategy/wesnoth/files/wesnoth-1.10.4-boost.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- branches/1.10/src/image.cpp	2012/11/03 15:08:51	55641
-+++ branches/1.10/src/image.cpp	2012/11/03 15:22:21	55642
-@@ -349,7 +349,11 @@
- 	using boost::hash_value;
- 	using boost::hash_combine;
- 
--	size_t hash = hash_value(val.type_);
-+	/*
-+	 * Boost 1.51.0 seems not longer accept an enumerate value in its hash
-+	 * function so cast it to a type it does like.
-+	 */
-+	size_t hash = hash_value(static_cast<unsigned>(val.type_));
- 	if (val.type_ == locator::FILE || val.type_ == locator::SUB_FILE) {
- 		hash_combine(hash, val.filename_);
- 	}
diff --git a/games-strategy/wesnoth/wesnoth-1.10.4.ebuild b/games-strategy/wesnoth/wesnoth-1.10.4.ebuild
deleted file mode 100644
index b1d4c5741a92..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.10.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.10.4.ebuild,v 1.6 2012/11/04 05:12:42 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"
-
-RDEPEND=">=media-libs/libsdl-1.2.7[joystick,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.36
-	sys-libs/zlib
-	x11-libs/pango
-	dev-lang/lua
-	media-libs/fontconfig
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-boost.patch
-	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.36")
-
-	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)
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DENABLE_FRIBIDI=FALSE"
-		"-DENABLE_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-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
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.10.6.ebuild b/games-strategy/wesnoth/wesnoth-1.10.6.ebuild
deleted file mode 100644
index 7ba37eeadf5c..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.10.6.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.10.6.ebuild,v 1.6 2013/07/10 04:11:35 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 nls server"
-
-RDEPEND=">=media-libs/libsdl-1.2.7[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]
-		dbus? ( sys-apps/dbus )
-		sys-libs/zlib
-		x11-libs/pango
-		dev-lang/lua
-		media-libs/fontconfig
-	)
-	>=dev-libs/boost-1.36
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	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
-	fi
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.36")
-
-	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}"
-
-	# 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
-}
-
-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)
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DENABLE_FRIBIDI=FALSE"
-		"-DENABLE_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-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
-	fi
-	prepgamesdirs
-}