6 files changed, 8 insertions, 350 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index af02331d98bc..3935798c6b33 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.31 2005/09/11 05:37:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.32 2005/09/19 23:12:41 mr_bones_ Exp $
+
+  19 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -freeciv-2.0.3.ebuild, -freeciv-2.0.4.ebuild:
+  clean old versions
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org> freeciv-2.0.5.ebuild:
   Mark 2.0.5 stable on alpha
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 7b83772a7b1e..a8119ce9c778 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,10 +1,6 @@
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 8efc1087b30ef70e153d0c57349a5a08 freeciv-2.0.4.ebuild 4559
-MD5 e16fc09d5bb5e45a4291ddf171fb2160 ChangeLog 5662
-MD5 9f0613cd4e121ea3b7e8b95b7cd5596a freeciv-2.0.5.ebuild 4572
 MD5 8ba6f0937fdbd16de6e906c841a23f6a freeciv-1.14.2.ebuild 2063
-MD5 3f03010191a64bcefa6fa9ea6995c4cf freeciv-2.0.3.ebuild 4559
-MD5 7b03506340a683cb71edfc8a8f9fa1d6 files/digest-freeciv-2.0.5 129
-MD5 dd1d0e9af6482a6772a4d84e6994f2f0 files/digest-freeciv-2.0.3 130
-MD5 59327911b7de609cbd6c8ea46a04d278 files/digest-freeciv-2.0.4 130
+MD5 9f0613cd4e121ea3b7e8b95b7cd5596a freeciv-2.0.5.ebuild 4572
+MD5 5136e264786c605b3b0c131a4b9a764b ChangeLog 5788
 MD5 439e954e20f13b112d572ff57700ce00 files/digest-freeciv-1.14.2 131
