gentoo resync : 28.04.2019

3 files changed, 2 insertions, 86 deletions

diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 0515006fa4c6..24a919decf35 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -4,8 +4,6 @@ AUX qemu-ga.conf-r1 452 BLAKE2B 546799fefad91644acc0cee1e5c3f4adfb3f12cf48831a61
 AUX qemu-ga.init-r1 624 BLAKE2B 79416a272a89349e4174a4238fc7763fc1f116c7c4a2e7c4d41ba2bb8d0a41a2db1abb2053e307a257519af3163e3d603280d45f20e259ec1a1a9b090a9891fd SHA512 820ae4b04b9eeb2c8ac6128544f764af67b4462cc98377ceb37708130a5cae118bd3ed892a945fb25234a8d73fb98e60dbf5da3a44861fc56f97b66a3f12532e
 AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a0679a90805919aa4b7afac4f1d0c3bac72fcc5c7c0e0d87b227be8b1697338b827c890c56be77b07db SHA512 0fb39dd7ee528b36d8e837fbc53ba69476ba83947a4df10a9df03a02861a37d21f53865adbd3050c24aad72ec8a8bee1fb33f7382213d855884aff109f3c3789
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
-DIST qemu-2.12.0.tar.bz2 41196232 BLAKE2B f258e570558249ea647c3571908f90b8bacdcef9a1814009b98571cf0e96406194d44aa041fd0a97c9b673f39a9eaae8d873824745509778a6784cd85f8398b0 SHA512 91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346
 DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
-EBUILD qemu-guest-agent-2.12.0-r1.ebuild 1726 BLAKE2B ecf84ebaf79fb62a7d39cd971fe5669211f1915cc7f1bd71d3bcc272684ae61dea705ee6d7b3a3b47d6320db87b3666601bfed7f75204ee6ffec9e76c4c99d88 SHA512 bc380e7dd9773921b48669400fceff34d9b5a3ddba47814cdeafba99aac640650710501780f0e254d831748a6ea24f634463d8176d20545475a6fdf4d2244b8c
-EBUILD qemu-guest-agent-3.1.0.ebuild 1725 BLAKE2B 8497f71abb01bf8bee6922ac42757db471a1b4d09c83c35bbe8df62b70ffbae1ed8fc0ad93b660fc1da928d2b0f88c9cfea0431f21b7b32bfbbaafd171176d42 SHA512 4a0f7932d05810df1852988ee445bf498d88872315d309403ced9d5a96d5250a9b58ca030febd0fa21be118760473640b973e5c0436c820560d0ed3274e87660
+EBUILD qemu-guest-agent-3.1.0.ebuild 1721 BLAKE2B e5431c5fe7028db73468c19f209a631d3737a2591142820bc6407d73fd5ee35ff107b9f1e8083c05756aeab325fa3526070177bc61e790d400ec2a9b1b5fa714 SHA512 d1d75d7c7fd0bd84d675ae83d723dc8c1dd0932a9c9b950218486eb82065744a9958262de051df9f29ecd346f5979a870acb0d0c04f7b0407da1ed77021550e2
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild
deleted file mode 100644
index 753a720c1c90..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils systemd udev python-any-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
-
-DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
-HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-)
-
-src_configure() {
-	tc-export AR LD OBJCOPY
-
-	local myconf=(
-		--prefix=/usr
-		--sysconfdir=/etc
-		--libdir="/usr/$(get_libdir)"
-		--localstatedir=/
-		--disable-bsd-user
-		--disable-linux-user
-		--disable-system
-		--disable-strip
-		--disable-tools
-		--disable-werror
-		--enable-guest-agent
-		--python="${PYTHON}"
-		--cc="$(tc-getCC)"
-		--cxx="$(tc-getCXX)"
-		--host-cc="$(tc-getBUILD_CC)"
-	)
-	echo "./configure ${myconf[*]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	emake V=1 qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
-
-	# systemd stuff
-	udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
-
-	systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
-		qemu-guest-agent.service
-}
-
-pkg_postinst() {
-	elog "You should add 'qemu-guest-agent' to the default runlevel."
-	elog "e.g. rc-update add qemu-guest-agent default"
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
index f46f82dc4b43..00cdc52433d6 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-3.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit eutils systemd udev python-any-r1