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 24B0A1396D9 for ; Tue, 17 Oct 2017 14:41:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 326AAE0EC9; Tue, 17 Oct 2017 14:41:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0F44AE0EC9 for ; Tue, 17 Oct 2017 14:41:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AEC1633BF51 for ; Tue, 17 Oct 2017 14:41:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 21CA7805 for ; Tue, 17 Oct 2017 14:41:24 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1508251251.a9c0225c729f3bddd3a06986a2b0ed1ad5d0a91a.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/waylandpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/waylandpp/waylandpp-9999.ebuild X-VCS-Directories: dev-cpp/waylandpp/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: a9c0225c729f3bddd3a06986a2b0ed1ad5d0a91a X-VCS-Branch: master Date: Tue, 17 Oct 2017 14:41:24 +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: 285c219a-481b-4591-a653-b3abd37d3a5c X-Archives-Hash: 59cd3c01610a3b85e1c72e879d4a6948 commit: a9c0225c729f3bddd3a06986a2b0ed1ad5d0a91a Author: Craig Andrews gentoo org> AuthorDate: Tue Oct 17 14:40:29 2017 +0000 Commit: Craig Andrews gentoo org> CommitDate: Tue Oct 17 14:40:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9c0225c dev-cpp/waylandpp: use cmake instead of scons Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-cpp/waylandpp/waylandpp-9999.ebuild | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild index 1dd04bc09c5..73572d42b7a 100644 --- a/dev-cpp/waylandpp/waylandpp-9999.ebuild +++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit scons-utils toolchain-funcs versionator +inherit cmake-utils versionator DESCRIPTION="Wayland C++ bindings" HOMEPAGE="https://github.com/NilsBrause/waylandpp" @@ -31,19 +31,11 @@ DEPEND="${RDEPEND} ) " -src_compile() { - CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" LIBDIR="$(get_libdir)" escons - if use doc; then - doxygen || die "error making docs" - fi -} +src_configure() { + local mycmakeargs=( + -DBUILD_DOCUMENTATION=$(usex doc) + -DINSTALL_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + ) -src_install() { - CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" PREFIX="/usr" LIBDIR="$(get_libdir)" escons install - # fix multilib-strict QA failures - if use doc; then - doman doc/man/man3/*.3 - local HTML_DOCS=( doc/html ) - einstalldocs - fi + cmake-utils_src_configure }