old

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64

4 files changed, 6 insertions, 197 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 63075361823c..5342af1c88db 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.154 2014/10/06 04:39:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.155 2014/10/27 18:52:41 mr_bones_ Exp $
+
+  27 Oct 2014; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/freeciv-2.4.2-as-needed.patch, -freeciv-2.4.2.ebuild:
+  old
 
 *freeciv-2.4.3 (06 Oct 2014)
 
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index a81b3e8c6765..814765540549 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,9 +1,6 @@
-AUX freeciv-2.4.2-as-needed.patch 270 SHA256 2f702ea01a106dd7763b685909ab9bc47648397fafe4f05898749670a8ba792d SHA512 1a62c3cc98c07aae998b36c2b1b864de1c9d657fc849f6382821f41178e24018f74711dc826f6ab429ed71dcbffb60df9fdc10bf9f8779d378ddaaa170fae7c4 WHIRLPOOL d38cd664aa316c13c256a928183f62d3c25ce6b2a4e63f32911278d39c7fcd34a867092aff978d7ab531831cbd1475a8882dc06bb311e37470a129c78c568d82
 DIST freeciv-2.3.4.tar.bz2 31395893 SHA256 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c SHA512 51d89321cf7b5b08d2338f8d76051ebde745c85e4ebad21b9ff2109696edfdc79ad43d7f8d2bf989400ce5e71f28127835dc4b4e60635fb71ebb3a2fb149269a WHIRLPOOL afcb5543049059d87503451c7d82abe6be765406fe3aba13fa01dec430062c4ed51c39b42827fb863a37c0b9737962f9557c6069f9d7be1efbd851c18268b6ce
-DIST freeciv-2.4.2.tar.bz2 38545497 SHA256 025d3cf51237a0c12422a5f100460a22ce1236b650a1e73cbd1c13c0b0676ce0 SHA512 de2b409b113c0da4cb3279d31f6525e94c9123806e71b183639ac8f7ed5af58520109cf3ce7561637146a11c4d2aa44c74818a7445824c399297009722d98a7c WHIRLPOOL eab5eb1120d325ebfd09be3250f79deea9c9b1208b5dc0b30df5675882594546305b47bd35178a7bc518868be999a2315cd21c3017aa6df26846deea9ab8d2e6
 DIST freeciv-2.4.3.tar.bz2 38815762 SHA256 7f107fe3b09f37934410dc7a64ac1b99a95997ddf53da53933b75d4da79fa899 SHA512 7abed9b3c0f65aa5ed856080a6da68152a8fe9ea285a070858f9a92ec32fb27bfb48fb77b7098a23bbf3e092c982ed455b6ea795230295c9d14f4832378ee3ba WHIRLPOOL 8f83c02ed5954a2ffcb522110543877251199650834e27d014ff4bab783d8d7d8283c7ef95d573c8af2860dd4884ea9878b6f4a0e3fbe8bcde1349af4f242705
 EBUILD freeciv-2.3.4.ebuild 3216 SHA256 c1d1c253fbf8c4864dc6611f647288d091244113ea137f524b7341cb41c1b8e7 SHA512 ad68f749101cfc93ed18757a80fdecc181a0081f30647f666a896e53c0ecd338811e1d8089f8852b6953b0026627eecb26d148180d5971ae5ed7f3c5ed2afea1 WHIRLPOOL 1cd41f64b65e78fd3108f19daca21a32692cb4664dfdb87468ee9a0bbd4ef5a45b4ffa64c06ae7928e8ea71911feb21e4e67fc56df29211604d442c176607b1e
-EBUILD freeciv-2.4.2.ebuild 4823 SHA256 0b5b40d8e8fa4feac42fa30dd69ad0dbaf412b82e6c2f5a4d3d6f8bb041bae0e SHA512 99279f7500b190178f587e45b1fbbe5efdd3330821d7aa826ba0ed8928bd2982a870a4ddf8b5910b580fef0bd01ee3dc1e3798dd45b6e65a0cce684138b2f42c WHIRLPOOL 4c9a8286355e5a23e9603b69112bd5b0bf7c6df81660e9f487a130704d0257fcf04e870d3be8c98467c04701d799097e41b6bcc304b4cd00b7ecacf7dd08e8d4
 EBUILD freeciv-2.4.3.ebuild 4797 SHA256 e301d9e0ebcd3426439e015e3a8d7049ad9c7a56e8d0d68417d9739c7909e9d5 SHA512 e391db6248a3c1f95ba9447c1a9097780e22244be96d44485821e7b37d792820f5e81b806d4a63e3a712d661b843598b8828d2019f0065c60d60b706bae7b3eb WHIRLPOOL 2fdd535ae658f01edbb3850688ebad7328ae00db3d9e6ae947f99f5d6e396818b609f824b6806db76f51c94c1fc90950a48e3d293ccccf5fe7aa9cdb87075437
