diff options
| -rw-r--r-- | games-strategy/freeciv/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/freeciv/files/freeciv-2.4.2-as-needed.patch | 11 | ||||
| -rw-r--r-- | games-strategy/freeciv/freeciv-2.4.2.ebuild | 181 |
3 files changed, 5 insertions, 193 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/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 -} |