old

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

9 files changed, 19 insertions, 493 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 7a1c9ac6aec5..d09ae9a31d07 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/openttd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.135 2012/12/31 16:33:20 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.136 2013/01/22 18:00:25 mr_bones_ Exp $
+
+  22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/openttd-1.2.0-cflags.patch, -files/openttd-1.2.2-cflags.patch,
+  -openttd-1.2.0.ebuild, -openttd-1.2.2.ebuild:
+  old
 
   31 Dec 2012; Agostino Sarubbo <ago@gentoo.org> openttd-1.2.3.ebuild:
   Add ~ppc64, wrt bug #412329
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 58d1f3b809c8..aa96e5bf796e 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,12 +1,6 @@
-AUX openttd-1.2.0-cflags.patch 1174 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555 SHA512 4c94f688024c790dec5e57acb957b496f4f3e0b36f4a754f0415b20d1dadbb996209f74b7fe0b7b31981352bb3a38ed24eb04a723442bf6fd5efaf2baf8ba1f5 WHIRLPOOL 1dacb07003a44bee826eaf3aadb4ac58c984e2c83e70b7ec0475b8cb4a1287e439bfbb346de9515c4c5380348653a766515660415ca5dabc72202e1207cdb33f
-AUX openttd-1.2.2-cflags.patch 1174 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555 SHA512 4c94f688024c790dec5e57acb957b496f4f3e0b36f4a754f0415b20d1dadbb996209f74b7fe0b7b31981352bb3a38ed24eb04a723442bf6fd5efaf2baf8ba1f5 WHIRLPOOL 1dacb07003a44bee826eaf3aadb4ac58c984e2c83e70b7ec0475b8cb4a1287e439bfbb346de9515c4c5380348653a766515660415ca5dabc72202e1207cdb33f
 AUX openttd-1.2.3-cflags.patch 1174 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555 SHA512 4c94f688024c790dec5e57acb957b496f4f3e0b36f4a754f0415b20d1dadbb996209f74b7fe0b7b31981352bb3a38ed24eb04a723442bf6fd5efaf2baf8ba1f5 WHIRLPOOL 1dacb07003a44bee826eaf3aadb4ac58c984e2c83e70b7ec0475b8cb4a1287e439bfbb346de9515c4c5380348653a766515660415ca5dabc72202e1207cdb33f
 AUX openttd.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 SHA512 a1be89727fa76ba2104d934367e69c840735024e9abc8e6a32a67d3553e26ee565a9f1680b56e923a959c01f3209bf267ef8421d077ce2ff131b661d4a88c318 WHIRLPOOL c369d4c82da6a68473d25a636b5d1817e5f6035d85759c484fece1d0bd87d74123fabb64bad74898b87985d5a480d5caccd13eb7fafb15e622380dcde89ca1c1
-DIST openttd-1.2.0-source.tar.gz 8702942 SHA256 e0d5ac8a972e079331d1bb43e1fbb70156f416254b1d9f220c8288bb417ed414 SHA512 63bf2a69e5372c9c5d032c12de4b2dd21b0637315327e3b83b9cc2a2bfdabe3e2ba63f1fff85fb613ecded16827bcd5bed787f9e21a8f51c091ccc82e5b21135 WHIRLPOOL 372506e5ff31ca6cd28ed9bac38f3247f61238f049265d756e067284436bf251c5096b8721784c7900c027d3b058239bac47f5922cc327ff31d9c489406d5878
-DIST openttd-1.2.2-source.tar.gz 8716733 SHA256 2ca100f403d5270ec9da96e8757d8b40991dce5c390f6dcd539bdd1a126b42f3 SHA512 6ec0bfa7ec070ce029eb625463f5d7b0c3fcca482c7f3f85ca06c6c38ad2e42174e390455302a46b3c4495a9cb1577e417af97bcbc2b62a7b936fbd2f6384473 WHIRLPOOL af0c43077cc3595f67fba20b4dc4cc93ca8f1085e49291c66cf1a4e4a78df2dd332120c8378bc59d58d9ee6f828cd40d7934328c18add2be369fff7e89a09e6c
 DIST openttd-1.2.3-source.tar.gz 8722028 SHA256 ebf306bb1911f96118243921055ffea296d7ad5aa39fa20d3bc1f27a22d872fc SHA512 fa96ac210e767e163893c25a5943a77217d78a31b435593417a4498819f62aa16e21530249293e4dd58bdbf44e28e015280ad43078320a7ce18a3bf1a3f4ad35 WHIRLPOOL e6a483de0e84b02a9568eb72d06188c842168903cbe3e5a051265b06180f8bb0634dbd9ae63584a75ca0df262c8949a13958d5a7b51c8108b620b57157929588
