drop ggz support

Package-Manager: portage-2.2.14/cvs/Linux x86_64

diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index bf7642bf8a08d999739e6fc82bb9e0f403fbbddb..110f4c85ba09c85b3bcdd6d11d1b6c50434cbdec 100644 (file)
--- 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.158 2014/12/28 15:48:56 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.159 2015/01/03 17:49:50 mr_bones_ Exp $
+
+  03 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.3.4.ebuild,
+  freeciv-2.4.3.ebuild:
+  drop ggz support
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> freeciv-2.4.3.ebuild:
   Rename virtual/postgresql to dev-db/postgresql

diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 903894d2534245a45d50daca6c874c829bb043af..162dd4cf2c623a4006db109124c9199a599d1cea 100644 (file)
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST freeciv-2.3.4.tar.bz2 31395893 SHA256 084c10c50c06166177c9864b5610eaf36dca3808e3d3a7da8ef7ae927d56c41c SHA512 51d89321cf7b5b08d2338f8d76051ebde745c85e4ebad21b9ff2109696edfdc79ad43d7f8d2bf989400ce5e71f28127835dc4b4e60635fb71ebb3a2fb149269a WHIRLPOOL afcb5543049059d87503451c7d82abe6be765406fe3aba13fa01dec430062c4ed51c39b42827fb863a37c0b9737962f9557c6069f9d7be1efbd851c18268b6ce
 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.3.ebuild 4792 SHA256 44b2e01402dffe9565176d5b5f82a70d5a07ba4844a1e93f483f6f9d25522b60 SHA512 9fa1151f5664e34c3f5187ba1469490879a4c1a1ec075ec113233a12d0f0a9e580be688b5a0cfba50d1c177b061565928baa7b85237ec3d1ab790145b3feb3e8 WHIRLPOOL ae4e5985f30860604ecc04f9c4cdade687368b025d7ec90dff4cb07b9e28f3fb92b060d162c646904c341626493828b732f9e272d49bd102acfd5be8c521c152
-MISC ChangeLog 22648 SHA256 94f43daf8d40b5d113cdce9b99a92a4bea4f90836d9c4a48febe2987f9229f58 SHA512 f628c87a496c937fd6b49b36232af6cf254d50a16a2281d914b9bc5f587c7117fa40a4962c6d3557b8325ee2f0b6837d4fc4f129595cebbb3b0f51dcdaf3c112 WHIRLPOOL 3ea07613186bb75bbda4d54db6220daf35ba0fbe2247b990384f713ec2e18805b5048e92a32b4287b7e478fbf6228fc200121e9e0368089771e5ae2e1c58ad99
+EBUILD freeciv-2.3.4.ebuild 3084 SHA256 33d92621a203f68f2d4ca61d9ff2878fc265873ba9938154daadc3c47bd663f5 SHA512 25fb6a542dffbae41e9e06f8bbb843a156190cddd01093edb463ad268593b1ce991e6f62b4e67855ca280c9f439204588984746282c4a11840c5641f63512e5e WHIRLPOOL a187339e6b7f2444844646c1137957fca28d94ceae3fad926aa816a939ad685c667a33a37c7fadc9061480e3656ee62879abf6aaef0c3c16030b4d90ba798137
+EBUILD freeciv-2.4.3.ebuild 4569 SHA256 452997b36489473be4f755deb2920e4e09b2b40720fa4cb4958f4fb07e2a4273 SHA512 04e6e490043db652319030859d9d974bac48ad4f4a91998dfef06fa27f88f213d6fa71f9bf941c8321d32374d3da95bcf4fb84295827156849d308d5109d2c8c WHIRLPOOL af7f0697124966f27d60a13a437269e93521c8376a08d2fdaa133957310df291958cf21f2a62231e5d2c4d15b2f9bb8d3f298a443ae622c2ba4d3c94fcb0c630
+MISC ChangeLog 22768 SHA256 a74548564990e96d7d87be014ab22a2e02bbe0d4c3fabc3b7ce279bd6d154f1e SHA512 f2216215ddf9f696df36099b276e6183c22a142bb49e84cf9151afff395cac90aa086446590cdf96f7d71391aa9fa55afaaa50901b830f062980d076887a8702 WHIRLPOOL 0f98a8c7d91e0801ae379bf3cf368e9647e6364aa4c496b42b2f66346cb2cfcdc9239d3e9b62452b127a43ae024a8a3e1627bd02bb878fb326ebd22341dc225b
 MISC metadata.xml 824 SHA256 6cc757311f3ca78853f0cfca67a322d1f332d93b9fdf44cab82957babcf2cdec SHA512 be03ae743496462b779cc6e4f8f2a2b1f2db534fc8bf14060c313843d2c5180bb7d38b6262b9cd4a93aa2ed2116fa5c8f5ad19bd565d7a55f5d7cb4c3d5e480d WHIRLPOOL d3ec0e0b75475c7b9455062be02ad0f575cb1d052118dd83ca6c6bb16171306dd2c0986f13639ae9f3cfce974afac7270bcadce5ace7aca0986a9b88da2e15c4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iF4EAREIAAYFAlSgJmkACgkQVxOqA9G7/aC3NwD9HtfbosIPSO99shExMjjujzMy
