| 1 |
aballier 13/07/28 14:04:19 |
| 2 |
|
| 3 |
Modified: ChangeLog bzip2-1.0.6-r4.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.108 app-arch/bzip2/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?rev=1.108&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?rev=1.108&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?r1=1.107&r2=1.108 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v |
| 19 |
retrieving revision 1.107 |
| 20 |
retrieving revision 1.108 |
| 21 |
diff -u -r1.107 -r1.108 |
| 22 |
--- ChangeLog 2 Jul 2013 16:21:17 -0000 1.107 |
| 23 |
+++ ChangeLog 28 Jul 2013 14:04:19 -0000 1.108 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for app-arch/bzip2 |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.107 2013/07/02 16:21:17 vapier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.108 2013/07/28 14:04:19 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 28 Jul 2013; Alexis Ballier <aballier@g.o> bzip2-1.0.6-r4.ebuild: |
| 31 |
+ Fix blocker on emul-libs |
| 32 |
|
| 33 |
02 Jul 2013; Mike Frysinger <vapier@g.o> bzip2-1.0.6-r4.ebuild, |
| 34 |
files/bzip2-1.0.4-man-links.patch: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 app-arch/bzip2/bzip2-1.0.6-r4.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: bzip2-1.0.6-r4.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- bzip2-1.0.6-r4.ebuild 2 Jul 2013 16:21:17 -0000 1.2 |
| 51 |
+++ bzip2-1.0.6-r4.ebuild 28 Jul 2013 14:04:19 -0000 1.3 |
| 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/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.2 2013/07/02 16:21:17 vapier Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v 1.3 2013/07/28 14:04:19 aballier Exp $ |
| 57 |
|
| 58 |
# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly |
| 59 |
# (since we're building shared libs) ... |
| 60 |
@@ -18,7 +18,10 @@ |
| 61 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 62 |
IUSE="static static-libs" |
| 63 |
|
| 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 |
|
| 70 |
src_prepare() { |
| 71 |
epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch |
Archives