old

(Portage version: 2.1.10.65/cvs/Linux x86_64)

5 files changed, 6 insertions, 290 deletions

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 4f0e1d895594..ae0a2b0874af 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/freeciv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.137 2012/05/21 10:10:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.138 2012/07/02 21:42:55 mr_bones_ Exp $
+
+  02 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/freeciv-2.3.0-clean-man.patch, -files/freeciv-2.3.1-clean-man.patch,
+  -freeciv-2.3.0.ebuild, -freeciv-2.3.1.ebuild:
+  old
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> freeciv-2.3.2.ebuild:
   x86 stable wrt bug #414521
diff --git a/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch
deleted file mode 100644
index 6745a5005d93..000000000000
--- a/games-strategy/freeciv/files/freeciv-2.3.0-clean-man.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- doc/man/Makefile.in.orig
-+++ doc/man/Makefile.in
-@@ -360,8 +360,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- MAN_PAGES = \
--	freeciv-server.6	\
--	freeciv-client.6
-+	freeciv-server.6
- 
- MAN_LINKS = \
- 	freeciv-gtk2.6		\
-@@ -370,7 +369,7 @@
- 	freeciv-win32.6		\
- 	freeciv-ftwl.6
- 
--man_MANS = $(MAN_PAGES) $(MAN_LINKS)
-+man_MANS = $(MAN_PAGES)
- EXTRA_DIST = $(MAN_LINKS)
- all: all-am
- 
diff --git a/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch b/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch
deleted file mode 100644
index 6dc1054ead18..000000000000
--- a/games-strategy/freeciv/files/freeciv-2.3.1-clean-man.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/man/Makefile.in.orig
-+++ doc/man/Makefile.in
-@@ -358,7 +358,6 @@
- top_srcdir = @top_srcdir@
- MAN_PAGES = \
- 	freeciv-server.6	\
--	freeciv-client.6	\
- 	freeciv-modpack.6
- 
- MAN_LINKS = \
-@@ -368,7 +367,7 @@
- 	freeciv-win32.6		\
- 	freeciv-ftwl.6
- 
--man_MANS = $(MAN_PAGES) $(MAN_LINKS)
-+man_MANS = $(MAN_PAGES)
- EXTRA_DIST = $(MAN_LINKS)
- all: all-am
- 
diff --git a/games-strategy/freeciv/freeciv-2.3.0.ebuild b/games-strategy/freeciv/freeciv-2.3.0.ebuild
deleted file mode 100644
index d137cf8066e3..000000000000
--- a/games-strategy/freeciv/freeciv-2.3.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.0.ebuild,v 1.3 2012/05/04 04:51:08 jdhore Exp $
-
-EAPI=2
-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 dedicated ggz gtk ipv6 nls readline sdl +sound"
-
-RDEPEND="readline? ( sys-libs/readline )
-	sys-libs/zlib
-	app-arch/bzip2
-	auth? ( virtual/mysql )
-	!dedicated? (
-		nls? ( virtual/libintl )
-		gtk? ( x11-libs/gtk+:2 )
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-image[png]
-			media-libs/freetype
-		)
-		!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
-		sound? (
-			media-libs/libsdl[audio]
-			media-libs/sdl-mixer
-		)
-		ggz? ( games-board/ggz-gtk-client )
-		media-libs/libpng
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		nls? ( sys-devel/gettext )
-		x11-proto/xextproto
-	)"
-
-src_prepare() {
-	# 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
-		epatch "${FILESDIR}"/${P}-clean-man.patch
-	fi
-}
-
-src_configure() {
-	local myclient myopts
-
-	if use dedicated ; then
-		myclient="no"
-	else
-		use sdl && myclient="${myclient} sdl"
-		use gtk && myclient="${myclient} gtk"
-		[[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified
-		myopts=$(use_with ggz ggz-client)
-	fi
-
-	egamesconf \
-		--disable-dependency-tracking \
-		--localedir=/usr/share/locale \
-		--with-ggzconfig=/usr/bin \
-		--enable-noregistry="${GGZ_MODDIR}" \
-		$(use_enable auth) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		${myopts} \
-		--enable-client="${myclient}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if ! use dedicated ; then
-		# 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/freeciv-manual || die "freeciv-manual failed"
-		dohtml manual*.html || die "dohtml failed"
-		rm -f "${D}/${GAMES_BINDIR}"/civmanual
-		use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-	fi
-
-	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
-	rm -rf "${D}$(games_get_libdir)"
-
-	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
-}
diff --git a/games-strategy/freeciv/freeciv-2.3.1.ebuild b/games-strategy/freeciv/freeciv-2.3.1.ebuild
deleted file mode 100644
index eb56352cfc34..000000000000
--- a/games-strategy/freeciv/freeciv-2.3.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.1.ebuild,v 1.3 2012/05/04 04:51:08 jdhore Exp $
-
-EAPI=2
-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 dedicated ggz gtk ipv6 nls readline sdl +sound"
-
-RDEPEND="readline? ( sys-libs/readline )
-	sys-libs/zlib
-	app-arch/bzip2
-	auth? ( virtual/mysql )
-	!dedicated? (
-		nls? ( virtual/libintl )
-		gtk? ( x11-libs/gtk+:2 )
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-image[png]
-			media-libs/freetype
-		)
-		!gtk? ( !sdl? ( x11-libs/gtk+:2 ) )
-		sound? (
-			media-libs/libsdl[audio]
-			media-libs/sdl-mixer
-		)
-		ggz? ( games-board/ggz-gtk-client )
-		media-libs/libpng
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		nls? ( sys-devel/gettext )
-		x11-proto/xextproto
-	)"
-
-src_prepare() {
-	# 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 "sed failed"
-
-	# remove civclient manpage if dedicated server
-	if use dedicated ; then
-		epatch "${FILESDIR}"/${P}-clean-man.patch
-	fi
-}
-
-src_configure() {
-	local myclient myopts
-
-	if use dedicated ; then
-		myclient="no"
-	else
-		use sdl && myclient="${myclient} sdl"
-		use gtk && myclient="${myclient} gtk"
-		[[ -z ${myclient} ]] && myclient="gtk" # default to gtk if none specified
-		myopts=$(use_with ggz ggz-client)
-	fi
-
-	egamesconf \
-		--disable-dependency-tracking \
-		--localedir=/usr/share/locale \
-		--with-ggzconfig=/usr/bin \
-		--enable-noregistry="${GGZ_MODDIR}" \
-		$(use_enable auth) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with readline) \
-		$(use_enable sound sdl-mixer) \
-		${myopts} \
-		--enable-client="${myclient}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if ! use dedicated ; then
-		# 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/freeciv-manual || die "freeciv-manual failed"
-		dohtml manual*.html || die "dohtml failed"
-		rm -f "${D}/${GAMES_BINDIR}"/civmanual
-		use sdl && make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-	fi
-
-	dodoc ChangeLog NEWS doc/{BUGS,CodingStyle,HACKING,HOWTOPLAY,README*,TODO}
-	rm -rf "${D}$(games_get_libdir)"
-
-	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
-}