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 BE9C2138334 for ; Mon, 15 Apr 2019 23:35:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAFACE0AA3; Mon, 15 Apr 2019 23:35:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC107E0AA3 for ; Mon, 15 Apr 2019 23:35:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F745341312 for ; Mon, 15 Apr 2019 23:35:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB17A503 for ; Mon, 15 Apr 2019 23:35:38 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1555371328.4bc040f0ae3b7c98d4c7fdb525f49b5a29f7e2df.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-12.2.12-r1.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 4bc040f0ae3b7c98d4c7fdb525f49b5a29f7e2df X-VCS-Branch: master Date: Mon, 15 Apr 2019 23:35:38 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9632f9e8-b5e0-49fe-8c25-991cf69b8946 X-Archives-Hash: 68af04514a79740d56eade6479329db2 commit: 4bc040f0ae3b7c98d4c7fdb525f49b5a29f7e2df Author: Patrick McLean sony com> AuthorDate: Mon Apr 15 23:35:28 2019 +0000 Commit: Patrick McLean gentoo org> CommitDate: Mon Apr 15 23:35:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bc040f0 sys-cluster/ceph: Another merge issue Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Patrick McLean gentoo.org> sys-cluster/ceph/ceph-12.2.12-r1.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild index 24b436de237..5a7ad336c75 100644 --- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild @@ -141,9 +141,6 @@ PATCHES=( "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) -# dpdk and ninja don't get along -CMAKE_MAKEFILE_GENERATOR="emake" - check-reqs_export_vars() { if use amd64; then CHECKREQS_DISK_BUILD="12G"