diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-31 16:00:27 +0000 |
| commit | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (patch) | |
| tree | c34bf820c2809fb7e08ed5564df2a25cf759516f /sci-libs/gdal | |
| parent | 693cc9b6e847a01c1bb692153021aaf9fb0fab25 (diff) | |
gentoo resync 31.01.2019
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/Manifest | 2 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-2.3.1.ebuild | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index caee535a7abb..ec3432a4adc6 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -13,5 +13,5 @@ AUX gdal-2.3.1-poppler-0.73.0.patch 906 BLAKE2B c71bf66068f19e80f38907d3f5ffd24e DIST gdal-2.3.0.tar.gz 14423820 BLAKE2B 6c67c66b2f68699249ccd4df2cb1e3b7042e94003b730e64bd8b8eec726a32da9485cab29552bd34c23831686ec3e879edd1848a2339c8289580ce282a287992 SHA512 b37e433be0b7a587ea9f9e5e720295e4cd1406f6c8ca770f5fedcd7fdc797e01e576eb887034b38f93f04a4e76c0ce84792bc7d91a49fea4122231a37ace812f DIST gdal-2.3.1.tar.gz 14450452 BLAKE2B 226ddf80ff8b9e3d420ac717b245a09fe3daa0331931f4d371b62ab9fa9bb0735ca11e1e045398de92d61b68815aa1dc3e7b6568f4853964cf42d188e46e6eb7 SHA512 0c5bb515dd2a9ad3110421b39bd680ce7e9de68e969cf35a7e63118965dbe193d25a7720a525e53af153de3e78f76ccc6983f4dcdfa6ba429d732a7a47a35d57 EBUILD gdal-2.3.0-r2.ebuild 8138 BLAKE2B f11f4a5110a63b6eacac015ce16d05c235776a365d8328ce2046494ec560f6653f9dee26b8c99b536c6452d25e0fb600bfaed4b849b5dea87dea2bf5c0d5752b SHA512 a2cbe076456ad3b151c554b7f72da5fdf52637278b2e06816aede1e5150ee6c8aaf6441fd1be10a90b3bba380d99262c33430df10dfc7a524ea6001feca7bcab -EBUILD gdal-2.3.1.ebuild 8497 BLAKE2B 263ccfa2d5ec703d0a51adea18f3a4cdfa5d2a8808c04b30f37bc5cb674e8d5c2f2eb578c4942691610a3d509252967b16056a371929a0eb1490ef4922c15f49 SHA512 9fe9e0bbe01a40dcff87ea0aa6004c8f5ca58619227bd76349ed0b85406c23c6f0cef79021a7634cce10fd1072a1f8bc1d6f7e5a6b6c35cb4a1bf5c21d999a29 +EBUILD gdal-2.3.1.ebuild 8399 BLAKE2B 6ca20d8216c0efb8091ea610a379a0f58aa51796b8bc72469c08105c98c087cd66ffd0646bcca492b260b786e48ae0f86288de42a4404b4e65a4005311aa7e87 SHA512 9ff7532518e51c578075315bd962e2b9d404deb27a053c479f3143ba9eac364f251ff23c8eca8e6951e41aed0eec8f9e78cd28a574a5d3f970fd821aa5ad87d6 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1 diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild index 9f81394be026..89243a3e82ff 100644 --- a/sci-libs/gdal/gdal-2.3.1.ebuild +++ b/sci-libs/gdal/gdal-2.3.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz" SLOT="0/2.3" LICENSE="BSD Info-ZIP MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd" COMMON_DEPEND=" @@ -82,8 +82,9 @@ PATCHES=( "${FILESDIR}/${PN}-2.2.3-soname.patch" "${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866 "${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840 - "${FILESDIR}/${PN}-2.3.1-poppler-0.69.0.patch" - "${FILESDIR}/${PN}-2.3.1-poppler-0.71.0.patch" # bug 674556 + # fixed in 2.4.0: + "${FILESDIR}/${P}-poppler-0.69.0.patch" + "${FILESDIR}/${P}-poppler-0.71.0.patch" # bug 674556 ) src_prepare() { @@ -120,10 +121,9 @@ src_prepare() { default - # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-12: - has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.72.0.patch" - # not upstreamable, not fixed in 2.4.0 or master as of 2019-01-16: - has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${PN}-2.3.1-poppler-0.73.0.patch" + # fixed in git master or what will become 2.4.1: + has_version ">=app-text/poppler-0.72.0" && eapply "${FILESDIR}/${P}-poppler-0.72.0.patch" + has_version ">=app-text/poppler-0.73.0" && eapply "${FILESDIR}/${P}-poppler-0.73.0.patch" eautoreconf } |