Fix issue with paths being prefixed with /usr/local. Correctly move everything to /run from /var/run. Fix issue with daemon not starting up correctly due to missing options. Add GA_OPTIONS to init script config for other options like a --fsfreeze-hook. bug #480438. bug #480370.

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)

6 files changed, 36 insertions, 152 deletions

diff --git a/app-emulation/qemu-guest-agent/ChangeLog b/app-emulation/qemu-guest-agent/ChangeLog
index a544dd13eee8..a87b5daac69d 100644
--- a/app-emulation/qemu-guest-agent/ChangeLog
+++ b/app-emulation/qemu-guest-agent/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/qemu-guest-agent
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/ChangeLog,v 1.11 2013/08/09 16:56:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/ChangeLog,v 1.12 2013/08/11 21:36:56 cardoe Exp $
+
+*qemu-guest-agent-1.5.2-r1 (11 Aug 2013)
+
+  11 Aug 2013; Doug Goldstein <cardoe@gentoo.org> +files/qemu-ga.conf-r1,
+  +files/qemu-ga.init-r1, +qemu-guest-agent-1.5.2-r1.ebuild,
+  -files/qemu-ga.conf, -files/qemu-ga.init, -qemu-guest-agent-1.2.0.ebuild,
+  -qemu-guest-agent-1.4.2.ebuild, -qemu-guest-agent-1.5.2.ebuild:
+  Fix issue with paths being prefixed with /usr/local. Correctly move everything
+  to /run from /var/run. Fix issue with daemon not starting up correctly due to
+  missing options. Add GA_OPTIONS to init script config for other options like a
+  --fsfreeze-hook. bug #480438. bug #480370.
 
 *qemu-guest-agent-1.5.2 (09 Aug 2013)
 
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.conf b/app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1
index 228c0325444d..a1a78df3dea0 100644
--- a/app-emulation/qemu-guest-agent/files/qemu-ga.conf
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga.conf-r1
@@ -5,3 +5,7 @@
 # Specifies the device path for the communications back to QEMU on the host
 # Default: /dev/virtio-ports/org.qemu.guest_agent.0
 #GA_PATH="/dev/virtio-ports/org.qemu.guest_agent.0"
+
+# Additional options to qemu-guest-agent such as --fsfreeze-hook
+# See qemu-ga --help for more info
+#GA_OPTIONS="-F/etc/qemu/fsfreeze-hook"
diff --git a/app-emulation/qemu-guest-agent/files/qemu-ga.init b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1
index 83876308aea5..d9cd406ee1d4 100644
--- a/app-emulation/qemu-guest-agent/files/qemu-ga.init
+++ b/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/files/qemu-ga.init,v 1.2 2012/10/30 21:12:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/files/qemu-ga.init-r1,v 1.1 2013/08/11 21:36:56 cardoe Exp $
 
 start() {
     GA_METHOD=${GA_METHOD:-virtio-serial}
@@ -9,9 +9,9 @@ start() {
 
     ebegin "Starting QEMU Guest Agent"
 
-    start-stop-daemon --start --pidfile /var/run/qemu-ga.pid \
+    start-stop-daemon --start --pidfile /run/qemu-ga.pid \
         --exec /usr/bin/qemu-ga -- -m ${GA_METHOD} -p ${GA_PATH} \
-        -l /var/log/qemu-ga.log -d
+        -l /var/log/qemu-ga.log -d -f /run/qemu-ga.pid -t /run ${GA_OPTIONS}
 
     eend $?
 }
@@ -19,7 +19,7 @@ start() {
 stop() {
     ebegin "Stopping QEMU Guest Agent"
 
-    start-stop-daemon --stop --pidfile /var/run/qemu-ga.pid
+    start-stop-daemon --stop --pidfile /run/qemu-ga.pid
 
     eend $?
 }
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild
deleted file mode 100644
index 96ae218d16ff..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.2.0.ebuild,v 1.3 2013/02/10 21:47:50 cardoe Exp $
-
-EAPI=4
-
-inherit systemd udev python
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-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=""
-
-DEPEND=">=dev-libs/glib-2.22"
-RDEPEND="${DEPEND}
-	!<app-emulation/qemu-1.1.1-r1"
-PYTHON_DEPEND="2:2.4"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_configure() {
-	./configure --python=python2
-}
-
-src_compile() {
-	emake qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf" 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-1.4.2.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.4.2.ebuild
deleted file mode 100644
index 4f5b462394de..000000000000
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.4.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.4.2.ebuild,v 1.1 2013/06/03 02:16:12 cardoe Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-
-inherit systemd udev python-r1
-
-MY_PN="qemu"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-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"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_export_best
-}
-
-src_configure() {
-	./configure --python=${PYTHON}
-}
-
-src_compile() {
-	emake qemu-ga
-}
-
-src_install() {
-	dobin qemu-ga
-
-	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf" 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"
-
-	if has_version '<sys-apps/sysvinit-2.88-r5'; then
-		ewarn "The guest shutdown command will not work with <=sysvinit-2.88-r4"
-	fi
-}
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild
index a52163e1b7ad..17ab9507be0f 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2.ebuild,v 1.1 2013/08/09 16:56:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-guest-agent/qemu-guest-agent-1.5.2-r1.ebuild,v 1.1 2013/08/11 21:36:56 cardoe Exp $
 
 EAPI=5
 
@@ -51,7 +51,18 @@ src_prepare() {
 }
 
 src_configure() {
-	./configure --python=${PYTHON}
+	./configure \
+		--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}
 }
 
 src_compile() {
@@ -62,8 +73,8 @@ src_install() {
 	dobin qemu-ga
 
 	# Normal init stuff
-	newinitd "${FILESDIR}/qemu-ga.init" qemu-guest-agent
-	newconfd "${FILESDIR}/qemu-ga.conf" qemu-guest-agent
+	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