| 1 |
aballier 13/07/28 14:01:51 |
| 2 |
|
| 3 |
Modified: ChangeLog zlib-1.2.8-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix blocker on emul-libs |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.125 sys-libs/zlib/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.125&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/ChangeLog?rev=1.125&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/ChangeLog?r1=1.124&r2=1.125 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v |
| 19 |
retrieving revision 1.124 |
| 20 |
retrieving revision 1.125 |
| 21 |
diff -u -r1.124 -r1.125 |
| 22 |
--- ChangeLog 23 Jun 2013 07:43:53 -0000 1.124 |
| 23 |
+++ ChangeLog 28 Jul 2013 14:01:51 -0000 1.125 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for sys-libs/zlib |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.124 2013/06/23 07:43:53 pacho Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.125 2013/07/28 14:01:51 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 28 Jul 2013; Alexis Ballier <aballier@g.o> zlib-1.2.8-r1.ebuild: |
| 31 |
+ Fix blocker on emul-libs |
| 32 |
|
| 33 |
*zlib-1.2.8-r1 (23 Jun 2013) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 sys-libs/zlib/zlib-1.2.8-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: zlib-1.2.8-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- zlib-1.2.8-r1.ebuild 23 Jun 2013 07:43:53 -0000 1.1 |
| 51 |
+++ zlib-1.2.8-r1.ebuild 28 Jul 2013 14:01:51 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.1 2013/06/23 07:43:53 pacho Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.8-r1.ebuild,v 1.2 2013/07/28 14:01:51 aballier Exp $ |
| 57 |
|
| 58 |
EAPI=4 |
| 59 |
AUTOTOOLS_AUTO_DEPEND="no" |
| 60 |
@@ -19,7 +19,10 @@ |
| 61 |
IUSE="minizip static-libs" |
| 62 |
|
| 63 |
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )" |
| 64 |
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 ) |
| 65 |
+RDEPEND="abi_x86_32? ( |
| 66 |
+ !<=app-emulation/emul-linux-x86-baselibs-20130224 |
| 67 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 68 |
+ ) |
| 69 |
!<dev-libs/libxml2-2.7.7" #309623 |
| 70 |
|
| 71 |
src_prepare() { |
Archives