cleanup

(Portage version: 2.1.2-r8)

6 files changed, 71 insertions, 138 deletions

diff --git a/games-strategy/widelands/files/digest-widelands-0.0.9 b/games-strategy/widelands/files/digest-widelands-0.0.9
deleted file mode 100644
index a693c7d6ba99..000000000000
--- a/games-strategy/widelands/files/digest-widelands-0.0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0efaa379795496c05feee47de27b5dae widelands-b9-source.tar.bz2 2135320
diff --git a/games-strategy/widelands/files/digest-widelands-0.0.9.5 b/games-strategy/widelands/files/digest-widelands-0.0.9.5
deleted file mode 100644
index ba1068bd0424..000000000000
--- a/games-strategy/widelands/files/digest-widelands-0.0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7bced82bda4b83d884da3e5b0143b2b4 widelands-b9half-source.tar.bz2 10989969
-RMD160 b9382690dfec3f789c0db7f0163f7392d889cfb0 widelands-b9half-source.tar.bz2 10989969
-SHA256 a883b410fbe3089233926f3b2314fb3ccc9262b00a1aadbda9f7d73ea572ea9b widelands-b9half-source.tar.bz2 10989969
diff --git a/games-strategy/widelands/files/widelands-makefile.patch b/games-strategy/widelands/files/widelands-makefile.patch
index da96caf3241e..41b2b1cbacdc 100644
--- a/games-strategy/widelands/files/widelands-makefile.patch
+++ b/games-strategy/widelands/files/widelands-makefile.patch
@@ -1,6 +1,37 @@
---- widelands-b9half/Makefile.orig	2006-01-13 00:19:12.000000000 +0100
-+++ widelands-b9half/Makefile	2006-01-13 00:19:29.000000000 +0100
-@@ -160,9 +160,9 @@
+--- Makefile
++++ Makefile
+@@ -61,9 +61,6 @@
+ #  release    optimized
+ #  profile    optimized, debugging symbols, profiling
+ #
+-ifndef BUILD
+-BUILD:=debug
+-endif
+ 
+ endif
+ 
+@@ -124,11 +121,6 @@
+ BUILD:=debug
+ OPTIMIZE:=yes
+ DEBUG:=yes
+-else
+-BUILD:=debug-no-parachute
+-OPTIMIZE:=YES
+-DEBUG:=YES
+-ADD_CFLAGS:=-DNO_PARACHUTE
+ endif
+ endif
+ endif
+@@ -139,7 +131,7 @@
+ endif
+ 
+ ifdef DEBUG
+-ADD_CFLAGS += -g -DDEBUG  -fmessage-length=0
++ADD_CFLAGS += -DDEBUG
+ else
+ ADD_CFLAGS += -DNDEBUG
+ endif
+@@ -160,9 +152,9 @@
  # Object files and directories, final compilation flags
  
  OBJECT_DIR:=src/$(TARGET)-$(BUILD)
@@ -12,3 +43,12 @@
  
  ##############################################################################
  # Building
+@@ -220,7 +212,7 @@
+ -include $(DEP)
+ 
+ $(OBJECT_DIR)/%.o: src/%.cc
+-	$(CXX) -pipe $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $<
++	$(CXX) $(CXXFLAGS) -MMD -MP -MF $@.d -c -o $@ $<
+ 	sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' $@.d > $(OBJECT_DIR)/$*.d
+ 	rm $@.d
+ 
diff --git a/games-strategy/widelands/widelands-0.0.9.5-r1.ebuild b/games-strategy/widelands/widelands-0.0.9.5-r1.ebuild
index fc876c708e48..81e382005398 100644
--- a/games-strategy/widelands/widelands-0.0.9.5-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.0.9.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.9.5-r1.ebuild,v 1.2 2006/05/06 07:27:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.9.5-r1.ebuild,v 1.3 2007/02/08 10:02:30 nyhm Exp $
 
-inherit eutils games flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs games
 
 DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://widelands.sourceforge.net/"
+HOMEPAGE="http://www.widelands.org/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-b${PV:4:1}half-source.tar.bz2"
 
 LICENSE="GPL-2"
@@ -13,41 +13,46 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug nls"
 
-DEPEND="media-libs/libpng
+RDEPEND="media-libs/libpng
 	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer
 	media-libs/sdl-net
 	media-libs/sdl-ttf
-	sys-libs/zlib"
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-b9half
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/widelands-0.0.9-amd64.patch"
-	epatch "${FILESDIR}/widelands-makefile.patch"
-	epatch "${FILESDIR}/widelands-0.0.9.5-gcc41.patch"
-	sed -i -e "s:__ppc__:__PPC__:g" "${S}/src/machdep.h" || die "sed failed"
+	epatch \
+		"${FILESDIR}"/${PN}-0.0.9-amd64.patch \
+		"${FILESDIR}"/${PN}-makefile.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
+	sed -i -e "s:__ppc__:__PPC__:g" "${S}"/src/machdep.h || die "sed failed"
 
 	if use nls ; then
