diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
| commit | 4cd2370bed609c118b6edfde5d3f116e5c35b897 (patch) | |
| tree | ec58f2c41f49754e41521d5ebc9dce4597ddd0a5 /sci-libs/dcmtk | |
| parent | f443475c824b4b5c086e6d040961cb35ad81bc60 (diff) | |
gentoo resync : 03.12.2017
Diffstat (limited to 'sci-libs/dcmtk')
| -rw-r--r-- | sci-libs/dcmtk/Manifest | 5 | ||||
| -rw-r--r-- | sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/dcmtk/files/dcmtk-fix_doc_install.patch | 16 |
3 files changed, 23 insertions, 4 deletions
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest index 43b525b68d7b..fcd5bcc1d223 100644 --- a/sci-libs/dcmtk/Manifest +++ b/sci-libs/dcmtk/Manifest @@ -2,10 +2,11 @@ AUX 01_fix_perl_script_path.patch 8946 BLAKE2B 76f69ab764a150539732cfa71014bf8b4 AUX 02_dcmtk_3.6.0-1.patch 3245 BLAKE2B 0aa7fae29baeacfddf676324ed13f8386be94129e45e3e8e5e4355491e2418177600b102b9b47e2969277b095f0d4d7c0d7c07ad931f788290c4ff8a69acb695 SHA512 369ee28f0d30f7aaa6f204aa45a4314218eb6ed070dc1e3a557802d62956ec3bdf8dcc1490c0b7b879d1a2e9145aa8bf0de691ef32e2bc7dd9270f63cc31f68a AUX 04_nostrip.patch 7339 BLAKE2B 1ff0efe77ba2d277e5d3eceec6de5ed3bd9bc0df415909584d95c74b2d40507b8a1a10eed0956182c944190c8f70fec2ecf68528b4f2f6916ae4c4064a311eb1 SHA512 7f8fb30a4ad4b2b0ab6ace37afb618efc3faed6af3dbed6793ff8c61dfd0a99aa26b880e6c0cc7addfffa008044ba8e81e622f94bebf6152cb0bd273da023e29 AUX dcmtk-asneeded.patch 4403 BLAKE2B 14323df7dccad5de0f4746a025c25ed9fb92964c0acecacd25a9aed9d00e655e9681800cc4eb6fef562fbc2b941542d119b3f0531ec2dd0670c4c768be2a96ec SHA512 629b6cc819c0440b9173ca09343309399abaa1cd23b92f7a2a78b732508140c9b6f9885f38c18328dc9b3dc5e86534940595380fac9223c2fb45c901c9f1222c +AUX dcmtk-fix_doc_install.patch 877 BLAKE2B 70b85d1e1747b309413c5ba2c201eaccf52dadf93e84a18bfd0dd8a202b1fa5f1a10755c6cca7b2dd8feb5df10bd6c3565de6bae4ec83d997ec17213f8fe2903 SHA512 243d4fe9c3259f852de3e662e5b3914a9ea8e22ebdd7992b61561f9e26d04fc2b78a1045eca63791d13ad34dcc26c3e9a76b750a1b7b1cc1040151cb454903b2 AUX dcmtk-gcc472-error.patch 13994 BLAKE2B d9f376ea78c181c24caddb7fddcdf2a83fbee587e98152fd47048f84c8871611004fb01903e66fdfd054b92bae79c13f616e734be54436e8abda918d09e7abd8 SHA512 d408a83cd7b1de08041ff2c3df7ee3a766ffa31a7085c8a1e853de6fd3d4d871557a5b2a2a417c52953a4bcc4ed2d5f813cd3a5170fb27482caec60ff1361eac AUX dcmtk_version_number.patch 5439 BLAKE2B 91f3a39227bb7c6a70005dca060709a5e976f3c442057e19e7ec6537c7b9b5b95677b36c2e93a80622b4532a78ac02c9c15b8b112920112a5a46d43d2163d786 SHA512 22f93c2bd3b1d4ac301653484bf5dca384a65fbc31ee61038c156d285ab587715ed61101761d5edaf4e64c31cd56239fb09c8d81a3aa241772e5c2c0556da872 AUX png_tiff.patch 620 BLAKE2B a4bf8a55581723131f27a513f7e16550be70012b85f709bc54e4a4404a72f2211571f41be00e64042a520f7a51740a3d09a76e7889ff7fbc925102ac7a618892 SHA512 b6c30e40ffcabf77f3dd04dbf5ba76ac0e86972e06eec81a1833c472099e7b207c4343208dc756f650f5b5ff77df6b950b0acb24c43029f30e2d67a3f882fab2 AUX regression_stacksequenceisodd.patch 4989 BLAKE2B 4a2ab9cb535d6d643b6b92134e5ebb53f25d600e6e744ee6ab51ee66b4fd1d37570c321c4b957678d28f5c0c94dfc112faafb07de01beccb45ad6152fd30f916 SHA512 bb126c947646ca3274863b8517478e738fcbe16f3e1e0bb75b8601ad2b5e6492400f96a89aaf25f683b06f6f3f9dad76391d5adc62177496cbffc0309aa7dc72 -DIST dcmtk-3.6.0.tar.gz 4673121 SHA256 cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c WHIRLPOOL 88538048a7534847c5c1450be0ccc94979ab20be8fc1a05a944b4a7f8f627578d585e91a30984f75ae0f1c29bca0c615c3b290cc6c0965b6e7ddd23e31ba3cd9 -EBUILD dcmtk-3.6.0.ebuild 2312 BLAKE2B b31ee2ed9d273c36b4d4e9ced9abe96da46f7a051d20bd0af0bdfe61071ab745fc24a3c65610bf2683a971f72fff37b6ee791bcbcbde367b70f9f8129b3d3cfb SHA512 9c850d90eaf30a27ff22730b8766284e4a5f06d6131bac7d29f5942985215e82fcfee9b833d2c6f108f96a9d770c76379c6eb83842fd57b86a5c1187649c7264 +DIST dcmtk-3.6.0.tar.gz 4673121 BLAKE2B 5694669bf4e612fbc39c5785a1498097972d47ecd5c66e437603dd2259258783b36ac86ea2dd57cc74b3af1701c933965e53c433dd09e1acd94dbb768b81b365 SHA512 2a9d866bafcaea72d889d24b51ff2341ee39c717aacf9ae5825c8588cd5cb01c3e341b6173abce751f6cb32c45be8888e81ccb08967cae2cca7fdcb2b61be53c +EBUILD dcmtk-3.6.0.ebuild 2343 BLAKE2B 2478b9825a180098e3ab47046d59acb8412d923844f59d17bdbe3195d93fd694c53487fe0a6d35c429ab0faaeba744ff7e8cd87ac90a9fa39e7162bec99544d7 SHA512 76d0fce8ed91d6f0352386b0319e6abe8aaaa66af9c2c55fa6556354f28d8210fd369a0286585b806ccfe106c7b4894d9bf6c666d821befc5eff0b7876701b0f MISC metadata.xml 317 BLAKE2B cad6b71cf9d8e4f626ee594c2eaad2e75f8ae288ea53206ae8ba37f0be04168f2ce7adeef7e45876d1358250e7ec6f2d9a07cc1c0ea4cf929323f1292ae4853a SHA512 0c6bb7cc6f8d56a7809354d0630ee49f33b63f7b60ad0a0ccbbfd7f28391a4c6b0c9f56caeb7cefcc74bf169ed6d46adda4fd204ef633311376b3cc3f7193d68 diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild index 986977e0200c..2b6faacbba6c 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 000000000000..50f4a362dccc --- /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 :-/ |