-MISC ChangeLog 22108 SHA256 fb72667f0618c3e0fce990318c095a4085604e9b8551bb5bc89c62c0ccabfac9 SHA512 9d3ac6fd696ba71c49e24262049096cc1054cc42a9b4a6465ec36a58fe3884f11ce68a08281a5bf4915871e0a766408e26922a3a3ec4146d321fd5798b0eb01f WHIRLPOOL 940d50346d2ab6d14f69d22acb1e15c624cbd7580ce458303c12abe59bc764aca6c5cf3fbc9e1e545cfa249eee55de31c5905ef329fbef73200e7618476ae3f6
+MISC ChangeLog 22233 SHA256 ff1b68b62b88c8e0ab0d4e3017d189a877c2d06e6b1a24d0b6d21ae30f3580dc SHA512 a3a85de8dae0b69e5c6fcecc015b387b5bd5e22375628cc0534a0a4b7c85ffad224ac0bd88c7390c90204ba9327dd8d0e0c44cff1d0fdddcd2bef4de79f1bd21 WHIRLPOOL c46fc8aa44b1822948216a53221a6a106adc4eeb7304e7114a0144a29002bb6667772fabbc8f0c4adb6cac51bb03e24ada1e5de8475fead0b60f9d71503e30e1
 MISC metadata.xml 824 SHA256 6cc757311f3ca78853f0cfca67a322d1f332d93b9fdf44cab82957babcf2cdec SHA512 be03ae743496462b779cc6e4f8f2a2b1f2db534fc8bf14060c313843d2c5180bb7d38b6262b9cd4a93aa2ed2116fa5c8f5ad19bd565d7a55f5d7cb4c3d5e480d WHIRLPOOL d3ec0e0b75475c7b9455062be02ad0f575cb1d052118dd83ca6c6bb16171306dd2c0986f13639ae9f3cfce974afac7270bcadce5ace7aca0986a9b88da2e15c4
diff --git a/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch b/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch
deleted file mode 100644
index 1d13cad46fe2..000000000000
--- a/games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/Makefile.in
-+++ server/Makefile.in
-@@ -610,7 +610,7 @@
-  $(top_builddir)/server/scripting/libscripting_server.la
- 
- libfreeciv_srv_la_LIBADD = \
-- $(srvlibs)
-+ $(srvlibs) $(SERVER_LIBS)
- 
- freeciv_server_LDFLAGS = $(GGZDMOD_LDFLAGS)
- freeciv_server_LDADD = \
diff --git a/games-strategy/freeciv/freeciv-2.4.2.ebuild b/games-strategy/freeciv/freeciv-2.4.2.ebuild
deleted file mode 100644
index bab4d166ef3f..000000000000
--- a/games-strategy/freeciv/freeciv-2.4.2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.2.ebuild,v 1.5 2014/06/04 05:03:42 mr_bones_ Exp $
-
-# FIXME: gtk3 support breaks ggz support
-
-EAPI=5
-inherit eutils gnome2-utils games-ggz games
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="auth aimodules dedicated ggz +gtk ipv6 mapimg modpack mysql nls postgres readline sdl +server +sound sqlite"
-
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	dev-lang/lua
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-base )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
-	)
-	readline? ( sys-libs/readline:0 )
-	dedicated? ( aimodules? ( sys-devel/libtool:2 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		ggz? ( games-board/ggz-gtk-client )
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-image[png]
-			media-libs/freetype:2
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-proto/xextproto
-		nls? ( sys-devel/gettext )
-	)"
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-
-	# 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 \
-		modinst/Makefile.in \
-		data/Makefile.in \
-		data/icons/Makefile.in \
-		|| die
-}
-
-src_configure() {
-	local myclient myopts mydatabase
-
-	if use auth ; then
-		if use !mysql && use !postgres && use !sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase="${mydatabase} mysql"
-			use postgres && mydatabase="${mydatabase} postgres"
-			use sqlite && mydatabase="${mydatabase} sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myopts="--enable-server"
-	else
-		if use !sdl && use !gtk ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient="${myclient} sdl"
-			use gtk && myclient="${myclient} gtk2"
-		fi
-		myopts="$(use_enable server) $(use_with ggz ggz-client)"
-	fi
-
-	# disabling shared libs will break aimodules USE flag
-	egamesconf \
-		--localedir=/usr/share/locale \
-		$(use_enable ipv6) \
-		$(use_enable mapimg) \
-		--enable-aimodules="$(usex aimodules "yes" "no")" \
-		--enable-shared \
-		--enable-fcdb="${mydatabase}" \
-		--with-ggzconfig=/usr/bin \
-		--enable-noregistry="${GGZ_MODDIR}" \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		--enable-fcmp="$(usex modpack "gtk2" "no")" \
-		--enable-sys-lua \
-		${myopts} \
-		--enable-client="${myclient}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	if use dedicated ; then
-		rm -rf "${D}/usr/share/pixmaps"
-		rm -f "${D}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's 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/freeciv-manual || die
-			dohtml manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${D}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${D}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${D}" -name "freeciv-manual*" -delete
-
-	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
-	rm -f "${D}$(games_get_libdir)"/*.a
-	prune_libtool_files --all
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	games-ggz_update_modules
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	games-ggz_update_modules
-	gnome2_icon_cache_update
-}