+MD5 7b03506340a683cb71edfc8a8f9fa1d6 files/digest-freeciv-2.0.5 129
diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.3 b/games-strategy/freeciv/files/digest-freeciv-2.0.3
deleted file mode 100644
index 91ecab9a267a..000000000000
--- a/games-strategy/freeciv/files/digest-freeciv-2.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3a8fbcedc15ded1c1c48c78161cac0c9 freeciv-2.0.3.tar.bz2 8463169
-MD5 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz 1223738
diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.4 b/games-strategy/freeciv/files/digest-freeciv-2.0.4
deleted file mode 100644
index b9e4ca8a9b10..000000000000
--- a/games-strategy/freeciv/files/digest-freeciv-2.0.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 833befa003eefda244f49d349bdb585c freeciv-2.0.4.tar.bz2 8464445
-MD5 63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz 1223738
diff --git a/games-strategy/freeciv/freeciv-2.0.3.ebuild b/games-strategy/freeciv/freeciv-2.0.3.ebuild
deleted file mode 100644
index 82c9e98a16d5..000000000000
--- a/games-strategy/freeciv/freeciv-2.0.3.ebuild
+++ /dev/null
@@ -1,169 +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/freeciv/freeciv-2.0.3.ebuild,v 1.3 2005/07/30 23:16:34 mr_bones_ Exp $
-
-inherit games
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2
-	!dedicated? (
-		alsa? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz )
-		esd? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz )
-		sdl? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz )
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="alsa dedicated esd gtk gtk2 nls readline sdl Xaw3d"
-
-RDEPEND="sys-libs/zlib
-	readline? ( sys-libs/readline )
-	!dedicated? (
-		virtual/x11
-		gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.0.0
-				>=dev-libs/glib-2.0.0
-				>=dev-libs/atk-1.0.3
-				>=x11-libs/pango-1.0.5
-			)
-			!gtk2? (
-				=x11-libs/gtk+-1*
-				>=dev-libs/glib-1.2.5
-				>=media-libs/imlib-1.9.2
-			)
-		)
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		alsa? (
-			>=media-libs/alsa-lib-1.0
-			>=media-libs/audiofile-0.2
-		)
-		esd? ( >=media-sound/esound-0.2 )
-		sdl? (
-			>=media-libs/sdl-mixer-1.2
-			>=media-libs/libsdl-1.2
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	games_pkg_setup
-	if ! use dedicated ; then
-		if use gtk ; then
-			if use gtk2 ; then
-				einfo "The Freeciv Client will be built with the GTK+-2 toolkit"
-			else
-				einfo "The Freeciv Client will be built with the GTK+-1.2 toolkit"
-			fi
-		elif use Xaw3d ; then
-			einfo "The Freeciv Client will be built with the Xaw3d toolkit"
-		else
-			einfo "The Freeciv Client will be built with the Xaw toolkit"
-		fi
-		if ! use esd && ! use alsa && ! use sdl ; then
-			ewarn
-			ewarn "To enable sound support in civclient, you must enable"
-			ewarn "at least one of this USE flags: alsa, esd, sdl"
-			ewarn
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# install locales in /usr/share/locale
-	sed -i \
-		-e 's:^\(localedir = \).*:\1/usr/share/locale:' \
-		intl/Makefile.in po/Makefile.in.in \
-		|| die "sed failed"
-	sed -i \
-		-e '/^#define LOCALEDIR/s:".*":"/usr/share/locale":' \
-		configure \
-		|| die "sed failed"
-
-	# install the .desktop in /usr/share/applications
-	sed -i \
-		-e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		client/Makefile.in \
-		|| die "sed failed"
-
-	# remove civclient manpage if dedicated server
-	if use dedicated ; then
-		sed -i \
-			-e '/man_MANS = /s:civclient.6::' \
-			doc/man/Makefile.in \
-			|| die "sed failed"
-	fi
-}
-
-src_compile() {
-	local mysoundconf
-	local myclient
-
-	if use dedicated ; then
-		mysoundconf="--disable-alsa --disable-esd --disable-sdl-mixer"
-		myclient="no"
-	else
-		myclient="xaw"
-		use Xaw3d && myclient="xaw3d"
-		if use gtk ; then
-			use gtk2 \
-				&& myclient="gtk-2.0" \
-				|| myclient="gtk"
-		fi
-		#FIXME --enable-{alsa,esd,sdl-mixer} actually disable them...
-		#FIXME   ==> use --disable-* only, and autodetect to enable.
-		use alsa || mysoundconf="${mysoundconf} --disable-alsa"
-		use esd || mysoundconf="${mysoundconf} --disable-esd"
-		use sdl || mysoundconf="${mysoundconf} --disable-sdl-mixer"
-	fi
-
-	egamesconf \
-		--disable-dependency-tracking \
-		--with-zlib \
-		$(use_enable nls) \
-		$(use_with readline) \
-		--enable-client=${myclient} \
-		${mysoundconf} \
-		|| die "egamesconf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if ! use dedicated ; then
-		# Install the app-defaults if Xaw/Xaw3d toolkit
-		if ! use gtk ; then
-			insinto /etc/X11/app-defaults
-			doins data/Freeciv || die "doins failed"
-		fi
-		# Install sounds if at least one sound plugin was built
-		if use alsa || use esd || use sdl ; then
-			cp -R ../stdsounds* "${D}${GAMES_DATADIR}/${PN}" \
-				|| die "failed to install sounds"
-		fi
-		# Create and install the html manual. It can't be done for dedicated
-		# servers, because the 'civmanual' tool is then not built. Also
-		# delete civmanual from the GAMES_BINDIR, because it's then useless.
-		# Note: to have it localized, it should be ran from _postinst, or
-		# something like that, but then it's a PITA to avoid orphan files...
-		./manual/civmanual || die "civmanual failed"
-		dohtml manual*.html || die "dohtml failed"
-		rm -f "${D}/${GAMES_BINDIR}/civmanual"
-	fi
-
-	dodoc ChangeLog NEWS \
-		doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
-
-	prepgamesdirs
-}
diff --git a/games-strategy/freeciv/freeciv-2.0.4.ebuild b/games-strategy/freeciv/freeciv-2.0.4.ebuild
deleted file mode 100644
index 8c7438aee32c..000000000000
--- a/games-strategy/freeciv/freeciv-2.0.4.ebuild
+++ /dev/null
@@ -1,169 +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/freeciv/freeciv-2.0.4.ebuild,v 1.1 2005/07/30 23:16:34 mr_bones_ Exp $
-
-inherit games
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="ftp://ftp.freeciv.org/pub/freeciv/stable/${MY_P}.tar.bz2
-	!dedicated? (
-		alsa? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz )
-		esd? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz )
-		sdl? ( http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz )
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="alsa dedicated esd gtk gtk2 nls readline sdl Xaw3d"
-
-RDEPEND="sys-libs/zlib
-	readline? ( sys-libs/readline )
-	!dedicated? (
-		virtual/x11
-		gtk? (
-			gtk2? (
-				>=x11-libs/gtk+-2.0.0
-				>=dev-libs/glib-2.0.0
-				>=dev-libs/atk-1.0.3
-				>=x11-libs/pango-1.0.5
-			)
-			!gtk2? (
-				=x11-libs/gtk+-1*
-				>=dev-libs/glib-1.2.5
-				>=media-libs/imlib-1.9.2
-			)
-		)
-		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-		alsa? (
-			>=media-libs/alsa-lib-1.0
-			>=media-libs/audiofile-0.2
-		)
-		esd? ( >=media-sound/esound-0.2 )
-		sdl? (
-			>=media-libs/sdl-mixer-1.2
-			>=media-libs/libsdl-1.2
-		)
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	games_pkg_setup
-	if ! use dedicated ; then
-		if use gtk ; then
-			if use gtk2 ; then
-				einfo "The Freeciv Client will be built with the GTK+-2 toolkit"
-			else
-				einfo "The Freeciv Client will be built with the GTK+-1.2 toolkit"
-			fi
-		elif use Xaw3d ; then
-			einfo "The Freeciv Client will be built with the Xaw3d toolkit"
-		else
-			einfo "The Freeciv Client will be built with the Xaw toolkit"
-		fi
-		if ! use esd && ! use alsa && ! use sdl ; then
-			ewarn
-			ewarn "To enable sound support in civclient, you must enable"
-			ewarn "at least one of this USE flags: alsa, esd, sdl"
-			ewarn
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# install locales in /usr/share/locale
-	sed -i \
-		-e 's:^\(localedir = \).*:\1/usr/share/locale:' \
-		intl/Makefile.in po/Makefile.in.in \
-		|| die "sed failed"
-	sed -i \
-		-e '/^#define LOCALEDIR/s:".*":"/usr/share/locale":' \
-		configure \
-		|| die "sed failed"
-
-	# install the .desktop in /usr/share/applications
-	sed -i \
-		-e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		client/Makefile.in \
-		|| die "sed failed"
-
-	# remove civclient manpage if dedicated server
-	if use dedicated ; then
-		sed -i \
-			-e '/man_MANS = /s:civclient.6::' \
-			doc/man/Makefile.in \
-			|| die "sed failed"
-	fi
-}
-
-src_compile() {
-	local mysoundconf
-	local myclient
-
-	if use dedicated ; then
-		mysoundconf="--disable-alsa --disable-esd --disable-sdl-mixer"
-		myclient="no"
-	else
-		myclient="xaw"
-		use Xaw3d && myclient="xaw3d"
-		if use gtk ; then
-			use gtk2 \
-				&& myclient="gtk-2.0" \
-				|| myclient="gtk"
-		fi
-		#FIXME --enable-{alsa,esd,sdl-mixer} actually disable them...
-		#FIXME   ==> use --disable-* only, and autodetect to enable.
-		use alsa || mysoundconf="${mysoundconf} --disable-alsa"
-		use esd || mysoundconf="${mysoundconf} --disable-esd"
-		use sdl || mysoundconf="${mysoundconf} --disable-sdl-mixer"
-	fi
-
-	egamesconf \
-		--disable-dependency-tracking \
-		--with-zlib \
-		$(use_enable nls) \
-		$(use_with readline) \
-		--enable-client=${myclient} \
-		${mysoundconf} \
-		|| die "egamesconf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if ! use dedicated ; then
-		# Install the app-defaults if Xaw/Xaw3d toolkit
-		if ! use gtk ; then
-			insinto /etc/X11/app-defaults
-			doins data/Freeciv || die "doins failed"
-		fi
-		# Install sounds if at least one sound plugin was built
-		if use alsa || use esd || use sdl ; then
-			cp -R ../stdsounds* "${D}${GAMES_DATADIR}/${PN}" \
-				|| die "failed to install sounds"
-		fi
-		# Create and install the html manual. It can't be done for dedicated
-		# servers, because the 'civmanual' tool is then not built. Also
-		# delete civmanual from the GAMES_BINDIR, because it's then useless.
-		# Note: to have it localized, it should be ran from _postinst, or
-		# something like that, but then it's a PITA to avoid orphan files...
-		./manual/civmanual || die "civmanual failed"
-		dohtml manual*.html || die "dohtml failed"
-		rm -f "${D}/${GAMES_BINDIR}/civmanual"
-	fi
-
-	dodoc ChangeLog NEWS \
-		doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,PEOPLE,README*,TODO}
-
-	prepgamesdirs
-}