diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-18 13:33:47 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-18 13:39:49 +0100 |
| commit | 6193a852d7a16148e5cdbc2f69f618834df5925d (patch) | |
| tree | 79b2cf0db7356534551c3ac903c7dc138c7236d1 | |
| parent | dev-ruby/test-unit-rr: add ruby26 (diff) | |
| download | gentoo-6193a852d7a16148e5cdbc2f69f618834df5925d.tar.gz gentoo-6193a852d7a16148e5cdbc2f69f618834df5925d.tar.bz2 gentoo-6193a852d7a16148e5cdbc2f69f618834df5925d.zip | |
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 <asturm@gentoo.org>
| -rw-r--r-- | media-gfx/exiv2/exiv2-0.27.0-r2.ebuild | 17 | ||||
| -rw-r--r-- | 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 4b30b442529c..80de16822e2c 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 000000000000..a57da03199c4 --- /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 <asn@cryptomilk.org> +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 <asn@cryptomilk.org> +--- + 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 + |