use version-correct patch; clean old files

Package-Manager: portage-2.1.4.4

5 files changed, 11 insertions, 82 deletions

diff --git a/games-strategy/widelands/ChangeLog b/games-strategy/widelands/ChangeLog
index 922ec193d1a8..24b386921353 100644
--- a/games-strategy/widelands/ChangeLog
+++ b/games-strategy/widelands/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/widelands
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.15 2008/04/13 10:18:33 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/ChangeLog,v 1.16 2008/09/01 20:19:27 mr_bones_ Exp $
+
+  01 Sep 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/widelands-0.0.11-build.patch, +files/widelands-0.0.12-build.patch,
+  -widelands-0.0.11.ebuild, widelands-0.0.12.ebuild:
+  use version-correct patch; clean old files
 
   13 Apr 2008; Stefan Schweizer <genstef@gentoo.org>
   widelands-0.0.12.ebuild:
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index dfdc6029e6d2..f337f0184817 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,7 +1,5 @@
-AUX widelands-0.0.11-build.patch 1873 RMD160 fe038d69b72813fe779cab3579ca857842a35042 SHA1 2658e12493f26c27bcb50a4f0cde23b9ae0e58c1 SHA256 7acee54e4d3b9eb69e55868e85357f760c7e7da3b03770e5d710ff8a871c7b69
-DIST widelands-build-11-source.tar.bz2 35011678 RMD160 0aa009e91ee661b7e7bf04f82c4a136bb1e651e0 SHA1 bb6c730fc956c6451f52577649379fea45ef39f5 SHA256 102a305703070eb20af23f3015c8e1dfc9f87d7f719d71e07fcdbf84e85de0d3
+AUX widelands-0.0.12-build.patch 1873 RMD160 fe038d69b72813fe779cab3579ca857842a35042 SHA1 2658e12493f26c27bcb50a4f0cde23b9ae0e58c1 SHA256 7acee54e4d3b9eb69e55868e85357f760c7e7da3b03770e5d710ff8a871c7b69
 DIST widelands-build-12-source.tar.bz2 41442971 RMD160 1f44fa6be78d545ffeeb19020c9fa1dc934d610f SHA1 b8d927dd44e82d357a9c05dd26d8ec386e4dce96 SHA256 3640ab4a5147ebd826accb013e2013563759ad13b31e9e41193e203c94ee6384
-EBUILD widelands-0.0.11.ebuild 1850 RMD160 9d3603ec4905a6b3e77ff337abeafd47bf081c59 SHA1 b5c816aa6bc9b6ccb185aefe4269556699bb7559 SHA256 e6cbbf6f4af61d3035452320378f10e0e92d3824ed6bfbc434176fa6a874707a
-EBUILD widelands-0.0.12.ebuild 1885 RMD160 a177d51fba38b3d66bad10a833e44eb2bc858b7d SHA1 f860ae3dbd3df328d23812dc98082fd57ac72594 SHA256 44a9e99abf8f0de9faf18ae8b14c0b4a06c6f02925e2c1722afc749580006041
-MISC ChangeLog 2862 RMD160 0159d989d36a34a8cc0527c8f0ed5cda52d667a7 SHA1 30fbdca9bd80f80c4cc95b2192cb57d97be80d9b SHA256 325ebab596c0d0581781821d4e163444af01cbc2af6db8e8935cb41403674c78
+EBUILD widelands-0.0.12.ebuild 1875 RMD160 61c207d6559b90ab0e130cdca009ed0fa1ba7bd5 SHA1 729cf00e5a3d39c2b888b7a959eeb66312a63bc0 SHA256 c5a4ae59c6068c785239355736ffa77d5abf1ebbc8ef6bf3a22b28f1c87a935b
+MISC ChangeLog 3094 RMD160 e38cc820c3d9a0c6329133cc04983f18451aba75 SHA1 2069eb29f6f494df7c6db1bf967de9219b206659 SHA256 654a3cafe00fafcce6808a476a30bd7c15c8edafb0678463fe893c5378f89297
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/widelands/files/widelands-0.0.11-build.patch b/games-strategy/widelands/files/widelands-0.0.12-build.patch
index 64f4691b2bc7..64f4691b2bc7 100644
--- a/games-strategy/widelands/files/widelands-0.0.11-build.patch
+++ b/games-strategy/widelands/files/widelands-0.0.12-build.patch
diff --git a/games-strategy/widelands/widelands-0.0.11.ebuild b/games-strategy/widelands/widelands-0.0.11.ebuild
deleted file mode 100644
index 198084d0e109..000000000000
--- a/games-strategy/widelands/widelands-0.0.11.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.11.ebuild,v 1.2 2008/01/22 08:39:33 nyhm Exp $
-
-inherit eutils flag-o-matic toolchain-funcs versionator games
-
-MY_PV=$(get_version_component_range 3)
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-build-${MY_PV}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-	media-libs/libpng
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -f $(find . -name SConscript)
-
-	epatch "${FILESDIR}"/${P}-build.patch
-
-	sed -i 's:__ppc__:__PPC__:' src/s2map.cc \
-		|| die "sed s2map.cc failed"
-	sed -i "s:/usr/share/games:${GAMES_DATADIR}:" src/wlapplication.cc \
-		|| die "sed wlapplication.cc failed"
-	sed -i "s:/l/WiLa/Setup:${GAMES_DATADIR}/${PN}:" src/config.h.default \
-		|| die "sed config.h.default failed"
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-	emake CXX=$(tc-getCXX) || die "emake failed"
-
-	if use nls ; then
-		utils/buildlocale.py || die "buildlocale.py failed"
-	fi
-}
-
-src_install() {
-	dogamesbin ${PN} || die "dogamesbin failed"
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r campaigns fonts maps music pics sound tribes txts worlds \
-		|| die "doins failed"
-
-	insinto "${GAMES_DATADIR}"/${PN}/locale
-	local d
-	for d in locale/* ; do
-		if [[ -d ${d} ]] ; then
-			doins -r ${d} || die "doins ${d} failed"
-		fi
-	done
-
-	newicon pics/wl-ico-48.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-
-	dodoc ChangeLog CREDITS
-	prepgamesdirs
-}
diff --git a/games-strategy/widelands/widelands-0.0.12.ebuild b/games-strategy/widelands/widelands-0.0.12.ebuild
index 7cd6bf1fd4e3..cdf3a47f82c1 100644
--- a/games-strategy/widelands/widelands-0.0.12.ebuild
+++ b/games-strategy/widelands/widelands-0.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.12.ebuild,v 1.2 2008/04/13 10:18:33 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.12.ebuild,v 1.3 2008/09/01 20:19:27 mr_bones_ Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator games
 
@@ -33,7 +33,7 @@ src_unpack() {
 	cd "${S}"
 	rm -f $(find . -name SConscript)
 
-	epatch "${FILESDIR}"/widelands-0.0.11-build.patch
+	epatch "${FILESDIR}"/${P}-build.patch
 
 	sed -i 's:__ppc__:__PPC__:' src/s2map.cc \
 		|| die "sed s2map.cc failed"