diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /sci-libs/grib_api | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'sci-libs/grib_api')
| -rw-r--r-- | sci-libs/grib_api/Manifest | 6 | ||||
| -rw-r--r-- | sci-libs/grib_api/grib_api-1.11.0.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/grib_api/grib_api-1.14.5.ebuild | 5 | ||||
| -rw-r--r-- | sci-libs/grib_api/metadata.xml | 2 |
4 files changed, 8 insertions, 11 deletions
diff --git a/sci-libs/grib_api/Manifest b/sci-libs/grib_api/Manifest index 5c5b2659ebe9..8b5820f7e38c 100644 --- a/sci-libs/grib_api/Manifest +++ b/sci-libs/grib_api/Manifest @@ -3,6 +3,6 @@ AUX grib_api-1.14.5-disable-failing-test.patch 841 BLAKE2B 7ee8902b4ff278885bdeb DIST grib_api-1.11.0.tar.gz 14412684 BLAKE2B 72375400f74f3edba62e781b9dac4c40f3944c676cd90221ad57b0d6690a3a8958ef9d77c414ccb45b60ff2fd2c93923628e0ac3d0f10cfb4c393fb91eaf3001 SHA512 09c50d194049d2d19686139fb7150bd7399fc05bb5b7e40e8d91ce0301698263c40357b8524f925642ae6f78d9bc61218be26bef7f2dfeb326ccc9e8bc3a49e3 DIST grib_api-1.14.5-Source.tar.gz 4530071 BLAKE2B 7d9660e0c244ace011ef53e5a77c8ddc1f9435b210df407d6e90ef111c501cd589db1b34739937d5c78d6e1050b12d7c334b215122467a25b9a513e817a0eb7b SHA512 ad31dc27adcdeeded1aa3c3620181c0d4a5250734724c242443d19332b84f2297b4dea2aa02027627321fa35822c94865a41f24d03eb1143756621da14a59322 DIST grib_api_test_data.tar.gz 131042849 BLAKE2B 9036d4363b86ae0ad948026dd8ea7371232723942dea9eb6d8cceec466d8e37ebbe6a8e4eadb4cd413ab40601d8ea01c91bef0265310aac9ea3773a9bc252868 SHA512 25b37c3e725f7a2c18979d96e7d512111ba54f4e448c57e6a8ae913b7f13be25d9e643edb45ebc714daf6de51d85e9a7d252e735299affc562b9911e53a95058 -EBUILD grib_api-1.11.0.ebuild 2051 BLAKE2B df350b475c33ef307e2d1066196a085bb26b80a4efa02deab9d53bc44bbac3fc07b30b4a37e4215416f54f76789265a05c9cab8b9e3fdd4916280e616c279e97 SHA512 d19a87ecd3f3a8b42786c31fdbcc928f7cc2a0e9232c9f907315b6f1f8222dc066cc9941e9fbe9f3621693e10b5c21218b046327bd356401c82cbcf1b1b92a12 -EBUILD grib_api-1.14.5.ebuild 2461 BLAKE2B 01f6694b4bac595014ae94e85bc03bcc03e8c23c3af009c62c74fdae93dc17200cdf23e6a9e881605c440765f1b459a6d1f041af0e327e19569db4c7701c5ef5 SHA512 88f1eaae6f1190e2a02a023b620eb346e9e70e8bb00b81efa699ea7e16d0cdd9698e3382590e78abfd09c975216bf1a674e654f9dd279c3380dc98cf995bda7e -MISC metadata.xml 890 BLAKE2B 6a02ae5a83a54569ff02b5f2d30c4be7b765bc148772ec0360cff70ecf2d0a481642a2a01cdeff9a494a4c173ef120f6af14ee8624c076da6b0c7acd3355f5b3 SHA512 7e1ceccaf41783414b3fd3e3b00db274aa8df748d66e9f83617d4528f84d674ce313568a130cc5bac53eec5fc94cf03c9a35e9bf1f46a25851992f5c44f1bcd0 +EBUILD grib_api-1.11.0.ebuild 2019 BLAKE2B 39fbf10cee5e02f597cce76a338e74e87ac0c526b11aaa77328b3c74cee8f036dd3230f02bc7271d47fbb048699f2ea9109bbfc2693753acc01b0ccfb4839987 SHA512 b448af11504178dd6a582643d54b231ef4d8a738fdf8495ae35cda007fd15b6deef5a39a239f9173b94497a28162339b07fea646d8962c9225ccfc63d67e1212 +EBUILD grib_api-1.14.5.ebuild 2408 BLAKE2B c386fbdad1766723bd5e5b52a24c3888573b457777387e60b6f7f2258518350b8b469d6fc5d66bef504ca3a2958da65d51a3612a8f5483a55f7be30a05c9f3e9 SHA512 5609e07b738c1a6641e9000361693ec37cd1436c619e3435946ba0445fe06bf39ae62c9cd432eeb7dfc4fb483683defb0a64045882b817153bba5054986e9535 +MISC metadata.xml 762 BLAKE2B d691892137e85fdf2c7ab7d1845e5203b4c5c86199371a02d0680cbde369c122e17ec2cc08d58518a55a6accecbe5fd4937e1a96865c70b80ef1d96d9f73dcdf SHA512 f4d15bed44a3072c987c2467c8e034f1569611b277915a1ea17f63da576bccdd4c38ea0e5212325e6f5687471e789fb1c46412b8e2510bd8a1f6cbd6d86056e8 diff --git a/sci-libs/grib_api/grib_api-1.11.0.ebuild b/sci-libs/grib_api/grib_api-1.11.0.ebuild index e49572604770..e1476a9132a9 100644 --- a/sci-libs/grib_api/grib_api-1.11.0.ebuild +++ b/sci-libs/grib_api/grib_api-1.11.0.ebuild @@ -21,13 +21,13 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples fortran jasper jpeg2k netcdf openmp png python static-libs threads perl" +IUSE="doc examples fortran jpeg2k netcdf openmp png python static-libs threads perl" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" jpeg2k? ( - jasper? ( media-libs/jasper:= ) - !jasper? ( media-libs/openjpeg:0 ) + media-libs/openjpeg:0 + !!media-libs/jasper ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng:0= ) diff --git a/sci-libs/grib_api/grib_api-1.14.5.ebuild b/sci-libs/grib_api/grib_api-1.14.5.ebuild index ff36dfbfdf82..40b5406dc0f4 100644 --- a/sci-libs/grib_api/grib_api-1.14.5.ebuild +++ b/sci-libs/grib_api/grib_api-1.14.5.ebuild @@ -22,12 +22,11 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="aec doc examples fortran jpeg2k netcdf png python static-libs test threads" +IUSE="aec doc examples fortran netcdf png python static-libs test threads" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" aec? ( sci-libs/libaec:= ) - jpeg2k? ( media-libs/jasper:= ) netcdf? ( sci-libs/netcdf:= ) png? ( media-libs/libpng:= ) python? ( @@ -72,7 +71,7 @@ src_configure() { -DENABLE_AEC="$(usex aec)" -DENABLE_FORTRAN="$(usex fortran)" -DENABLE_GRIB_THREADS="$(usex threads)" - -DENABLE_JPG="$(usex jpeg2k)" + -DENABLE_JPG=OFF -DENABLE_NETCDF="$(usex netcdf)" -DENABLE_PNG="$(usex png)" -DENABLE_PYTHON="$(usex python)" diff --git a/sci-libs/grib_api/metadata.xml b/sci-libs/grib_api/metadata.xml index b053bfcb8747..9a5952fcb794 100644 --- a/sci-libs/grib_api/metadata.xml +++ b/sci-libs/grib_api/metadata.xml @@ -13,8 +13,6 @@ line tools is also provided to give quick access to grib messages. </longdescription> <use> - <flag name="jasper">Use <pkg>media-libs/jasper</pkg> instead of - <pkg>media-libs/openjpeg</pkg> for JPEG 2000 support</flag> <flag name="aec">Build with Adaptive Entropy Coding compression, needs <pkg>sci-libs/libaec</pkg></flag> </use> </pkgmetadata> |