switch to git-r3; cleanup

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

3 files changed, 27 insertions, 35 deletions

diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog
index 855ea11cd4c7..d29d79ced4de 100644
--- a/app-emulation/libvirt/ChangeLog
+++ b/app-emulation/libvirt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/libvirt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.384 2014/11/08 17:24:40 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.385 2014/11/08 18:00:44 tamiko Exp $
+
+  08 Nov 2014; Matthias Maier <tamiko@gentoo.org> libvirt-9999.ebuild:
+  switch to git-r3; cleanup
 
   08 Nov 2014; Matthias Maier <tamiko@gentoo.org> libvirt-9999.ebuild:
   disable -Werror for live builds; minor cleanup
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index d681d13b3029..8b4dea339f7a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -13,23 +13,23 @@ DIST libvirt-1.2.9.tar.gz 30154430 SHA256 95931a5a52f451b9ab73d6a5ae11a5740e1ba6
 EBUILD libvirt-1.2.10.ebuild 13061 SHA256 4804bb54d0004985d81c481804a2194c619ddc5bc1c1ce7f95cd4e92f105a80c SHA512 8b1f46e1d90daa7d3079da724cf49c55c63a1e7ed146a4342f51586c6dccb427fc4dc20c50b53061668fa31aeab9b2c0d97e7bf304c9f79179d6502d8fecea0f WHIRLPOOL 5e063d2d7f41d8fae688853d6ade4a4287deae32b634b8bb5ba49407397506a7007b34a36b65796807b2f4be52c7313a0af0be5409590392f729836e161bf4bc
 EBUILD libvirt-1.2.9-r2.ebuild 13056 SHA256 40f6404ed96588700e79510e644bdd594a741cbdb43f6bc7087f0643bb213cbf SHA512 5694dcd7d6115f86abf322bef9223a41cce1047ef59ad99c4befe209083d80b376c763588d88aec29975cddfbacd399240567f0b089b29854440aba45fd1512a WHIRLPOOL c2cbfad1acc7d42305b16c443bfe349662575cb823cfd3ffe0b764eddb4b08c4527483ab3fa740302ac12b5269a3d0d125eeee02ab00ce0bc84c60c1d5445ac6
 EBUILD libvirt-1.2.9.ebuild 12535 SHA256 15119a80b32e4c38f60ca171acdb2f81a32bd4a52eb0f0ec509cc60fa0942443 SHA512 28164fde352359c4f5cc52859eb26ea836c61fb24b9bf196a48e70eea09b8963bb11cfcce67452f4a6aec65602d8b6b7c94dfb2ae6671cf198f117a5bcb3b185 WHIRLPOOL 3b85c9512cc647493ac1b7d2dd17273e1db2b8e17c973e3af1c88e836bb927c105527c426f586c27bcf765600d2e8e46a598da4f36e6e501fa90e933692934ce