-EBUILD openttd-1.2.0.ebuild 4953 SHA256 f1ba803b643b272a922fffbadecbe6ec13ebb349d58b59e5acce898b8f7b44c2 SHA512 7e0523c1e9ea5cab7179cdbf25d69844a099213cb3fa0a3f95ecea1e5f82c57705c5116a5e1dd42e79f1b5ec4ecaea2fd2677079e0472180ded2e3dca4b4156d WHIRLPOOL d5ade803dcd4eea6200ea1fe8a94e992bc2657ceb5dfb7fdf0a219a8cee9da687470429b047d70af57dfcfdb53ede7357f14fdc6527f2021f6d6c053302080f2
-EBUILD openttd-1.2.2.ebuild 5147 SHA256 d118aadd73603c94a6dabf90963a5b29074f3d080554ce527e4e4989a91f89dd SHA512 a814bdcceba3598343847313dfac8f45d307037c87c834101bf86b494beb1cea2b9f23470d3e9728cf269bfd5a420786f00bc8e461cd718c2fd76ef2ee95ef2f WHIRLPOOL fb2e9b343e9e565a1f1e2a139400a105c7f93c393c0d3e575303cf3859d066eb77432f62f933b07377251f172e7ade2afb04f087e72f70d85fc59b1e277930cc
 EBUILD openttd-1.2.3.ebuild 5154 SHA256 7afd8eeee40d7ef745505fe302783e0260280acecf4699ac3b1c72360b438d0f SHA512 b552a70f828f18f064ad4b8da38a8430d7bfd67023bdb6c1eaa4349ab33fa5ee24eb891031e87b3ae4f55e3095cb29e3c65487b38370d7a14b95f8f45b0f0453 WHIRLPOOL ee9ec6a3c5581aae520a747d988e03ee57ab28140b62d895863a61ee7110aca70e3462cdbdb851a130cb0b7222e98ea523fa633f51a69cf27ddedd48673999de
-MISC ChangeLog 18007 SHA256 be1365976097e02acfea6e54111b13ed2d031676988d1c55cd485d703007a8a1 SHA512 374b6dec09bfa77e704d81d6bac9afcda8fdb56e07938aab36936246454d02e1fae88db39582eae1e5670f0a8d93c1f82f292ceac1ebf0587582c2518ad469d3 WHIRLPOOL b0fa8c4f2af7034f62735f27aed5663a4138d55c9a38ae11758a592ebd23e494269255cf589c0c416a9199e3f5f978539a135c66253a1dcc1c33480e03d72c06
+MISC ChangeLog 18195 SHA256 68800295d07d55cfbfbaee039cf1efb8c4b925150204663eeca9455cd95b62a2 SHA512 f435fd6b89609458fa94e33df41e65e09ea1d7993cb7becef8024f68c7e454366abccda82f845ed7f6080a7aeab93c7723aa38e9bbf0693a1ad84df5c530e84c WHIRLPOOL be2e34305d3a1ff11a47043a595809079df5264da605696bd24f191e4f942d6044807684fd1072119c21cebf6ccad5fd0086c2f92c262c1714372a7374334216
 MISC metadata.xml 658 SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 SHA512 30a2ea245738a34e159d1fdf65a4ffede8de14111804c46176613592c4ae63ce1fd9e3fbc36f639f5c7c41214d3f2e6c741e78b424889417bbe0da180e7d0ab1 WHIRLPOOL 51c8f15d834ba7f0be395ca174a9f388cf3dbee218da358a338ee81797fc73a9aebc7d4759a95466d50f8d333e0ff8d58980d1a4c94701e0647d99b16db9963d
