use version-correct patch; clean old files

(Portage version: 2.1.4.4)

4 files changed, 8 insertions, 77 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/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"