use bigger icons (bug #472994)

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

3 files changed, 15 insertions, 10 deletions

diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog
index d3e8e5746aff..bd1070d23d66 100644
--- a/games-strategy/wesnoth/ChangeLog
+++ b/games-strategy/wesnoth/ChangeLog
@@ -1,6 +1,9 @@
 # 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.222 2013/03/19 17:04:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.223 2013/06/11 23:08:37 mr_bones_ Exp $
+
+  11 Jun 2013; Michael Sterrett <mr_bones_@gentoo.org> wesnoth-1.10.6.ebuild:
+  use bigger icons (bug #472994)
 
 *wesnoth-1.10.6 (19 Mar 2013)
 
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 126401ea6666..3845e1629572 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -5,6 +5,6 @@ DIST wesnoth-1.10.5.tar.bz2 343638424 SHA256 f627d246e473dcbad3b928a37e0783a7191
 DIST wesnoth-1.10.6.tar.bz2 346125796 SHA256 05f3b47dcec4d2c3e2aaa05be270bc1505948d0311f2508d2bf8ece5741d2081 SHA512 185f5df617fcd7aa4e206caf09705e3679735bb0fb4fef25bdd20b4d354e043d66ec2988ec9d7f92c864a31cf8ee0b4ff13cc621175c44b4f756825d98fb6d63 WHIRLPOOL 8ba208fa9b8533aed899e51544cdcba67f895e50c111b406324703e3474215840ea37652967f81517d67f889242e094e085055b2bde7839113eadda5820be01b
 EBUILD wesnoth-1.10.4.ebuild 3261 SHA256 7401fc9fa7dbd9331bc825ba548139388abe87597da9fa4e5e75c89158747918 SHA512 1c17aae0b16c71251e35c9054ece7b9d87dca519e6985d6e340022e1c82681e4d9ca3bfb31d6c663d1c5b14d45ece76535d4cf1052ed8c2c5aa181c75c48b7ef WHIRLPOOL cbe8c4faf61ab92f294157fb69ae4bf8fc9868067030449c25946b551d7b37d63706468f6bce0656351a9e46fa166634343ac17be41383b859e12b4e98a78652
 EBUILD wesnoth-1.10.5.ebuild 3217 SHA256 c28b2a28787c3df75f52b37617e20a8b2ab4aef60a0667bfdd92e5d9fe254366 SHA512 df97c7b44e50ea25a62150fafc91b97d9f4a96d046d7ea1a3d20a9b70023813eb27eacab010e66a3ff09a93eeaec2698c239bbf200599d990068c921bfb7d121 WHIRLPOOL 1db8970779f09c4b73f49f17cf61b8622ff0621a381fd1413bbaa6bb2cb65441010b7e4afb0cc3d3841df11d20a4d9e8d47f3493f73cd4415452e7f6844e74cc
-EBUILD wesnoth-1.10.6.ebuild 3226 SHA256 8a2f6e7f3c35d105d2ab2a38fb65199654ebb0610ed188c88e6a6c184b035785 SHA512 c1bf5092c5c90fbd5f085c2bbbae91b29917ff583ba21e4203afd1308a9d3543db753f414bc6a67adc278dee45dc6432f503af1a6aa9c106185cb18cb1c8eb1b WHIRLPOOL d637d705d0e4dd62ca5368baa9d76380222fe5d993ec6b7dd0dd2d1c1b6418f31ce54dabfd74c3b688a6f4f0ebdb22f55a3e409cdec0d4ba05beae405073a1b1
-MISC ChangeLog 28559 SHA256 de8c8bd091a86051e5a7649e74b6cbdace4be78c4f31d6d71ad4ceb42f526eda SHA512 659f431c873ae95926dbc6cecf413bf6a31e067ea6d4635cb609edfd5d426db0bbdc872f1fca0a4f816937f1c3855274023e8bbca5ca13c3f62573a44deabf7d WHIRLPOOL 4fc549e2f7f6c642ea1536ca8fe0535b505a19843497716140ad175aef4431e0c6011a74f5bfd51b36be6cff1a00487766cc56508ae02e9393f0512cd3d7b8b9
+EBUILD wesnoth-1.10.6.ebuild 3321 SHA256 62a93943aa9b9f78de19b5ab9381c98f8a3895ea4347c1c4584297210670a05c SHA512 1c7b0a88e20009ea58549284c9d94c1b5bdc3d2725076a245f14712193eb4192120784cb78476e859cf5314742484e05b8c6698083670aff609d78f01bc630f4 WHIRLPOOL ebb37d898c5b39a0244c3cb6dbac979a993f9b18a5807449f8dba3f1d64ec6bed3bf43b2118a9dfe73e61f9255f6cb0dfbb86b1ee5450f575ccc125951b1d406
+MISC ChangeLog 28671 SHA256 a1a62e42e329077de8d4190127ed11a2273c7e9dcc6b5b5374c41e3d071988e0 SHA512 e0723fe366ddc3b6dc5e83c05b2c4a207f78b90488741cbd7deeac8f7e5aec89a064c1adfe8c0a15e1cedf3cfd8b75d3a17027a8890a3ca02c4bbde3d409931d WHIRLPOOL 1f0433f0f3fb1b8e735ce6e1e4dafea95df65e82b2154098dc589842ef2b4ce712ee149c8bdee4be453b6be07d7486cb6567e7eb510816a46a65009fcb409c51
 MISC metadata.xml 237 SHA256 6ae15c0944026e6b0783ac18e715f1e15f130734c023091ce9c74fb933b698e0 SHA512 915c574b3e3ce7924d302e6e89156c5caa86d386114a90a52864a4bec4a30db8fe7546488e6054ba60308d819d281c707edf9f71c9e9ca6d42731d33ef9ee5be WHIRLPOOL 472c9ff5f9249832faf765771953fee5ee7dfdc2b95de74be6c71292fc278ee88b0c2e6d6b08665de6f7f25a9822f16158b7d6c0e14f4aa7d8fcf4a7692b5578
diff --git a/games-strategy/wesnoth/wesnoth-1.10.6.ebuild b/games-strategy/wesnoth/wesnoth-1.10.6.ebuild
index ebf6f21a64b0..d769c2e953d8 100644
--- a/games-strategy/wesnoth/wesnoth-1.10.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.10.6.ebuild
@@ -1,8 +1,8 @@
 # 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.1 2013/03/19 17:04:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.10.6.ebuild,v 1.2 2013/06/11 23:08:37 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
@@ -39,14 +39,12 @@ src_prepare() {
 			-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"
+			> "${T}"/wesnothd || die
 	fi
 	if ! use doc ; then
 		sed -i \
 			-e '/manual/d' \
-			doc/CMakeLists.txt \
-			|| die "sed failed"
+			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")
@@ -62,6 +60,10 @@ src_prepare() {
 		-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() {
@@ -111,7 +113,7 @@ 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"
+		doinitd "${T}"/wesnothd || die
 	fi
 	prepgamesdirs
 }