[gentoo-commits] gentoo-x86 commit in app-arch/bzip2: ChangeLog bzip2-1.0.6-r4.ebuild

[gentoo-commits] gentoo-x86 commit in app-arch/bzip2: ChangeLog bzip2-1.0.6-r4.ebuild

[Alexis Ballier (aballier)]

aballier    13/07/28 14:04:19

  Modified:             ChangeLog bzip2-1.0.6-r4.ebuild
  Log:
  Fix blocker on emul-libs
  
  (Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.108                app-arch/bzip2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/ChangeLog?r1=1.107&r2=1.108

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog	2 Jul 2013 16:21:17 -0000	1.107
+++ ChangeLog	28 Jul 2013 14:04:19 -0000	1.108
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/bzip2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.107 2013/07/02 16:21:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/ChangeLog,v 1.108 2013/07/28 14:04:19 aballier Exp $
+
+  28 Jul 2013; Alexis Ballier <aballier@gentoo.org> bzip2-1.0.6-r4.ebuild:
+  Fix blocker on emul-libs
 
   02 Jul 2013; Mike Frysinger <vapier@gentoo.org> bzip2-1.0.6-r4.ebuild,
   files/bzip2-1.0.4-man-links.patch:



1.3                  app-arch/bzip2/bzip2-1.0.6-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild?rev=1.3&view=markup
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
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild?r1=1.2&r2=1.3

Index: bzip2-1.0.6-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.6-r4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bzip2-1.0.6-r4.ebuild	2 Jul 2013 16:21:17 -0000	1.2
+++ bzip2-1.0.6-r4.ebuild	28 Jul 2013 14:04:19 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 # XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
 #      (since we're building shared libs) ...
@@ -18,7 +18,10 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="static static-libs"
 
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )"
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch