From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 603221381F3 for ; Fri, 26 Jul 2013 16:03:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1C41FE0A5B; Fri, 26 Jul 2013 16:03:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72898E0A5B for ; Fri, 26 Jul 2013 16:03:56 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 67A7433EA7D for ; Fri, 26 Jul 2013 16:03:55 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2332) id 2CF032171D; Fri, 26 Jul 2013 16:03:54 +0000 (UTC) From: "Ian Delaney (idella4)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, idella4@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/xen-tools: xen-tools-4.3.0.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: xen-tools-4.3.0.ebuild ChangeLog X-VCS-Directories: app-emulation/xen-tools X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130726160354.2CF032171D@flycatcher.gentoo.org> Date: Fri, 26 Jul 2013 16:03:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2dd70535-fd7f-44c3-9133-0bfa38981434 X-Archives-Hash: 6c348e8d1148c7a3d07297d0733bd4ad idella4 13/07/26 16:03:54 Modified: xen-tools-4.3.0.ebuild ChangeLog Log: Alternate fix of file collision with qemu-bridge-helper with corresponding patch wrt Bug #478064 (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) Revision Changes Path 1.12 app-emulation/xen-tools/xen-tools-4.3.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild?r1=1.11&r2=1.12 Index: xen-tools-4.3.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xen-tools-4.3.0.ebuild 25 Jul 2013 15:09:55 -0000 1.11 +++ xen-tools-4.3.0.ebuild 26 Jul 2013 16:03:53 -0000 1.12 @@ -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/xen-tools/xen-tools-4.3.0.ebuild,v 1.11 2013/07/25 15:09:55 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.0.ebuild,v 1.12 2013/07/26 16:03:53 idella4 Exp $ EAPI=5 @@ -68,9 +68,7 @@ ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) - qemu? ( x11-libs/pixman - !app-emulation/qemu )" - + qemu? ( x11-libs/pixman )" RDEPEND="${CDEPEND} sys-apps/iproute2 net-misc/bridge-utils @@ -217,6 +215,12 @@ # Bug 477676 epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch + # Prevent file collision with qemu package Bug 478064 + if use qemu; then + epatch "${FILESDIR}"/qemu-bridge.patch + mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die + fi + epatch_user } @@ -357,8 +361,14 @@ fi if use xend; then - echo - elog "xend capability has been enabled and installed" + elog"";elog "xend capability has been enabled and installed" + fi + + if use qemu; then + elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source" + elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently" + elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" + elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise" fi if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then 1.180 app-emulation/xen-tools/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.180&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?rev=1.180&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/xen-tools/ChangeLog?r1=1.179&r2=1.180 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- ChangeLog 25 Jul 2013 15:09:55 -0000 1.179 +++ ChangeLog 26 Jul 2013 16:03:53 -0000 1.180 @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/xen-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.179 2013/07/25 15:09:55 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.180 2013/07/26 16:03:53 idella4 Exp $ + + 26 Jul 2013; Ian Delaney +files/qemu-bridge.patch, + xen-tools-4.3.0.ebuild: + Alternate fix of file collision with qemu-bridge-helper with corresponding + patch wrt Bug #478064 25 Jul 2013; Ian Delaney files/xenstored.initd, xen-tools-4.3.0.ebuild: