version bump

Package-Manager: portage-2.1.4.4

3 files changed, 190 insertions, 2 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 78de5b9325a6..af21c33dc055 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.77 2008/08/24 11:35:30 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.78 2008/08/29 05:31:34 mr_bones_ Exp $
+
+*freeciv-2.1.6 (29 Aug 2008)
+
+  29 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.1.6.ebuild:
+  version bump
 
   24 Aug 2008; Markus Rothe <corsair@gentoo.org> freeciv-2.1.5.ebuild:
   Stable on ppc64; bug #234507
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 2c9917341adc..8d3e89de9c26 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,8 +1,10 @@
 DIST freeciv-2.0.9.tar.bz2 8875323 RMD160 e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5 SHA1 9e1b64a96f38821abadc636621d276f70dedd686 SHA256 e7f1eb6a240db4c48396d8920d103b8cf275b510e304dbbd2af6bb8ab5db4a98
 DIST freeciv-2.1.5.tar.bz2 29568407 RMD160 f66c94e25943664341006decf485303960de7ce7 SHA1 2b49458aa26e47fe75e90f68b899efb7e9443e09 SHA256 f2a4eb38bba4b9ed64c844c984b86fba49d4de8387b5983cc5d2ff5711db1a26
+DIST freeciv-2.1.6.tar.bz2 29647438 RMD160 085637b8b7219756772adcdd05f38afe1dc73980 SHA1 6685a5ad65201f6b80782a1e4752d597e2447831 SHA256 5cf51ef22d316983d2e189358a3cd0bee591ccca24281ebe3d58d6ec89935c75
 DIST freeciv.png 3657 RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd SHA1 929520ea26f3e3093f8ab1984ffd61c99c154511 SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160
 DIST stdsounds3.tar.gz 118278 RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 SHA1 103d02a0702687fb038f5187a321f8074b4ebfb5 SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
 EBUILD freeciv-2.0.9.ebuild 4689 RMD160 dbe388841e02360cdccb403c89cdc7bc104a2577 SHA1 ae3b23b2f0aa05808412fd43377de4574977c6ae SHA256 2de85d58f254e062b5fda03b682c7e35353ac929b6386545bbfc6f50e12178cb
 EBUILD freeciv-2.1.5.ebuild 4912 RMD160 f575fa04383aeceeee83505ecd8dacf1300ae236 SHA1 6a581b001475b8756fccfcb152de382045a346bc SHA256 91676f6f5d658c9df9c0282bf631a12e0595490bd53af5393faa311758c8be9a
-MISC ChangeLog 11881 RMD160 abe396657b8ca8fa702ada5b8b969345f75d4055 SHA1 f39d4ba35f2a5f793d13089da1a1ef2f4eb74b0e SHA256 4dff772ab42af612d11edf5824e67e2769ff65def78ac474abdd64e26b2ed283
+EBUILD freeciv-2.1.6.ebuild 4988 RMD160 ab6f06e8ef876ee14cdb5f1935ee032710981e1a SHA1 f5c4b860b05986303f58450dfadf129e2d955dbf SHA256 42db28e80255e6b2b25c15af82b423c6603727a6bd9de2bf3536465e40438b43
+MISC ChangeLog 12009 RMD160 2f13fc59b59bdf02f4ca1f441c4b8c2c0bb7c467 SHA1 38cdd66d2ded36f39a87b4d391e953a87724a57d SHA256 c0e66fb211a85de739c67d2b9558e6b69c3e2c79c53d324eb68f0e74411386ea
 MISC metadata.xml 236 RMD160 da6a85d843183d3823ae8bcaf92cfd5bf61cc098 SHA1 ad6c23aa83441de75d14971aad4b6db5033a57e5 SHA256 c82561dfd15956bdf1e990623e951b31932fc782bdca7d94ea91dae35d88116d
diff --git a/games-strategy/freeciv/freeciv-2.1.6.ebuild b/games-strategy/freeciv/freeciv-2.1.6.ebuild
new file mode 100644
index 000000000000..ecf7c4e85bcc
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.1.6.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.6.ebuild,v 1.1 2008/08/29 05:31:34 mr_bones_ Exp $
+
+inherit eutils 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? (
+			ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz )
+		esd? (
+			ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz )
+		sdl? (
+			ftp://ftp.freeciv.org/freeciv/contrib/audio/soundsets/stdsounds3.tar.gz )
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa auth dedicated esd gtk nls readline sdl Xaw3d"
+
+RDEPEND="readline? ( sys-libs/readline )
+	!dedicated? (
+		nls? ( virtual/libintl )
+		gtk? ( >=x11-libs/gtk+-2 )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				sdl? (
+					media-libs/libsdl
+					media-libs/sdl-image
+					media-libs/freetype
+				)
+				!sdl? ( x11-libs/libXaw )
+			)
+		)
+		media-libs/libpng
+		alsa? (
+			media-libs/alsa-lib
+			media-libs/audiofile
+		)
+		esd? ( media-sound/esound )
+		sdl? ( media-libs/sdl-mixer )
+		auth? ( virtual/mysql )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	!dedicated? (
+		gtk? ( dev-util/pkgconfig )
+		x11-proto/xextproto
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	games_pkg_setup
+	if ! use dedicated ; then
+		if use gtk ; then
+			einfo "The Freeciv Client will be built with the GTK+-2 toolkit"
+		elif use Xaw3d ; then
+			einfo "The Freeciv Client will be built with the Xaw3d toolkit"
+		elif use sdl ; then
+			einfo "The Freeciv Client will be built with the SDL 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 's:$datadir/locale:/usr/share/locale:' \
+		configure \
+		|| die "sed failed"
+
+	# change .desktop category so it's freedesktop complient
+	sed -i \
+		-e '/Icon/ s:\.png::' \
+		bootstrap/freeciv.desktop.in \
+		|| die "sed failed"
+	# install the .desktop in /usr/share/applications
+	# install the icons in /usr/share/pixmaps
+	sed -i \
+		-e 's:^\(desktopfiledir = \).*:\1/usr/share/applications:' \
+		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
+		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
+		client/Makefile.in \
+		server/Makefile.in \
+		data/Makefile.in \
+		data/icons/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 sdl && myclient="sdl"
+		use Xaw3d && myclient="xaw3d"
+		if use gtk ; then
+			myclient="gtk-2.0"
+		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 auth) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		--enable-client=${myclient} \
+		${mysoundconf} \
+		|| die "egamesconf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if ! use dedicated ; then
+		# Install the app-defaults if Xaw/Xaw3d toolkit
+		if ! use gtk && ! use sdl ; 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
+			insinto "${GAMES_DATADIR}"/${PN}
+			doins -r ../data/stdsounds* || die "doins sounds failed"
+		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,README*,TODO}
+
+	prepgamesdirs
+}