clean old; tidy

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

5 files changed, 13 insertions, 195 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 4f8eb9ddeb2a..8096cd82ec2e 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.124 2012/05/06 19:29:52 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.125 2012/05/31 16:34:39 mr_bones_ Exp $
+
+  31 May 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/openttd-1.2.0-cflags.patch, -files/openttd-1.1.3-cflags.patch,
+  -openttd-1.1.3.ebuild, openttd-1.2.0.ebuild:
+  clean old; tidy
 
   06 May 2012; Mark Loeser <halcy0n@gentoo.org> openttd-1.1.3.ebuild:
   Drop to ~ppc; bug #398161
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
index 0315b63c8670..fb7a42b1c9a6 100644
--- a/games-simulation/openttd/Manifest
+++ b/games-simulation/openttd/Manifest
@@ -1,28 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX openttd-1.1.3-cflags.patch 1246 RMD160 75ba5fa96bb079ff293af6071b47d265b7b2b193 SHA1 db09c40667712c9597eb08581943ca0e86ee724f SHA256 ba8d183f9cd8e97e6a98c3a6fec5555b695bcc6d033723ff096e6953cad68ddd
+AUX openttd-1.2.0-cflags.patch 1174 RMD160 922e53f2753cbc330f041fbad156f90062efcb42 SHA1 51b0c521d6056914920403e572f03a90749d1930 SHA256 b3e269376afbe93beb7d6cff6ba268b641b4631328518f76112c69e39cbd6555
 AUX openttd.initd 529 RMD160 ff9fdf7a787ae3d08ec4dbef1b1b37eee12d1ccd SHA1 f833206fc430c6e7afec76c39e97af0f7ec6578a SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112
-DIST openttd-1.1.3-source.tar.gz 7854903 RMD160 a1441084fdc4f8ebe4e7198a7d07ef45baadd8cd SHA1 d6e6cb09e238b6bee4b9da48de78bad68565f773 SHA256 003ffe231bf98cf6c83c58f68091ea0cc1c2f851b17a7dbb8e5eda61ff9665bf
 DIST openttd-1.2.0-source.tar.gz 8702942 RMD160 25f133c3b302b56215d9f46fa5b96fb9ee23f999 SHA1 6094f37c27fd8801c23c588b9945d14919b53132 SHA256 e0d5ac8a972e079331d1bb43e1fbb70156f416254b1d9f220c8288bb417ed414
-EBUILD openttd-1.1.3.ebuild 5114 RMD160 98ae59e3d1c4d4eb9f95a3ef56bacc720588f2d6 SHA1 8538cbddcbfb1f6193671ea7d85cbb89297d85aa SHA256 85057c23bb586e29731e3c07046fe2facb4f3af2d5f142dfb84c5578fdad7767
-EBUILD openttd-1.2.0.ebuild 5005 RMD160 b1cc0bd6701c3c636e3f67811aa46c17590a7d98 SHA1 500aacf0ac0008c8cf9f11ed28929a4e5c074779 SHA256 bea6bcc5f53a427af28d4ebcc7e2f342804356c04b0ba75e22e4f7cd35f65f0e
-MISC ChangeLog 16414 RMD160 cceb75da8db98e450c92b1fb53deec8176c3d776 SHA1 c6fccad79e7cc8251e36c83015703006b71dec09 SHA256 442784c21b79b0d4883fdde38acddab6cd9e9574608e016fdee12477f77839b4
+EBUILD openttd-1.2.0.ebuild 5004 RMD160 1c257261bcadcd29cb90ac3a47756302fe36bce7 SHA1 397e558148280df65476c7b796a946827c2d4bcf SHA256 953d1279f55ccbb3c630906b01bc4516131d32ce178b63c03fc120bb8fdd4dc4
+MISC ChangeLog 16609 RMD160 20815b3521be84e551123e06aa86f518ce497ca2 SHA1 86fa0a3b204deda9fe8e0c261d53c98b2e2a784e SHA256 b03a98423f422a5263f1b8986ed3ad3441344430be9534b2f2d3ca9a572c025d
 MISC metadata.xml 658 RMD160 3e5f41ef03cfc2b3d91f3fe18939ded3aaf86cd1 SHA1 e5b0eefc09ca65a2dd09049aca0da1b6dcbe269c SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPptE2AAoJEPTTRK0uRVaNOsEP/AqfTo9fwPvPI7sOcAR/khkF
