From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- games-strategy/freeciv/Manifest | 3 - .../files/freeciv-2.5.11-freetype_pkgconfig.patch | 242 --------------------- games-strategy/freeciv/freeciv-2.6.1.ebuild | 184 ---------------- 3 files changed, 429 deletions(-) delete mode 100644 games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch delete mode 100644 games-strategy/freeciv/freeciv-2.6.1.ebuild (limited to 'games-strategy/freeciv') diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest index 4fe2efb84614..6a6adcf9a154 100644 --- a/games-strategy/freeciv/Manifest +++ b/games-strategy/freeciv/Manifest @@ -1,8 +1,5 @@ -AUX freeciv-2.5.11-freetype_pkgconfig.patch 8120 BLAKE2B cbcb39010d40abd530b8b30955c0461b7207698bb2e0701469e696d3ad3be6b3b0887d58623c7589784edd6961485517e18877dfbe9c011292e29b94dbcffb94 SHA512 525d3829fa17401cde3a0324d1342d4513decf6996864fa5d02462e2449d0895e8048fa71bd255b028b2ed084f8ca4734536cb86f85dd00d65e14d0f68b41184 DIST freeciv-2.5.12.tar.bz2 40983794 BLAKE2B 53c5f9833684bef20a80c891bb001b2e03c819ba57c0989463b854fda7fe2cffe16d292e8f13f8bf8253aee0691c8ad1cb6f19522c5aae69b48165d26a0c3665 SHA512 bc0de8f2e63779ab0ac57b9a1dfd6ab30b4ad973c9ed1704ae7c1575ec63a695e65016f45abf5ad44b9d3818211aa351b74492783a4155cf19357b7f1dd2554d -DIST freeciv-2.6.1.tar.bz2 51915573 BLAKE2B 160df7f59a5d2ab8090132df5c690ee96ce6811ad0644341ba07b10000bc2e4c30ef4e60ead57d17a7d0f722e42c204d839264830c7b423ccc393b7e7b30c30b SHA512 44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4 DIST freeciv-2.6.2.tar.bz2 52139007 BLAKE2B 5d30274f24786dcd0b29d4d85a45be47e791aedba7fbeeb28001e2c19d2acc1fa16b4ab88b779d0dbd318806e571a26c94f8a61b33c6d8df8e68d4fd90713302 SHA512 b11752f38027fcc8b092f323d4e76cf3c4c426bfcc811eb3a76daca075dc391d8179cd140abf1534abc56409344c53238b9fee2ee10d08a688e15671f3a70ef3 EBUILD freeciv-2.5.12.ebuild 4536 BLAKE2B 2673bcafd06b9c720d3aa62c57f281028ee5b796fa63535bf1ccfd90acaac744fd74c3cd14ce470f8b18f9920a09a7d33b54eb194a41e90af611d7ff3ba39712 SHA512 a6fdaa207990d2fd5521d627a54d24fd2fa62fbe42578e8176f35c598fb2a4149b8ab728f6ac516a63ce3b4923912a54096c87c65f5035a6b1e221e579a8e600 -EBUILD freeciv-2.6.1.ebuild 4655 BLAKE2B 56b8dbca0b4e7409498fb8ca25d6b44633fb7aec98003a7343c3f91aaa349c6e92c1ffeb9913edaab6554f8a2871f1a1f1d910e033f41598dea3cbd6e5f45708 SHA512 304f1bd699e1e76e580aa46f5bdf37b7aee36d4fdef067e706c06883f7275832ff1750bed4b74bb4f9e9600a72149e5e26344441c289579957aac620f87ebc64 EBUILD freeciv-2.6.2.ebuild 4743 BLAKE2B a2c22a679a1f38f4cb4014be58c91498e03d13d18caf3a3b00d8ff6cd6f82dbb735cd90c52ad8fa9e7931cef724e58b96b14230337d4f6199e3f59b4aa3dc121 SHA512 10f48189feb3bb70e78e1962f5106a3f63b157526f29a31c0980c9d0f07569179a05a2904dbdc08d085abe64edae1c08fb8b5742b2f427de41351b426be76fae MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201 diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch deleted file mode 100644 index d2b321dde274..000000000000 --- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch +++ /dev/null @@ -1,242 +0,0 @@ -From f2eafd087a20b4236c1f2f1324e8644cb5055bf9 Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Wed, 16 May 2018 20:41:22 +0200 -Subject: [PATCH] Use pkg-config to find freetype - -As of freetype-2.9.1 the freetype-config script no longer gets installed -by default. ---- - Makefile.am | 1 - - m4/freetype2.m4 | 194 ----------------------------------------------- - m4/sdl-client.m4 | 2 +- - 3 files changed, 1 insertion(+), 196 deletions(-) - delete mode 100644 m4/freetype2.m4 - -diff --git a/Makefile.am b/Makefile.am -index 5d5a187d47..51791433ab 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -64,7 +64,6 @@ EXTRA_DIST = autogen.sh \ - m4/fcdb-postgres.m4 \ - m4/fcdb-sqlite3.m4 \ - m4/features.m4 \ -- m4/freetype2.m4 \ - m4/gettimeofday.m4 \ - m4/ggz.m4 \ - m4/freeciv-gettext.m4 \ -diff --git a/m4/freetype2.m4 b/m4/freetype2.m4 -deleted file mode 100644 -index 3d0ecb3554..0000000000 ---- a/m4/freetype2.m4 -+++ /dev/null -@@ -1,194 +0,0 @@ --# Configure paths for FreeType2 --# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor --# --# Copyright 2001, 2003, 2007, 2009 by --# David Turner, Robert Wilhelm, and Werner Lemberg. --# --# This file is part of the FreeType project, and may only be used, modified, --# and distributed under the terms of the FreeType project license, --# LICENSE.TXT. By continuing to use, modify, or distribute this file you --# indicate that you have read the license and understand and accept it --# fully. --# --# As a special exception to the FreeType project license, this file may be --# distributed as part of a program that contains a configuration script --# generated by Autoconf, under the same distribution terms as the rest of --# that program. --# --# serial 3 -- --# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) --# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS. --# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is --# FreeType 2.0.4). --# --AC_DEFUN([AC_CHECK_FT2], -- [# Get the cflags and libraries from the freetype-config script -- # -- AC_ARG_WITH([ft-prefix], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--with-ft-prefix=PREFIX], -- [Prefix where FreeType is installed (optional)]), -- [ft_config_prefix="$withval"], -- [ft_config_prefix=""]) -- -- AC_ARG_WITH([ft-exec-prefix], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--with-ft-exec-prefix=PREFIX], -- [Exec prefix where FreeType is installed (optional)]), -- [ft_config_exec_prefix="$withval"], -- [ft_config_exec_prefix=""]) -- -- AC_ARG_ENABLE([freetypetest], -- dnl don't quote AS_HELP_STRING! -- AS_HELP_STRING([--disable-freetypetest], -- [Do not try to compile and run a test FreeType program]), -- [], -- [enable_fttest=yes]) -- -- if test x$ft_config_exec_prefix != x ; then -- ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix" -- if test x${FT2_CONFIG+set} != xset ; then -- FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config -- fi -- fi -- -- if test x$ft_config_prefix != x ; then -- ft_config_args="$ft_config_args --prefix=$ft_config_prefix" -- if test x${FT2_CONFIG+set} != xset ; then -- FT2_CONFIG=$ft_config_prefix/bin/freetype-config -- fi -- fi -- -- if test "x$FT2_CONFIG" = x ; then -- AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no]) -- fi -- -- min_ft_version=m4_if([$1], [], [7.0.1], [$1]) -- AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version]) -- no_ft="" -- if test "$FT2_CONFIG" = "no" ; then -- no_ft=yes -- else -- FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags` -- FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs` -- ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- ft_min_major_version=`echo $min_ft_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- ft_min_minor_version=`echo $min_ft_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- ft_min_micro_version=`echo $min_ft_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test x$enable_fttest = xyes ; then -- ft_config_is_lt="" -- if test $ft_config_major_version -lt $ft_min_major_version ; then -- ft_config_is_lt=yes -- else -- if test $ft_config_major_version -eq $ft_min_major_version ; then -- if test $ft_config_minor_version -lt $ft_min_minor_version ; then -- ft_config_is_lt=yes -- else -- if test $ft_config_minor_version -eq $ft_min_minor_version ; then -- if test $ft_config_micro_version -lt $ft_min_micro_version ; then -- ft_config_is_lt=yes -- fi -- fi -- fi -- fi -- fi -- if test x$ft_config_is_lt = xyes ; then -- no_ft=yes -- else -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $FT2_CFLAGS" -- LIBS="$FT2_LIBS $LIBS" -- -- # -- # Sanity checks for the results of freetype-config to some extent. -- # -- AC_RUN_IFELSE([ -- AC_LANG_SOURCE([[ -- --#include --#include FT_FREETYPE_H --#include --#include -- --int --main() --{ -- FT_Library library; -- FT_Error error; -- -- error = FT_Init_FreeType(&library); -- -- if (error) -- return 1; -- else -- { -- FT_Done_FreeType(library); -- return 0; -- } --} -- -- ]]) -- ], -- [], -- [no_ft=yes], -- [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"]) -- -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi # test $ft_config_version -lt $ft_min_version -- fi # test x$enable_fttest = xyes -- fi # test "$FT2_CONFIG" = "no" -- -- if test x$no_ft = x ; then -- AC_MSG_RESULT([yes]) -- m4_if([$2], [], [:], [$2]) -- else -- AC_MSG_RESULT([no]) -- if test "$FT2_CONFIG" = "no" ; then -- AC_MSG_WARN([ -- -- The freetype-config script installed by FreeType 2 could not be found. -- If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in -- your path, or set the FT2_CONFIG environment variable to the -- full path to freetype-config. -- ]) -- else -- if test x$ft_config_is_lt = xyes ; then -- AC_MSG_WARN([ -- -- Your installed version of the FreeType 2 library is too old. -- If you have different versions of FreeType 2, make sure that -- correct values for --with-ft-prefix or --with-ft-exec-prefix -- are used, or set the FT2_CONFIG environment variable to the -- full path to freetype-config. -- ]) -- else -- AC_MSG_WARN([ -- -- The FreeType test program failed to run. If your system uses -- shared libraries and they are installed outside the normal -- system library path, make sure the variable LD_LIBRARY_PATH -- (or whatever is appropriate for your system) is correctly set. -- ]) -- fi -- fi -- -- FT2_CFLAGS="" -- FT2_LIBS="" -- m4_if([$3], [], [:], [$3]) -- fi -- -- AC_SUBST([FT2_CFLAGS]) -- AC_SUBST([FT2_LIBS])]) -- --# end of freetype2.m4 -diff --git a/m4/sdl-client.m4 b/m4/sdl-client.m4 -index 095cd0b287..015d948d95 100644 ---- a/m4/sdl-client.m4 -+++ b/m4/sdl-client.m4 -@@ -30,7 +30,7 @@ AC_DEFUN([FC_SDL_CLIENT], - missing_project="SDL_gfx" - fi - if test "x$sdl_h_found" = "xyes" ; then -- AC_CHECK_FT2([2.1.3], [freetype_found="yes"], [freetype_found="no"]) -+ PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [freetype_found="yes"], [freetype_found="no"]) - if test "$freetype_found" = yes; then - gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS" - gui_sdl_libs="$gui_sdl_libs $FT2_LIBS" --- -2.18.0 - diff --git a/games-strategy/freeciv/freeciv-2.6.1.ebuild b/games-strategy/freeciv/freeciv-2.6.1.ebuild deleted file mode 100644 index 764443f246c5..000000000000 --- a/games-strategy/freeciv/freeciv-2.6.1.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PV="${PV/_beta/-beta}" -MY_PV="${MY_PV/_rc/-RC}" -MY_P="${PN}-${MY_PV}" -inherit desktop flag-o-matic xdg - -DESCRIPTION="multiplayer strategy game (Civilization Clone)" -HOMEPAGE="http://www.freeciv.org/" - -if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then - SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="aimodules auth dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua" - -# postgres isn't yet really supported by upstream -BDEPEND=" - virtual/pkgconfig - !dedicated? ( - x11-base/xorg-proto - nls? ( sys-devel/gettext ) - ) -" -DEPEND=" - app-arch/bzip2 - app-arch/xz-utils - net-misc/curl - sys-libs/zlib - auth? ( - !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:0= ) ) ) - mysql? ( dev-db/mysql-connector-c:0= ) - sqlite? ( dev-db/sqlite:3 ) - ) - dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) - !dedicated? ( - media-libs/libpng:0 - gtk? ( x11-libs/gtk+:2 ) - mapimg? ( media-gfx/imagemagick:= ) - modpack? ( x11-libs/gtk+:2 ) - nls? ( virtual/libintl ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) - sdl? ( - media-libs/libsdl2[video] - media-libs/sdl2-gfx - media-libs/sdl2-image[png] - media-libs/sdl2-ttf - ) - server? ( aimodules? ( sys-devel/libtool:2 ) ) - sound? ( - media-libs/libsdl2[sound] - media-libs/sdl2-mixer[vorbis] - ) - ) - readline? ( sys-libs/readline:0= ) - system-lua? ( >=dev-lang/lua-5.3:= ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -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 -} - -src_prepare() { - default - - # 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 \ - tools/Makefile.in \ - data/icons/Makefile.in || die - sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die -} - -src_configure() { - local myclient=() mydatabase=() myeconfargs=() - - if use auth ; then - if ! use mysql && ! use sqlite ; then - einfo "No database backend chosen, defaulting" - einfo "to mysql!" - mydatabase=( mysql ) - else - use mysql && mydatabase+=( mysql ) - use sqlite && mydatabase+=( sqlite3 ) - fi - else - mydatabase=( no ) - fi - - if use dedicated ; then - myclient=( no ) - myeconfargs+=( - --enable-server - --enable-freeciv-manual=html - ) - else - if use !sdl && use !gtk && ! use qt5 ; then - einfo "No client backend given, defaulting to" - einfo "gtk2 client!" - myclient=( gtk2 ) - else - use sdl && myclient+=( sdl2 ) - use gtk && myclient+=( gtk2 ) - if use qt5 ; then - myclient+=( qt ) - append-cxxflags -std=c++11 - fi - fi - myeconfargs+=( - $(use_enable server) - $(use_enable server freeciv-manual html ) - ) - fi - - myeconfargs+=( - --enable-aimodules="$(usex aimodules "yes" "no")" - --enable-client="${myclient[*]}" - --enable-fcdb="${mydatabase[*]}" - --enable-fcmp="$(usex modpack "gtk2" "no")" - # disabling shared libs will break aimodules USE flag - --enable-shared - --localedir=/usr/share/locale - $(use_enable ipv6) - $(use_enable mapimg) - $(use_enable nls) - $(use_enable sound sdl-mixer) - $(use_enable system-lua sys-lua) - $(use_with readline) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use dedicated ; then - rm -rf "${ED}"/usr/share/pixmaps - rm -f "${ED}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,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... - ./tools/freeciv-manual || die - docinto html - dodoc classic*.html - fi - if use sdl ; then - make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client - else - rm -f "${ED}"/usr/share/man/man6/freeciv-sdl* - fi - rm -f "${ED}"/usr/share/man/man6/freeciv-xaw* - fi - find "${ED}" -name "freeciv-manual*" -delete - - rm -f "${ED}/usr/$(get_libdir)"/*.a - find "${ED}" -name "*.la" -delete || die -} -- cgit v1.2.3