Adding authentication capability. Bug #139027

Package-Manager: portage-2.1.1

4 files changed, 208 insertions, 5 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 697843e507fc..64ffebe4f3f1 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.49 2006/08/28 00:43:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.50 2006/09/15 22:04:21 tupone Exp $
+
+*freeciv-2.0.8-r2 (15 Sep 2006)
+
+  15 Sep 2006; <tupone@gentoo.org> +freeciv-2.0.8-r2.ebuild:
+  Adding authentication capability. Bug #139027 by <lordvan@gentoo.org>
 
   29 Aug 2006; Joshua Kinard <kumba@gentoo.org> freeciv-2.0.8-r1.ebuild:
   Marked stable on mips.
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index d98d4e976797..b91c48bbb575 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freeciv-2.0.8-DoS.patch 1065 RMD160 f4a383a17a6508f7e95966d63bc03785156398e8 SHA1 9106687bf60cc1d321d57277e8a465402d85b99b SHA256 c3e3f83440b581aea1d2d9f46f10f4daeded8fa0f822f974439c6a7d783b190a
 MD5 6f66d4ce889a078a7a154b6e5c9842c9 files/freeciv-2.0.8-DoS.patch 1065
 RMD160 f4a383a17a6508f7e95966d63bc03785156398e8 files/freeciv-2.0.8-DoS.patch 1065
@@ -12,10 +15,14 @@ EBUILD freeciv-2.0.8-r1.ebuild 5169 RMD160 8e685496b6c5ab5e668866553b4f93d61ebb4
 MD5 9f1ac12d3d352cf98d389ba714be570f freeciv-2.0.8-r1.ebuild 5169
 RMD160 8e685496b6c5ab5e668866553b4f93d61ebb4182 freeciv-2.0.8-r1.ebuild 5169
 SHA256 1d969873db3c175b4d9b619fa837ada2e73914e8a5b13d373a5264f108f59b30 freeciv-2.0.8-r1.ebuild 5169
-MISC ChangeLog 8217 RMD160 65879f025bdffe45cc6a88786d49f2eb92fca29b SHA1 e65f0cfc04d44ef4bd5fa48e6311df6071fdb0cb SHA256 503862d35d4b21973392d5562d18cb5c985fb460c10c54eee4d9252a11be344f
-MD5 dd9aecfb55fd68e83683907744a1eaeb ChangeLog 8217
-RMD160 65879f025bdffe45cc6a88786d49f2eb92fca29b ChangeLog 8217
-SHA256 503862d35d4b21973392d5562d18cb5c985fb460c10c54eee4d9252a11be344f ChangeLog 8217
+EBUILD freeciv-2.0.8-r2.ebuild 4941 RMD160 09caa8981a8ccc3cb9c9eaa215684737a73c3195 SHA1 413be4d4d05f96de27e2d6573d6c08ccb3a98b84 SHA256 9d509b09bd092a4d0519f1f82af7a7afd2f831781990cbfa8b8092eb069f9cc7
+MD5 2cc17625cf7fc1c14c83fb0a025c7a58 freeciv-2.0.8-r2.ebuild 4941
+RMD160 09caa8981a8ccc3cb9c9eaa215684737a73c3195 freeciv-2.0.8-r2.ebuild 4941
+SHA256 9d509b09bd092a4d0519f1f82af7a7afd2f831781990cbfa8b8092eb069f9cc7 freeciv-2.0.8-r2.ebuild 4941
+MISC ChangeLog 8385 RMD160 aca260e11dafd98b92afd86d7e002a1fc2176fd5 SHA1 270ebb250c164db771bb2c832af69af7e5d6870c SHA256 f6768f322d4cbb4f4c07ad98ce80289c651e3a4dc0b919ceaec36fcb8959cc39
+MD5 9ab4f7e2cc3c8135c6deaefafb884f7f ChangeLog 8385
+RMD160 aca260e11dafd98b92afd86d7e002a1fc2176fd5 ChangeLog 8385
+SHA256 f6768f322d4cbb4f4c07ad98ce80289c651e3a4dc0b919ceaec36fcb8959cc39 ChangeLog 8385
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -23,3 +30,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 40f3883d3eefecb900a217e2dc40e3da files/digest-freeciv-2.0.8-r1 479
 RMD160 d6332b47a3075ae2b93849528921b9e3672197b5 files/digest-freeciv-2.0.8-r1 479
 SHA256 2d5e6d0e14506a64b40ca97b8bec34a97483796d45226cbe1b316d617377bdf2 files/digest-freeciv-2.0.8-r1 479
+MD5 40f3883d3eefecb900a217e2dc40e3da files/digest-freeciv-2.0.8-r2 479
+RMD160 d6332b47a3075ae2b93849528921b9e3672197b5 files/digest-freeciv-2.0.8-r2 479
+SHA256 2d5e6d0e14506a64b40ca97b8bec34a97483796d45226cbe1b316d617377bdf2 files/digest-freeciv-2.0.8-r2 479
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFCyNx2CTtIKiFlQIRAhXrAJwJwi9UmcAgJHOv3RxJd4ITwAQCjQCgiucA
+K6BC9I0OL8Snj3zm5GFw1n8=
+=Ylo5
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2 b/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2
new file mode 100644
index 000000000000..fd5043d06cbd
--- /dev/null
+++ b/games-strategy/freeciv/files/digest-freeciv-2.0.8-r2
@@ -0,0 +1,6 @@
+MD5 9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 8535513
+RMD160 7ab93442cf63db22e9e660d2c1955990a1376d26 freeciv-2.0.8.tar.bz2 8535513
+SHA256 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3 freeciv-2.0.8.tar.bz2 8535513
+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.0.8-r2.ebuild b/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..4986bd612867
--- /dev/null
+++ b/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.0.8-r2.ebuild,v 1.1 2006/09/15 22:04:21 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
+	!dedicated? (
+		alsa? (
+			http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz )
+		esd? (
+			http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz )
+		sdl? (
+			http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds3.tar.gz ) )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+IUSE="alsa auth dedicated esd gtk nls readline sdl Xaw3d"
+
+RDEPEND="sys-libs/zlib
+	readline? ( sys-libs/readline )
+	!dedicated? (
+		gtk? ( >=x11-libs/gtk+-2.0.0 )
+		!gtk? (
+			Xaw3d? ( x11-libs/Xaw3d )
+			!Xaw3d? ( x11-libs/libXaw )
+			x11-libs/libXmu
+			x11-libs/libXpm
+		)
+		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 )
+		auth? ( dev-db/mysql )
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	!dedicated? ( gtk? ( >=dev-util/pkgconfig-0.9 ) )
+	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"
+		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}"
+
+	# bug #141563 DoS attack
+	# https://bugs.gentoo.org/show_bug.cgi?id=141563
+	epatch "${FILESDIR}/${P}-DoS.patch"
+
+	# 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"
+
+	# change .desktop icon to the freeciv icon rather than the gnome globe
+	sed -i \
+		-e 's:^\(Icon=\).*:\1freeciv.png:' \
+		bootstrap/freeciv.desktop.in \
+		|| 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;:' \
+		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 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() {
+	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 ../data/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}
+
+	doicon "${FILESDIR}/${PN}.png"
+
+	prepgamesdirs
+}