| 1 |
mgorny 14/11/30 11:34:16 |
| 2 |
|
| 3 |
Modified: json-c-0.11-r1.ebuild json-c-0.12.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add missing blocker on emul-linux-x86-baselibs, bug #527138. |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.11 dev-libs/json-c/json-c-0.11-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild?rev=1.11&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild?rev=1.11&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild?r1=1.10&r2=1.11 |
| 15 |
|
| 16 |
Index: json-c-0.11-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild,v |
| 19 |
retrieving revision 1.10 |
| 20 |
retrieving revision 1.11 |
| 21 |
diff -u -r1.10 -r1.11 |
| 22 |
--- json-c-0.11-r1.ebuild 19 Mar 2014 15:13:47 -0000 1.10 |
| 23 |
+++ json-c-0.11-r1.ebuild 30 Nov 2014 11:34:16 -0000 1.11 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild,v 1.10 2014/03/19 15:13:47 ago Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.11-r1.ebuild,v 1.11 2014/11/30 11:34:16 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -17,6 +17,12 @@ |
| 33 |
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 34 |
IUSE="doc static-libs" |
| 35 |
|
| 36 |
+RDEPEND=" |
| 37 |
+ abi_x86_32? ( |
| 38 |
+ !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 |
| 39 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 40 |
+ )" |
| 41 |
+ |
| 42 |
# tests break otherwise |
| 43 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
|
| 48 |
1.2 dev-libs/json-c/json-c-0.12.ebuild |
| 49 |
|
| 50 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.12.ebuild?rev=1.2&view=markup |
| 51 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.12.ebuild?rev=1.2&content-type=text/plain |
| 52 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/json-c-0.12.ebuild?r1=1.1&r2=1.2 |
| 53 |
|
| 54 |
Index: json-c-0.12.ebuild |
| 55 |
=================================================================== |
| 56 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.12.ebuild,v |
| 57 |
retrieving revision 1.1 |
| 58 |
retrieving revision 1.2 |
| 59 |
diff -u -r1.1 -r1.2 |
| 60 |
--- json-c-0.12.ebuild 12 Apr 2014 15:42:43 -0000 1.1 |
| 61 |
+++ json-c-0.12.ebuild 30 Nov 2014 11:34:16 -0000 1.2 |
| 62 |
@@ -1,6 +1,6 @@ |
| 63 |
# Copyright 1999-2014 Gentoo Foundation |
| 64 |
# Distributed under the terms of the GNU General Public License v2 |
| 65 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.12.ebuild,v 1.1 2014/04/12 15:42:43 hwoarang Exp $ |
| 66 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/json-c-0.12.ebuild,v 1.2 2014/11/30 11:34:16 mgorny Exp $ |
| 67 |
|
| 68 |
EAPI=5 |
| 69 |
|
| 70 |
@@ -17,6 +17,12 @@ |
| 71 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 72 |
IUSE="doc static-libs" |
| 73 |
|
| 74 |
+RDEPEND=" |
| 75 |
+ abi_x86_32? ( |
| 76 |
+ !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 |
| 77 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 78 |
+ )" |
| 79 |
+ |
| 80 |
# tests break otherwise |
| 81 |
AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
|
| 86 |
1.47 dev-libs/json-c/ChangeLog |
| 87 |
|
| 88 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/ChangeLog?rev=1.47&view=markup |
| 89 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/ChangeLog?rev=1.47&content-type=text/plain |
| 90 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/json-c/ChangeLog?r1=1.46&r2=1.47 |
| 91 |
|
| 92 |
Index: ChangeLog |
| 93 |
=================================================================== |
| 94 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v |
| 95 |
retrieving revision 1.46 |
| 96 |
retrieving revision 1.47 |
| 97 |
diff -u -r1.46 -r1.47 |
| 98 |
--- ChangeLog 12 Apr 2014 15:42:43 -0000 1.46 |
| 99 |
+++ ChangeLog 30 Nov 2014 11:34:16 -0000 1.47 |
| 100 |
@@ -1,6 +1,10 @@ |
| 101 |
# ChangeLog for dev-libs/json-c |
| 102 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 103 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.46 2014/04/12 15:42:43 hwoarang Exp $ |
| 104 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/json-c/ChangeLog,v 1.47 2014/11/30 11:34:16 mgorny Exp $ |
| 105 |
+ |
| 106 |
+ 30 Nov 2014; Michał Górny <mgorny@g.o> json-c-0.11-r1.ebuild, |
| 107 |
+ json-c-0.12.ebuild: |
| 108 |
+ Add missing blocker on emul-linux-x86-baselibs, bug #527138. |
| 109 |
|
| 110 |
*json-c-0.12 (12 Apr 2014) |
Archives