-+GQuFSUgLfOjrg+eyDAA/1fIHGRF0fS5IK6KzgbpZyweXU7C7HZ720KCOAFZlwUH
-=Ql8f
------END PGP SIGNATURE-----

diff --git a/games-strategy/freeciv/freeciv-2.3.4.ebuild b/games-strategy/freeciv/freeciv-2.3.4.ebuild
index 846413719e9fb29e5906620af5bef79ace409863..e1e4edfa2af3a352c4fb7ddb935a431acce19360 100644 (file)
--- a/games-strategy/freeciv/freeciv-2.3.4.ebuild
+++ b/games-strategy/freeciv/freeciv-2.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.4.ebuild,v 1.5 2014/05/15 17:03:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.3.4.ebuild,v 1.6 2015/01/03 17:49:50 mr_bones_ Exp $
 
 EAPI=5
-inherit eutils gnome2-utils games-ggz games
+inherit eutils gnome2-utils games
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
@@ -12,7 +12,7 @@ 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"
+IUSE="auth dedicated +gtk ipv6 nls readline sdl +sound"
 REQUIRED_USE="!dedicated? ( || ( gtk sdl ) )"
 
 RDEPEND="readline? ( sys-libs/readline )
@@ -31,7 +31,6 @@ RDEPEND="readline? ( sys-libs/readline )
                        media-libs/libsdl[sound]
                        media-libs/sdl-mixer[vorbis]
                )
-               ggz? ( games-board/ggz-gtk-client )
                media-libs/libpng:0
        )"
 DEPEND="${RDEPEND}
@@ -64,12 +63,11 @@ src_configure() {
        else
                use sdl && myclient="${myclient} sdl"
                use gtk && myclient="${myclient} gtk"
-               myopts=$(use_with ggz ggz-client)
+               myopts="--without-ggz-client"
        fi
 
        egamesconf \
                --localedir=/usr/share/locale \
-               --with-ggzconfig=/usr/bin \
                --enable-noregistry="${GGZ_MODDIR}" \
                $(use_enable auth) \
                $(use_enable ipv6) \
@@ -116,11 +114,9 @@ pkg_preinst() {
 
 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.4.3.ebuild b/games-strategy/freeciv/freeciv-2.4.3.ebuild
index 87f9797ee6e1631e9aef4950c1cadafe78f645e0..367165ae688bfa5f098be10a4831015ef480028a 100644 (file)
--- a/games-strategy/freeciv/freeciv-2.4.3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.4.3.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.3.ebuild,v 1.4 2014/12/28 15:48:56 titanofold Exp $
-
-# FIXME: gtk3 support breaks ggz support
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.3.ebuild,v 1.5 2015/01/03 17:49:50 mr_bones_ Exp $
 
 EAPI=5
-inherit eutils gnome2-utils games-ggz games
+inherit eutils gnome2-utils games
 
 DESCRIPTION="multiplayer strategy game (Civilization Clone)"
 HOMEPAGE="http://www.freeciv.org/"
@@ -14,7 +12,7 @@ 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"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres readline sdl +server +sound sqlite"
 
 RDEPEND="app-arch/bzip2
        app-arch/xz-utils
@@ -31,7 +29,6 @@ RDEPEND="app-arch/bzip2
        dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
        !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 )
@@ -109,7 +106,7 @@ src_configure() {
                        use sdl && myclient="${myclient} sdl"
                        use gtk && myclient="${myclient} gtk2"
                fi
-               myopts="$(use_enable server) $(use_with ggz ggz-client)"
+               myopts="$(use_enable server) --without-ggz-client"
        fi
 
        # disabling shared libs will break aimodules USE flag
@@ -121,8 +118,6 @@ src_configure() {
                --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) \
@@ -170,11 +165,9 @@ pkg_preinst() {
 
 pkg_postinst() {
        games_pkg_postinst
-       games-ggz_update_modules
        gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-       games-ggz_update_modules
        gnome2_icon_cache_update
 }