From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2B32138330 for ; Wed, 5 Oct 2016 13:24:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E59CCE08F8; Wed, 5 Oct 2016 13:24:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA62BE08F8 for ; Wed, 5 Oct 2016 13:24:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C8F234112E for ; Wed, 5 Oct 2016 13:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 327B9248B for ; Wed, 5 Oct 2016 13:24:04 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1475673773.92b8c417d8bbeb6b531cb1cfd08ac6fc79aa40d5.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openvswitch/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openvswitch/openvswitch-2.6.0.ebuild X-VCS-Directories: net-misc/openvswitch/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 92b8c417d8bbeb6b531cb1cfd08ac6fc79aa40d5 X-VCS-Branch: master Date: Wed, 5 Oct 2016 13:24:04 +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: 32a4485f-211a-4319-875b-5218c2e620d6 X-Archives-Hash: d0c30d369e3469fd771b72632b5b5e9c commit: 92b8c417d8bbeb6b531cb1cfd08ac6fc79aa40d5 Author: Matthew Thode gentoo org> AuthorDate: Wed Oct 5 13:22:53 2016 +0000 Commit: Matt Thode gentoo org> CommitDate: Wed Oct 5 13:22:53 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b8c417 net-misc/openvswitch: fixing it for the last time I hope Package-Manager: portage-2.3.0 net-misc/openvswitch/openvswitch-2.6.0.ebuild | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-misc/openvswitch/openvswitch-2.6.0.ebuild b/net-misc/openvswitch/openvswitch-2.6.0.ebuild index b2c629c..721111b 100644 --- a/net-misc/openvswitch/openvswitch-2.6.0.ebuild +++ b/net-misc/openvswitch/openvswitch-2.6.0.ebuild @@ -107,8 +107,12 @@ src_install() { fperms 0750 /etc/ssl/openvswitch rm -rf "${ED}var/run" || die "rm failed" - ! use monitor && rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" - ! use debug && rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" + if ! use monitor ; then + rmdir "${ED}usr/share/ovsdbmonitor" || die "rm failed" + fi + if ! use debug ; then + rm "${ED}usr/bin/ovs-parse-leaks" die "rm failed" + fi newconfd "${FILESDIR}/ovsdb-server_conf2" ovsdb-server newconfd "${FILESDIR}/ovs-vswitchd_conf" ovs-vswitchd