Fix up libnl depends to use the 1.1 slot since libvirt uses the 1.1 API and not the new 3.x API. bug #388659

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

6 files changed, 19 insertions, 18 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 2a65511b4c84..4667fee465dd 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.136 2011/09/29 16:51:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.137 2011/10/27 18:57:28 cardoe Exp $
+
+  27 Oct 2011; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.3-r1.ebuild,
+  libvirt-0.9.4.ebuild, libvirt-0.9.6.ebuild, libvirt-9999.ebuild:
+  Fix up libnl depends to use the 1.1 slot since libvirt uses the 1.1 API and
+  not the new 3.x API. bug #388659
 
 *libvirt-0.9.6 (29 Sep 2011)
 
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 5c3ef09b9b4a..6f589a039969 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -9,9 +9,9 @@ DIST libvirt-0.9.3-backports-2.tar.bz2 2165 RMD160 445a2391fa10b76160ecb1d1d80ea
 DIST libvirt-0.9.3.tar.gz 15958983 RMD160 a01dbe29e23225706afcff74146aa3b224ba04bb SHA1 e25850d270a24441305dd92935209efa993b479d SHA256 4d673be9aa7b5618c0fef3cfdbbbeff02df1c83e26680fe40defad2b32a56ae3
 DIST libvirt-0.9.4.tar.gz 16643543 RMD160 a9edfdac715caac650520e5e12dd499f46e9957b SHA1 29e81c972ca7c3e73f4cecf84e77f68739ef00a2 SHA256 e76c026646ae4885b162bf711b854f36195f93538d6fcbee48479c2354a342af
 DIST libvirt-0.9.6.tar.gz 17326676 RMD160 5e0837e8ee770e017e574fd002e9e489e448ca65 SHA1 9fd108e1a351d191c5d7f89458096fb35bd6413e SHA256 ce29b1cd3067b224aa834fec2a93d7613c0e72bc035760ad536a2142430bc02b
-EBUILD libvirt-0.9.3-r1.ebuild 7767 RMD160 ed8a3e2ae63f03fe494cf9569ac20990a655e4d9 SHA1 91664cf8f0ff2efa495772ee24792d991530944e SHA256 d61e6045c9035863dd2a90e62ff09c2eb0495b1e3f0d5124db975c73c7f2e6de
-EBUILD libvirt-0.9.4.ebuild 7909 RMD160 4bfa72cf94baefcb0ca04988b17ad51dfe21fb3f SHA1 927769dcf09da943151ba436a4c975f3c6784cc2 SHA256 20d621a1f06eb94af5781349fdd6ba53e313a0c9705422aae157e6936849fd80
-EBUILD libvirt-0.9.6.ebuild 7909 RMD160 48a079a4090c8835634efa7bc191b6b88dd1f56f SHA1 58fdd6af11086ba6c33e715856e4bab58e7854df SHA256 d3b9f733f4a2620f92f9295711a97ecab129c0952f614a96729e5ea6d64fc6f1
-EBUILD libvirt-9999.ebuild 7909 RMD160 dd2212b2453844772433c5b240b77bd3e0384b20 SHA1 15c31374c1a9dcf06d3bc3b0ddcb7553d3fcb3c3 SHA256 141061feac936dfe139403f00f9b97dbbe349d40be36585a21a27646cb706d9d
-MISC ChangeLog 28668 RMD160 26ac645883da56c7f47f7d866b01c48de3ff2cfd SHA1 e99fee24389df35e32f5c4ee0cbe3bf2ce22f9c5 SHA256 47ab85a812cbbc1eb01ee290652f1156a93355eb12d5f65c11854e4ad68baafd
+EBUILD libvirt-0.9.3-r1.ebuild 7737 RMD160 b0b705ccca86b210cfc7d5edf85598293bf18899 SHA1 b57290a3779ebbf860c8d956641bdf75d211ca0f SHA256 4c092f4c6d57b127199dad40985bd98acc9607beda92b644c3069b5c60f98d16
+EBUILD libvirt-0.9.4.ebuild 7878 RMD160 c514dc4531ce263f9fdedf28314844908c96fe76 SHA1 8066a9146d9c2ea8615daaa356ef52c30a1bdff0 SHA256 692ab87250ba25a49c161eb1f2aca9266bf6062eed20d822664331d93e76652b
+EBUILD libvirt-0.9.6.ebuild 7878 RMD160 b2d89a590da15fb1993204cf5fad010e38d6263d SHA1 d16a10aadd0dd1e4cb6835c979d9735f1ed2da12 SHA256 c35c965cd2c89f92330789411826b605cfe1727403f07296dff3da679a5b33d6
+EBUILD libvirt-9999.ebuild 7878 RMD160 d24a6ba66653b0856ba513997c228f42d8b74dab SHA1 41cda5aa50fffa8be6ea51b1c332f08ab79f85c6 SHA256 69c221285995cccbe43d603fa3ab897b12c37345276a6e97a7a8ea9d113787af
+MISC ChangeLog 28924 RMD160 b6e48f787118ea24cc26fed5931cf44a0a195b55 SHA1 15e9d7e19e50ba156438de6cb920d969bccfb191 SHA256 7488e60936cfea69544f8e8cdd5678f531b47eedd7c31d64fd0e9341f48ed9ae
 MISC metadata.xml 3132 RMD160 066870c02fd835f9a633b69328367737d4cc0b71 SHA1 940cc910ef4d1a75947afef95d73a3026bb91527 SHA256 e0eb882799f41f51c9930a1142cf5427061bdacf629a028ac4e8b65c1cf67ea4
