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 252F5139897 for ; Tue, 25 Aug 2015 12:32:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2435AE0810; Tue, 25 Aug 2015 12:32:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEC18E0810 for ; Tue, 25 Aug 2015 12:31:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CE383408D4 for ; Tue, 25 Aug 2015 12:31:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06B04155 for ; Tue, 25 Aug 2015 12:31:54 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1440505867.7e0c96ad93482db849b855b6c179bb64bcf400dc.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/qjson/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/qjson/qjson-0.8.1-r1.ebuild X-VCS-Directories: dev-libs/qjson/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 7e0c96ad93482db849b855b6c179bb64bcf400dc X-VCS-Branch: master Date: Tue, 25 Aug 2015 12:31: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: 3f0b8683-f09f-407c-9e74-6dc663ee2f8c X-Archives-Hash: 63edc1e81ae34885a46653e4163ffceb commit: 7e0c96ad93482db849b855b6c179bb64bcf400dc Author: Davide Pesavento gentoo org> AuthorDate: Tue Aug 25 12:31:07 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Aug 25 12:31:07 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e0c96ad dev-libs/qjson: use qt4_get_bindir() Package-Manager: portage-2.2.20.1 dev-libs/qjson/qjson-0.8.1-r1.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-libs/qjson/qjson-0.8.1-r1.ebuild b/dev-libs/qjson/qjson-0.8.1-r1.ebuild index 71fde45..cfbc2b8 100644 --- a/dev-libs/qjson/qjson-0.8.1-r1.ebuild +++ b/dev-libs/qjson/qjson-0.8.1-r1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit cmake-multilib multilib +inherit cmake-multilib multilib qmake-utils DESCRIPTION="A library for mapping JSON data to QVariant objects" HOMEPAGE="http://qjson.sourceforge.net" @@ -24,8 +24,8 @@ DOCS=( ChangeLog README.md ) multilib_src_configure() { local mycmakeargs=( + -DQT_QMAKE_EXECUTABLE="$(qt4_get_bindir)/qmake" $(cmake-utils_use test QJSON_BUILD_TESTS) - -DQT_QMAKE_EXECUTABLE=/usr/$(get_libdir)/qt4/bin/qmake ) cmake-utils_src_configure @@ -33,9 +33,10 @@ multilib_src_configure() { multilib_src_compile() { cmake-utils_src_compile + use doc && if is_final_abi; then - cd "${S}"/doc || die "Failed to move inside doc directory" - doxygen Doxyfile || die "Generating documentation failed" + cd "${S}"/doc || die + doxygen Doxyfile || die fi }