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 86A2C1396D0 for ; Wed, 23 Aug 2017 16:28:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2FE4E0D43; Wed, 23 Aug 2017 16:28:30 +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 91914E0D43 for ; Wed, 23 Aug 2017 16:28:30 +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 08AAF3417C9 for ; Wed, 23 Aug 2017 16:28:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 690887FF1 for ; Wed, 23 Aug 2017 16:28:27 +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: <1503505698.ee14e170f16813fd85379f7d5617db3b6c5b3b8d.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-0.1.0.ebuild 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: ee14e170f16813fd85379f7d5617db3b6c5b3b8d X-VCS-Branch: master Date: Wed, 23 Aug 2017 16:28:27 +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: 40acb846-aa31-4aac-b33c-8f898099276b X-Archives-Hash: 5f09b20b22e978bcb2bd00ac58fc2a9b commit: ee14e170f16813fd85379f7d5617db3b6c5b3b8d Author: Craig Andrews gentoo org> AuthorDate: Wed Aug 23 16:27:31 2017 +0000 Commit: Craig Andrews gentoo org> CommitDate: Wed Aug 23 16:28:18 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee14e170 dev-cpp/waylandpp: ebuild cleanup Note that none of these changes modify the installed image or the ebuild metadata so no revbump is required. Package-Manager: Portage-2.3.8, Repoman-2.3.3 dev-cpp/waylandpp/waylandpp-0.1.0.ebuild | 15 +++++++-------- dev-cpp/waylandpp/waylandpp-9999.ebuild | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild index a85f301bf9f..846643b6113 100644 --- a/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild +++ b/dev-cpp/waylandpp/waylandpp-0.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit multilib scons-utils toolchain-funcs versionator +inherit scons-utils toolchain-funcs versionator DESCRIPTION="Wayland C++ bindings" HOMEPAGE="https://github.com/NilsBrause/waylandpp" @@ -18,34 +18,33 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/waylandpp-${PV}" fi -COMMON_DEPEND=" +RDEPEND=" >=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} doc? ( app-doc/doxygen media-gfx/graphviz ) " -RDEPEND="${COMMON_DEPEND}" src_compile() { - CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" escons + CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons if use doc; then doxygen || die "error making docs" fi } src_install() { - PREFIX="${D%/}/usr" scons install + CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install # fix multilib-strict QA failures mv "${ED%/}"/usr/{lib,$(get_libdir)} || die if use doc; then doman doc/man/man3/*.3 - HTML_DOCS="doc/html" einstalldocs + local HTML_DOCS=( doc/html ) + einstalldocs fi } diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild b/dev-cpp/waylandpp/waylandpp-9999.ebuild index a85f301bf9f..846643b6113 100644 --- a/dev-cpp/waylandpp/waylandpp-9999.ebuild +++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit multilib scons-utils toolchain-funcs versionator +inherit scons-utils toolchain-funcs versionator DESCRIPTION="Wayland C++ bindings" HOMEPAGE="https://github.com/NilsBrause/waylandpp" @@ -18,34 +18,33 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/waylandpp-${PV}" fi -COMMON_DEPEND=" +RDEPEND=" >=dev-libs/wayland-1.11.0 media-libs/mesa[wayland] " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} doc? ( app-doc/doxygen media-gfx/graphviz ) " -RDEPEND="${COMMON_DEPEND}" src_compile() { - CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" escons + CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons if use doc; then doxygen || die "error making docs" fi } src_install() { - PREFIX="${D%/}/usr" scons install + CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${D%/}/usr" escons install # fix multilib-strict QA failures mv "${ED%/}"/usr/{lib,$(get_libdir)} || die if use doc; then doman doc/man/man3/*.3 - HTML_DOCS="doc/html" einstalldocs + local HTML_DOCS=( doc/html ) + einstalldocs fi }