version bump; clean old

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 9 insertions, 194 deletions

diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog
index 01814b491d77..2f610cae9df9 100644
--- a/games-simulation/openttd/ChangeLog
+++ b/games-simulation/openttd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/openttd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.73 2009/08/01 12:07:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.74 2009/08/01 17:00:49 mr_bones_ Exp $
+
+*openttd-0.7.2 (01 Aug 2009)
+
+  01 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -openttd-0.7.0.ebuild, -files/openttd-0.7.0-build.patch,
+  -openttd-0.7.1.ebuild, +openttd-0.7.2.ebuild:
+  version bump; clean old
 
   01 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> openttd-0.7.0.ebuild,
   openttd-0.7.1.ebuild:
diff --git a/games-simulation/openttd/files/openttd-0.7.0-build.patch b/games-simulation/openttd/files/openttd-0.7.0-build.patch
deleted file mode 100644
index 6d50c07a5366..000000000000
--- a/games-simulation/openttd/files/openttd-0.7.0-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- config.lib	2009-04-01 16:36:05.000000000 +0200
-+++ config.lib.new	2009-04-02 13:08:50.000000000 +0200
-@@ -1389,7 +1389,8 @@
- 		CFLAGS="$CFLAGS -DWITH_SHARED_DIR -DSHARED_DIR=\\\\\"$shared_dir\\\\\""
- 	fi
- 
--	CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\""
-+	[[ $data_dir = "/"* ]] || data_dir="$prefix_dir/$data_dir"
-+	CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$data_dir\\\\\""
- 
- 	log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS"
- 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
-@@ -2532,6 +2533,16 @@
- 
- 	SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR"
- 
-+	# we have to replace all prefix/x_dir with x_dir 
-+	# and append prefix only when needed
-+	[[ $data_dir = "/"* ]] || data_dir="$prefix_dir/$data_dir"
-+	[[ $binary_dir = "/"* ]] || binary_dir="$prefix_dir/$binary_dir"
-+	[[ $doc_dir = "/"* ]] || doc_dir="$prefix_dir/$doc_dir"
-+	[[ $man_dir = "/"* ]] || man_dir="$prefix_dir/$man_dir"
-+	[[ $icon_dir = "/"* ]] || icon_dir="$prefix_dir/$icon_dir"
-+	[[ $icon_theme_dir = "/"* ]] || icon_theme_dir="$prefix_dir/$icon_theme_dir"
-+	[[ $menu_dir = "/"* ]] || menu_dir="$prefix_dir/$menu_dir"
-+
- 	# All the data needed to compile a single target
- 	#  Make sure if you compile multiple targets to
- 	#  use multiple OBJS_DIR, because all in-between
-@@ -2561,12 +2572,12 @@
- 		s~!!OSXAPP!!~$OSXAPP~g;
- 		s~!!LANG_DIR!!~$LANG_DIR~g;
- 		s~!!TTD!!~$TTD~g;
--		s~!!BINARY_DIR!!~$prefix_dir/$binary_dir~g;
--		s~!!DATA_DIR!!~$prefix_dir/$data_dir~g;
--		s~!!DOC_DIR!!~$prefix_dir/$doc_dir~g;
--		s~!!MAN_DIR!!~$prefix_dir/$man_dir~g;
--		s~!!ICON_DIR!!~$prefix_dir/$icon_dir~g;
--		s~!!ICON_THEME_DIR!!~$prefix_dir/$icon_theme_dir~g;
-+		s~!!BINARY_DIR!!~$binary_dir~g;
-+		s~!!DATA_DIR!!~$data_dir~g;
-+		s~!!DOC_DIR!!~$doc_dir~g;
-+		s~!!MAN_DIR!!~$man_dir~g;
-+		s~!!ICON_DIR!!~$icon_dir~g;
-+		s~!!ICON_THEME_DIR!!~$icon_theme_dir~g;
- 		s~!!PERSONAL_DIR!!~$personal_dir~g;
- 		s~!!SHARED_DIR!!~$shared_dir~g;
- 		s~!!INSTALL_DIR!!~$install_dir~g;
-@@ -2601,7 +2612,7 @@
- 
- 	if [ "$icon_theme_dir" != "" ]; then
- 		SRC_REPLACE="$SRC_REPLACE
--			s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g;
-+			s#!!ICON_THEME_DIR!!#$icon_theme_dir#g;
- 		"
- 	else
- 		SRC_REPLACE="$SRC_REPLACE
-@@ -2611,7 +2622,7 @@
- 
- 	if [ "$man_dir" != "" ]; then
- 		SRC_REPLACE="$SRC_REPLACE
--			s#!!MAN_DIR!!#$prefix_dir/$man_dir#g;
-+			s#!!MAN_DIR!!#$man_dir#g;
- 		"
- 	else
- 		SRC_REPLACE="$SRC_REPLACE
-@@ -2621,7 +2632,7 @@
- 
- 	if [ "$menu_dir" != "" ]; then
- 		SRC_REPLACE="$SRC_REPLACE
--			s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g;
-+			s#!!MENU_DIR!!#$menu_dir#g;
- 		"
- 	else
- 		SRC_REPLACE="$SRC_REPLACE
\ No newline at end of file
diff --git a/games-simulation/openttd/openttd-0.7.0.ebuild b/games-simulation/openttd/openttd-0.7.0.ebuild
deleted file mode 100644
index 718b1dadd483..000000000000
--- a/games-simulation/openttd/openttd-0.7.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.7.0.ebuild,v 1.3 2009/08/01 11:59:43 ssuominen 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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="alsa debug dedicated iconv icu +png +truetype zlib"
-RESTRICT="test"
-
-DEPEND="
-	!dedicated? (
-		media-libs/libsdl[X]
-		icu? ( dev-libs/icu )
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	!dedicated? (
-		alsa? ( media-sound/alsa-utils )
-	)"
-
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-src_configure() {
-	local myopts
-
-	use debug && myopts="${myopts} --enable-debug=3"
-
-	if use dedicated ; then
-		myopts="${myopts} --enable-dedicated"
-	else
-		use alsa && 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
-
-	# 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.
-	myopts="${myopts} --without-allegro"
-
-	# configure is a hand-written bash-script, so econf will not work
-	bash ./configure \
-		--disable-strip \
-		--prefix-dir=/usr \
-		--binary-dir="${GAMES_BINDIR}" \
-		--data-dir="${GAMES_DATADIR}/${PN}" \
-		--install-dir="${D}" \
-		--doc-dir=share/doc/${PF} \
-		--menu-group="Game;Simulation;" \
-		${myopts} \
-		$(use_with iconv) \
-		$(use_with png) \
-		|| die "configure failed"
-}
-
-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
-
-	elog
-	elog "In order to play, you must copy the following 6 files from "
-	elog "a version of TTD to ${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 so make sure they are "
-	elog "correct for whichever version you have."
-	elog
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when run, including any running client sessions!"
-	else
-		if use alsa ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "You have to set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			elog "alsa not in USE so music will not be played during the game."
-		fi
-	fi
-}
diff --git a/games-simulation/openttd/openttd-0.7.1.ebuild b/games-simulation/openttd/openttd-0.7.2.ebuild
index a0715ff65cbd..27d16809067f 100644
--- a/games-simulation/openttd/openttd-0.7.1.ebuild
+++ b/games-simulation/openttd/openttd-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.7.1.ebuild,v 1.3 2009/08/01 11:59:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-0.7.2.ebuild,v 1.1 2009/08/01 17:00:49 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games