diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
| commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
| tree | 697733f5cb713908dcf378e13fd15a798a906a91 /sci-libs | |
| parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) | |
gentoo resync : 18.11.2018
Diffstat (limited to 'sci-libs')
27 files changed, 874 insertions, 137 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 58f845ed7c2a..cd90218996ba 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/Rtree/Manifest b/sci-libs/Rtree/Manifest index 173a38cdcdcf..1d59f2e7992a 100644 --- a/sci-libs/Rtree/Manifest +++ b/sci-libs/Rtree/Manifest @@ -1,3 +1,5 @@ DIST Rtree-0.8.2.tar.gz 55813 BLAKE2B fd7391ef92c61a9d502d03376e1eef157dcfec77d3d46642d1b14bbe3a5021880641cbc741dd85e8b3b3d66a019db0a2eb638cfa76d109102459544969877eba SHA512 c0c1091c21e92022540a0aed09c00f3b2b6abb2869757e0cb7a68a120e3a289f275cea824a72172ea5b327696a67024894f5f01354f0cd5ec5b05d9b3ec130e0 +DIST Rtree-0.8.3_p20180802.tar.gz 48893 BLAKE2B bd0745e8e5051a772c2d50fe35712dc661737f32f6af382579dbbffc7467c21ef73bbeb794489da9891e50497b6f8775b1a670185453d54881e6dc8496fef539 SHA512 10c35a1d00369b3a30c486830d7cecdae6bd9bbc2ab9ea7f398227bc46b116783b1486cc75759eb27d7b25439400cbc39b55e6f58c686caec45bbc8436c6067c EBUILD Rtree-0.8.2.ebuild 454 BLAKE2B a50e623faa35666ea8cd369e0efe9bff0468720975003492fe3c9f2ba71c0d0bd64fc483bc65da40e9bf25dde0680d1f36e185406b386324c5e09b6c8b9aad35 SHA512 90f6cda1e3031dc10b87fb35c0857dc4258842f8503bc0303d9be077a1bf9bd69d048d5b6ab07a89ba3cc9786bc56ac494dd1027c08f8086cb72ab90079bc47f -MISC metadata.xml 291 BLAKE2B 1d7f9362287c7ae3b7adb3658a75b3291c50fc99931fbb5ed1591ff94f863ab28b6c52f45b993260d7dd49f7af792517e0876cbce0fe3eac19f4dc6ba60ed2f4 SHA512 1dc1aaee480103b3d6f3cbdc7612960d422407ceed6e9014a28438bb19d61657291fe7df764928e1cbabb53e7b611afe70ea00c2eb2fb5e5c65a973cadedf367 +EBUILD Rtree-0.8.3_p20180802.ebuild 662 BLAKE2B e3453195636f60f25c4334be02660f9acf76f15bc07c442de2e983edb8c9c7f85f3c6f1df92df7176fbe72ee7213667befc8ff8f574c332fe8e620a6c7f069d0 SHA512 9371a5ecc63b1687cdcc85c76672d0464cee48699b1649afd0dd61154b9bc1c9a200381f6b580103f8082dcbac8a35b9fdaa9f6df072f6fb418a10b1e4bd969a +MISC metadata.xml 348 BLAKE2B d075025a84c4e5828a919a6d959e936043b12e1ff30f66e63113c4477879f1ea0bf141271f9fb575d3aaae46de309b261ce9d77319c472e3ededf2100c6b9810 SHA512 8ac80d045fc9ae972bac0b0e6f4618b2eba27225e85710970548e01341f13e32f42839a7baff5de3650059a55c6cad179eccfbda2ec4c8ccdfac94c195277bc3 diff --git a/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild new file mode 100644 index 000000000000..2c31f17d56b2 --- /dev/null +++ b/sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) + +inherit distutils-r1 + +EGIT_COMMIT_HASH="c6437a8ae182cb58aef1d0a4465bfc0c6f75b273" + +DESCRIPTION="R-Tree spatial index for Python GIS" +HOMEPAGE="https://github.com/Toblerity/rtree" +SRC_URI="https://github.com/Toblerity/rtree/archive/${EGIT_COMMIT_HASH}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND="sci-libs/libspatialindex" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" + +S="${WORKDIR}/rtree-${EGIT_COMMIT_HASH}" + +python_test() { + pytest -vv || die +} diff --git a/sci-libs/Rtree/metadata.xml b/sci-libs/Rtree/metadata.xml index 150a150f5ebe..0a6a504a6658 100644 --- a/sci-libs/Rtree/metadata.xml +++ b/sci-libs/Rtree/metadata.xml @@ -5,6 +5,7 @@ <email>slis@gentoo.org</email> </maintainer> <upstream> + <remote-id type="github">Toblerity/rtree</remote-id> <remote-id type="pypi">Rtree</remote-id> </upstream> </pkgmetadata> diff --git a/sci-libs/arprec/Manifest b/sci-libs/arprec/Manifest index df89994618ba..42188dc66f0e 100644 --- a/sci-libs/arprec/Manifest +++ b/sci-libs/arprec/Manifest @@ -1,5 +1,8 @@ AUX arprec-2.2.18-fix-c++14.patch 368 BLAKE2B 021af8127ec3d139ec3e5ab00b35296a9e0321b3f6a99aff5d853ed3cf5666a47cbacd11817ff4aa0ae835b229d7cdd10d342c06edc250a75789b589b0847501 SHA512 9763bd97dd8b678195c3967296deaf4b2d9c3853c5f35b4b9c31a02bbd1ba810809585c46a9bdf42f5b56dc6abf4e326f5d3ab0665cd3aff0f363a77598ec029 AUX arprec-2.2.18-gold.patch 545 BLAKE2B 26ec85a03bb693bdc484fa14d360e90b5571d172d9d696f71363a7f7805d957c14597ddb221f827c2752b89680b6c4382935dd84874a3887f2df11ba5e31ca5c SHA512 09368abacb24ea28e7ff32f1638526e17a0928e3f37f3d216b6918666ac86df8cd447400e2aa3bae6e81c6037ac43ce4b2af9c3dae79b322fa934b36f727a032 +AUX arprec-2.2.19-gold.patch 477 BLAKE2B 128d84824143a6af222f92462efd58d22ae014e359555b59380bd0060faea249a879244baca3cf7c2d81510070647c49414c4589efce5ce40328a6f3871e387f SHA512 f8a6408916b26a395832a6bd55f43de7153ceab5a343df1f974a2dd9e6ae3eec1b2533db36a11061e74f15f471dcff52a3247681e8872b15dfb8115f9b406cf6 DIST arprec-2.2.18.tar.gz 1751743 BLAKE2B de9a9a37bbe03357ad17d9d10d8bb42f73b9c9464643a35d4d1e209d049c205f967266dcae1af8972fc8c029f03053b298a4c85fdc48fb3f66d152aca8623a25 SHA512 372eb0a0c3aceac0d222679058f47c4d1037b5a51524b752b87f1b61c1b25101c34d4e56d9da45b4075ea7040dd59a597e0add4f34be902955dcf209423a6579 +DIST arprec-2.2.19.tar.gz 1962133 BLAKE2B a2fccc1908e791fd4759e61ff52b180fcaccbfbfa831ee1beca9b22a1a745d17d21040974ffe02ea21397a2339c819a30cd93a247738564a2b433f7cef14c9e4 SHA512 97cf090398aa169e31711077efd26dc6da1f62291ab37b241b133634838bdd44743f85b86b861a3be18d2696ae9132afb6cd1871502bedb9cc17dfb63fde2632 EBUILD arprec-2.2.18.ebuild 1533 BLAKE2B 05c9d0238707535220400f7caeb9352ca45a730979121ce9d79a3deb09d8c087406d8eced7b1f8ed435ee6804227f1fca5feebd604284eca325bf0ef219c4167 SHA512 0b4d377fda48265a8671123a752044ec70ea58f28bb471744c0e5f9138711269d1284c7feb678388e62a2e771d876a0f0e28a4307700bab9184959e60af0c118 +EBUILD arprec-2.2.19.ebuild 1570 BLAKE2B e27261e2a2eb1dbe338e8f1a2ea4e6c49fcb0b1112f3272ec7298c7eb31809aeb6d499eed22b8616207585c1c71dee70cbcd6204c191edb50004ee3b0714c5e2 SHA512 9fafaaab47fc4605fc0412862570e36fe2083858d0d327b25071c79abaf54baea3a2ec7ecca6c6dbfcbb38b550a819a5f6b2007510d32893bbb885716b093e42 MISC metadata.xml 474 BLAKE2B d74aad2e60fe6ce5a44dca931506ef83275032371c05310b287973b10055f7635fe196d08656dedc369350c5c9a2bf7f8c0f0c732f47b38c462c3aa1352a6c76 SHA512 cde307a1a91601c08153dc01535f8567cb37e7c9a0c194d4379ef428f73b75438416281a5ab478c995e7fcf108df25e7d2247430eb0960cbc6630acc2e444808 diff --git a/sci-libs/arprec/arprec-2.2.19.ebuild b/sci-libs/arprec/arprec-2.2.19.ebuild new file mode 100644 index 000000000000..4fe88b289cba --- /dev/null +++ b/sci-libs/arprec/arprec-2.2.19.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +FORTRAN_NEEDED=fortran +FORTRAN_STANDARD=90 + +inherit autotools fortran-2 + +DESCRIPTION="Arbitrary precision float arithmetics and functions" +HOMEPAGE="http://crd-legacy.lbl.gov/~dhbailey/mpdist/" +SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran qd static-libs" + +DEPEND="qd? ( sci-libs/qd[fortran=] )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gold.patch +) + +S="${WORKDIR}/${PN}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --enable-shared \ + $(use_enable static-libs static) \ + $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \ + $(use_enable fortran) \ + $(use_enable qd) +} + +src_compile() { + default + + if use fortran; then + emake toolkit + cd toolkit || die + ./mathinit || die "mathinit failed" + fi +} + +src_install() { + default + + if use fortran; then + cd toolkit || die + + exeinto /usr/libexec/${PN} + doexe mathtool + + exeinto /usr/libexec/${PN}/.libs + doexe .libs/mathtool + + insinto /usr/libexec/${PN} + doins *.dat + + cat > mathtool.exe <<- _EOF_ || die + #!/usr/bin/env sh + cd "${EPREFIX}/usr/libexec/${PN}" && exec ./mathtool + _EOF_ + + newbin mathtool.exe mathtool + newdoc README README.mathtool + fi + + if ! use doc; then + rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die + fi + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +} diff --git a/sci-libs/arprec/files/arprec-2.2.19-gold.patch b/sci-libs/arprec/files/arprec-2.2.19-gold.patch new file mode 100644 index 000000000000..809ca15588fb --- /dev/null +++ b/sci-libs/arprec/files/arprec-2.2.19-gold.patch @@ -0,0 +1,11 @@ +diff -r -U3 arprec.orig/fortran/Makefile.am arprec/fortran/Makefile.am +--- arprec.orig/fortran/Makefile.am 2015-12-12 07:20:15.000000000 +0600 ++++ arprec/fortran/Makefile.am 2018-11-09 22:10:39.192991101 +0700 +@@ -4,6 +4,7 @@ + + lib_LTLIBRARIES = libarprecmod.la libarprec_f_main.la + libarprecmod_la_SOURCES = f_mp.cpp mp_mod.f mp_modm.f mp_modx.f ++libarprecmod_la_LIBADD = $(top_builddir)/src/libarprec.la $(FCLIBS) + libarprec_f_main_la_SOURCES = main.cpp + + if UPCASE_MODULE diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 6df23c34f961..6fcaf4eb5a20 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -6,8 +6,9 @@ AUX gdal-2.3.0-changeset_38658.patch 3281 BLAKE2B 3939df03e8ceba4c3615a70003bfa6 AUX gdal-2.3.0-curl.patch 471 BLAKE2B 551c9fba5cd49afef45ae271f20b8440214b06f569893cf8dfba73bd5682a9494e8ff1d3c81c1784019e49149d56aa4a4f4ced77db2d1a29f12eaec3f4fbce72 SHA512 a23a7df486ed2fe0c000a87405ad56ed48107a957ce29bd6692df26ef93e493b2221b856720721cafeba9646c4c959e154549c87e1012a8a65389343d267dbe6 AUX gdal-2.3.0-frmts-nitf38234.patch 421 BLAKE2B d32592e440b459a57a25de39658224db5a871a82955620140a209bab0f84872dd5c67414df16d64cf24d7ad7a180eeaff7eed7e4aef8e6a70f550575538d93ec SHA512 ffcd68e4fc277f37540a81cf200a597da0f3ee42284107724a3b6bdb44ca54459dceefd52e9d946c8b3d8fd9c5153bcdcc30dacf3ebef46180a9d22280e62c2d AUX gdal-2.3.0-libtiff.patch 306 BLAKE2B 8f2b39c812ceeee94b95102638885d0ff25086dec8196eaf9ae50378abe88809414da370d9b626b05d2daecfd762bf56938e35fd566952fddc18f1c614dfb4c4 SHA512 b793b1f2631a5944a79be58eab530f3cd248b25858f810515875adc71abb8e4abb1c9f9cf87ec45282bf9eca2e3932706110099a330664aadba3724954ca7297 +AUX gdal-2.3.1-poppler-0.69.0.patch 12775 BLAKE2B 27fe38cb5db58961e1f9f4aef9eddbf396dd364dd1c14bb61fefe4eb16397b75a56edd1b7e3225ccb30ecb2da1f5a5ddc669c9dd984807d5e92fb76c9b83e0b5 SHA512 84eb0107abc9030e34bd953d1b8218a15c35432c0dc687e4d52b97c66cda44e842b53d2819cd998921fe5e90830ce063aa242fe933f0675b1c649fb1c5e44ecc 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 8013 BLAKE2B 8b4b8c647241b9828a6860327c2e58165882417945998029c811a4008c5f12770d811448a993f46bcf5681d7911af63986c9cb4bbcb985e972659db415ecf0db SHA512 fd61d52be4f9529c50b0b6ab6d62fff932cc5e57ef69572d2d4ef6a1ef88cafcc6ef5a59a53e8b0fe663197f60379b0a3665fc756be619a546d1eed0a0faa1ef +EBUILD gdal-2.3.1.ebuild 8061 BLAKE2B e8ae8cb8b04b1699e6b03f3f314cb6ea8f328570481834fe9c8db8fc45981a11a9a6ad80284f14fb698cef3a0bd87c48131a2dd4d2e8b9c5a4533e28e1d1ef69 SHA512 5a5d1521960ed475bb50a7a8547bdbb70f9476f5eae056975ae9d2aaf80ebe0336a21321412d76ca3c94dcb11a685a38bd67e193d65607dd94ded883879b02d7 MISC metadata.xml 1616 BLAKE2B 7167165623c93e069ce77ef80e68e6339fc38354c0db343564ce8ecf3566e0d61b8b5aeb4e6b69e66bf1e8932d18de54b528bf1a2148767efe3b5cf985a31748 SHA512 dca0cb7a8c94a5313aed09f8c28ae35a55de4b0ff8198469b7f9adc8220b29cbd8c3f92db121b944b03c169b302ac8aa95f4342b76510590aff63a5f122c74c1 diff --git a/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch new file mode 100644 index 000000000000..a89970074b06 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.1-poppler-0.69.0.patch @@ -0,0 +1,301 @@ +From 0c0b9ea5a5d6bbef938de8a77c5b00cb228b902d Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Fri, 12 Oct 2018 19:02:40 +0200 +Subject: [PATCH] Add support for Poppler 0.69 (fixes #1004) + +--- + GDALmake.opt.in | 1 + + configure | 61 ++++++++++++++++++++++++++--------- + configure.ac | 56 +++++++++++++++++++++++--------- + frmts/pdf/GNUmakefile | 4 +++ + frmts/pdf/makefile.vc | 6 +++- + frmts/pdf/pdfdataset.cpp | 12 +++++++ + nmake.opt | 2 ++ + 7 files changed, 111 insertions(+), 31 deletions(-) + +diff --git a/GDALmake.opt.in b/GDALmake.opt.in +index 30749ae982a..f9ab41fd124 100644 +--- a/GDALmake.opt.in ++++ b/GDALmake.opt.in +@@ -481,6 +481,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS = @POPPLER_BASE_STREAM_HAS_TWO_ARGS@ + POPPLER_0_20_OR_LATER = @POPPLER_0_20_OR_LATER@ + POPPLER_0_23_OR_LATER = @POPPLER_0_23_OR_LATER@ + POPPLER_0_58_OR_LATER = @POPPLER_0_58_OR_LATER@ ++POPPLER_0_69_OR_LATER = @POPPLER_0_69_OR_LATER@ + POPPLER_INC = @POPPLER_INC@ + POPPLER_PLUGIN_LIB = @POPPLER_PLUGIN_LIB@ + +diff --git a/configure b/configure +index 050bc79ac97..a8472ba8c2d 100755 +--- a/configure ++++ b/configure +@@ -669,6 +669,7 @@ PODOFO_INC + HAVE_PODOFO + POPPLER_PLUGIN_LIB + POPPLER_INC ++POPPLER_0_69_OR_LATER + POPPLER_0_58_OR_LATER + POPPLER_0_23_OR_LATER + POPPLER_0_20_OR_LATER +@@ -34798,6 +34799,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no + POPPLER_0_20_OR_LATER=no + POPPLER_0_23_OR_LATER=no + POPPLER_0_58_OR_LATER=no ++POPPLER_0_69_OR_LATER=no + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler" >&5 + $as_echo_n "checking for poppler... " >&6; } +@@ -34840,24 +34842,51 @@ $as_echo "yes" >&6; } + + CHECK_OTHER_POPPLER_VERSION=yes + +- # And now we check if we have Poppler >= 0.58.0 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5 ++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if OptionalContent has API >= 0.69.0" >&5 ++$as_echo_n "checking if OptionalContent has API >= 0.69.0... " >&6; } ++ rm -f testpoppler.* ++ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp ++ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp ++ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp ++ echo 'ocg.getOCGs().size();' >> testpoppler.cpp ++ echo 'return 0; }' >> testpoppler.cpp ++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then ++ POPPLER_0_69_OR_LATER=yes ++ POPPLER_0_58_OR_LATER=yes ++ POPPLER_0_23_OR_LATER=yes ++ POPPLER_0_20_OR_LATER=yes ++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes ++ POPPLER_HAS_OPTCONTENT=yes ++ CHECK_OTHER_POPPLER_VERSION=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ fi ++ fi ++ ++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then ++ # And now we check if we have Poppler >= 0.58.0 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Object does have new API (>= 0.58.0)" >&5 + $as_echo_n "checking if Object does have new API (>= 0.58.0)... " >&6; } +- rm -f testpoppler.* +- echo '#include <poppler/Object.h>' > testpoppler.cpp +- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp +- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then +- POPPLER_0_58_OR_LATER=yes +- POPPLER_0_23_OR_LATER=yes +- POPPLER_0_20_OR_LATER=yes +- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes +- POPPLER_HAS_OPTCONTENT=yes +- CHECK_OTHER_POPPLER_VERSION=no +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++ rm -f testpoppler.* ++ echo '#include <poppler/Object.h>' > testpoppler.cpp ++ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp ++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then ++ POPPLER_0_58_OR_LATER=yes ++ POPPLER_0_23_OR_LATER=yes ++ POPPLER_0_20_OR_LATER=yes ++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes ++ POPPLER_HAS_OPTCONTENT=yes ++ CHECK_OTHER_POPPLER_VERSION=no ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++ else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } ++ fi + fi + + if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then +@@ -34962,6 +34991,8 @@ POPPLER_0_23_OR_LATER=$POPPLER_0_23_OR_LATER + + POPPLER_0_58_OR_LATER=$POPPLER_0_58_OR_LATER + ++POPPLER_0_69_OR_LATER=$POPPLER_0_69_OR_LATER ++ + POPPLER_INC=$POPPLER_INC + + POPPLER_PLUGIN_LIB=$POPPLER_PLUGIN_LIB +diff --git a/configure.ac b/configure.ac +index 4b8ab911cec..0c588e04f03 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4496,6 +4496,7 @@ POPPLER_BASE_STREAM_HAS_TWO_ARGS=no + POPPLER_0_20_OR_LATER=no + POPPLER_0_23_OR_LATER=no + POPPLER_0_58_OR_LATER=no ++POPPLER_0_69_OR_LATER=no + + AC_MSG_CHECKING([for poppler]) + +@@ -4536,21 +4537,45 @@ if test "$with_poppler" != "no" -a "$with_poppler" != ""; then + + CHECK_OTHER_POPPLER_VERSION=yes + +- # And now we check if we have Poppler >= 0.58.0 +- AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)]) +- rm -f testpoppler.* +- echo '#include <poppler/Object.h>' > testpoppler.cpp +- echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp +- if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then +- POPPLER_0_58_OR_LATER=yes +- POPPLER_0_23_OR_LATER=yes +- POPPLER_0_20_OR_LATER=yes +- POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes +- POPPLER_HAS_OPTCONTENT=yes +- CHECK_OTHER_POPPLER_VERSION=no +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) ++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then ++ AC_MSG_CHECKING([if OptionalContent has API >= 0.69.0]) ++ rm -f testpoppler.* ++ echo '#include <poppler/OptionalContent.h>' > testpoppler.cpp ++ echo 'int main(int argc, char** argv) {' >> testpoppler.cpp ++ echo 'OCGs ocg(nullptr, nullptr);' >> testpoppler.cpp ++ echo 'ocg.getOCGs().size();' >> testpoppler.cpp ++ echo 'return 0; }' >> testpoppler.cpp ++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then ++ POPPLER_0_69_OR_LATER=yes ++ POPPLER_0_58_OR_LATER=yes ++ POPPLER_0_23_OR_LATER=yes ++ POPPLER_0_20_OR_LATER=yes ++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes ++ POPPLER_HAS_OPTCONTENT=yes ++ CHECK_OTHER_POPPLER_VERSION=no ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ fi ++ ++ if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then ++ # And now we check if we have Poppler >= 0.58.0 ++ AC_MSG_CHECKING([if Object does have new API (>= 0.58.0)]) ++ rm -f testpoppler.* ++ echo '#include <poppler/Object.h>' > testpoppler.cpp ++ echo 'int main(int argc, char** argv) { Object o(objNull); return 0; }' >> testpoppler.cpp ++ if test -z "`${CXX} ${CXXFLAGS} ${CPPFLAGS} testpoppler.cpp -c ${POPPLER_INC} 2>&1`" ; then ++ POPPLER_0_58_OR_LATER=yes ++ POPPLER_0_23_OR_LATER=yes ++ POPPLER_0_20_OR_LATER=yes ++ POPPLER_BASE_STREAM_HAS_TWO_ARGS=yes ++ POPPLER_HAS_OPTCONTENT=yes ++ CHECK_OTHER_POPPLER_VERSION=no ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi + fi + + if test "$CHECK_OTHER_POPPLER_VERSION" = "yes"; then +@@ -4635,6 +4660,7 @@ AC_SUBST(POPPLER_BASE_STREAM_HAS_TWO_ARGS, $POPPLER_BASE_STREAM_HAS_TWO_ARGS) + AC_SUBST(POPPLER_0_20_OR_LATER, $POPPLER_0_20_OR_LATER) + AC_SUBST(POPPLER_0_23_OR_LATER, $POPPLER_0_23_OR_LATER) + AC_SUBST(POPPLER_0_58_OR_LATER, $POPPLER_0_58_OR_LATER) ++AC_SUBST(POPPLER_0_69_OR_LATER, $POPPLER_0_69_OR_LATER) + AC_SUBST(POPPLER_INC, $POPPLER_INC) + AC_SUBST(POPPLER_PLUGIN_LIB, $POPPLER_PLUGIN_LIB) + +diff --git a/frmts/pdf/GNUmakefile b/frmts/pdf/GNUmakefile +index 2c332d2798f..6a267f529b2 100644 +--- a/frmts/pdf/GNUmakefile ++++ b/frmts/pdf/GNUmakefile +@@ -34,6 +34,10 @@ ifeq ($(POPPLER_0_58_OR_LATER),yes) + CPPFLAGS += -DPOPPLER_0_58_OR_LATER + endif + ++ifeq ($(POPPLER_0_69_OR_LATER),yes) ++CPPFLAGS += -DPOPPLER_0_69_OR_LATER ++endif ++ + ifeq ($(HAVE_PODOFO),yes) + CPPFLAGS += -DHAVE_PODOFO + endif +diff --git a/frmts/pdf/makefile.vc b/frmts/pdf/makefile.vc +index b4fa14d0a18..ad76d3de70c 100644 +--- a/frmts/pdf/makefile.vc ++++ b/frmts/pdf/makefile.vc +@@ -14,7 +14,7 @@ OBJ = $(OBJ) ..\..\ogr\ogrsf_frmts\mem\ogrmemdatasource.obj ..\..\ogr\ogrsf_frmt + EXTRAFLAGS = -I..\vrt -I..\mem -I..\..\ogr\ogrsf_frmts\mem $(POPPLER_EXTRAFLAGS) $(PODOFO_EXTRAFLAGS) $(PDFIUM_EXTRAFLAGS) + + !IFDEF POPPLER_ENABLED +-POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) -DHAVE_POPPLER ++POPPLER_EXTRAFLAGS = $(POPPLER_CFLAGS) $(POPPLER_HAS_OPTCONTENT_FLAGS) $(POPPLER_BASE_STREAM_HAS_TWO_ARGS_FLAGS) $(POPPLER_0_20_OR_LATER_FLAGS) $(POPPLER_0_23_OR_LATER_FLAGS) $(POPPLER_0_58_OR_LATER_FLAGS) $(POPPLER_0_69_OR_LATER_FLAGS) -DHAVE_POPPLER + + !IFDEF POPPLER_HAS_OPTCONTENT + POPPLER_HAS_OPTCONTENT_FLAGS = -DPOPPLER_HAS_OPTCONTENT +@@ -36,6 +36,10 @@ POPPLER_0_23_OR_LATER_FLAGS = -DPOPPLER_0_23_OR_LATER + POPPLER_0_58_OR_LATER_FLAGS = -DPOPPLER_0_58_OR_LATER + !ENDIF + ++!IFDEF POPPLER_0_69_OR_LATER ++POPPLER_0_69_OR_LATER_FLAGS = -DPOPPLER_0_69_OR_LATER ++!ENDIF ++ + !ENDIF + + !IFDEF PODOFO_ENABLED +diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp +index ee89fd07564..1a56f57ee06 100644 +--- a/frmts/pdf/pdfdataset.cpp ++++ b/frmts/pdf/pdfdataset.cpp +@@ -3440,10 +3440,16 @@ void PDFDataset::FindLayersPoppler() + } + else + { ++#ifdef POPPLER_0_69_OR_LATER ++ for( const auto& refOCGPair: optContentConfig->getOCGs() ) ++ { ++ auto ocg = refOCGPair.second.get(); ++#else + GooList* ocgList = optContentConfig->getOCGs(); + for(int i=0;i<ocgList->getLength();i++) + { + OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i); ++#endif + if( ocg != nullptr && ocg->getName() != nullptr ) + { + const char* pszLayerName = (const char*)ocg->getName()->getCString(); +@@ -3472,10 +3478,16 @@ void PDFDataset::TurnLayersOnOffPoppler() + { + int i; + int bAll = EQUAL(pszLayers, "ALL"); ++#ifdef POPPLER_0_69_OR_LATER ++ for( const auto& refOCGPair: optContentConfig->getOCGs() ) ++ { ++ auto ocg = refOCGPair.second.get(); ++#else + GooList* ocgList = optContentConfig->getOCGs(); + for(i=0;i<ocgList->getLength();i++) + { + OptionalContentGroup* ocg = (OptionalContentGroup*) ocgList->get(i); ++#endif + ocg->setState( (bAll) ? OptionalContentGroup::On : OptionalContentGroup::Off ); + } + +diff --git a/nmake.opt b/nmake.opt +index 682d766d93e..1eb049038c8 100644 +--- a/nmake.opt ++++ b/nmake.opt +@@ -639,6 +639,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include + # Uncomment POPPLER_0_20_OR_LATER = YES for Poppler >= 0.20.0 + # Uncomment POPPLER_0_23_OR_LATER = YES for Poppler >= 0.23.0 + # Uncomment POPPLER_0_58_OR_LATER = YES for Poppler >= 0.58.0 ++# Uncomment POPPLER_0_69_OR_LATER = YES for Poppler >= 0.69.0 + #POPPLER_ENABLED = YES + #POPPLER_CFLAGS = -Ie:/kde/include -Ie:/kde/include/poppler + #POPPLER_HAS_OPTCONTENT = YES +@@ -646,6 +647,7 @@ OCI_INCLUDE = -I$(ORACLE_HOME)\oci\include + #POPPLER_0_20_OR_LATER = YES + #POPPLER_0_23_OR_LATER = YES + #POPPLER_0_58_OR_LATER = YES ++#POPPLER_0_69_OR_LATER = YES + #POPPLER_LIBS = e:/kde/lib/poppler.lib e:/kde/lib/freetype.lib e:/kde/lib/liblcms-1.lib advapi32.lib gdi32.lib + + # Uncomment for PDF support diff --git a/sci-libs/gdal/gdal-2.3.1.ebuild b/sci-libs/gdal/gdal-2.3.1.ebuild index 65af4595613d..317b386da9e5 100644 --- a/sci-libs/gdal/gdal-2.3.1.ebuild +++ b/sci-libs/gdal/gdal-2.3.1.ebuild @@ -82,6 +82,7 @@ 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" ) src_prepare() { diff --git a/sci-libs/geos/Manifest b/sci-libs/geos/Manifest index c0fd449c4079..247289a3efb7 100644 --- a/sci-libs/geos/Manifest +++ b/sci-libs/geos/Manifest @@ -1,6 +1,4 @@ AUX 3.4.2-solaris-isnan.patch 575 BLAKE2B 34e2fddd46e4e503630d0c44c03ee72ceb8bb19af31075ae209d0198b5db0839a633cbb7c855035bf8964d860174c56288579a4bd50e322d728ea4704d312108 SHA512 efa2730f178814e8d98318347e7a8313327679a5c861ef2a844ce821c5854f4dd56e0cc2c52fa5866fb4214b0d9aa8614b1f1ebaa62f0427e69221a93106aa45 -DIST geos-3.6.2.tar.bz2 2030705 BLAKE2B f23cf1fc080fb7b353fb6292900d84811ace04a5364200bfea19f79d7b09a795d36e30cd6e4dbb7acd8417245bc2ce644298dc1b4140ef70495e4f7d71fc522b SHA512 515d8700b8a28282678e481faee355e3a43d7b70160472a63335b8d7225d9ba10437be782378f18f31a15288118126d411a2d862f01ce35d27c96f6bc0a73016 DIST geos-3.7.0.tar.bz2 2028814 BLAKE2B 17385d9be831d4812391a30627e13989d3ca099ca9b0a719a92cdb2503dadff3693d4b3d320652764185db05782b33760ca14d155365d87167bb4ef6d6c2463c SHA512 fcca5e503efa32bb388376b2a06b9ca5c74fbcddba750cce6b3b4109eb2eb122058aead12b9462cdd881f425cd75d7241645ab344f25ce022bc0659954560742 -EBUILD geos-3.6.2.ebuild 1342 BLAKE2B 2cdc55473a3c7e2f4cf45b77de88e3e359598e1b9a7f6ee33d221474853ad191c61692ed84b1648204fe71b4e8c3fec70710725a1f30f4c81c89c3607db6e51a SHA512 91f4a1f15927b151e2d7811410dfa3cf4ccee0a667751eb05f6ebdcaa12b2a8c38e0c6ce08018f22da7bb7220ac77846a5975d4dd439c230eb326718a03ea6ba -EBUILD geos-3.7.0.ebuild 1340 BLAKE2B 1aabe23b1bea2f7800b909c76c5bab28d94fe580d2df0ee48fb484ef328a92064df1a94c403de778414e64b620cb17f12155f7af74550a4a264d2b08fbd7bbf9 SHA512 2be4b6ab790c8cfddb5559924d9985c31bffdd6ee695433d0bd04ffdb7b854e810529a2a398f4114ef1b71430e1dc4086f2727cd988e7b3d152c58d548f0fcf7 +EBUILD geos-3.7.0.ebuild 1339 BLAKE2B 34db98d731c945204bc323681df3929c430e62f257edeaf99dd30ece466d50ab0b688efd9f852fe87cf105dcef916beafc0422af34a8993443284da2a8497e40 SHA512 907a02c6d3884f8fbf3e49a04eca0c98b4a1c719d6088cd86e3b6ea7b9fb3fc5d0962f459f545fbce81db5a6a45048480aafa7871df6fc8600ecdf9b7dff0d67 MISC metadata.xml 941 BLAKE2B 037cfbe59d6e841cfd50acce4eb41b58d1caf2459205cbb9432a1c2187a26196c09785665df2e8fd17498e672a1a66fb3d50f8bb8ced62e54bf963b821b93181 SHA512 cf93ad12e2e2d23ce6b454ae1032e8362beccd952a0f431780467c2985c07fa284edcb10a5d7b61d098a70c097f091a7f771be5a1650c1ed431ba249f73e5b1c diff --git a/sci-libs/geos/geos-3.6.2.ebuild b/sci-libs/geos/geos-3.6.2.ebuild deleted file mode 100644 index a53255ec4230..000000000000 --- a/sci-libs/geos/geos-3.6.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 - -DESCRIPTION="Geometry engine library for Geographic Information Systems" -HOMEPAGE="http://trac.osgeo.org/geos/" -SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="doc python ruby static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - python? ( ${PYTHON_DEPS} ) - ruby? ( dev-lang/ruby:* ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - python? ( dev-lang/swig:0 ) - ruby? ( dev-lang/swig:0 ) -" - -PATCHES=( "${FILESDIR}"/3.4.2-solaris-isnan.patch ) - -RESTRICT="test" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - echo "#!${EPREFIX}/bin/bash" > py-compile -} - -src_configure() { - econf \ - $(use_enable python) \ - $(use_enable ruby) \ - $(use_enable static-libs static) -} - -src_compile() { - default - use doc && emake -C "${S}/doc" doxygen-html -} - -src_install() { - use doc && HTML_DOCS=( doc/doxygen_docs/html/. ) - default - use python && python_optimize "${D}$(python_get_sitedir)"/geos/ - - find "${D}" -name '*.la' -delete || die -} diff --git a/sci-libs/geos/geos-3.7.0.ebuild b/sci-libs/geos/geos-3.7.0.ebuild index 8d66cd012ccd..f0f47c27e064 100644 --- a/sci-libs/geos/geos-3.7.0.ebuild +++ b/sci-libs/geos/geos-3.7.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="amd64 arm ~arm64 ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="doc python ruby static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sci-libs/keras-applications/Manifest b/sci-libs/keras-applications/Manifest index 7d374be54fa7..1cf3c19789ff 100644 --- a/sci-libs/keras-applications/Manifest +++ b/sci-libs/keras-applications/Manifest @@ -1,5 +1,7 @@ DIST keras-applications-1.0.4.tar.gz 285031 BLAKE2B 7208752b45f825949eb2718e4e276f7c3e4a523b2668975d6834084c42cdc2dc3efb57fd0ef24401bc0dd35453f4798422f6afd9583249237cd35941939c25f4 SHA512 10a793a60b7084ea641035618e178d5b1261da5826292db25134f9886b191bd152dfa8fa686a6270fa56a7fc1831bda07e77d12597972b186a9354f857feb1d0 DIST keras-applications-1.0.5.tar.gz 26556 BLAKE2B 263a5917ca6aa58f47fee09849ba149cdf6742b3278ce2f2dd7ace5f1a445a9eb53f218f906ec9c1384a4e7bbe87d40e3ef0fcc22261e64805042822b14a0684 SHA512 6ac0312b8eb6781c93cb3ffad09b8b631831855f35247f939b6fccfe9ababb85e3b0e5a59f9f30f5265d96290bf4f61e1046dbcc8333f914065c566040012ddc +DIST keras-applications-1.0.6.tar.gz 284862 BLAKE2B 1f1b34574dc2af3e66983334fd6fad626b810f134f17fbf4dfae161d8f0c695f52da0ef8e689513834a2c7031cff7f0c58773d834932d6db96ead4a68a8cd765 SHA512 11587ec9ab00c667d6b1e9c7c35ea6746c044986668a9f24f3ca6ec80e43d37839fa557bf531efd4c05c3518b3fd390c00806bfa672576e9b4b389412527e9e1 EBUILD keras-applications-1.0.4.ebuild 554 BLAKE2B 8492cef67af05dc39a0ed36f0afdedb568983de1c6225417ee143ed73017cc76e38307ac7e95aaeebed6494d1a8b2ccbbfe9eb1b5a86d66cb5597d9650debd43 SHA512 b0ab5268039f213cf46c88198f2153acdacf672e42e6d51bb85c6115d7ceca39fe78472a71af2a2e93b6ef176a44b0d9000fd8ef693fa967158432a98d5151a9 EBUILD keras-applications-1.0.5.ebuild 683 BLAKE2B ad47e5ec1d26eb1a03ac233ce886967bf793b0948d4cc16f82263516fc418eab7915f076c86759a9845cf7de22f3efc6e293cb6fef013b0df797b9aebf863194 SHA512 259fce92b4ba451556a34a40fa1dc2265979d24cb30cb889729a2e5d94df92a123a05c946b1483d963c02847b3a5af9b6ad52e3195beb6ed9990c866c6f1584b +EBUILD keras-applications-1.0.6.ebuild 557 BLAKE2B bc2a9d22264847ad6f6ef0152cb483226f29644510a752f3c2377d6b08790dae2a44838e55ea6602a0a6c294eba5bb21d28faebc43e85118f359818ee467bb96 SHA512 3ff0ea369874778064341eca06b8aedb9d886cae1c0278b53760fb2d481981ed5a81a50496493579fc98f2aa2df1608e00cda17257dd649db9e6885a5306a917 MISC metadata.xml 621 BLAKE2B 4f375ddfcfed6172df186350f7bd3dbfbcacea34f555b14719af43f58b140d73e378cd0a5efd8438ed2a0006f3552febc684b4fce85aeb88fb2c9bf819c06c4b SHA512 9dbb366d483843279cc7532b56a877313a7c39de25c93c313a2957092f9766ce5715a83dd87ef116d1733a7cc399319025ce1eb0e7ad174e2b7441360a9f5560 diff --git a/sci-libs/keras-applications/keras-applications-1.0.6.ebuild b/sci-libs/keras-applications/keras-applications-1.0.6.ebuild new file mode 100644 index 000000000000..92c2e51ab3f5 --- /dev/null +++ b/sci-libs/keras-applications/keras-applications-1.0.6.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python{3_5,3_6} ) +inherit distutils-r1 + +DESCRIPTION="Keras deep learning library reference implementations of deep learning models" +HOMEPAGE="https://keras.io/applications/" +SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/keras-preprocessing/Manifest b/sci-libs/keras-preprocessing/Manifest index f6a4a4ce2b05..98dfab31a2f2 100644 --- a/sci-libs/keras-preprocessing/Manifest +++ b/sci-libs/keras-preprocessing/Manifest @@ -1,5 +1,7 @@ DIST keras-preprocessing-1.0.2.tar.gz 34762 BLAKE2B 3b4766aa48d6e6cfd50817af97c8f2faf9ae7e78007f7dddcbf1f4ded072657a5b94ac4b563d090dd8a8437a249b64fea61a1cd5f680767f14611fa6fe92dd3a SHA512 d5a558c3d9741c298ea3737bfb04788bd2cbecefe14aa53e0f6ccde891ad9304ec673a888dc53a2f954c0b718ce31d9d35095d3f21e15d73248acfc8105457d9 DIST keras-preprocessing-1.0.3.tar.gz 36360 BLAKE2B 4a5d8e8d1211434b212a509acd563ef38f043ffc2f856019205e5e9b6806303c824bdfd19009a38a19ca961a9ece7719dcecf41f494b19da11084d5fa733e807 SHA512 98501a96eeca29d13a50f418b8d7417911cba50f0a3097b9576684a78c60441b93296ac3fb544f951f40990f5c8b7c0a15e9da3ac336119b0234caec8d182f4c +DIST keras-preprocessing-1.0.5.tar.gz 39776 BLAKE2B 459318d4bdece8176f7a268da3070c71f8fa44a2425acd6dd3d4cc2c023a4a6398c3298f29c7ea2d273353e6898eb9218043451a7817e618ecc2eb6e38bc74e9 SHA512 64b5e7f2fea0ec21bb43853b998f8e628185e82846c12320d6c60bb7bd9e508dd2497108c04040e2d8bbebc3b7b7cac3fbb08354bb31a4b155c5ed2bc5dbb98d EBUILD keras-preprocessing-1.0.2.ebuild 602 BLAKE2B 2e9a1d1fe5af86239dd6c28ad262506b1e6d52ca853daa89130ac536ae37de0b83954cbf3cfddf4a1e25e20c945aee9d3a28f1d5ea192eead788960294cd6410 SHA512 eab972f49c8c94d4c2a14b2f643e9ebc164657fc637605ee683eabb7eefa414245b65859dd01b60387c9b1b638bc4038bbafeb1bf2cdf643b88695bdf7f7cce1 EBUILD keras-preprocessing-1.0.3.ebuild 608 BLAKE2B 735d172d2c0b217f69cb9a8aca03f2cb6af43d6be3172bcf15e5e9aeac3deeea31622b231b30442473852b17a25f574b48c56205b1952775d1278be5acdb6ed9 SHA512 2b54605d8c1542153c0f936c250f78162b8d33dc5868a4e028d5855f7b159f0dc3c1075f9cae428943a5ef163789edc120ed0050fb9a5a30babd2376093c6379 +EBUILD keras-preprocessing-1.0.5.ebuild 605 BLAKE2B 018d2bde6dacbf1b6d3e85feee58abf3f9bcab16812f00a553a3d77a02bd64c935d7e41a95d0f7d795b2926d46c2ce5b432fe22d59a84e87e59de0d555b7fe28 SHA512 660408f123b8242421a5d04ac9c4e2ec25f08120e3049c702e930f8d35b2cd85d16dcb48d82c680ccd36765125822ee00ede0f3af9e0484255f04bbb26593fae MISC metadata.xml 585 BLAKE2B a2f92ac4e2b9af055313a13de9bcbaee7ab7ca2efa4790c82027aece4b629bfa7a73c5ed0286b0f24f1853330057527009afe6ab1722f19d9c504a9d0737e827 SHA512 371cc3f5897bd28c62642a8857a22e775e24aa917bc0e58bb4de4e0a2a6580174ba35cfda2e8dd83599e2180fdfb3f11a953e7076c6d87073e1465b145b115e9 diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.0.5.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.5.ebuild new file mode 100644 index 000000000000..1299a0693b5f --- /dev/null +++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.0.5.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python{3_5,3_6} ) +inherit distutils-r1 + +DESCRIPTION="Easy data preprocessing and data augmentation for deep learning models" +HOMEPAGE="https://keras.io/" +SRC_URI="https://github.com/keras-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] + sci-libs/scipy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest index d1474fca1ce4..6c71d487e39d 100644 --- a/sci-libs/libqalculate/Manifest +++ b/sci-libs/libqalculate/Manifest @@ -1,6 +1,8 @@ AUX libqalculate-0.9.9-readline.patch 424 BLAKE2B be67a73b0ee7c01c059111261305450b1c6c1547062eee955f6dac2d22582a70df85a3feb8189b304ee388b2a8aee69a8a9ce7bb7408d5fc9957178b66f3dd0f SHA512 677589db5ce91c8092666f20d54e8f607a4ad06beaddbe8a1b11262d70eb2707cf70a608b797efa20b635e018da082585d74309e6506f78f931c09487b8c9aa2 DIST libqalculate-0.9.9.tar.gz 1509180 BLAKE2B 3f309add80ddb6b21730eab25d37c2d8fee163a79768a09ec5e7e5d329aa11ed9dafbf77f4ce194a96c2ac6a3b55a9c0d16755d5e106123cc2a5f931f6872d91 SHA512 c7692dcd91e0a7aea8184ca5366a3caf704b6e716c9e8552f4214ce7fc3157cf127daf7a063196383e4d5a99f8703486f2282c7fb01acafee5e1b3d8993de384 DIST libqalculate-2.2.0.tar.gz 1717207 BLAKE2B 020ca544683ff140ab5f8256a5a955c895a6ea09a581e9e75ab6c0a0657886c352a1ec2d34400057fe80004481d3198998613113ca40fb4feebfca010445dced SHA512 e6f3693e4dba2beffca300b673657b90037a6b7acc5bbd4e659863f4f5aec148d6d385fc3c666b16b2be713d0a8ad1b4d7fda557cef0e2be340ca2435f62aae7 +DIST libqalculate-2.8.1.tar.gz 1961535 BLAKE2B 074d83a44cbc6cb5d8afe5121e4c34cec46f2f6fecf046f6b4e67c6ebc612030ccbd0f42c303cc675267374502ecb3e831c9bbfca0f13d339e31fb8933a99b7a SHA512 a258bf4f67db70263626ac77822afc75fd7a9e5af2feb1930314daff219865b28c43e82fef6ceae4f3f23957447d6eaebdc709e606d28457bca0f47eefb9274a EBUILD libqalculate-0.9.9.ebuild 1443 BLAKE2B 2c4927b86f73b51e88b06700cc301b30c158133d49bb9e3ae3bd4722e321b60969827bf82ea37a4cc7477188ced124ec57f6d166a23b8a2ac5615da01f500c56 SHA512 6ab0e02af0b984019143f13ae88c0bfab432227ec7d5c4843b53eefe11a74aab3857191930a3e7534e8dce39e6b78f63af77200b7e6645c4052b429020bdfdd2 EBUILD libqalculate-2.2.0.ebuild 1349 BLAKE2B ea1df54be1d8970a19f229dcc268627ec760e586c3c9c5e9526c747d15d95b91cf3bb0fb90e56fda9191191a22ebd23728bb8921a6b608eae8fa5e7b149785ee SHA512 739d3946688533002637177352784a9884a08931ed9d70ec3012e76b3bfdb7d7831d54fc401e3e74ff4f73b1a015fc18c8cbbf8ee27913d5149c44094cdc16f8 +EBUILD libqalculate-2.8.1.ebuild 1441 BLAKE2B 0fe455d930d87346657de7f521078dadcb7ce0d53d72a79f78b6ad01760fe808720fe5994b509dc60f367afb688629f498659bbb9676439ffbf807314c366ffb SHA512 8aaa4c7ffeba2908dade8b752e01b8339400c03e648eb573211e30bb2c7714da926d4f33b74d1ff18e2a0170bcd7893540634698ac980030cc28a9d19fdfad66 MISC metadata.xml 412 BLAKE2B 6cb8a434ec8e0eaa50982720079db60a5a2211c9d67852712351e9d6698edb1d70058f8f093ecf7b93fb7f853b1f1c138bc0871a6751975d35c24c622510dde5 SHA512 b6c55b741bda2a497dae278d47c6931611cbda132e08deb16a9c4efef59c7cb18bc464e7d242380b7afde2af4ab6f8e7f72b7db4ed3fd6b8f4cdc9c0359550ce diff --git a/sci-libs/libqalculate/libqalculate-2.8.1.ebuild b/sci-libs/libqalculate/libqalculate-2.8.1.ebuild new file mode 100644 index 000000000000..a06b1b5b5e12 --- /dev/null +++ b/sci-libs/libqalculate/libqalculate-2.8.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A modern multi-purpose calculator library" +HOMEPAGE="https://qalculate.github.io/" +SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/20" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="curl icu gnuplot readline static-libs" + +COMMON_DEPEND=" + dev-libs/gmp:0= + dev-libs/libxml2:2 + dev-libs/mpfr:0= + virtual/libiconv + curl? ( net-misc/curl ) + icu? ( dev-libs/icu:= ) + readline? ( sys-libs/readline:0= )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" +RDEPEND="${COMMON_DEPEND} + gnuplot? ( >=sci-visualization/gnuplot-3.7 )" + +src_prepare() { + default + + cat >po/POTFILES.skip <<-EOF + # Required by make check + data/currencies.xml.in + data/datasets.xml.in + data/elements.xml.in + data/functions.xml.in + data/planets.xml.in + data/units.xml.in + data/variables.xml.in + src/defs2doc.cc + EOF +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_with curl libcurl) \ + $(use_with icu) \ + $(use_with readline) +} + +src_install() { + # docs/reference/Makefile.am -> referencedir= + emake \ + DESTDIR="${D}" \ + referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \ + install + + dodoc AUTHORS ChangeLog NEWS README* TODO + + find "${ED}" -name '*.la' -delete || die +} diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index d1768de69031..8a7e6fe82692 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -3,8 +3,10 @@ AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b SHA512 5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0 DIST libsigrok-0.5.0.tar.gz 1560400 BLAKE2B 2093a7f2855708ef5b8d260fb6721c1ed66cade65ceecdce5808d4edf97f65026755586ca28888969417c19b89bde46b0b786287dcf0bf554d8faba42f8f51a9 SHA512 56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec +DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517 EBUILD libsigrok-0.3.0.ebuild 1700 BLAKE2B 33dc1607eb3aaf38b7547fafe90940b3cf3b539fd257d394ee27225d3c40fea9d9d349a1ecaf8b7b4c99b6a57e590aae4c9b5225e6baf514d2bdfe47c4043107 SHA512 73f17a46ea7bfb003dc1ac6be3b32e43bffe2bbe135c6f5c667419ecae5ee0a57f77377d2eb69113e8e50cd25b73f123dffa2711a64837a1035841f3f4d7df43 EBUILD libsigrok-0.4.0.ebuild 2115 BLAKE2B f15bc1e01ea4cc389148eb6b3ebc5bc6f1ef42d14662888562ca48a1e1f5a1afe639ebd7755e36994675a461f4c4ac85e962efb4467503d9926ce4f06b51b2c9 SHA512 c0106ee8b697b6932a1ea69721b51e43d84d145ba9050e79afc3dc2e97303f93e73f2e8717a3ea4e6f522ec68830382def004283d32807be5bac647e47f78c4d EBUILD libsigrok-0.5.0.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c +EBUILD libsigrok-0.5.1.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c EBUILD libsigrok-9999.ebuild 2288 BLAKE2B d10e435f1b15d58980ddbc9d89c49b68502d2d95ba3fad33b08f2ff916bfae7c3cbf3ddf82b2e4d62e8d94ad09481f5d2c199e29823cf8ab6e40757357520307 SHA512 1c04d587e6adda41c877ea5d8f0a07a89f354b757d1f412d9b91c85a7c575825cce4ff56049eae82d019c7078f0da7644bfe8237358b2ce24f9927098bd34925 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild new file mode 100644 index 000000000000..8d56edf96992 --- /dev/null +++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://sigrok.org/${PN}" + inherit git-r3 autotools +else + SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support" +HOMEPAGE="https://sigrok.org/wiki/Libsigrok" + +LICENSE="GPL-3" +SLOT="0/4" +IUSE="cxx ftdi java parport python serial static-libs test usb" +REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" + +# We also support librevisa, but that isn't in the tree ... +LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)] + >=dev-libs/libzip-0.8:=[static-libs(+)] + cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) + python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] ) + ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) + parport? ( sys-libs/libieee1284[static-libs(+)] ) + serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) + usb? ( virtual/libusb:1[static-libs(+)] )" +RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) + static-libs? ( ${LIB_DEPEND} ) + java? ( >=virtual/jre-1.4 )" +DEPEND="${LIB_DEPEND//\[static-libs(+)]} + test? ( >=dev-libs/check-0.9.4 ) + cxx? ( app-doc/doxygen ) + java? ( + >=dev-lang/swig-3.0.6 + >=virtual/jdk-1.4 + ) + python? ( + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-lang/swig-3.0.6 + ) + virtual/pkgconfig" + +pkg_setup() { + use python && python-single-r1_pkg_setup + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + [[ ${PV} == "9999" ]] && eautoreconf + eapply_user +} + +src_configure() { + econf \ + $(use_with ftdi libftdi) \ + $(use_with parport libieee1284) \ + $(use_with serial libserialport) \ + $(use_with usb libusb) \ + $(use_enable cxx) \ + $(use_enable java) \ + $(use_enable python) \ + --disable-ruby \ + $(use_enable static-libs static) +} + +src_test() { + emake check +} + +src_install() { + default + prune_libtool_files +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update +} diff --git a/sci-libs/qd/Manifest b/sci-libs/qd/Manifest index f253b54d34b3..d36bd41c05e9 100644 --- a/sci-libs/qd/Manifest +++ b/sci-libs/qd/Manifest @@ -1,4 +1,7 @@ AUX qd-2.3.17-fix-build-system.patch 6245 BLAKE2B 8ab1ddc9ee18ad3c434e20716f3cfaaaf1ea5bf79d413ae640f12339a53c8583f85d1c38c10aef9d9c7b07439710a6bb811db3411768c25780acd56518e31993 SHA512 e7db957d3c2927062637a80644bb5d41739fe5ac31d1a2beb6bee62873d348e2675d720ed5c0a5a0b7d621053e299701724becac5ffeff8efc3d8aa5de339e53 +AUX qd-2.3.22-fix-build-system.patch 6617 BLAKE2B 6712f53a1b46a4d1f74d45380330ff5b15b7f2216f61245d467748557f607f670fbb0d977f4e6455c93c383ef6eb466e243177d29a3227ba89cf34ec836c54d2 SHA512 e70d4b87342840fb63cab04e63ceddb790d5509f65188894cbedb077042e2dbb6e7e18a108589fb77e8ec6253ba6b70680f637ce30c62575aa4a0eb7fbed36ce DIST qd-2.3.17.tar.gz 1445774 BLAKE2B f2af961db49747475a96dc0abecbcffcf88e43265b6ae21b4d6539ac7ce1086bb40e2cfd795dc9c78dd4b0f790a1a51c5b53d6bbfa224c5d3484d58a222c1872 SHA512 9c6f5dc8d5ad7c9c3d0ec626f7089eb760f31fb14b36daee9c6ba403ab146ff7ce99e01a8750960117a34d662c11620db2ec999e9cf44eb0f80e9224e365d496 +DIST qd-2.3.22.tar.gz 1427456 BLAKE2B 628fb88b8cb105baa689380e4084cc2e327415674fcebca59721cc163e1043f39e48c1b2a2bdc68ba402d311f37e71c9e3c390a119515128e0296aa413c850d5 SHA512 2228b6ed019d1462939957d0d0f64ab2ecfa98ac5aefecf56e9dbcf0c6ed63bdd895b86019fbb0dfdbc22d047c4c2d4e42ff91ca18846b5c1bdaa1ad28a55c2b EBUILD qd-2.3.17.ebuild 1115 BLAKE2B 6ebd934567315a22b214b358e5654e95095f25725281a1c8bbe38d28e886d665a780e861b2d4f0ea794a64d3f428a2bbd02450c2b9a6e287bdf94d1cf9548f55 SHA512 75b4f56a31b0f3c3c4e581e7325371f133932b0d9b8d2e26c297f9b05d7c34a1ab51bcbb1be96842094cabf713efb47f8fe197a2d2f91d828c7c2fb1e64015e2 +EBUILD qd-2.3.22.ebuild 1107 BLAKE2B ac2e8ec6296965e285e975ec3fd43e4a6ba65fcd38526448c5cb2ba0583a09afb85f6133d6d5f00abdbc02495ec45124983d6ba1ceb50c6d11761182bf6310df SHA512 1144e880a100d2cd6f4d84514cc18deadf070ed63024498e346ac26ae8212a365236358d4193ace25654093a61c18811c260da86ad0c3fe335cdee12f21b0817 MISC metadata.xml 344 BLAKE2B 0c45caae8363d44dcfdeda566ac4151fbe8285e2831fc89eec2b7708b5eaf435dcdeb9f8a37cf0ae09ae681e79af934e51fccd240ba5105e66a5aa0b121335d6 SHA512 fcd87f94796927519b886bd85ff724abe2ae6e89e21481fde2e11abb7870b364908e650665a36138837347fdbca7b97786249b9dd21b4e8462b8d3f8da37a77a diff --git a/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch b/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch new file mode 100644 index 000000000000..204880de95cd --- /dev/null +++ b/sci-libs/qd/files/qd-2.3.22-fix-build-system.patch @@ -0,0 +1,177 @@ +diff -U3 -r qd-2.3.22.orig/configure.ac qd-2.3.22/configure.ac +--- qd-2.3.22.orig/configure.ac 2018-10-30 23:01:31.000000000 +0700 ++++ qd-2.3.22/configure.ac 2018-11-09 21:45:39.415092314 +0700 +@@ -18,14 +18,14 @@ + + AC_CONFIG_AUX_DIR(config) + AM_INIT_AUTOMAKE([nostdinc foreign]) +-AM_CONFIG_HEADER([config.h]) +-AM_CONFIG_HEADER([include/qd/qd_config.h]) ++AC_CONFIG_HEADERS([config.h]) ++AC_CONFIG_HEADERS([include/qd/qd_config.h]) + + AC_CANONICAL_HOST + + # Checks for arguments + # --enable-inline +-AC_ARG_ENABLE(enable_inline, AC_HELP_STRING(--enable-inline, [inline commonly used functions. [[default=yes]]])) ++AC_ARG_ENABLE([inline], AS_HELP_STRING(--enable-inline, [inline commonly used functions. [[default=yes]]])) + AC_MSG_CHECKING([if commonly used function is to be inlined]) + if test "$enable_inline" != "no"; then + enable_inline="yes" +@@ -34,7 +34,7 @@ + AC_MSG_RESULT($enable_inline) + + # --enable-ieee-add +-AC_ARG_ENABLE(enable_ieee_add, AC_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound. [[default=no]]])) ++AC_ARG_ENABLE([ieee-add], AS_HELP_STRING(--enable-ieee-add, [use addition that satisfies IEEE-style error bound instead of Cray-style error bound. [[default=no]]])) + AC_MSG_CHECKING([if addition with IEEE-style error bound is to be used]) + if test "$enable_ieee_add" = "yes"; then + AC_DEFINE([QD_IEEE_ADD], [1], [Define to 1 to use additions with IEEE-style error bounds.]) +@@ -44,7 +44,7 @@ + AC_MSG_RESULT($enable_ieee_add) + + # --enable-sloppy-mul +-AC_ARG_ENABLE(enable_sloppy_mul, AC_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication. [[default=yes]]])) ++AC_ARG_ENABLE([sloppy-mul], AS_HELP_STRING(--enable-sloppy-mul, [use fast but slightly inaccurate multiplication. [[default=yes]]])) + AC_MSG_CHECKING([if sloppy multiplication is to be used]) + if test "$enable_sloppy_mul" != "no"; then + enable_sloppy_mul="yes" +@@ -53,7 +53,7 @@ + AC_MSG_RESULT($enable_sloppy_mul) + + # --enable-sloppy-div +-AC_ARG_ENABLE(enable_sloppy_div, AC_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division. [[default=yes]]])) ++AC_ARG_ENABLE([sloppy-div], AS_HELP_STRING(--enable-sloppy-div, [use fast but slightly inaccurate division. [[default=yes]]])) + AC_MSG_CHECKING([if sloppy division is to be used]) + if test "$enable_sloppy_div" != "no"; then + enable_sloppy_div="yes" +@@ -63,7 +63,7 @@ + + + # --enable-debug +-AC_ARG_ENABLE(enable_debug, AC_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]])) ++AC_ARG_ENABLE([debug], AS_HELP_STRING(--enable-debug, [enable debugging code. [[default=no]]])) + AC_MSG_CHECKING([if debugging code is to be enabled]) + if test "$enable_debug" = "yes"; then + AC_DEFINE([QD_DEBUG], [1], [Define to 1 to enable debugging code.]) +@@ -73,7 +73,7 @@ + AC_MSG_RESULT($enable_debug) + + # --enable-warnings +-AC_ARG_ENABLE(enable_warnings, AC_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]])) ++AC_ARG_ENABLE([warnings], AS_HELP_STRING(--enable-warnings, [enable compiler warnings. [[default=no]]])) + AC_MSG_CHECKING([if compiler warnings is to be enabled]) + if test "$enable_warnings" != "yes"; then + enable_warnings="no" +@@ -83,13 +83,6 @@ + + # Checks for programs. + AC_LANG(C++) +-if test "$CXXFLAGS" = ""; then +- if test "$enable_debug" = "yes"; then +- CXXFLAGS="-O" +- else +- CXXFLAGS="-O2" +- fi +-fi + + # Set up compiler search list. DUe to possible case insensitive filesystems, + # Cygwin and Apple systems sometimes gets confused between cc and CC. +@@ -106,50 +99,10 @@ + fi + AC_PROG_CC + +- +-CXX_PROG_NAME=`basename $CXX` +-case $host in +- powerpc*-*-*) +- case "$CXX_PROG_NAME" in +- xlC*) +- REQ_CXXFLAGS="$REQ_CXXFLAGS -qstrict" +- ;; +- esac +- ;; +- i?86-*-* | k?*-*-* | athlon-*-* | ia64-*-* | x86_64-*-*) +- case "$CXX_PROG_NAME" in +- icc|icpc|ecc) +- REQ_CXXFLAGS="$REQ_CXXFLAGS -mp" +- if test "$enable_warnings" = "yes"; then +- CXXFLAGS="$CXXFLAGS -wd1572 -wd981 -wd1418 -wd1419" +- fi +- ;; +- esac +- ;; +- alpha*-*-*) +- case "$CXX_PROG_NAME" in +- cxx) +- CXXFLAGS="$CXXFLAGS -std strict_ansi -tweak" +- ;; +- esac +- ;; +-esac +- +-AC_SUBST(REQ_CXXFLAGS) +-CXXFLAGS="$CXXFLAGS $REQ_CXXFLAGS" +- +-if test "$enable_warnings" = "yes"; then +- if test "$GCC" = "yes"; then +- CXXFLAGS="$CXXFLAGS -Wall" +- fi +-fi +- +-if test "$enable_debug" = "yes"; then +- CXXFLAGS="$CXXFLAGS -g" +-fi ++CXXFLAGS="${CXXFLAGS} -Wall" + + # --enable-fma +-AC_ARG_ENABLE(enable_fma, AC_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]])) ++AC_ARG_ENABLE([fma], AS_HELP_STRING(--enable-fma, [use fused multiply-add/subtract (auto,gnu,ia64,c99,ibm,compiler). Use this option with care. [[default=auto]]])) + if test "x$enable_fma" = "x"; then + enable_fma="auto" + fi +@@ -248,7 +201,7 @@ + FCFLAGS="-O2" + fi + fi +-AC_ARG_ENABLE(enable_fortran, AC_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]])) ++AC_ARG_ENABLE([fortran], AS_HELP_STRING(--enable-fortran, [build Fortran 77/90 interfaces [[default=auto]]])) + if test "$enable_fortran" != "no"; then + AC_LANG_PUSH(Fortran) + AC_PROG_FC([xlf95 ifort pathf95 f95 gfortran g95 pgf95 lf95 fort ifc efc pathf90 xlf90 pgf90 epcf90 xlf f90]) +@@ -312,8 +265,7 @@ + AC_CHECK_LIB(m,sqrt) + + # libtool stuff +-AC_DISABLE_SHARED +-AC_PROG_LIBTOOL ++LT_INIT + + # Output + AC_CONFIG_FILES([Makefile config/Makefile src/Makefile include/Makefile +diff -U3 -r qd-2.3.22.orig/fortran/Makefile.am qd-2.3.22/fortran/Makefile.am +--- qd-2.3.22.orig/fortran/Makefile.am 2018-10-30 23:05:01.000000000 +0700 ++++ qd-2.3.22/fortran/Makefile.am 2018-11-09 21:47:44.530083871 +0700 +@@ -16,7 +16,9 @@ + + lib_LTLIBRARIES = libqdmod.la libqd_f_main.la + libqdmod_la_SOURCES = ddext.f ddmod.f qdext.f qdmod.f f_dd.cpp f_qd.cpp ++libqdmod_la_LIBADD = $(top_builddir)/src/libqd.la $(FCLIBS) + libqd_f_main_la_SOURCES = main.cpp ++libqd_f_main_la_LIBADD = $(top_builddir)/src/libqd.la libqdmod.la $(FCLIBS) + ddmod.lo: $(DDEXT) ddext.lo + qdmod.lo: ddmod.lo $(DDMOD) qdext.lo + $(QDMOD): qdmod.lo $(DDMOD) +diff -U3 -r qd-2.3.22.orig/qd-config.in qd-2.3.22/qd-config.in +--- qd-2.3.22.orig/qd-config.in 2018-10-30 23:04:56.000000000 +0700 ++++ qd-2.3.22/qd-config.in 2018-11-09 21:49:18.140077553 +0700 +@@ -14,7 +14,7 @@ + build_CXXFLAGS="@CXXFLAGS@" + build_LDFLAGS="@LDFLAGS@" + CXX="@CXX@" +-CXXFLAGS="-I$includedir @REQ_CXXFLAGS@" ++CXXFLAGS="-I$includedir" + FC="@FC@" + + LDFLAGS="-L$libdir -lqd @LIBS@" diff --git a/sci-libs/qd/qd-2.3.22.ebuild b/sci-libs/qd/qd-2.3.22.ebuild new file mode 100644 index 000000000000..aca6e4aa6610 --- /dev/null +++ b/sci-libs/qd/qd-2.3.22.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +FORTRAN_NEEDED=fortran + +inherit autotools fortran-2 + +DESCRIPTION="Quad-double and double-double float arithmetics" +HOMEPAGE="http://crd-legacy.lbl.gov/~dhbailey/mpdist/" +SRC_URI="http://crd.lbl.gov/~dhbailey/mpdist/${P}.tar.gz" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 doc fortran static-libs" + +PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-ieee-add \ + --disable-sloppy-mul \ + --disable-sloppy-div \ + --enable-inline \ + --enable-shared \ + $(use_enable static-libs static) \ + $(use_enable cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4) fma) \ + $(use_enable fortran) +} + +src_install() { + default + + dosym qd_real.h /usr/include/qd/qd.h + dosym dd_real.h /usr/include/qd/dd.h + + if ! use doc; then + rm "${ED%/}"/usr/share/doc/${PF}/*.pdf || die + fi + + if ! use static-libs; then + find "${D}" -name '*.la' -delete || die + fi +} diff --git a/sci-libs/xdmf2/Manifest b/sci-libs/xdmf2/Manifest index 66160288b2ff..2c1ab9175b62 100644 --- a/sci-libs/xdmf2/Manifest +++ b/sci-libs/xdmf2/Manifest @@ -2,6 +2,5 @@ AUX xdmf2-1.0_p141226-cannot-find-hdf5-bug-591302.patch 1675 BLAKE2B f1a2674d987 AUX xdmf2-1.0_p141226-cmake-3.12.patch 422 BLAKE2B 904de870ce6e7cb9aaa4454dbecd47447048eee08e7826869e09e7f294570e0dd235f011ccc775a1c4369bb4e6e890d8279c2102ce1c85f8488815c185be891e SHA512 e9fbf5caeffcccd12d9112cc4afc2485cea89105743d69483c08e931e84cb5d48facf67017b49c20a9c0f3087dbac974fa6eb2b0b76714ad207c1bbb20fd9518 AUX xdmf2-1.0_p141226-module.patch 452 BLAKE2B 1611edbdf962ba25b72dab702044b7c7299abe5d92757c333827f08eb643fd17661739a4c0f7c0e759c516d9eeba794733145bdb03ef6779d1a9ef6e315fc5db SHA512 9a9e05001f1d8ea8250a7bb9231a43e8cceeface61fb125330b6255a1ba452650a80cb6592a69fdecc04212752c0d1fa195151b13c88262c40a36ca566a33dcd DIST xdmf2-1.0_p141226.tar.xz 267096 BLAKE2B 230ed73cc0521f04ff519c0050559ccf3837b915a196336de4b439cf05cae02220270a81290a6aac70e04095695b853e7de35613fba39cef6a90e93e6c99a3f9 SHA512 031b947ccd942c39cb40504e939f03bc9e3190ae1a7baf8325809decf70a040e860b43d5bc9debfcf2f3838f5f0d7a9c77c92561c89fc0d632306e140b136db9 -EBUILD xdmf2-1.0_p141226-r1.ebuild 1540 BLAKE2B fb84d09a0aa7082f90deb5ec8fffa003a409da6ed0318b33837473d1c61bbb9bce6793eeb92152efe4e5495e0baf255432170866764318218250b92b40052f92 SHA512 4758b233409d8979fe16e6c700528692c61784573613f74d154e99902e09b80bf37463558e96627b4e422bdcc98516aaf10066533465d9a0315c8f917c115115 -EBUILD xdmf2-1.0_p141226-r3.ebuild 1800 BLAKE2B 127b5fc924f917e410e0264a613a57fc7b481367ddf382eff184c5e8648f6e17fdd1edf37e57aef2073438d9a02ba24c530ffb08cd80a201592063c8dd672d71 SHA512 86fba3e44c93562df87a4a518cd0c720387d75e3d29a8b05ee483e8174872d6466e597fd6866321014a1825efba4f27e1bd4cd84732ee1dc446fea2b0c740537 +EBUILD xdmf2-1.0_p141226-r3.ebuild 1799 BLAKE2B 770c26881372a21f0d714e83291f61aa7020ec78e60d732df34b7991faab6c552ca39340862d63c60572e33e51909b8e7bb9835bd78536060afca68900a6c947 SHA512 392b8e52627109788cba56df12a4d08ab94b34c32914bb06a97e83dfe6c60621ef03d66c2395e8afda065c02097f827aa56593d454495328e8ba0e0394914346 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706 diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild deleted file mode 100644 index a0cf89a25299..000000000000 --- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils flag-o-matic multilib python-single-r1 - -DESCRIPTION="eXtensible Data Model and Format" -HOMEPAGE="http://xdmf.org/index.php/Main_Page" -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -SLOT="0" -LICENSE="VTK" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="doc python test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sci-libs/hdf5:= - dev-libs/libxml2:2 - python? ( ${PYTHON_DEPS} ) - " -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - python? ( dev-lang/swig:0 ) -" - -PATCHES=( "${FILESDIR}"/${P}-module.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup && python_export -} - -src_prepare() { - if use python; then - local _site=$(python_get_sitedir) - sed \ - -e "/DESTINATION/s:python:${_site##${EPREFIX}/usr/$(get_libdir)/}:g" \ - -i CMakeLists.txt || die - fi - - sed \ - -e "/DESTINATION/s:lib:$(get_libdir):g" \ - -e "/INSTALL/s:lib:$(get_libdir):g" \ - -i CMakeLists.txt core/CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - # bug 619604 - append-cxxflags -std=c++14 - - local mycmakeargs=( - $(cmake-utils_use doc XDMF_BUILD_DOCUMENTATION) - $(cmake-utils_use_build test TESTING) - $(cmake-utils_use python XDMF_WRAP_PYTHON) -# $(cmake-utils_use java XDMF_WRAP_JAVA) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dosym XdmfConfig.cmake /usr/share/cmake/Modules/${PN}Config.cmake -} diff --git a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild index 87f9c1e1fbb2..f8f903a4c1d0 100644 --- a/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild +++ b/sci-libs/xdmf2/xdmf2-1.0_p141226-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" SLOT="0" LICENSE="VTK" -KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" IUSE="doc python test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |