cleanup

Package-Manager: portage-2.1.2-r8

7 files changed, 94 insertions, 166 deletions

diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
index c9466ba79793..4364287a8172 100644
--- a/games-strategy/widelands/Manifest
+++ b/games-strategy/widelands/Manifest
@@ -1,43 +1,38 @@
-AUX widelands-0.0.9-amd64.patch 425 RMD160 02a4dcb0c0bb5d962df8347ee4cb6804ac08b3bd SHA1 358de9b0558b5e4643588f33a7a2a1f5d493467f SHA256 878939c6809b5de1e530d4770a9efd8ca309cd45d985e261b566ff159922d3b3 size 425
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX widelands-0.0.9-amd64.patch 425 RMD160 02a4dcb0c0bb5d962df8347ee4cb6804ac08b3bd SHA1 358de9b0558b5e4643588f33a7a2a1f5d493467f SHA256 878939c6809b5de1e530d4770a9efd8ca309cd45d985e261b566ff159922d3b3
 MD5 839d74b86a5e329cbfb77e61c65d6921 files/widelands-0.0.9-amd64.patch 425
 RMD160 02a4dcb0c0bb5d962df8347ee4cb6804ac08b3bd files/widelands-0.0.9-amd64.patch 425
 SHA256 878939c6809b5de1e530d4770a9efd8ca309cd45d985e261b566ff159922d3b3 files/widelands-0.0.9-amd64.patch 425
-AUX widelands-0.0.9.5-gcc41.patch 304 RMD160 17d3a6486dfb78f6aa69c8fb90ec6809cb7d462e SHA1 7cf8fc8618043013d73fc2f363b2a0a60acc7d16 SHA256 92516fb795fa01fb87cff443fe37b86c4e2680f79ea60adee87c08bffe014acf size 304
+AUX widelands-0.0.9.5-gcc41.patch 304 RMD160 17d3a6486dfb78f6aa69c8fb90ec6809cb7d462e SHA1 7cf8fc8618043013d73fc2f363b2a0a60acc7d16 SHA256 92516fb795fa01fb87cff443fe37b86c4e2680f79ea60adee87c08bffe014acf
 MD5 2ddf9d093211e7c32be95beff1ad6951 files/widelands-0.0.9.5-gcc41.patch 304
 RMD160 17d3a6486dfb78f6aa69c8fb90ec6809cb7d462e files/widelands-0.0.9.5-gcc41.patch 304
 SHA256 92516fb795fa01fb87cff443fe37b86c4e2680f79ea60adee87c08bffe014acf files/widelands-0.0.9.5-gcc41.patch 304