diff --git a/games-simulation/openttd/files/openttd-1.2.0-cflags.patch b/games-simulation/openttd/files/openttd-1.2.0-cflags.patch
deleted file mode 100644
index f79915ecf600..000000000000
--- a/games-simulation/openttd/files/openttd-1.2.0-cflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- config.lib.orig
-+++ config.lib
-@@ -1357,14 +1357,12 @@
- 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
- 			LDFLAGS="$LDFLAGS -noixemul"
- 		fi
--
--		CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
- 	else
- 		OBJS_SUBDIR="debug"
- 
- 		# Each debug level reduces the optimization by a bit
- 		if [ $enable_debug -ge 1 ]; then
--			CFLAGS="$CFLAGS -g -D_DEBUG"
-+			CFLAGS="-D_DEBUG $CFLAGS"
- 			if basename "$cc_host" | grep "gcc" &>/dev/null; then
- 				# Define only when compiling with GCC, some
- 				# GLIBC versions use GNU extensions in a way
-@@ -1375,14 +1373,6 @@
- 				CFLAGS="$CFLAGS -G0"
- 			fi
- 		fi
--		if [ $enable_debug -ge 2 ]; then
--			CFLAGS="$CFLAGS -fno-inline"
--		fi
--		if [ $enable_debug -ge 3 ]; then
--			CFLAGS="$CFLAGS -O0"
--		else
--			CFLAGS="$CFLAGS -O2"
--		fi
- 	fi
- 
- 	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
-@@ -1391,11 +1381,6 @@
- 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
- 	fi
- 
--	if [ "$enable_profiling" != "0" ]; then
--		CFLAGS="$CFLAGS -p"
--		LDFLAGS="$LDFLAGS -pg"
--	fi
--
- 	if [ "$with_threads" = "0" ]; then
- 		CFLAGS="$CFLAGS -DNO_THREADS"
- 	fi
diff --git a/games-simulation/openttd/files/openttd-1.2.2-cflags.patch b/games-simulation/openttd/files/openttd-1.2.2-cflags.patch
deleted file mode 100644
index f79915ecf600..000000000000
--- a/games-simulation/openttd/files/openttd-1.2.2-cflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- config.lib.orig
-+++ config.lib
-@@ -1357,14 +1357,12 @@
- 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
- 			LDFLAGS="$LDFLAGS -noixemul"
- 		fi
--
--		CFLAGS="-O2 -fomit-frame-pointer $CFLAGS"
- 	else
- 		OBJS_SUBDIR="debug"
- 
- 		# Each debug level reduces the optimization by a bit
- 		if [ $enable_debug -ge 1 ]; then
--			CFLAGS="$CFLAGS -g -D_DEBUG"
-+			CFLAGS="-D_DEBUG $CFLAGS"
- 			if basename "$cc_host" | grep "gcc" &>/dev/null; then
- 				# Define only when compiling with GCC, some
- 				# GLIBC versions use GNU extensions in a way
-@@ -1375,14 +1373,6 @@
- 				CFLAGS="$CFLAGS -G0"
- 			fi
- 		fi
--		if [ $enable_debug -ge 2 ]; then
--			CFLAGS="$CFLAGS -fno-inline"
--		fi
--		if [ $enable_debug -ge 3 ]; then
--			CFLAGS="$CFLAGS -O0"
--		else
--			CFLAGS="$CFLAGS -O2"
--		fi
- 	fi
- 
- 	if [ "$os" = "OSX" ] && [ $cc_version -eq 40 ]; then
-@@ -1391,11 +1381,6 @@
- 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
- 	fi
- 
--	if [ "$enable_profiling" != "0" ]; then
--		CFLAGS="$CFLAGS -p"
--		LDFLAGS="$LDFLAGS -pg"
--	fi
--
- 	if [ "$with_threads" = "0" ]; then
- 		CFLAGS="$CFLAGS -DNO_THREADS"
- 	fi
diff --git a/games-simulation/openttd/openttd-1.2.0.ebuild b/games-simulation/openttd/openttd-1.2.0.ebuild
deleted file mode 100644
index 377ed938c77c..000000000000
--- a/games-simulation/openttd/openttd-1.2.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.0.ebuild,v 1.8 2012/09/14 05:10:46 ferringb Exp $
-
-EAPI=3
-inherit eutils games
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
-
-DEPEND="!dedicated? (
-		media-libs/libsdl[audio,X,video]
-		icu? ( dev-libs/icu )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.4 )"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_configure() {
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts=" --without-allegro"
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=" --without-libtimidity"
-
-	use debug && myopts+=" --enable-debug=3"
-
-	if use dedicated ; then
-		myopts+=" --enable-dedicated"
-	else
-		use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'"
-		myopts+="
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl"
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=" --with-zlib"
-	else
-		myopts+=" --without-zlib"
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX}" \
-		--binary-dir="${GAMES_BINDIR}" \
-		--data-dir="${GAMES_DATADIR}/${PN}" \
-		--install-dir="${D}" \
-		--icon-dir=/usr/share/pixmaps \
-		--menu-dir=/usr/share/applications \
-		--icon-theme-dir=/usr/share/icons/hicolor \
-		--man-dir=/usr/share/man/man6 \
-		--doc-dir=/usr/share/doc/${PF} \
-		--menu-group="Game;Simulation;" \
-		${myopts} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1 || die
-}
-
-src_test() {
-	emake -j1 test || die "Make test failed. See above for details."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-	prepalldocs
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
diff --git a/games-simulation/openttd/openttd-1.2.2.ebuild b/games-simulation/openttd/openttd-1.2.2.ebuild
deleted file mode 100644
index 10aae8a22f07..000000000000
--- a/games-simulation/openttd/openttd-1.2.2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.2.ebuild,v 1.5 2012/12/04 10:53:31 ago Exp $
-
-EAPI=3
-inherit eutils gnome2-utils games
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-DEPEND="!dedicated? (
-		media-libs/libsdl[audio,X,video]
-		icu? ( dev-libs/icu )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.4 )"
-
-PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
-
-src_configure() {
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts=" --without-allegro"
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=" --without-libtimidity"
-
-	use debug && myopts+=" --enable-debug=3"
-
-	if use dedicated ; then
-		myopts+=" --enable-dedicated"
-	else
-		use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'"
-		myopts+="
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl"
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=" --with-zlib"
-	else
-		myopts+=" --without-zlib"
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX}" \
-		--binary-dir="${GAMES_BINDIR}" \
-		--data-dir="${GAMES_DATADIR}/${PN}" \
-		--install-dir="${D}" \
-		--icon-dir=/usr/share/pixmaps \
-		--menu-dir=/usr/share/applications \
-		--icon-theme-dir=/usr/share/icons/hicolor \
-		--man-dir=/usr/share/man/man6 \
-		--doc-dir=/usr/share/doc/${PF} \
-		--menu-group="Game;Simulation;" \
-		${myopts} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1 || die
-}
-
-src_test() {
-	emake -j1 test || die "Make test failed. See above for details."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-	prepalldocs
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	games_pkg_postinst
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/singularity/ChangeLog b/games-simulation/singularity/ChangeLog
index 86249596721a..9353e3f0b6b6 100644
--- a/games-simulation/singularity/ChangeLog
+++ b/games-simulation/singularity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/singularity
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v 1.19 2011/08/07 03:11:59 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v 1.20 2013/01/22 18:01:09 mr_bones_ Exp $
+
+  22 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
+  -singularity-0.30b.ebuild:
+  old
 
   07 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   singularity-0.30c.ebuild:
@@ -92,4 +96,3 @@
   31 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org> +metadata.xml,
   +singularity-0.24.ebuild:
   initial commit - ebuild submitted by Leszek via bug #130461
-
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index 41540b787130..e814b284d8d6 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST endgame-singularity-music-006.zip 28250705 RMD160 02d820803c5af660a45b7891ea06738409598530 SHA1 abde1c1490261c0fed3cba3d1ee6d57700183765 SHA256 469697285c00564d831249898204d3e532f2685a17b4cf47ee4abc3ffc29276f
-DIST singularity-0.30b-src.tar.gz 2265019 RMD160 6d2030c3ae17f873de12be4dd97a5fa6f49ba428 SHA1 0930e99023fa4b9c1d202f5d3f9072334cae00e3 SHA256 24c5d454b29fdf000663c238513465c0d2dc7c58be510cfd11c00373ef89d6c8
-DIST singularity-0.30c-src.tar.gz 2265133 RMD160 ab2b1b057767fb3f1d903bd3807fc30cd2d7698a SHA1 f4cb2d9e7a04cf22fe76c58b482c568c817baa02 SHA256 f4759fc059ef136c2d4d9668a021b14922dd7300ab5f37ed318ad6778c83f28f
-EBUILD singularity-0.30b.ebuild 1163 RMD160 8f822f511f0971e36abd78a46daf3986909bf910 SHA1 291ee5782af3fe7a633ef556c354cb8216a41fae SHA256 d78179c74cbcd6710bf06555bae0f4ac18b96653d8ff4abb1c23014f90296a52
-EBUILD singularity-0.30c.ebuild 1165 RMD160 4bd1d91b0b63129a92566da567b1123fba8e9e8a SHA1 3617e2b6f424cfc3eb4e41c645cd5dafb7c74814 SHA256 7d101143b5aefb5311b0f6ea439a6b567d07bf237d217bf3b5f737126da3185b
-MISC ChangeLog 2949 RMD160 6e90555df190c90503b07c2a3e21c3b19e5a30a5 SHA1 daf5966d9e40c6c2cd4d063b693f9c41766c3b49 SHA256 f671eea9ff637a24fe904f1191fba55f62bdcaf6326eeb72c1e54b46f76ff1e8
-MISC metadata.xml 311 RMD160 fb98a9badd2120dfdf3a5305ad82db26bb284597 SHA1 16f3c43d252daebbd4a9957b7d32e4aca9ddef1c SHA256 9c5b948e1498ef429b4e676f60f859b8eaedbd4931577c2e7249a676572d9e2a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk93TgMACgkQ/ejvha5XGaM2fwCg13bH/2/VrUchFbjIAT8Cdb38
-hS4AoLj5VkA+M2pTX18UkkTdeLVTefej
-=+oCn
------END PGP SIGNATURE-----
+DIST endgame-singularity-music-006.zip 28250705 SHA256 469697285c00564d831249898204d3e532f2685a17b4cf47ee4abc3ffc29276f
+DIST singularity-0.30c-src.tar.gz 2265133 SHA256 f4759fc059ef136c2d4d9668a021b14922dd7300ab5f37ed318ad6778c83f28f
+EBUILD singularity-0.30c.ebuild 1165 SHA256 7d101143b5aefb5311b0f6ea439a6b567d07bf237d217bf3b5f737126da3185b SHA512 7db811fbcf3ea311c104ad405f2f3a39cc019681e40876c8515f76ae05d7f29653d4628faa0c2967bc65a7c0a02ffbb13a6161fe607abda8924f395b46746a91 WHIRLPOOL f33db350317d74be0b10f045454ce12b3fe8dadd0fe3af8d143b0443d670d01b900b89123552fef35a8e5b69934c5893e809668ca4d0c3e34d192b8addcdd723
+MISC ChangeLog 3038 SHA256 4d4a35888912e3d1443d9f50c87489ca01d452a68973030ce96f1bdc504c57f0 SHA512 b92d7367460ef048d0c995f9ab719f9ed93ef8eed8fc7a26b187b055652924fdecccd35a8d83efac14d532122006fd8156b7ebf27d9568fed9c92d68cacf3930 WHIRLPOOL 1e2c02417fa9e942606e7c4924cae90702629f8d60e31d1755102e6b21ed7ebf46d5aca2aff296a21cdc01a1e2031ea4601a7c02bc9deb90c9520f7009525211
+MISC metadata.xml 311 SHA256 9c5b948e1498ef429b4e676f60f859b8eaedbd4931577c2e7249a676572d9e2a SHA512 c3ab2bc84cd5de53d88ca118efed9a56a2071db5e9481b8fa45caf867c4db73895e732826f14003d0bc12585b532dbdf9c252fc8a706853060a74eea6993dc90 WHIRLPOOL c550e666a8ef4b42cf7cf1d9ae0b052892399fa7da75464848d01881c9b91514583cee300b0e0d0bac3c52d56c1dfc7b1554eb0a5c22b0703613226128971c89
diff --git a/games-simulation/singularity/singularity-0.30b.ebuild b/games-simulation/singularity/singularity-0.30b.ebuild
deleted file mode 100644
index 27cbd2d7ab51..000000000000
--- a/games-simulation/singularity/singularity-0.30b.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30b.ebuild,v 1.4 2010/09/19 18:22:16 hwoarang Exp $
-
-EAPI=2
-inherit eutils games
-
-MUSIC=endgame-${PN}-music-006
-DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
-HOMEPAGE="http://www.emhsoft.com/singularity/"
-SRC_URI="http://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
-	music? ( http://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
-
-LICENSE="GPL-2 CCPL-Attribution-ShareAlike-2.5"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+music"
-
-RDEPEND="dev-python/pygame
-	media-libs/sdl-mixer[vorbis]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-	rm -f code/{,*}/*.pyc data/*.html # Remove unecessary files
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r code data ${PN}.py || die "doins failed"
-	if use music ; then
-		doins -r ../${MUSIC}/music || die "doins failed"
-	fi
-	games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}/${PN}"
-	dodoc README.txt TODO Changelog AUTHORS
-	prepgamesdirs
-}