Version bump to 2.1.2. Bug #206765

Package-Manager: portage-2.1.3.19

4 files changed, 208 insertions, 10 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index a9263a5c8916..48d22bea2968 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.66 2007/11/30 22:14:44 tupone Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.67 2008/01/21 06:34:10 tupone Exp $
+
+*freeciv-2.1.2 (21 Jan 2008)
+
+  21 Jan 2008; Tupone Alfredo <tupone@gentoo.org> +freeciv-2.1.2.ebuild:
+  Version bump to 2.1.2. Bug #206765 by Matthias Dahl
 
   30 Nov 2007; Tupone Alfredo <tupone@gentoo.org> freeciv-2.0.9.ebuild,
   freeciv-2.1.1.ebuild:
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 32ab3e1d9fc4..1f6f26cf81b4 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 DIST freeciv-2.0.9.tar.bz2 8875323 RMD160 e79cfc1d00f4f1b7ff28e84aca42dd2ef1e158d5 SHA1 9e1b64a96f38821abadc636621d276f70dedd686 SHA256 e7f1eb6a240db4c48396d8920d103b8cf275b510e304dbbd2af6bb8ab5db4a98
 DIST freeciv-2.1.1.tar.bz2 29574047 RMD160 0b3cb62ea00bd9ae8086d00eb872d97e0032bcb0 SHA1 95c342d3e9d713be550c8e68aa6c30723f336c84 SHA256 5eb4681bb6c8b16877b7f86ce5fe36678f521c1b5f70e00ce0defaeac35c3211
+DIST freeciv-2.1.2.tar.bz2 29407276 RMD160 1e790415bc75bc8aff414f7ec4d9019e1b66979e SHA1 533d179685ad29eefd61c310cab031e5e0930215 SHA256 efb892a2b08f7b0703ff9d737c3573f8445a621df146b35fb66aa53720b0d66a
 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 4686 RMD160 649722a1dece7db2b14fcb6ae08c4033788331ae SHA1 caded4017276ad51628e2fe88b2be818e36a23c9 SHA256 2bd702d8c5ded16882f196455deb32f87117d543b67b7719da235afc90f08497
@@ -13,10 +14,14 @@ EBUILD freeciv-2.1.1.ebuild 4896 RMD160 7c198132162e412015ff63a0b4588e6cfe8b75a0
 MD5 5a3be495193a23799d56f0f75c23deb5 freeciv-2.1.1.ebuild 4896
 RMD160 7c198132162e412015ff63a0b4588e6cfe8b75a0 freeciv-2.1.1.ebuild 4896
 SHA256 db0f8ba278ba8ba6ee52f7732a33e1745e15caee4eb4a3149818a1f30e5a9b8c freeciv-2.1.1.ebuild 4896
-MISC ChangeLog 10508 RMD160 771300615cbd35abd79cca48c4e0fdf91a32d56b SHA1 9ef3bb35207adaab1f9393e528842dca06eab40b SHA256 ac662a5c1eeb58388d1c3080b8e41651510d7147175d646ddaae4031ad2c022d
-MD5 a3d3c34d40b071dfd8fe6bdde280b3ec ChangeLog 10508
-RMD160 771300615cbd35abd79cca48c4e0fdf91a32d56b ChangeLog 10508
-SHA256 ac662a5c1eeb58388d1c3080b8e41651510d7147175d646ddaae4031ad2c022d ChangeLog 10508
+EBUILD freeciv-2.1.2.ebuild 4896 RMD160 dab65a7cbd07b370cc857357f8444597d8024f43 SHA1 af1c65619dc6f5ef47988c12bb793fcd073bb789 SHA256 0e0f0fb8e3e2016343f267f8374751367ef307e6a1b997aead9ffaef9552ba68
+MD5 e54781062ca16baa16dfc3a947facb1d freeciv-2.1.2.ebuild 4896
+RMD160 dab65a7cbd07b370cc857357f8444597d8024f43 freeciv-2.1.2.ebuild 4896
+SHA256 0e0f0fb8e3e2016343f267f8374751367ef307e6a1b997aead9ffaef9552ba68 freeciv-2.1.2.ebuild 4896
+MISC ChangeLog 10666 RMD160 72d88c5067340a01281aa34ad0b65bc5abd173e5 SHA1 4e06d0550e2e68d4388420ad4ae9671077ae0553 SHA256 7e64730fd7efab346363afcf620e0968383406c605258730f4aafff367fb60fe
+MD5 48f1ad556a6f6fca8061c5ef879223ee ChangeLog 10666
+RMD160 72d88c5067340a01281aa34ad0b65bc5abd173e5 ChangeLog 10666
+SHA256 7e64730fd7efab346363afcf620e0968383406c605258730f4aafff367fb60fe ChangeLog 10666
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -27,10 +32,13 @@ SHA256 85a62e60b82bb9f0a6444e5cfaf1bc5f87a29f640860a70d1935115de8ee3a5c files/di
 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
+MD5 a4b63af618ee295a9a07b240581026d5 files/digest-freeciv-2.1.2 690
+RMD160 59fad12e51e5c7399f28d00f1bc1de877251ed70 files/digest-freeciv-2.1.2 690
+SHA256 360094ff54be08e91519df718e43b010580a40f95d3094814eed1126779e9feb files/digest-freeciv-2.1.2 690
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHUItf8qKy9+b2Hl0RArSkAKCn+64npOI3NJr3mDjeaVKM3x4zIgCgmOMa
-Yn+zNMapK7pyRME5fsdh16A=
-=pcSp
+iD8DBQFHlDzw8qKy9+b2Hl0RAuMyAJ40aHXYr1YwqSilVylDp4IaS0a96wCghCL7
+J/51Vi7h1wLZLNWXZjMKw1w=
+=0WPS
 -----END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/files/digest-freeciv-2.1.2 b/games-strategy/freeciv/files/digest-freeciv-2.1.2
new file mode 100644
index 000000000000..2ad1d1b44a56
--- /dev/null
+++ b/games-strategy/freeciv/files/digest-freeciv-2.1.2
@@ -0,0 +1,9 @@
+MD5 358d140f545c4ac9e05c4e2b13de7a55 freeciv-2.1.2.tar.bz2 29407276
+RMD160 1e790415bc75bc8aff414f7ec4d9019e1b66979e freeciv-2.1.2.tar.bz2 29407276
+SHA256 efb892a2b08f7b0703ff9d737c3573f8445a621df146b35fb66aa53720b0d66a freeciv-2.1.2.tar.bz2 29407276
+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.2.ebuild b/games-strategy/freeciv/freeciv-2.1.2.ebuild
new file mode 100644
index 000000000000..37ad36487d7c
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.1.2.ebuild
@@ -0,0 +1,176 @@
+# 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.2.ebuild,v 1.1 2008/01/21 06:34:10 tupone 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? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? (
+				sdl? (
+					media-libs/libsdl
+					media-libs/sdl-image
+					media-libs/freetype
+				)
+				!sdl? ( x11-libs/libXaw )
+			)
+		)
+		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
+			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
+}