Force yajl dependency to be version 1 and not later, since yajl2 breaks API and upstream has yet to implement it.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

5 files changed, 15 insertions, 9 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 09d3ffa8531e..bef4e3a7be49 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.104 2011/05/02 21:39:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.105 2011/05/03 20:16:42 flameeyes Exp $
+
+  03 May 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  libvirt-0.8.5-r2.ebuild, libvirt-0.8.8-r1.ebuild, libvirt-0.9.0-r1.ebuild,
+  libvirt-0.9.1_rc2.ebuild:
+  Force yajl dependency to be version 1 and not later, since yajl2 breaks API
+  and upstream has yet to implement it.
 
 *libvirt-0.9.1_rc2 (02 May 2011)
 
diff --git a/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild b/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild
index 680915874172..b5a5d316db85 100644
--- a/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild,v 1.5 2011/02/02 19:25:07 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.5-r2.ebuild,v 1.6 2011/05/03 20:16:42 flameeyes Exp $
 
 BACKPORTS=2
 
@@ -54,7 +54,7 @@ RDEPEND="sys-libs/readline
 	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
 	xen? ( app-emulation/xen-tools app-emulation/xen )
 	udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 )
-	json? ( dev-libs/yajl )"
+	json? ( =dev-libs/yajl-1* )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild b/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild
index 1e4a7115a733..8016d9b9e149 100644
--- a/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild,v 1.3 2011/03/17 23:25:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.8.8-r1.ebuild,v 1.4 2011/05/03 20:16:42 flameeyes Exp $
 
 BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -47,7 +47,7 @@ RDEPEND="sys-libs/readline
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
 	iscsi? ( sys-block/open-iscsi )
-	json? ( dev-libs/yajl )
+	json? ( =dev-libs/yajl-1* )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	macvtap? ( >=dev-libs/libnl-1.1 )
diff --git a/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild b/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild
index 25ed95888307..e8de1a7097a5 100644
--- a/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild,v 1.1 2011/04/12 21:36:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.0-r1.ebuild,v 1.2 2011/05/03 20:16:42 flameeyes Exp $
 
 #BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -47,7 +47,7 @@ RDEPEND="sys-libs/readline
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
 	iscsi? ( sys-block/open-iscsi )
-	json? ( dev-libs/yajl )
+	json? ( =dev-libs/yajl-1* )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	macvtap? ( >=dev-libs/libnl-1.1 )
diff --git a/app-emulation/libvirt/libvirt-0.9.1_rc2.ebuild b/app-emulation/libvirt/libvirt-0.9.1_rc2.ebuild
index 5e2a664865a6..89fd24e4bcd6 100644
--- a/app-emulation/libvirt/libvirt-0.9.1_rc2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.1_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.1_rc2.ebuild,v 1.1 2011/05/02 21:39:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.1_rc2.ebuild,v 1.2 2011/05/03 20:16:42 flameeyes Exp $
 
 #BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -47,7 +47,7 @@ RDEPEND="sys-libs/readline
 	avahi? ( >=net-dns/avahi-0.6[dbus] )
 	caps? ( sys-libs/libcap-ng )
 	iscsi? ( sys-block/open-iscsi )
-	json? ( dev-libs/yajl )
+	json? ( =dev-libs/yajl-1* )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
 	macvtap? ( >=dev-libs/libnl-1.1 )