summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/freeciv/ChangeLog6
-rw-r--r--games-strategy/freeciv/Manifest14
-rw-r--r--games-strategy/freeciv/freeciv-2.5.0.ebuild11
3 files changed, 12 insertions, 19 deletions
diff --git a/games-strategy/freeciv/ChangeLog b/games-strategy/freeciv/ChangeLog
index 59ecb1867b55..56fd8e095801 100644
--- a/games-strategy/freeciv/ChangeLog
+++ b/games-strategy/freeciv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-strategy/freeciv
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.167 2015/04/26 16:01:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/ChangeLog,v 1.168 2015/04/27 19:49:53 mr_bones_ Exp $
+
+ 27 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> freeciv-2.5.0.ebuild:
+ drop postgres support since it's unsupported by upstream (prevents bug
+ #547842)
26 Apr 2015; Pacho Ramos <pacho@gentoo.org> freeciv-2.5.0.ebuild:
x86 stable wrt bug #547134
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index 8b22e67ae6af..895ec87df62a 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST freeciv-2.4.4.tar.bz2 38847925 SHA256 8307fc9d69571b031ccc465e8029d8a7ea3dbef4e3651f2de07356aba931e2a3 SHA512 3f2ff619b21c36748a98bda98c923ec9ea71faf18cac77d8b247e4a79c4a8f41c9b399e648a0a51fe54738de3276081c31ded98f769104812125d304716796a7 WHIRLPOOL 0eb8374ad2d7174dab8971c39c0ce7f14e72c1c7a64dfa8461a054a53d2b659af71197bad7c65e65e3e5da4fd5552bfb10aa2fa8b9870c9b1fbd7e03c58c9c00
DIST freeciv-2.5.0.tar.bz2 40323793 SHA256 bd9f7523ea79b8d2806d0c1844a9f48506ccd18276330580319913c43051210b SHA512 f03bafdca47da0677ad81ed945afe79bbd01ae871b95e6bdaf6249acb8420e78e3210dd60f520d960ec127e1d443f45c11fcc484b49b6bb59cab5904e51fc651 WHIRLPOOL 1a9768837b40c6c19ff6138d07074d96d75d2cecdb671180659d9380beb7c996fcb0be2fb343166fe46e92cc2c2e7495be2683f62440540cea3072f34e928391
EBUILD freeciv-2.4.4.ebuild 4561 SHA256 3e4f718e429a6dd395c0ca12c21915c4fa7f554564887835d5c6f915b9f7188d SHA512 affde41805adcae2c93ad5ab460f7bfaea0a3918c5ad2fc3ce736094f2581994c7e0703218ff1c791d581a24f1b1e12885aa6b28399e2a90834c7fdb53ae06d1 WHIRLPOOL 3f50a7dc4c0ea5f8eb29c6fc30811e36dd2940927c0ca722f02e5e0ff20aef3fd22c916ef3a108e17eec1fd47643c7594579be2d2be783debcd369ef87991eb7
-EBUILD freeciv-2.5.0.ebuild 4709 SHA256 b3c69e0b65bb2fc08ce5a4a3c3444b72d01b1a748672d7ae1bc4004666ef9d61 SHA512 7f30bac5c471e87227e34dd38e8130ae6df657149965c3c9b4bc4b158582cc78956a365ae1d2da4b577d8d2ce0f1c782a9674795fbccf6c04da15291262382cf WHIRLPOOL b67388d8dd7236a58e266d88446cbcf96f4bb7bddf01bc77f670834509afd812993de27b07b3950973e9545a243c901501a5d0c4c09f177ee02577e7adff7d93
-MISC ChangeLog 23721 SHA256 6f61e5cacd80ac671534fd772061360d2a79e1f705a7571121d32e7f0c2d1508 SHA512 1684c3cb567dd91703e57842604eeb8dc9a2307b35e7e79352fc1734aae4a54ff8d8ca9c061fcd66ded89cb03471a929e9def11bd216aaed5228fc8537e44eed WHIRLPOOL 77a4758319f41544b753be39f2f166c2c5b5aaae09dfb54d943058c094c4f460e1552f621f417d71f9051e6c5992ef99144ba1ce4fe53203b8e7714341320c28
+EBUILD freeciv-2.5.0.ebuild 4637 SHA256 bbf6eb9dd7c0d289fd7788cc6332136699b8ba9b2e44e9b6da18ab4e1b4c3ec8 SHA512 f74264fa5623058a7f24a88cea75f0ab37ad2debcdcf97f5f43a8c572a53edca82bbbe1b5142402530392d7fe28647140996e870052858acb167531f7b7eb1b5 WHIRLPOOL c3a55d8c85b53ce14bbcf02c9e2d211151f0b6b268c6afdbc970beaee90311fdde64e135ce493e6103629f69204cc8a49b4d9ed404dd7489eeb697257927a21d
+MISC ChangeLog 23887 SHA256 82fa7a1e6d66dc366eb6b59ebb3a9033cc14f0d33e0c425e725d498b182aaf92 SHA512 2c39d2cece064f59dff6eeda04ab86d15abd169169c6dbe4127fde52ba07ac33c81143852bd994e862200ce4c008adcf0384f122da631d75b4d0e051f1175e47 WHIRLPOOL 7aec3d83a5529ec4cff22f248ca0033d51adaf765097571e6eef014d218acc534d27001784c11a91265b4416faf04037ac4473ea3cf031859860a52709833454
MISC metadata.xml 860 SHA256 ef2048f08823818e8c61405c153e38571a02db328010e8b8ab6b31fc02f4dbea SHA512 46f79f46321355ab35e00e71d1ac35bfefab6cc2619219e9cc44176bf1a0f1f914d946cf035b0459d219c82fd03c05230d93ea3096db23440784401ef71dfbc1 WHIRLPOOL fd747185eba3bd3584109dcb631c9d893342971a0d466059758568bc3b9760ff1aea048d949b7f2007b391a4b3041d98f8dc34ca3c1e0de795afe65f4651e9f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEAREIAAYFAlU9C70ACgkQCaWpQKGI+9TAdgCffvSdBlNBdVkxJk244Fs/7WX+
-4esAn0yF8Vp4WY+YpqiAMlI+pW1DFirc
-=OiZm
------END PGP SIGNATURE-----
diff --git a/games-strategy/freeciv/freeciv-2.5.0.ebuild b/games-strategy/freeciv/freeciv-2.5.0.ebuild
index 23bb1bed5fd0..1251be9d0553 100644
--- a/games-strategy/freeciv/freeciv-2.5.0.ebuild
+++ b/games-strategy/freeciv/freeciv-2.5.0.ebuild
@@ -1,6 +1,6 @@
# 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.5.0.ebuild,v 1.3 2015/04/26 16:01:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.5.0.ebuild,v 1.4 2015/04/27 19:49:53 mr_bones_ Exp $
EAPI=5
inherit eutils gnome2-utils games
@@ -12,17 +12,17 @@ SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls postgres qt5 readline sdl +server +sound sqlite system-lua"
+IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
+# postgres isn't yet really supported by upstream
RDEPEND="app-arch/bzip2
app-arch/xz-utils
net-misc/curl
sys-libs/zlib
auth? (
mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
sqlite? ( dev-db/sqlite:3 )
- !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
+ !mysql? ( ( !sqlite? ( virtual/mysql ) ) )
)
readline? ( sys-libs/readline:0 )
dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
@@ -86,13 +86,12 @@ src_configure() {
local myclient myopts mydatabase
if use auth ; then
- if use !mysql && use !postgres && use !sqlite ; then
+ if use !mysql && 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