-		cd ${S}/locale
+		cd "${S}"/locale
 		cp ../utils/*.py .
 	fi
 }
 
 src_compile() {
 	filter-flags -fomit-frame-pointer
-	use debug || export BUILD="release"
-	use elibc_glibc && export IMPLICIT_LIBINTL=1
-	emake || die "emake failed"
-	unset BUILD IMPLICIT_LIBINTL
+
+	emake \
+		CXX=$(tc-getCXX) \
+		IMPLICIT_LIBINTL=1 \
+		$(use debug && echo DEBUG=1) \
+		|| die "emake failed"
 
 	if use nls ; then
-		cd ${S}/locale
+		cd "${S}"/locale
 		./buildcat.py
-		rm *.p* .cvsignore tmp
+		rm -f *.p* .cvsignore tmp
 	fi
 }
 
@@ -55,18 +60,16 @@ src_install() {
 	local dir=${GAMES_DATADIR}/${PN}
 
 	insinto "${dir}"
+	doins -r fonts maps pics tribes worlds campaigns $(use nls && echo locale) \
+		|| die "doins failed"
 
-	if use nls ; then
-		doins -r fonts maps pics tribes worlds campaigns locale || die "doins failed"
-	else
-		doins -r fonts maps pics tribes worlds campaigns || die "doins failed"
-	fi
 	exeinto "${dir}"
-	doexe ${PN} || die "copying widelands"
+	doexe ${PN} || die "doexe failed"
 	games_make_wrapper widelands ./widelands "${dir}"
+
 	dodoc AUTHORS ChangeLog README.developers
 
-	newicon pics/wl-ico-48.png widelands.png
-	make_desktop_entry widelands Widelands widelands.png
+	newicon pics/wl-ico-48.png ${PN}.png
+	make_desktop_entry ${PN} Widelands
 	prepgamesdirs
 }
diff --git a/games-strategy/widelands/widelands-0.0.9.5.ebuild b/games-strategy/widelands/widelands-0.0.9.5.ebuild
deleted file mode 100644
index dff6686352e9..000000000000
--- a/games-strategy/widelands/widelands-0.0.9.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.9.5.ebuild,v 1.9 2006/05/06 07:27:40 mr_bones_ Exp $
-
-inherit eutils games flag-o-matic
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://widelands.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-b${PV:4:1}half-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="media-libs/libpng
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	sys-libs/zlib"
-
-S=${WORKDIR}/${PN}-b9half
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/widelands-0.0.9-amd64.patch"
-	epatch "${FILESDIR}/widelands-makefile.patch"
-	epatch "${FILESDIR}/widelands-0.0.9.5-gcc41.patch"
-	sed -i -e "s:__ppc__:__PPC__:g" "${S}/src/machdep.h" || die "sed failed"
-}
-
-src_compile() {
-	filter-flags -fomit-frame-pointer
-	use debug || export BUILD="release"
-	use elibc_glibc && export IMPLICIT_LIBINTL=1
-	emake || die "emake failed"
-	unset BUILD IMPLICIT_LIBINTL
-}
-
-src_install() {
-	local dir=${GAMES_DATADIR}/${PN}
-
-	insinto "${dir}"
-	doins -r fonts maps pics tribes worlds campaigns \
-		|| die "doins failed"
-	exeinto "${dir}"
-	doexe ${PN} || die "copying widelands"
-	games_make_wrapper widelands ./widelands "${dir}"
-	dodoc AUTHORS ChangeLog README.developers
-
-	newicon pics/wl-ico-48.png widelands.png
-	make_desktop_entry widelands Widelands widelands.png
-	prepgamesdirs
-}
diff --git a/games-strategy/widelands/widelands-0.0.9.ebuild b/games-strategy/widelands/widelands-0.0.9.ebuild
deleted file mode 100644
index 0f38cfdab590..000000000000
--- a/games-strategy/widelands/widelands-0.0.9.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/widelands/widelands-0.0.9.ebuild,v 1.4 2005/10/29 12:37:52 lu_zero Exp $
-
-inherit eutils games
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://widelands.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-b${PV:4:4}-source.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	media-libs/jpeg
-	media-libs/libpng"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-amd64.patch"
-	sed -i -e "s:__ppc__:__PPC__:g" ${S}/src/machdep.h
-}
-
-src_compile() {
-	use debug || export BUILD="release"
-	emake || die "emake failed"
-	unset BUILD
-}
-
-src_install() {
-	local dir=${GAMES_DATADIR}/${PN}
-
-	insinto "${dir}"
-	doins -r fonts maps pics tribes worlds campaigns README \
-		|| die "doins failed"
-	exeinto "${dir}"
-	doexe ${PN} || die "copying widelands"
-	games_make_wrapper widelands ./widelands "${dir}"
-	dodoc AUTHORS ChangeLog README
-	prepgamesdirs
-}