Add a dependency over libtirpc, or to an old glibc, for the RPC code. Closes bug #371247.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 27 insertions, 10 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index e27f3e6b1115..48445953a312 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.113 2011/06/07 17:22:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.114 2011/06/14 09:16:44 flameeyes Exp $
+
+  14 Jun 2011; Diego E. Pettenò <flameeyes@gentoo.org> libvirt-0.9.2.ebuild,
+  libvirt-9999.ebuild:
+  Add a dependency over libtirpc, or to an old glibc, for the RPC code. Closes
+  bug #371247.
 
   07 Jun 2011; Doug Goldstein <cardoe@gentoo.org> libvirt-0.9.2.ebuild,
   libvirt-9999.ebuild:
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index a96f8891d3c0..826c27deb286 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libvirtd.confd-r1 1248 RMD160 ebd5f28c671f2d26e9ff5d4879f959c11d72d7e3 SHA1 4789a80343f06b535d6bc27ef4206704c548c078 SHA256 851ab3f9678f0fa9c3ee03f7fc7bd00c4ee86d5f0777eecf9eb1ffe3243adfd1
 AUX libvirtd.confd-r2 1749 RMD160 30c662b9a14a3dc635674d0aee6452076da60102 SHA1 ae7a2b801ca0f9f610c015eb0fe06640596ac614 SHA256 93040599a7cb878b54b8b963ef4963e9450bc25e982e390cef3e5b7e8039757c
 AUX libvirtd.init-r1 2558 RMD160 d87b527e9917ef926045fa07e809dc4527f04af7 SHA1 b483a176d650cbf80d64d8da2b5165f62fc23e7f SHA256 03020823683a3374f05a0a45e023037433b2b6fc4c7c8d52ed90f61f3d3f5b7b
@@ -15,7 +18,14 @@ EBUILD libvirt-0.8.5-r2.ebuild 7275 RMD160 c2566e468d932ea0d0cca5d863c310b6b50a2
 EBUILD libvirt-0.8.8-r1.ebuild 7556 RMD160 b9069b101450bb1467c2b26db7e0ad32ec976f96 SHA1 a841c56d986ea16d4c305f1ffcf8f2d074dc8f01 SHA256 7cb3ee82f9ff77e1b90f4638356a7d64d584930d36bad68979af14f9fe543b23
 EBUILD libvirt-0.9.0-r1.ebuild 7681 RMD160 b0df411901f90f1a5e8835b32f4d4a30ea36049d SHA1 5c060c288de13fd3b59f44e7dd718ab4f1b68375 SHA256 0f27aada9c593aa1b427fe3631807d4eafc560b4c31e7a0be5057a39bd9af8b7
 EBUILD libvirt-0.9.1.ebuild 7678 RMD160 e1e4b1da74c1b831f3cabb5d2f7fa60fd3d879bc SHA1 40c43cb9e3415bf865dc8c5bf87613fe9fe2bf53 SHA256 c674aa642a429a14b27fb8f922d886618073773a5502e187e59206009eaa897d
-EBUILD libvirt-0.9.2.ebuild 7748 RMD160 2b9f047e67aa7f781ae62406d1a63051b47e892f SHA1 f4aec20b0e384a9d959a6d8a8604b631d3621df3 SHA256 a54a81abc01abafc62f1d2f244fccbf96e4cae78b463ea8f44c29c2cbce1e6b9
-EBUILD libvirt-9999.ebuild 8081 RMD160 3f3177295f6831dee234d7a16ad3d8ca92b7c356 SHA1 285e9f556dc69dc95cfe35b596200e3531e91f54 SHA256 b41a23146ec19aefb73b02bf13e972c266a0b63b83ac98e2d7eddf67f2865142
-MISC ChangeLog 24702 RMD160 61fbdd903547c7ca7d21236c78411f477ab22ed3 SHA1 3ddbe0352dc37a1006f1a963a29aed4e5c4289ac SHA256 ccbf4cdfe91d90d567d3b1a73007d0471b0d79248a8809e214f2971fb8e2bf02
+EBUILD libvirt-0.9.2.ebuild 7838 RMD160 99628f4eb540aefd676f4755b96b3c9a2fea3569 SHA1 00770331ae8807b2f82df3d87bc4fca3a970d843 SHA256 d37747175b880ec85e30505cde5035e09852411a1f15e75138d00de0c1c007aa
+EBUILD libvirt-9999.ebuild 8171 RMD160 ac13bcd271c74c21a63c2b9b543729cfcc38f8f7 SHA1 f8fb922627e129c6179b417c703fb66b02741fb2 SHA256 fa44539bde5dc92c77f64f65b4dcfe7dd64eea38fcf17bfcab4645762785a18f
+MISC ChangeLog 24901 RMD160 3edaa6b19475aa635ef3b44f7a5c5fe855a272b9 SHA1 13956fd85320a4e88825f4ee60a9b3e0b749f634 SHA256 58e4848746dc4adad2eb3d8b200cc968f11bd9a6d489297cdb164cb9002ce9ad
 MISC metadata.xml 3068 RMD160 9a801cf744b0168424ff86f38a812c7025279f5b SHA1 98c14395869b353a11b605942a66aa8cb980a974 SHA256 0304a7cfd9c8e8a8ce5b2a9f25027570d4a4e6f334afbeb15822d249827e2aed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk33JuEACgkQAiZjviIA2XgCLwCePrzI5vOKSdjj2O9dN3avfEWf
+hU0AnjPr7/shu5yyakGRC5x1qU6+GvXf
+=XGDG
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-0.9.2.ebuild b/app-emulation/libvirt/libvirt-0.9.2.ebuild
index d872d86e4c55..590da2cf74f8 100644
--- a/app-emulation/libvirt/libvirt-0.9.2.ebuild
+++ b/app-emulation/libvirt/libvirt-0.9.2.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.2.ebuild,v 1.2 2011/06/07 17:22:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.2.ebuild,v 1.3 2011/06/14 09:16:44 flameeyes Exp $
 
 #BACKPORTS=1
 #AUTOTOOLIZE=yes
@@ -29,7 +29,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
-	uml virtualbox virt-network xen"
+	uml virtualbox virt-network xen elibc_glibc"
 # IUSE=one : bug #293416 & bug #299011
 
 # gettext.sh command is used by the libvirt command wrappers, and it's
@@ -70,7 +70,8 @@ RDEPEND="sys-libs/readline
 	virt-network? ( net-dns/dnsmasq
 		>=net-firewall/iptables-1.4.10
 		net-firewall/ebtables
-		sys-apps/iproute2 )"
+		sys-apps/iproute2 )
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 14072050297d..2ee9ca539c0f 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.6 2011/06/07 17:22:27 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.7 2011/06/14 09:16:44 flameeyes Exp $
 
 #BACKPORTS=1
 
@@ -35,7 +35,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="avahi caps debug iscsi +json +libvirtd lvm +lxc macvtap nfs \
 	nls numa openvz parted pcap phyp policykit python qemu sasl selinux udev \
-	uml virtualbox virt-network xen"
+	uml virtualbox virt-network xen elibc_glibc"
 # IUSE=one : bug #293416 & bug #299011
 
 RDEPEND="sys-libs/readline
@@ -73,7 +73,8 @@ RDEPEND="sys-libs/readline
 	virt-network? ( net-dns/dnsmasq
 		>=net-firewall/iptables-1.4.10
 		net-firewall/ebtables
-		sys-apps/iproute2 )"
+		sys-apps/iproute2 )
+	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
 # one? ( dev-libs/xmlrpc-c )
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig