gentoo resync : 30.06.2018

4 files changed, 5 insertions, 89 deletions

diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index c20e98c54202..09b74ab5708a 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -6,8 +6,6 @@ AUX qemu-ga.logrotate 128 BLAKE2B 99035fefeccc6334c0cd5ae16e8550a07cfe4256d2374a
 AUX qemu-guest-agent-2.5.0-sysmacros.patch 365 BLAKE2B 0468e23b64612b0a9375ab6d47bd40447003f151d7f9421d1338d66663af390d69af6a8f9233eab66a69b7d38868e9735a19eefd16dd65f42853e4919ed27046 SHA512 a608a3d96f03c54fcccb7bcb354f0deec4bcb570f03b8ac9044ca5c6ee7a6252ae7cac05fb142d7c95feecfbb17e0499bbc1d6935c3e3e9ea7db319c4c11f6ad
 DIST qemu-2.11.1.tar.bz2 32819412 BLAKE2B 6b6d4e7b8dcf33aeedb0b33bad267da07ad17c2eeeb5fbd2c038d760bc03224e55ba0f03eb248c62bc0e8636c2c660ea76b367eaea96bee16388053f82c8b8a9 SHA512 1b692bbdfc3dc785738c7192aa2a3f9cf53d9f5bf3b3f49fa8692050dc50f7056c8a4d1b527d48ffb2a674a0fd3a46d87addd1eaaa758f35eec1ab5adfe32354
 DIST qemu-2.12.0.tar.bz2 41196232 BLAKE2B f258e570558249ea647c3571908f90b8bacdcef9a1814009b98571cf0e96406194d44aa041fd0a97c9b673f39a9eaae8d873824745509778a6784cd85f8398b0 SHA512 91d829f44c431e4c1cd335f3efea5afff9da62d832b0296a92417463ea0826d09ce226c2ea8ac167fe7b99b6bb976c7cb1357aaf17735ee57af6602161e46346
-DIST qemu-2.5.0.tar.bz2 25464996 BLAKE2B c2d36ed938644cb9e3a3541c16ceb09f1bc5f4897bc01d8974722fc167b4e5362e6674760ca7d22a8b157b20505d7643e2eea3810469e180c003857833f650aa SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3
-EBUILD qemu-guest-agent-2.11.1.ebuild 1714 BLAKE2B 789b82429c9ff98a0e7053ac3e39b05a8a2721ee3c3c5a781b65921a76acd1d084a4c9ec96c23ce5f450f4e5a5368308b143330b97d2521cb9c15f01b069b3b3 SHA512 7828fe7a5917fc02576ced7258ffef87616b24b06ba4b128ebc77c2b5e7fc84b5c34104016234872cae876b1ad97c25259b6b42a8432cf7d4d68584fe61c4d8b
-EBUILD qemu-guest-agent-2.12.0.ebuild 1730 BLAKE2B 4e6ff3a86e2dc34d2398b207c97067cde0cb016d4860d39653d21e646f39597918b62b2cc6e083f4f71e61ec087917673545121962511eda769f85837823f4ea SHA512 1bba7b0a6e0cdfd03056f23dc22947b3158050002070d080ad8465db2bdc3a07c9b83020edfd8707e5eba16045620fbf76bf585ea96ed446a55b2a9639b1bd33
-EBUILD qemu-guest-agent-2.5.0.ebuild 1791 BLAKE2B a8177d254e948ca6d69c41e6b8c69ec01357f779c2fe8a88f07c2c53f48bf191bffef6e0d8aed5e63d1d0eabaa54137971aefb820ab6295a4d6c905cfa5c9592 SHA512 2fbb48f9835c602d42e027cdd50b33d1c62b946305b8bfd78fbdbe36c1c3ebc07e8d32e0ae10e76934db5dea9dfdfdba702c43e5e8deb3f5df037ce6f9dbba80
+EBUILD qemu-guest-agent-2.11.1.ebuild 1732 BLAKE2B 15ad8c35a7178c60d8c588f3e7fbfa81612f72447e597f8b4061a96c20bacad118cf9d7d459eb887c5c27c7a25c326015972260aa5ff07e09e82913db2e3ff0a SHA512 9d4431c543eb33672b9581f995e3cd8c7a02a50bc9701506ffe250eb4aed6f71ab88d6245be4175c130e7a7bb5b45b04d4510ee7495f0dec4185d24f7cea6024
+EBUILD qemu-guest-agent-2.12.0-r1.ebuild 1731 BLAKE2B 91b6d9f6900240536bb92051217a2ca5b73ac631df6a06cac00089bb5e3f33482ac923d24bb2beeda03e05ec0418ad4c45e7bbc701bf94a962a66449a3b79841 SHA512 bab85f27d0a2fb6ba46d52fb565b3c34e37040a750c0d2704c75c742d5e5ec1b3560e45840a9bc3ae2da5391e3f4a9b80b8ba9d217ef18c4f7f532d4d1c65664
 MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild
index 3f49bc33cf3c..b34558adc4a8 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.11.1.ebuild
@@ -44,6 +44,7 @@ src_configure() {
 		--disable-linux-user
 		--disable-system
 		--disable-strip
+		--disable-tools
 		--disable-werror
 		--enable-guest-agent
 		--python="${PYTHON}"
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild
index 026b8592bbb1..ec4616852a89 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.12.0-r1.ebuild
@@ -20,8 +20,7 @@ LICENSE="GPL-2 BSD-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-libs/glib
-	x11-libs/pixman"
+RDEPEND="dev-libs/glib"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
@@ -44,6 +43,7 @@ src_configure() {
 		--disable-linux-user
 		--disable-system
 		--disable-strip
+		--disable-tools
 		--disable-werror
 		--enable-guest-agent
 		--python="${PYTHON}"
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
deleted file mode 100644
index 7373d4702c89..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-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="http://wiki.qemu.org/Features/QAPI/GuestAgent"
-
-LICENSE="GPL-2 BSD-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22
-	!<app-emulation/qemu-1.1.1-r1
-	!<sys-apps/sysvinit-2.88-r5"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch #580924
-	epatch_user
-}
-
-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-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"
-}