diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-05-14 18:51:22 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-05-14 18:51:22 +0000 |
| commit | df56263dbf1e96ceb42e1ce54f3f6d01b5fad5b3 (patch) | |
| tree | 6312d9081fd4d2b007660dd69c153f646db6f923 /games-action/shadowgrounds-bin | |
| parent | Reverse previous stabilization done by error (diff) | |
| download | gentoo-2-df56263dbf1e96ceb42e1ce54f3f6d01b5fad5b3.tar.gz gentoo-2-df56263dbf1e96ceb42e1ce54f3f6d01b5fad5b3.tar.bz2 gentoo-2-df56263dbf1e96ceb42e1ce54f3f6d01b5fad5b3.zip | |
use system zlib with patch from Robert Cernansky (bug #549074)
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-action/shadowgrounds-bin')
| -rw-r--r-- | games-action/shadowgrounds-bin/ChangeLog | 8 | ||||
| -rw-r--r-- | games-action/shadowgrounds-bin/shadowgrounds-bin-0_beta12-r1.ebuild | 17 |
2 files changed, 18 insertions, 7 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/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() { |