-AUX widelands-makefile.patch 728 RMD160 1df21cf0a8f511d9fbe0edc516b3193ee507bd32 SHA1 bdbcb4fe74a9d5822c50856cb79ffbecad17cd52 SHA256 a9f1db93b6f620e3185e8e9760c98a75b89062bc901a028f0fbecb11550bd6bc size 728
-MD5 3d7e00feeebcd47a5bf3ca35e1d5fe7e files/widelands-makefile.patch 728
-RMD160 1df21cf0a8f511d9fbe0edc516b3193ee507bd32 files/widelands-makefile.patch 728
-SHA256 a9f1db93b6f620e3185e8e9760c98a75b89062bc901a028f0fbecb11550bd6bc files/widelands-makefile.patch 728
-DIST widelands-b9-source.tar.bz2 2135320 size 2135320
-DIST widelands-b9half-source.tar.bz2 10989969 RMD160 b9382690dfec3f789c0db7f0163f7392d889cfb0 SHA256 a883b410fbe3089233926f3b2314fb3ccc9262b00a1aadbda9f7d73ea572ea9b size 10989969
-EBUILD widelands-0.0.9.5-r1.ebuild 1802 RMD160 8cc69c208e9c7df45a98a5d37f4f6765d0ba5691 SHA1 d1254ffeb7f0dfd1dd0c7f3360a341251ffed7fc SHA256 3c219866e106fe218f90a235ae21f769e25bd332c381621fc2ec13dc6260f6e7 size 1802
-MD5 6b5d192e8cc18d2865d21a236bf78040 widelands-0.0.9.5-r1.ebuild 1802
-RMD160 8cc69c208e9c7df45a98a5d37f4f6765d0ba5691 widelands-0.0.9.5-r1.ebuild 1802
-SHA256 3c219866e106fe218f90a235ae21f769e25bd332c381621fc2ec13dc6260f6e7 widelands-0.0.9.5-r1.ebuild 1802
-EBUILD widelands-0.0.9.5.ebuild 1544 RMD160 daf66be797a8f375cf1c03ba59e7d60cdfa40893 SHA1 713739c1793e5850de38a07fcbb19d45abc3a9cb SHA256 0b4ecda67f965fb803252ea3bc7f2712fdddb3bae715f8b9a101ff97f731ecc9 size 1544
-MD5 0b45d09afaed82e01d3f89972b6e57ae widelands-0.0.9.5.ebuild 1544
-RMD160 daf66be797a8f375cf1c03ba59e7d60cdfa40893 widelands-0.0.9.5.ebuild 1544
-SHA256 0b4ecda67f965fb803252ea3bc7f2712fdddb3bae715f8b9a101ff97f731ecc9 widelands-0.0.9.5.ebuild 1544
-EBUILD widelands-0.0.9.ebuild 1169 RMD160 9aba54ccf891405d14c8ee7153f18f197526bb9e SHA1 9e3b651743505271a057a73c200e3a92622808fb SHA256 d956dd842d82e5490b1389124e72e3601985a3705ff81da0d405cc92e367cb45 size 1169
-MD5 5973bcdbf97557cad2aaa063f7ba32e0 widelands-0.0.9.ebuild 1169
-RMD160 9aba54ccf891405d14c8ee7153f18f197526bb9e widelands-0.0.9.ebuild 1169
-SHA256 d956dd842d82e5490b1389124e72e3601985a3705ff81da0d405cc92e367cb45 widelands-0.0.9.ebuild 1169
-MISC ChangeLog 2150 RMD160 d6556518dab74a51b5011605afe0f5621622d745 SHA1 c9c17898d40e0570a6fc16fecc8d8a6a227143a7 SHA256 56ef1a738484539db33cf4ac26e1f90196aad58f9c4d2d7249ec6c054f8441ec size 2150
+AUX widelands-makefile.patch 1334 RMD160 a9f809392532b757a8b5a30a1ca16b7a5cd29245 SHA1 9b63dc47d3a99464c787ac966aa455deb9b78ece SHA256 3141758eb4fe913fe49c1332e576c68f2cc2a85e2d30d9b8ee9209fd7547038b
+MD5 45ff0d915b222f2ba2a3915c5c01aa1f files/widelands-makefile.patch 1334
+RMD160 a9f809392532b757a8b5a30a1ca16b7a5cd29245 files/widelands-makefile.patch 1334
+SHA256 3141758eb4fe913fe49c1332e576c68f2cc2a85e2d30d9b8ee9209fd7547038b files/widelands-makefile.patch 1334
+DIST widelands-b9half-source.tar.bz2 10989969 RMD160 b9382690dfec3f789c0db7f0163f7392d889cfb0 SHA1 5aea1a225760265cd2b2d34a2fb35a7b875488c5 SHA256 a883b410fbe3089233926f3b2314fb3ccc9262b00a1aadbda9f7d73ea572ea9b
+EBUILD widelands-0.0.9.5-r1.ebuild 1710 RMD160 280302530b869e9e270236be6cdd347501b5b949 SHA1 3d58300a838351a410677cea6d277fd33cd6cd72 SHA256 494a7a8df2947c982747a1f838274c0c449a43f34999c57f52d7f4f842d686e4
+MD5 143648ef0b197860c9a93621f80df3e6 widelands-0.0.9.5-r1.ebuild 1710
+RMD160 280302530b869e9e270236be6cdd347501b5b949 widelands-0.0.9.5-r1.ebuild 1710
+SHA256 494a7a8df2947c982747a1f838274c0c449a43f34999c57f52d7f4f842d686e4 widelands-0.0.9.5-r1.ebuild 1710
+MISC ChangeLog 2150 RMD160 d6556518dab74a51b5011605afe0f5621622d745 SHA1 c9c17898d40e0570a6fc16fecc8d8a6a227143a7 SHA256 56ef1a738484539db33cf4ac26e1f90196aad58f9c4d2d7249ec6c054f8441ec
 MD5 3b412efdabdc470d25d06689a05342c6 ChangeLog 2150
 RMD160 d6556518dab74a51b5011605afe0f5621622d745 ChangeLog 2150
 SHA256 56ef1a738484539db33cf4ac26e1f90196aad58f9c4d2d7249ec6c054f8441ec ChangeLog 2150
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 4de0ba8b5543e6d848c86838244852e6 files/digest-widelands-0.0.9 73
-RMD160 bff7ad9f11f0245e35d3346af8907a0d2daf2f97 files/digest-widelands-0.0.9 73
-SHA256 b5f227568c42e069523b3060f2316936e05acba6a14a1c7de9ae53487175595f files/digest-widelands-0.0.9 73
-MD5 e10d5f329e0eb06f44b8569526772ee8 files/digest-widelands-0.0.9.5 280
-RMD160 c9e6d18caecb85ff113b76c18da754e0da8c0af8 files/digest-widelands-0.0.9.5 280
-SHA256 65b319119c6b4b8653cadf0d12609cfdbb02d3126444a6a2621b99b569ad784a files/digest-widelands-0.0.9.5 280
 MD5 e10d5f329e0eb06f44b8569526772ee8 files/digest-widelands-0.0.9.5-r1 280
 RMD160 c9e6d18caecb85ff113b76c18da754e0da8c0af8 files/digest-widelands-0.0.9.5-r1 280
 SHA256 65b319119c6b4b8653cadf0d12609cfdbb02d3126444a6a2621b99b569ad784a files/digest-widelands-0.0.9.5-r1 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFFyvU+dz7hIScOURERAswuAKCb+Mv+G6Kxc35M3UGGsIty6NyiPgCdGZSs
+Wq/bFC6hr5kTy4zH1QRkfBI=
+=HhCj
+-----END PGP SIGNATURE-----
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
-}