From a310214342a865f164e8e2b7a88e513d996ad569 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 2 Apr 2015 07:21:11 +0000 Subject: [PATCH] Version BUmp, bug #544770; fix version string for lz4 dep to compatible version, bug #516432 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- dev-libs/c-blosc/ChangeLog | 10 ++++- dev-libs/c-blosc/Manifest | 31 +++++++++---- dev-libs/c-blosc/c-blosc-1.3.2.ebuild | 4 +- dev-libs/c-blosc/c-blosc-1.3.5.ebuild | 4 +- dev-libs/c-blosc/c-blosc-1.5.3.ebuild | 43 +++++++++++++++++++ .../files/c-blosc-1.5.3-shared-libs.patch | 27 ++++++++++++ 6 files changed, 106 insertions(+), 13 deletions(-) create mode 100644 dev-libs/c-blosc/c-blosc-1.5.3.ebuild create mode 100644 dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch diff --git a/dev-libs/c-blosc/ChangeLog b/dev-libs/c-blosc/ChangeLog index 917ffab465f7..38d0909d7200 100644 --- a/dev-libs/c-blosc/ChangeLog +++ b/dev-libs/c-blosc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/c-blosc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/ChangeLog,v 1.10 2015/03/09 00:03:28 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/ChangeLog,v 1.11 2015/04/02 07:21:10 jlec Exp $ + +*c-blosc-1.5.3 (02 Apr 2015) + + 02 Apr 2015; Justin Lecher +c-blosc-1.5.3.ebuild, + +files/c-blosc-1.5.3-shared-libs.patch, c-blosc-1.3.2.ebuild, + c-blosc-1.3.5.ebuild: + Version BUmp, bug #544770; fix version string for lz4 dep to compatible + version, bug #516432 09 Mar 2015; Pacho Ramos c-blosc-1.3.2.ebuild: x86 stable, bug 540290 diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest index c1310f0c30e7..7e0cb985116a 100644 --- a/dev-libs/c-blosc/Manifest +++ b/dev-libs/c-blosc/Manifest @@ -1,17 +1,32 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX c-blosc-1.3.2-shared-libs.patch 902 SHA256 148db1ff23b2d112997d6d64157fabab6409abe2e86048799a55a440c027d0a0 SHA512 d5e21dcd0086f44bb9b9823437f7f46c362543a84a947c2f85a2b0e0486324bc2e8726adfafda5e86e2650e778dcdebf5c00364a2dc094e8dd738850a1c44ed8 WHIRLPOOL 2cb9c78b898fa293d72077323410c5caf4e608aa4943b6e75abae1b60e02bf40eeb62f021114e70f3982a7111fb4b101d6bb210e4aea247a2de4791e51a75f4e +AUX c-blosc-1.5.3-shared-libs.patch 1008 SHA256 139c4cc20a832cc2f5a06a8f9740fc3891d6e2c2a8a6d47c2fb7c15378992d2c SHA512 009d4cce6d904d8fe65d63dca95850e5a460c01e20ab3ff1b9943f18f145abda3a3d765d3a7af79b3a1a6cf7ac740ec65ac8e8889e6a43359d2d3d1696614d9b WHIRLPOOL fc4247aae98e5ab9a07df84dcb02c969d3fc53d5229128a8fa8ea92de99b0514e68a1f73c4f26193c1e51d1346238ad84781417ffbe195962f8e7a125262b9e4 DIST c-blosc-1.3.2.tar.gz 229790 SHA256 7c21c4484c1ad7d6beddd73f35379e0d980530466cd6d87402e035c931983697 SHA512 0488042628b8b3d02e8e7b58d3d942751a43567e99e1e89f452765ad1aeba395248322df6a37daf828571b3c262ebaa54d3ca49cfed78ab499994454faf6bbdb WHIRLPOOL 195232123fbbd4f76f3a209069e7895c3ba900e98c49ca8334e1975634770463d993ae36f99fefb680d7c78a28ca979c27cd4af4412e83c804315f6cf52420fe DIST c-blosc-1.3.5.tar.gz 231653 SHA256 60efbbd2ef613480d135dbb245260e7cd904cfd785cc2504458615d7b397675a SHA512 4c11309a3f5dd0e2ecb35f62480cf86a9ad8d8d84b0d744c0597a51d8f51010a2ed0ad868cc3aef1f674efc1c35ee3312ad727cb308b348026f08db0ac9ab04a WHIRLPOOL 58742b85bf1d9637492871cab0f0c0b87c96162b2dfbf196e91f62569f6a06077b901a202fab43f39472ccf728550340a85bd60f3fee1d6e0e76d655659db3f0 -EBUILD c-blosc-1.3.2.ebuild 1131 SHA256 2450c0df33a7d5827c6b79f4cceab1e2e8803a8c888115e16b1142b8ef5fc24f SHA512 22ef05c3dbb86faaf0ecf4289168127b657bccb96af276db6f814e0d1aac8234e2c9a8dddddf2ad353f4c91448d4ce34dfbd7f9e5f5b727a5e0edceea76ee5fe WHIRLPOOL f30a147d2ed2609285846a35ab5d6c9047c8941379668c0151977d0edf8d2310dce7013237b46be81baee1fa9dade6f13f54db4fca69cc8eb89bb2349a4db400 -EBUILD c-blosc-1.3.5.ebuild 1150 SHA256 bf69b346b1d1a375405b80fa4c365a1009d0099618862554a93d0f61d4e0cfcc SHA512 d8acee26d105bdf17430208e2ea581360d4400a191cd9059aa7659c5053bac413b09d87e9d021ed337a70de2c22eae900cac333f48efbe6f1d81d67202c1fbcd WHIRLPOOL f895ee6c0a78cf9879f8744a805171c9e658074e96b530883c1fb8c52f345b95279edaaeddc519cc3af3b6142720dbdefb3b9c1c0ad75370d80e5d20aecacdd5 -MISC ChangeLog 1344 SHA256 642996a33adbe81e8fd3c80d6507c7e6b45d8eb15aebcf120542b6bf0db27ecc SHA512 ada8f35a051d445cee761b4fcde9968237faa1fec9260c3973631fd3a84d8ceb99bd2d5da5273805202bb9c3f838a2d9d7443cfb9c781832f7e1a2e8675a2805 WHIRLPOOL 8d6b46d9ec5d79ecb6ad4291555b9fe1dc4b1e4631eaa21b3e20e8e530d0ea57cabf19a4f2533cef5be172a13056627e9b04b325b59cc0f9a57ef506af982d0c +DIST c-blosc-1.5.3.tar.gz 240821 SHA256 d6d7c72d8e49311618f5f1609df1a9b2ca070655b563b9f7b80d5dc92fceaf4f SHA512 92f0a47ff6af2b776795315fce52e49c12e947e9007f97d05182a8369831e0ba80ff7b2b116fdedc4ef2b984106b014c90f82e233d5aed85cd91e3256f4a7313 WHIRLPOOL 9178c1a4e8e476b2a0556106ecbf58eb10bd076e3c731048d988f1e3dcaefa593cea176c6f5ec391c54a651421cce40858f1eae4ba9fc91d60a0fc158fe9fbc7 +EBUILD c-blosc-1.3.2.ebuild 1139 SHA256 72e72ced0655d967ad48a0077440f484907096eabece07c50477fd8e7efbdd07 SHA512 b211ee73c535308c93676a1a46f3ca5513ab70181d03b99a28bf1aae425a7ff2be8069259d5683a9b8d61abf1dac34592abae0616e17943fff06e0c623b0a14f WHIRLPOOL 52883151f7c19db8e176814325e550d58ce3fcba1d4109ce9521bffd0cbf6b3a3e31e7fbb39f4ed9b69222978cb3646d39ecae7d7a43557d783d31534c412953 +EBUILD c-blosc-1.3.5.ebuild 1158 SHA256 de9956146855a711dcd9a8496f2deba6b49a8f8d567014427d19e6b1b2cb14a4 SHA512 2ffb0942e7d5883f48e76babf439e431a84ba897f7788630633600c9532ebacf364875f7ef753f186bb94837680031f0cc788bfedcb0ceeabc3f5456e5c5f64a WHIRLPOOL 6e0763c6ec8099dda374e94be2be5447af30bc43ca989437f00529ebe91c571f22b42ceeab5de5cceb1a44f983d72f0b118104b68da44aa73920821d8a8e8f04 +EBUILD c-blosc-1.5.3.ebuild 1211 SHA256 62fce93f630a78828c5aeedc7859c556f59b1b6a22df17106e0e1b979a73a34b SHA512 4c3603c721348bb4820dde8c32e4a3affd2d6dc21a7e3d1f3fd7f1d3bc16e9d810d901dd1818ab64cedc4dea455087d6826affca660ed4615bebf2f24f2f3b89 WHIRLPOOL b2eec6920e3d4f939647edd0bc9fbab0b56dbc5d5ad0c09e3b23f2932187a0a6847c6999ee4c4c21548ba5b9dd5908184bf45dd02fc99d819ab2a312fbacc20f +MISC ChangeLog 1629 SHA256 5ecff0f4d0273c4047d3ffdca76f706df40980d0774be2adb066e19526940cee SHA512 333eab9ac39dd5256c5e9468a93bd8ba18513311c43933415f5eec5140e4c06e57039d5df0db28a24e6e1ace85ffaab655df2c151990b01e60f267fbd604c2d8 WHIRLPOOL 6b7873807dac7891b46fdfe65b3633ec23e8eb48797c0de52de9a045a81719fad8e195f405ae05355a49acc0fbbd5127b7b0d29c07f71ba9dc07881b175ddb6b MISC metadata.xml 687 SHA256 574a8658afee1a3d2bd537fd9ce5740c13b200f4db63dafdf996ad276348401e SHA512 b532cc973e119a3cc0380cfb858e41a550aef969fd3a6ead06e8e4e08bf63929d8ba1e0ff412ccdc340456152c89c6c81399c668f54e7330173583cd523d029b WHIRLPOOL 66c31e7c470e21429d9be3b0e068e645e8bf09b415b346bca7fb46bf4f496048589769db2c2971cfe85b09e6bdae7191b4ba265f27a9411b625b041d9f26d487 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iEYEAREIAAYFAlT8400ACgkQCaWpQKGI+9SkIQCdG+/xQmfX+ha+lD+nUX6jdyWG -c3cAn2GRN5DVHM8nn7da3p+i6jnGkUDH -=F3Qp +iQJ8BAEBCgBmBQJVHO3nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir7MYQAKJtqxvITsySKytvSQAFhsN1 +RsL2kxZjeBFsAqOPZdkHGuTKwiE50DPxxrJuS4Oh9Hwd/vTHBKL/h5LElho/Fb0L +MgIz71sxbA+BDX6kidiJAibRW/7BWeuMy410RbvrEPILCYlh3knfyC4q/nnjaBxL +iA924yU+MNc6Wz+UIFfiOnhiU/zh+Z2xfdmsuFpW0isaVCSf7nswewhu1gbfEP3V +Xyj2SOrU6vlWoLwX8/0xztVh5eJo7vg0wLprUmQQsZSqGZJL+98MkJmJqBOo169v +IAGmGZix1nAjAm0z+Qzk40OLV5JfBc35Es2OMt1yFlXEKlmyMC7oacB26mMUEaZW +CTeQmrgtcCJj/Rk8Q9ZFkDZsgK12Kgy6IxgvX6GC/PS0c6q/C6Ql/qZZJpEqAWSW +aZ7z1hrp1sM0/buI8Prhud3Bt+hy+aLnAeRKxq7AVgDrrTJP9UECrA1kCe0tZuCT +LDPAAShrvcSSX2AuNaEiWYe1AlSPl0DQsg1aadI/8yp51q0rJ3caHtXHCX2UvBRc +qjNp3PB7LdK9jGrDecthe3dyzGDPsfjWY5jwDI4X6SVYKRqtrNg0CuTIFsLwcA9L +6Rpz5ZeXjknl56CTF5CzNpa8Ve9Abgq66BpFDIn4g91gH90plfP8C0PizoutUVvW +PnWLi2B+TcJSVZqk2ZlG +=7Ndk -----END PGP SIGNATURE----- diff --git a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild b/dev-libs/c-blosc/c-blosc-1.3.2.ebuild index f9af8309d735..fd3dc57fd916 100644 --- a/dev-libs/c-blosc/c-blosc-1.3.2.ebuild +++ b/dev-libs/c-blosc/c-blosc-1.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.6 2015/03/09 00:03:28 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.2.ebuild,v 1.7 2015/04/02 07:21:10 jlec Exp $ EAPI=5 @@ -19,7 +19,7 @@ IUSE="hdf5 +lz4 +snappy static-libs test zlib" RDEPEND=" hdf5? ( sci-libs/hdf5 ) - lz4? ( app-arch/lz4 ) + lz4? ( >=app-arch/lz4-0_p120 ) snappy? ( app-arch/snappy ) zlib? ( sys-libs/zlib )" DEPEND="${RDEPEND}" diff --git a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild b/dev-libs/c-blosc/c-blosc-1.3.5.ebuild index 4d9f40b3b83a..ac7166ff5ea3 100644 --- a/dev-libs/c-blosc/c-blosc-1.3.5.ebuild +++ b/dev-libs/c-blosc/c-blosc-1.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.5.ebuild,v 1.3 2015/02/16 15:44:52 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.3.5.ebuild,v 1.4 2015/04/02 07:21:10 jlec Exp $ EAPI=5 @@ -19,7 +19,7 @@ IUSE="hdf5 +lz4 +snappy static-libs test zlib" RDEPEND=" hdf5? ( sci-libs/hdf5:0= ) - lz4? ( app-arch/lz4:0= ) + lz4? ( >=app-arch/lz4-0_p120:0= ) snappy? ( app-arch/snappy:0= ) zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND}" diff --git a/dev-libs/c-blosc/c-blosc-1.5.3.ebuild b/dev-libs/c-blosc/c-blosc-1.5.3.ebuild new file mode 100644 index 000000000000..7dfd256920be --- /dev/null +++ b/dev-libs/c-blosc/c-blosc-1.5.3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/c-blosc/c-blosc-1.5.3.ebuild,v 1.1 2015/04/02 07:21:10 jlec Exp $ + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Blocking, shuffling and lossless compression library" +HOMEPAGE="http://www.blosc.org/" +SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" + +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" + +IUSE="hdf5 +lz4 +snappy static-libs test zlib" + +RDEPEND=" + hdf5? ( sci-libs/hdf5:0= ) + lz4? ( >=app-arch/lz4-0_p120:0= ) + snappy? ( app-arch/snappy:0= ) + zlib? ( sys-libs/zlib:0= )" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-shared-libs.patch ) + +DOCS=( README.rst RELEASE_NOTES.rst THOUGHTS_FOR_2.0.txt ANNOUNCE.rst ) + +src_configure() { + local mycmakeargs=( + -DBUILD_BENCHMARKS=OFF + -DPREFER_EXTERNAL_COMPLIBS=ON + $(cmake-utils_use hdf5 BUILD_HDF5_FILTER) + $(cmake-utils_use !lz4 DEACTIVATE_LZ4) + $(cmake-utils_use !snappy DEACTIVATE_SNAPPY) + $(cmake-utils_use static-libs BUILD_STATIC) + $(cmake-utils_use test BUILD_TESTS) + $(cmake-utils_use !zlib DEACTIVATE_ZLIB) + ) + cmake-utils_src_configure +} diff --git a/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch b/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch new file mode 100644 index 000000000000..c46f66987445 --- /dev/null +++ b/dev-libs/c-blosc/files/c-blosc-1.5.3-shared-libs.patch @@ -0,0 +1,27 @@ + hdf5/CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/hdf5/CMakeLists.txt b/hdf5/CMakeLists.txt +index d91194f..032a292 100644 +--- a/hdf5/CMakeLists.txt ++++ b/hdf5/CMakeLists.txt +@@ -44,16 +44,16 @@ endif(MSVC) + + # install + install(FILES blosc_filter.h DESTINATION include COMPONENT HDF5_FILTER_DEV) +-install(TARGETS blosc_filter_shared DESTINATION lib COMPONENT HDF5_FILTER) ++install(TARGETS blosc_filter_shared DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER) + if(BUILD_STATIC) + install( +- TARGETS blosc_filter_static DESTINATION lib COMPONENT HDF5_FILTER_DEV) ++ TARGETS blosc_filter_static DESTINATION lib${LIB_SUFFIX} COMPONENT HDF5_FILTER_DEV) + endif(BUILD_STATIC) + + + # test + if(BUILD_TESTS) + add_executable(example example.c) +- target_link_libraries(example blosc_filter_static ${HDF5_LIBRARIES}) ++ target_link_libraries(example blosc_filter_shared ${HDF5_LIBRARIES}) + add_test(test_hdf5_filter example) + endif(BUILD_TESTS) -- 2.26.2