summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-06-19 03:15:41 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-06-19 03:15:41 +0000
commit22bd4e35c95ffece8f657b12673d478d064e24df (patch)
tree1916f48d06acf5522d147eeefd0b3e44c5f780a2 /dev-libs/nspr
parentFix file collision with emul-linux-x86-baselibs (diff)
downloadgentoo-2-22bd4e35c95ffece8f657b12673d478d064e24df.tar.gz
gentoo-2-22bd4e35c95ffece8f657b12673d478d064e24df.tar.bz2
gentoo-2-22bd4e35c95ffece8f657b12673d478d064e24df.zip
Update emul-linux-x86-baselibs blocker revision.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'dev-libs/nspr')
-rw-r--r--dev-libs/nspr/ChangeLog6
-rw-r--r--dev-libs/nspr/nspr-4.10.6-r1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 0ba9aba083ff..5c9199a43c4a 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/nspr
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.268 2014/06/15 08:33:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.269 2014/06/19 03:15:41 tetromino Exp $
+
+ 19 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+ nspr-4.10.6-r1.ebuild:
+ Update emul-linux-x86-baselibs blocker revision.
15 Jun 2014; Agostino Sarubbo <ago@gentoo.org> nspr-4.10.6.ebuild:
Stable for x86, wrt bug #512896
diff --git a/dev-libs/nspr/nspr-4.10.6-r1.ebuild b/dev-libs/nspr/nspr-4.10.6-r1.ebuild
index bafab152428f..09ecd0bd593e 100644
--- a/dev-libs/nspr/nspr-4.10.6-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.10.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.3 2014/06/14 08:23:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6-r1.ebuild,v 1.4 2014/06/19 03:15:41 tetromino Exp $
EAPI=5
WANT_AUTOCONF="2.5"
@@ -20,7 +20,7 @@ IUSE="debug"
RDEPEND="
abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r9
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r12
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"