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 B475E138334 for ; Fri, 18 Jan 2019 12:40:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1E14E0BD0; Fri, 18 Jan 2019 12:40:20 +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 6B68AE0BD0 for ; Fri, 18 Jan 2019 12:40:20 +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 04A97335CDB for ; Fri, 18 Jan 2019 12:40:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0411D4D3 for ; Fri, 18 Jan 2019 12:40:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1547815189.6193a852d7a16148e5cdbc2f69f618834df5925d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/, media-gfx/exiv2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/exiv2/exiv2-0.27.0-r2.ebuild media-gfx/exiv2/files/exiv2-0.27.0-doc.patch X-VCS-Directories: media-gfx/exiv2/files/ media-gfx/exiv2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6193a852d7a16148e5cdbc2f69f618834df5925d X-VCS-Branch: master Date: Fri, 18 Jan 2019 12:40:10 +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: 98015b42-97a2-46ba-863c-2fe544e328bc X-Archives-Hash: bb520a5e159d5b9d6ce7c5577dc153ca commit: 6193a852d7a16148e5cdbc2f69f618834df5925d Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 18 12:33:47 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 18 12:39:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6193a852 media-gfx/exiv2: Fix USE doc Closes: https://bugs.gentoo.org/675740 Package-Manager: Portage-2.3.56, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/exiv2/exiv2-0.27.0-r2.ebuild | 17 ++++++----------- media-gfx/exiv2/files/exiv2-0.27.0-doc.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild index 4b30b442529..80de16822e2 100644 --- a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild @@ -47,10 +47,9 @@ DOCS=( README.md doc/ChangeLog doc/cmd.txt ) S="${S}-Source" PATCHES=( - # pending upstream - "${FILESDIR}"/${P}-png-broken-icc-profile.patch - # bug 675240 - "${FILESDIR}"/${P}-fix-pkgconfig.patch + "${FILESDIR}"/${P}-png-broken-icc-profile.patch # pending upstream + "${FILESDIR}"/${P}-fix-pkgconfig.patch # bug 675240 + "${FILESDIR}"/${P}-doc.patch # bug 675740 ) pkg_setup() { @@ -63,11 +62,6 @@ src_prepare() { iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die mv -f doc/cmd.txt.tmp doc/cmd.txt || die - if use doc; then - einfo "Updating doxygen config" - doxygen &>/dev/null -u config/Doxyfile || die - fi - cmake-utils_src_prepare } @@ -82,6 +76,8 @@ multilib_src_configure() { -DEXIV2_ENABLE_WEBREADY=$(usex webready) -DEXIV2_ENABLE_XMP=$(usex xmp) $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) + $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) + -DCMAKE_INSTALL_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html ) cmake-utils_src_configure @@ -91,13 +87,12 @@ multilib_src_compile() { cmake-utils_src_compile if multilib_is_native_abi; then - use doc && emake -j1 doc + use doc && eninja doc fi } multilib_src_install_all() { use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - use doc && HTML_DOCS=( "${S}"/doc/html/. ) einstalldocs find "${D}" -name '*.la' -delete || die diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch b/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch new file mode 100644 index 00000000000..a57da03199c --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.0-doc.patch @@ -0,0 +1,28 @@ +From f8f63a8b4033549d47384c6e2b1972ae1a2775fc Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Wed, 2 Jan 2019 10:28:57 +0100 +Subject: [PATCH] cmake: Use correct installation dir for generated docs + +Fixes #623 + +Signed-off-by: Andreas Schneider +--- + cmake/generateDoc.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/generateDoc.cmake b/cmake/generateDoc.cmake +index a3aea727..16823946 100644 +--- a/cmake/generateDoc.cmake ++++ b/cmake/generateDoc.cmake +@@ -21,7 +21,7 @@ macro(generate_documentation DOX_CONFIG_FILE) + set(DOXY_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/doxy.config") + add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${DOXY_CONFIG}) + +- install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION "share/doc/lib${PROJECT_NAME}") ++ install(DIRECTORY "${PROJECT_BINARY_DIR}/doc/html/" DESTINATION ${CMAKE_INSTALL_DOCDIR}) + + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES doc) + endmacro() +-- +2.20.1 +