commit: 8230f66468c12dd1df02eefbc31b57c5a10dd854 Author: Bernd Waibel <waebbl <AT> gmail <DOT> com> AuthorDate: Tue Nov 21 23:41:38 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sat Dec 2 22:53:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8230f664
sci-libs/dcmtk: patch to install docs. Also fixes a warning about mycmakeargs not being an array in src_configure. Closes: https://bugs.gentoo.org/577594 Closes: https://github.com/gentoo/gentoo/pull/6258 Package-Manager: Portage-2.3.16, Repoman-2.3.6 sci-libs/dcmtk/Manifest | 2 +- sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 6 ++++-- sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index 471282072f3..0836ea2fcb2 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -1 +1 @@ -DIST dcmtk-3.6.0.tar.gz 4673121 SHA256 cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c WHIRLPOOL 88538048a7534847c5c1450be0ccc94979ab20be8fc1a05a944b4a7f8f627578d585e91a30984f75ae0f1c29bca0c615c3b290cc6c0965b6e7ddd23e31ba3cd9 +DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild index 986977e0200..2b6faacbba6 100644 --- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild +++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild @@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}"/regression_stacksequenceisodd.patch "${FILESDIR}"/${PN}-asneeded.patch "${FILESDIR}"/${PN}-gcc472-error.patch + "${FILESDIR}"/${PN}-fix_doc_install.patch ) src_prepare() { @@ -58,7 +59,7 @@ src_prepare() { } src_configure() { - local mycmakeargs="${mycmakeargs} + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/ $(cmake-utils_use tiff DCMTK_WITH_TIFF) @@ -67,7 +68,8 @@ src_configure() { $(cmake-utils_use zlib DCMTK_WITH_ZLIB) $(cmake-utils_use ssl DCMTK_WITH_OPENSSL) $(cmake-utils_use doc DCMTK_WITH_DOXYGEN) - $(cmake-utils_use threads DCMTK_WITH_THREADS)" + $(cmake-utils_use threads DCMTK_WITH_THREADS) + ) cmake-utils_src_configure diff --git a/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch b/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch new file mode 100644 index 00000000000..50f4a362dcc --- /dev/null +++ b/sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch @@ -0,0 +1,16 @@ +diff --git a/doxygen/CMakeLists.txt b/doxygen/CMakeLists.txt +index 6a0323f..4f18087 100644 +--- a/doxygen/CMakeLists.txt ++++ b/doxygen/CMakeLists.txt +@@ -32,9 +32,9 @@ IF(DCMTK_WITH_DOXYGEN) + ENDIF(NOT WIN32) + + # install html docs and manpages +- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htmldocs/ DESTINATION ${CMAKE_INSTALL_PREFIX}${INSTALL_HTMDIR} PATTERN "CVS" EXCLUDE) ++ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/htmldocs/ DESTINATION ${INSTALL_HTMDIR} PATTERN "CVS" EXCLUDE) + IF(NOT WIN32) +- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/manpages/ DESTINATION ${CMAKE_INSTALL_PREFIX}${INSTALL_MANDIR} PATTERN "CVS" EXCLUDE) ++ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/manpages/ DESTINATION ${INSTALL_MANDIR} PATTERN "CVS" EXCLUDE) + ENDIF(NOT WIN32) + + # cleanup created files on "make clean" - directories are not removed with CMake 2.4 :-/