-EBUILD libvirt-9999.ebuild 12682 SHA256 7647242f90c1cb9d518ba5c875b1fc8ec4e17614a0c26a6ffa5146b5c2532222 SHA512 31c80175c78d241c4232a3afa27d4a6e0ca50bcecbf83813446dd902029cfc988135f8c001d3548e5ad39ef1a9e6bfa5e4624d83d1a5123c1116834e5353bfb8 WHIRLPOOL f0e94f2491f0acc0d641f18523205c57c6b62bdd25af3aa1933d0cd53eaecd5bb20fd5971410bbf8a8b063420731ff5d5bb2def13c47e3ac564e102cc966c344
-MISC ChangeLog 21541 SHA256 e99b321096eee0b888a7e10cc460184c2a28301726242797175c7a063b01e7bb SHA512 2d01923b3379a558d72ee073d63f668c01d071add2d4196b1d4639754d970b2d6608682a187f6ae76162e5437418bf95753211e8ff83bd959d4bfb32aa0d6885 WHIRLPOOL 190a3de48c6ac7123fa88241aeadb6caaab6f4114c1b54eda162c5aee4fdb9c3f455e8242498481db51f12d70f77f23269d323ea68314f20311183887b43b25e
+EBUILD libvirt-9999.ebuild 12390 SHA256 908462a1e21fcd3329dd2f92f8dc458d50e665b2a79c52abbf760e134751db7a SHA512 8a8801c57a2f0a4c10be21fc324e7f15426c1476fb84edab6553fb82022506a254dcba1dbd2ad096f1687eb94f0356907597559946e07c30fac01911d0896c20 WHIRLPOOL ec30fba829c0ab949d4cda1510681aff803b2b213901b52650a49c4406ed87acd2551a6367fd36513549dabf137f6c241cb778b9facce8b08ad0c3c27fbd8c78
+MISC ChangeLog 21641 SHA256 d4ed127f0ae58a0db92641718a3f593c39cf81c9b1649782d06d0e5837a28f0f SHA512 c177ffe8341ecab6837a9a7e174a30d3cfd12148be122fb2e20c9531d91c838a3c1e4cb1805d5245868e4307fe0d3456e800d32c5d7dd5276f2cdc36eb49d8c7 WHIRLPOOL 3c65b6ba73ee08ba8f88ee3d38d0eb667b5189f14fb71062111b7b3b646a0cef928cbb3b3d95fa25029731be492b54fc9f37ba00ab9d76def6111dbe06aa6a67
 MISC metadata.xml 3736 SHA256 376b65feea8c2f85dccad2e564cc6111f2dc2de2a3b785a4c10af8c95c4920ee SHA512 93933d1ddfce67739e0647adce2f9253ae596429c794b73562737b508400a0fa7af93eae06808b088888b1d44f421ce4765cc6b56b9b5356140af80ca36bebfc WHIRLPOOL 7ef396db2e624c2798ba30ad4b8099237fb699c5e94cd1470ec6161a068f1e815930a87104545b4b98183784465a9a5f9dc051beb99ef1c5731e61f42f5c7381
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUXlHeAAoJELhOzYlK7nn/SvcP/jlBFG6xDTwV6eOdfnnDB76i
-i9+zjAgz+o8yZb+4o25U9P84cJ8CLsUOIVR19fZvHRaSSlAZ3jYBLQho9EIW/ktg
-y6NrO4m4lezAyTJh/0BQBq8ZGRRqpuYKLhSdGLfp6zoPPushWgNn9HLpq/vojrJV
-zBl5bfOBC/+ciTYaSEI2KGpFKQ3/gNaMQ5/bqI7OZR8Tqx0D749ZVapGhS3snZa6
-WXcau6h6ncWkdRAs7fwrikc5Y4e8/RSOvlBk01k41zcvC42KzvDR5j1AqlmIWPU1
-QYZfIvlLIscSLvKZAE4pW4AcC/xFYYziO9pz9m6Y4Uh5yLt3ZMeR9+JhvyVJEckG
-iVaYAfqxL68eo/y5668qSYl9vM0/KxrNTTOfq2b2RH7qLgEsJY8O3pH4HkF8QWH2
-DYmRrJE1OKPLrND7p3te6EPlX60Nkn4CtHopg+Sl+9WnreLx5Kqjh7gVXrSUcf37
-PkJW+GfFStjIpylZbo44EjHPdDtN4pUgkypu6/eJoaSKlPwAglSNPVuW68NKsN4l
-2xkRTaRBewqIW+s/DeAUbSyrZijzUoVyCi7YDIt4wm/zQKQtn2wBm86E2/dbklHI
-+UfY1GQunl4p80XRr8FkF0CH6K3ARNPculjOPNwd3Oya0ly/6va9sdW/3ikNb24k
-9Gn9ttAvnMJjdvfe7pNc
-=tVwW
+iQIcBAEBCAAGBQJUXlpSAAoJELhOzYlK7nn/vGMP/R/oI3wVLPXsBQbbmCUnLxhF
+/7P4JD/S97AcRbcHZSCqFfDnTLN3FSUAyB/0vm/gPjzfozfaYq6Wvlfyxm3AQvfR
+5rmoqWG8DIP4Ja4r2j/PKrO/6lHz4YPjOYcpvC1NfIE/5T7tN0zrIkGv5ITbapPd
+tIsjfuX7J0//WM0ToLAtW4sYDMqUXflDG2jsO6jdUCvtlKxshUeIxC8zZW8ahBAE
+JmoloppsOmW/NaojIRfpAnHkyhQSh4hFjv5S5Z1ZfJ5pI/nTKJUUt0Av1nKPIjuS
+e406y/PDCwn/58pNTX164lkxuHMBZTk2hkHKYMVqZZY7eBvHgb/pkCK6pZBRNX1k
+b+S8TMIAe6FWd0LRb8mq6YkdeRt57GB+qzy/sF8teXm8u6o/twcMxJCpGj1JWWRr
+FIVGvyGirHJ7hq1m7IYPrmEjjErD51+OjeTlPE3l7623Pco2xausfojg/0sj7UxJ
++XmorbuldfaAZG7FEQPCOxrdBaR740DiMcbqWUYXZAMCSmS+dGRY++rawHW9y3uv
+r1Pc924NjyAwhOIo0GNtSUIfHvpSJtpLiUaBHAc2Gdz8lH+6lePf9hYZgMLKG3h3
+egaAW+kufTNOb8PremlXCzXoPg7+OcGlHqqgaMjgFU4HDALo3aoHJhB5EutboijP
+gvy+KaQCAmzi9ReJV8lL
+=FeLU
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 1180e825deea..7361f0fd0c8b 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2014 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.65 2014/11/08 17:24:40 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.66 2014/11/08 18:00:44 tamiko Exp $
 
 EAPI=5
 
