version bump

Package-Manager: portage-2.1.3.19

4 files changed, 204 insertions, 5 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 256f74b93d92..3ee2e4b8e231 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.63 2007/10/31 23:04:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.64 2007/11/29 07:26:36 mr_bones_ Exp $
+
+*freeciv-2.1.1 (29 Nov 2007)
+
+  29 Nov 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +freeciv-2.1.1.ebuild:
+  version bump
 
   31 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.1.0.ebuild:
   add sdl patch to ebuild from Andrei Slavoiu (bug #197697)
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 84903dbbc46c..20cbfb641826 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,5 +1,6 @@
 DIST freeciv-2.0.9.tar.bz2 8875323 RMD160 e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5 SHA1 9e1b64a96f38821abadc636621d276f70dedd686 SHA256 e7f1eb6a240db4c48396d8920d103b8cf275b510e304dbbd2af6bb8ab5db4a98
 DIST freeciv-2.1.0.tar.bz2 29463631 RMD160 0f48b6841940a0ea4d7607face12e448dfd5f268 SHA1 a764b09132d83ecf78cc08380577acc4a571be68 SHA256 bc9a9f54e6775ad300da973cbce6728cd081cac79b4c95032da1c62f07918883
+DIST freeciv-2.1.1.tar.bz2 29574047 RMD160 0b3cb62ea00bd9ae8086d00eb872d97e0032bcb0 SHA1 95c342d3e9d713be550c8e68aa6c30723f336c84 SHA256 5eb4681bb6c8b16877b7f86ce5fe36678f521c1b5f70e00ce0defaeac35c3211
 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 4719 RMD160 0c6789da56702eb1fa0dd29544d7f3358a00e55d SHA1 de6f2814773f90cc25eb230ba7c99da812e9cf25 SHA256 02f7bf54ecb45fdd65adea56b52c396a1f64c978e847233d16fd12ad2945ee98
@@ -10,10 +11,14 @@ EBUILD freeciv-2.1.0.ebuild 4926 RMD160 498adcf90ce358cc5fe5d97ca36e3091d6311ec4
 MD5 02a6e069ff8c12378f019217a17353cd freeciv-2.1.0.ebuild 4926
 RMD160 498adcf90ce358cc5fe5d97ca36e3091d6311ec4 freeciv-2.1.0.ebuild 4926
 SHA256 d241ff5827be15b88d4fbe66ef88104a254b4fe3940aae4a5042490f3455c310 freeciv-2.1.0.ebuild 4926
-MISC ChangeLog 10066 RMD160 d5d7d23bfd3df5622fac7557a895bbf7399d9b46 SHA1 575e6c0819dfccb034cef50c9068dda998fa2507 SHA256 1ed1ff9ab380e857e360139bd3834d0b0a09daea55bafdd67d2907a6c943b053
-MD5 cb3e25d705ccd0b81d453782b51ef127 ChangeLog 10066
-RMD160 d5d7d23bfd3df5622fac7557a895bbf7399d9b46 ChangeLog 10066
-SHA256 1ed1ff9ab380e857e360139bd3834d0b0a09daea55bafdd67d2907a6c943b053 ChangeLog 10066
+EBUILD freeciv-2.1.1.ebuild 4926 RMD160 7bb0363586e8d575e88e0766dc2fe8d8f652723e SHA1 e2b7237bcf4d2ad37e439a53f29a7b4f20a7125b SHA256 86ff59b13aba7b1169a2fbc7469e84926dc570f5de232bbaa5741a3cb46282c1
+MD5 44f932cdd3ed2e1e96afab23ef6d2746 freeciv-2.1.1.ebuild 4926
+RMD160 7bb0363586e8d575e88e0766dc2fe8d8f652723e freeciv-2.1.1.ebuild 4926
+SHA256 86ff59b13aba7b1169a2fbc7469e84926dc570f5de232bbaa5741a3cb46282c1 freeciv-2.1.1.ebuild 4926
+MISC ChangeLog 10192 RMD160 b541bcb39d32d5749d19ad5dab75bda063119d2e SHA1 093b4720c61185d43679ee3fc5fb9513a3f413df SHA256 3e27127d2d90dfb79987b31b7fe8acfe25fbb6a351135443cfb2c9cb919175b7
+MD5 7d7b0865351bf5cacc642a8b779c05ed ChangeLog 10192
+RMD160 b541bcb39d32d5749d19ad5dab75bda063119d2e ChangeLog 10192
+SHA256 3e27127d2d90dfb79987b31b7fe8acfe25fbb6a351135443cfb2c9cb919175b7 ChangeLog 10192
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -24,3 +29,6 @@ SHA256 85a62e60b82bb9f0a6444e5cfaf1bc5f87a29f640860a70d1935115de8ee3a5c files/di
 MD5 ce61b186908a294cc1255a46e883834c files/digest-freeciv-2.1.0 690
 RMD160 41ea512a43b37790c7ba7a02962e7e1075fd095c files/digest-freeciv-2.1.0 690
 SHA256 06d1364db7ee56179ac12c2507c27689437cfde65f141d1ec0bfa5a4d4b14d16 files/digest-freeciv-2.1.0 690
+MD5 a960f34f3a0f71306f900fc2996002e8 files/digest-freeciv-2.1.1 690
+RMD160 785b2f5bc12d226be5b67bdb2290d4257ff002bb files/digest-freeciv-2.1.1 690
+SHA256 aa5c9f7e4ffc1db095541e2ee53be4cf031c186fc649b9e44fa6360adff2c0c0 files/digest-freeciv-2.1.1 690
diff --git a/games-strategy/freeciv/files/digest-freeciv-2.1.1 b/games-strategy/freeciv/files/digest-freeciv-2.1.1
new file mode 100644
index 000000000000..3dc38f8a5411
--- /dev/null
+++ b/games-strategy/freeciv/files/digest-freeciv-2.1.1
@@ -0,0 +1,9 @@
+MD5 cbbe72822d6698d9a66db2f383e2a421 freeciv-2.1.1.tar.bz2 29574047
+RMD160 0b3cb62ea00bd9ae8086d00eb872d97e0032bcb0 freeciv-2.1.1.tar.bz2 29574047
+SHA256 5eb4681bb6c8b16877b7f86ce5fe36678f521c1b5f70e00ce0defaeac35c3211 freeciv-2.1.1.tar.bz2 29574047
+MD5 42ae5aa07b3e176f81dfa905bcc0eb4f freeciv.png 3657
+RMD160 6f283d6031b7b4ae3da21ddd5145084f147a7acd freeciv.png 3657
+SHA256 50af34df5f43fb90844561ea5f91bbf1fbb762d15ea56811e39c7ad3f2cc0160 freeciv.png 3657
+MD5 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz 118278
+RMD160 46bb5fef4b2d3acf9959b3228c962bdf6591ea09 stdsounds3.tar.gz 118278
+SHA256 a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa stdsounds3.tar.gz 118278
diff --git a/games-strategy/freeciv/freeciv-2.1.1.ebuild b/games-strategy/freeciv/freeciv-2.1.1.ebuild
new file mode 100644
index 000000000000..02ec27fed194
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.1.1.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.1.1.ebuild,v 1.1 2007/11/29 07:26:36 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
+	mirror://gentoo/${PN}.png
+	!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? (
+			sdl? (
+				media-libs/libsdl
+				media-libs/sdl-image
+			)
+			!sdl? (
+				Xaw3d? ( x11-libs/Xaw3d )
+				!Xaw3d? ( x11-libs/libXaw )
+				x11-libs/libXmu
+				x11-libs/libXpm
+			)
+		)
+		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
+	media-libs/libpng"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	games_pkg_setup
+	if ! use dedicated ; then
+		if use gtk ; then
+			elog "The Freeciv Client will be built with the GTK+-2 toolkit"
+		elif use Xaw3d ; then
+			elog "The Freeciv Client will be built with the Xaw3d toolkit"
+		elif use sdl ; then
+			elog "The Freeciv Client will be built with the SDL toolkit"
+		else
+			elog "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 is not gnome specific
+	sed -i \
+		-e 's:^\(Categories=GNOME;Application;Game;Strategy;\):Categories=Application;Game;StrategyGame;:' \
+		-e 's:^\(Icon=\).*:\1freeciv.png:' \
+		bootstrap/freeciv.desktop.in \
+		|| 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 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}
+
+	doicon "${DISTDIR}"/${PN}.png
+	prepgamesdirs
+}