summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2015-05-14 18:51:27 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2015-05-14 18:51:27 +0000
commita65330ddb85bd7e5f3630223104e8e1579216c1d (patch)
tree0dbfabc1ee86a728b915b6ec59beb6027c5526e9 /games-action
parentReverse previous stabilization done by error (diff)
downloadhistorical-a65330ddb85bd7e5f3630223104e8e1579216c1d.tar.gz
historical-a65330ddb85bd7e5f3630223104e8e1579216c1d.tar.bz2
historical-a65330ddb85bd7e5f3630223104e8e1579216c1d.zip
use system zlib with patch from Robert Cernansky (bug #549074)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Diffstat (limited to 'games-action')
-rw-r--r--games-action/shadowgrounds-bin/ChangeLog8
-rw-r--r--games-action/shadowgrounds-bin/Manifest4
-rw-r--r--games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild17
3 files changed, 20 insertions, 9 deletions
diff --git a/games-action/shadowgrounds-bin/ChangeLog b/games-action/shadowgrounds-bin/ChangeLog
index fb3a2d87ae78..8d9eb9cf3937 100644
--- a/games-action/shadowgrounds-bin/ChangeLog
+++ b/games-action/shadowgrounds-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/shadowgrounds-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/shadowgrounds-bin/ChangeLog,v 1.6 2014/08/29 17:20:34 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/shadowgrounds-bin/ChangeLog,v 1.7 2015/05/14 18:51:22 mr_bones_ Exp $
+
+ 14 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ shadowgrounds-bin-0_beta12-r1.ebuild:
+ use system zlib with patch from Robert Cernansky (bug #549074)
29 Aug 2014; Michael Sterrett <mr_bones_@gentoo.org>
-shadowgrounds-bin-0_beta12.ebuild:
diff --git a/games-action/shadowgrounds-bin/Manifest b/games-action/shadowgrounds-bin/Manifest
index d913b319c2e3..6bfe482e3531 100644
--- a/games-action/shadowgrounds-bin/Manifest
+++ b/games-action/shadowgrounds-bin/Manifest
@@ -1,4 +1,4 @@
DIST ShadowgroundsBeta12.run 817462792 SHA256 583e9df5a40f46fd093a3aeeb1f1150ed437064566d77ae5e59daf7a059306c0
-EBUILD shadowgrounds-bin-0_beta12-r1.ebuild 1633 SHA256 201202466510b6749dba716a1ee690bdf2612e55ef22b398db2fb43738117a09 SHA512 28b1949049495fd46ffc3e9f1b820634df571dd47a766bebad9c8fc70f7a140dbb04a35c817955a34e0f30827e012563008f1d30c65d0defe078415dcb00707f WHIRLPOOL a5e9fe589108b3d6854881cd5ba0df70e9d7057c36c16c6f2465cc5854639f92a9a203000cb79a4eead30fb5602618e3c1fcf7d4ff7f5bcf0434f13655ab8cd1
-MISC ChangeLog 1157 SHA256 126490156a0ec06ffcec7c0a1b90ec6250a61791746318bbbab435acd88b7631 SHA512 9a5c22d8b8d07a31810df0431a9971f7257140b5e0ad3edebe30753197912a1d28dbaac25966c9c85baa04643827ae5f0fd24883b03d6e94e1f35a1f0d0b1e56 WHIRLPOOL 43ccb1a69da8397d80f69f473be2f47b66bbe29ca73ec9df196817fa20872607b5768563b43a5f3ba62a400b4b78ee2ec9e1cdd9cb0faedcbbe867d5596d0cf0
+EBUILD shadowgrounds-bin-0_beta12-r1.ebuild 1767 SHA256 41f56936b1d6fe83f38e92d0c6bba173a1a4d76a8a759d77b1cc0ecb158051b9 SHA512 cc2c1cef642a789f0acbbe6c36aeb2d7b9ece03414ae1aa80066e2bb9790956f5a13289b36c243245c344e603725b7db739a401035e2b56e692bb5f9e2449dfe WHIRLPOOL 708cbe26450114ac51c0a39756d2ede359ebfa81a25155602c2ba9afbcc3bae30837666d85d477ee02092796470858ed780565265b75ef97eecda108d07a6494
+MISC ChangeLog 1318 SHA256 71d7934bcf2cd32a73e0dab925f924e1e8a6de1bf224060c4ec4445044a2d4df SHA512 583208c6527642a9e3676de36f064f29211b8ee9ec576a75c6a9b5dea02363bf8780487a9c27a378ab920830ab67e99bdddbc10667f3a378a9ee6ea45d72b799 WHIRLPOOL f3e52c3ef50349ca71255e9b028fa4e37c1b43bda74f03621061a018132774bbfe498c811da35f0f6ca487242518f60e9da3612bbaca45e9a5626e67b41d4eec
MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild b/games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild
index c4bba632f3d8..a7065e6d152c 100644
--- a/games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild
+++ b/games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild
@@ -1,6 +1,6 @@
-# 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-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild,v 1.2 2014/06/25 13:46:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild,v 1.3 2015/05/14 18:51:22 mr_bones_ Exp $
EAPI=5
@@ -21,11 +21,18 @@ RDEPEND=">=sys-libs/glibc-2.4
>=sys-devel/gcc-4.3.0
!amd64? (
gnome-base/libglade
+ sys-libs/zlib
)
amd64? (
|| (
- app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- >=gnome-base/libglade-2.6.4-r1[abi_x86_32(-)]
+ (
+ app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+ (
+ >=gnome-base/libglade-2.6.4-r1[abi_x86_32(-)]
+ sys-libs/zlib[abi_x86_32(-)]
+ )
)
)"
@@ -43,7 +50,7 @@ pkg_nofetch() {
src_unpack() {
# manually run unzip as the initial seek causes it to exit(1)
unpack_zip ${A}
- rm lib*/lib{gcc_s,m,rt,selinux}.so.?
+ rm lib*/lib{gcc_s,m,rt,selinux,z}.so.?
}
src_install() {