-#BACKPORTS=062ad8b2
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
@@ -12,16 +11,13 @@ MY_P="${P/_rc/-rc}"
 inherit eutils user autotools linux-info systemd readme.gentoo
 
 if [[ ${PV} = *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
 	SRC_URI=""
 	KEYWORDS=""
 else
 	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+		ftp://libvirt.org/libvirt/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 S="${WORKDIR}/${P%_rc*}"
@@ -103,7 +99,7 @@ RDEPEND="sys-libs/readline
 		firewalld? ( net-firewall/firewalld )
 	)
 	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
+
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	app-text/xhtml1
@@ -116,8 +112,8 @@ including but not limited to NATed network, you can enable the
 'virt-network' USE flag.\n\n
 If you are using dnsmasq on your system, you will have
 to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
+	bind-interfaces\n
+	interface or except-interface\n\n
 Otherwise you might have issues with your existing DNS server."
 
 LXC_CONFIG_CHECK="
@@ -206,12 +202,8 @@ pkg_setup() {
 
 src_prepare() {
 	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
 
 	if [[ ${PV} = *9999* ]]; then
-
 		# git checkouts require bootstrapping to create the configure script.
 		# Additionally the submodules must be cloned to the right locations
 		# bug #377279
@@ -222,8 +214,7 @@ src_prepare() {
 		) >.git-module-status
 	fi
 
-	epatch \
-		"${FILESDIR}"/libvirt-1.2.9-do_not_use_sysconf.patch
+	epatch "${FILESDIR}"/libvirt-1.2.9-do_not_use_sysconf.patch
 
 	epatch_user
 
@@ -292,6 +283,7 @@ src_configure() {
 
 	# udev for device support details
 	myconf+=" $(use_with udev)"
+	myconf+=" --without-hal"
 
 	# linux capability support so we don't need privileged accounts
 	myconf+=" $(use_with caps capng)"
@@ -327,9 +319,6 @@ src_configure() {
 	## stuff we don't yet support
 	myconf+=" --without-netcf"
 
-	# we use udev over hal
-	myconf+=" --without-hal"
-
 	# locking support
 	myconf+=" --without-sanlock"