diff --git a/app-emulation/libvirt/libvirt-0.9.3-r1.ebuild b/app-emulation/libvirt/libvirt-0.9.3-r1.ebuild
index c203f5bb56d4..3925e081384c 100644
--- a/app-emulation/libvirt/libvirt-0.9.3-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.3-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.3-r1.ebuild,v 1.7 2011/08/26 09:40:57 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.3-r1.ebuild,v 1.8 2011/10/27 18:57:28 cardoe Exp $
 
 BACKPORTS=2
 AUTOTOOLIZE=yes
@@ -38,7 +38,7 @@ RDEPEND="sys-libs/readline
 	sys-libs/ncurses
 	>=net-misc/curl-7.18.0
 	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
+	>=dev-libs/libnl-1.1:1.1
 	>=net-libs/gnutls-1.0.25
 	sys-fs/sysfsutils
 	sys-apps/util-linux
@@ -50,7 +50,6 @@ RDEPEND="sys-libs/readline
 	json? ( dev-libs/yajl )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
 	nfs? ( net-fs/nfs-utils )
 	numa? ( >sys-process/numactl-2.0.2 )
 	openvz? ( sys-kernel/openvz-sources )
diff --git a/app-emulation/libvirt/libvirt-0.9.4.ebuild b/app-emulation/libvirt/libvirt-0.9.4.ebuild
index cf2897f754cc..7b4ccbdf9548 100644
--- a/app-emulation/libvirt/libvirt-0.9.4.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.4.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.4.ebuild,v 1.5 2011/09/14 15:10:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.4.ebuild,v 1.6 2011/10/27 18:57:28 cardoe Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -49,7 +49,7 @@ RDEPEND="sys-libs/readline
 	sys-libs/ncurses
 	>=net-misc/curl-7.18.0
 	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
+	>=dev-libs/libnl-1.1:1.1
 	>=net-libs/gnutls-1.0.25
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
@@ -60,7 +60,6 @@ RDEPEND="sys-libs/readline
 	json? ( dev-libs/yajl )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
 	nfs? ( net-fs/nfs-utils )
 	numa? ( >sys-process/numactl-2.0.2 )
 	openvz? ( sys-kernel/openvz-sources )
diff --git a/app-emulation/libvirt/libvirt-0.9.6.ebuild b/app-emulation/libvirt/libvirt-0.9.6.ebuild
index a7d8e7b9440e..f1bd288c5be7 100644
--- a/app-emulation/libvirt/libvirt-0.9.6.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.6.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.6.ebuild,v 1.1 2011/09/29 16:51:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.6.ebuild,v 1.2 2011/10/27 18:57:28 cardoe Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -49,7 +49,7 @@ RDEPEND="sys-libs/readline
 	sys-libs/ncurses
 	>=net-misc/curl-7.18.0
 	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
+	>=dev-libs/libnl-1.1:1.1
 	>=net-libs/gnutls-1.0.25
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
@@ -60,7 +60,6 @@ RDEPEND="sys-libs/readline
 	json? ( dev-libs/yajl )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
 	nfs? ( net-fs/nfs-utils )
 	numa? ( >sys-process/numactl-2.0.2 )
 	openvz? ( sys-kernel/openvz-sources )
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index f509617a18a5..0fb7bddb1ba1 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.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-9999.ebuild,v 1.10 2011/09/14 15:10:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.11 2011/10/27 18:57:28 cardoe Exp $
 
 #BACKPORTS=2
 #AUTOTOOLIZE=yes
@@ -49,7 +49,7 @@ RDEPEND="sys-libs/readline
 	sys-libs/ncurses
 	>=net-misc/curl-7.18.0
 	>=dev-libs/libxml2-2.7.6
-	>=dev-libs/libnl-1.1
+	>=dev-libs/libnl-1.1:1.1
 	>=net-libs/gnutls-1.0.25
 	>=sys-apps/util-linux-2.17
 	sys-devel/gettext
@@ -60,7 +60,6 @@ RDEPEND="sys-libs/readline
 	json? ( dev-libs/yajl )
 	libvirtd? ( net-misc/bridge-utils )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	macvtap? ( >=dev-libs/libnl-1.1 )
 	nfs? ( net-fs/nfs-utils )
 	numa? ( >sys-process/numactl-2.0.2 )
 	openvz? ( sys-kernel/openvz-sources )