-oEHAZ3paaXrbILF1koMIXK0fjoMjfe1V2J+3RW4qzUVrHjsOfwHrLG9jcdcbOa41
-t/eWFC9gGwVhazYJYqAGMBr4qe7W3O6fKdvQWLfygvnLlk/1UQj9ojitKUeBvAPn
-VUPYjDEVSX04mnyKWQ3jbLWJzVmpVqLP1/MesJIxb96IIWZtdie5zujmRcTUnTc/
-6Fo+03RdM1HvmwsxQW9Regg4a8xoViCZl+Mn9IecZBD8DJy/MSTtDyBj+CgSJMnN
-sBjw0VkaxSlXM94bzXg5lOANrtzm4R+U3uKNXvUmDjqxynf0KKjnZHAb6TZsfRle
-4LIm5EKpWhX7EBNhElO7q04M8IyHWPSsyixNoCl4QoYllzjyLaoPMHYCQuJpKjF4
-L2LQ7rX/3YJ2qhDY/MJOUGlmYrreJ9ntuaAtv4pM9lANsCMO0gOuPkSYaq8AD4r7
-mLdGz7lZ8kiTFNGOuJjUz4UcTVJyHre4CkB86gaUU24T5UygYuBFH6bYwT2EAry2
-Ts1IQ7xqW2QH1xcxpgxvtjU4ItZb1TScBvv7EhjsLzcwPiIe3O3XQ0YifK/aZIQv
-cgngVGTuddFSfr7Ydj5HhxoVZbt/KCniSBcjyoMAMdFmK4eV30dOtQcPg9J1ykdh
-mQ8nAUs8lu+mwmZXinyz
-=iP1D
------END PGP SIGNATURE-----
diff --git a/games-simulation/openttd/files/openttd-1.1.3-cflags.patch b/games-simulation/openttd/files/openttd-1.2.0-cflags.patch
index 60a9056a6634..f79915ecf600 100644
--- a/games-simulation/openttd/files/openttd-1.1.3-cflags.patch
+++ b/games-simulation/openttd/files/openttd-1.2.0-cflags.patch
@@ -1,5 +1,5 @@
---- config.lib.orig	2011-08-08 11:40:21.641085825 -0400
-+++ config.lib	2011-08-08 11:44:19.655285851 -0400
+--- 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"
diff --git a/games-simulation/openttd/openttd-1.1.3.ebuild b/games-simulation/openttd/openttd-1.1.3.ebuild
deleted file mode 100644
index e16ac77ef5a0..000000000000
--- a/games-simulation/openttd/openttd-1.1.3.ebuild
+++ /dev/null
@@ -1,165 +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.1.3.ebuild,v 1.5 2012/05/06 19:29:52 halcy0n Exp $
-
-EAPI=2
-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 ~arm ~ppc ~ppc64 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 )
-	"
-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="${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="${myopts} --without-libtimidity"
-
-	use debug && myopts="${myopts} --enable-debug=3"
-
-	if use dedicated ; then
-		myopts="${myopts} --enable-dedicated"
-	else
-		use aplaymidi && myopts="${myopts} --with-midi='/usr/bin/aplaymidi'"
-		myopts="${myopts}
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl"
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts="${myopts} --with-zlib"
-	else
-		myopts="${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 "configure failed"
-}
-
-src_compile() {
-	emake VERBOSE=1 || die
-}
-
-src_test() {
-	vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	emake -j1 test || die "Make test failed. See above for details."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		rm -rf "${D}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${D}"/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.0.ebuild b/games-simulation/openttd/openttd-1.2.0.ebuild
index 24032d45652d..4f5373294f95 100644
--- a/games-simulation/openttd/openttd-1.2.0.ebuild
+++ b/games-simulation/openttd/openttd-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2012/04/19 11:53:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.2.0.ebuild,v 1.7 2012/05/31 16:34:39 mr_bones_ Exp $
 
 EAPI=3
 inherit eutils games
@@ -38,7 +38,7 @@ PDEPEND="
 	)
 	openmedia? ( >=games-misc/opengfx-0.4.4 )"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.1.3-cflags.patch )
+PATCHES=( "${FILESDIR}"/${P}-cflags.patch )
 
 src_configure() {
 	# there is an allegro interface available as well as sdl, but