From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- sci-libs/Manifest.gz | Bin 41519 -> 41522 bytes sci-libs/chemkit/Manifest | 2 +- sci-libs/chemkit/chemkit-0.1-r2.ebuild | 24 +- sci-libs/plplot/Manifest | 4 - .../plplot/files/plplot-5.11.0-multiarch.patch | 60 ---- sci-libs/plplot/files/plplot-5.11.0-ocaml.patch | 40 --- sci-libs/plplot/plplot-5.11.1-r1.ebuild | 249 --------------- sci-libs/silo/Manifest | 4 +- sci-libs/silo/files/silo-4.10.2-qt5.patch | 44 +++ sci-libs/silo/files/silo-4.10.2-qtlibs.patch | 48 +-- sci-libs/silo/silo-4.10.2-r1.ebuild | 40 +++ sci-libs/vtk/Manifest | 5 + sci-libs/vtk/vtk-8.1.0.ebuild | 339 +++++++++++++++++++++ 13 files changed, 472 insertions(+), 387 deletions(-) delete mode 100644 sci-libs/plplot/files/plplot-5.11.0-multiarch.patch delete mode 100644 sci-libs/plplot/files/plplot-5.11.0-ocaml.patch delete mode 100644 sci-libs/plplot/plplot-5.11.1-r1.ebuild create mode 100644 sci-libs/silo/files/silo-4.10.2-qt5.patch create mode 100644 sci-libs/silo/silo-4.10.2-r1.ebuild create mode 100644 sci-libs/vtk/vtk-8.1.0.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 15cc170c3300..ac3be53eb17f 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest index 30329518411d..cf36a345298e 100644 --- a/sci-libs/chemkit/Manifest +++ b/sci-libs/chemkit/Manifest @@ -1,5 +1,5 @@ AUX chemkit-0.1-multilib.patch 4694 BLAKE2B f52836ec887b9673c8eabac6ca4fb008aa23def355419f02704605438de44457f2a017a56a7fdd3ce387df08e5b57a0352052d2b88ff0e051a6cf47a192ffd1e SHA512 dedde9e5db14f088e5a70ebfcd9f46b6fbb2d60b1800a61ece1f7afef24caac502f129573823807caec050ba1515ad402a3615953b903a239c5287a5b96aa8b8 AUX chemkit-0.1-unbundle.patch 6103 BLAKE2B 9ee0f121fec938a528abb837ab386fec62a8576b5c7d123538ce95604953f4f30d0b285b27a153ef98629f053954324f7c384329fe3ca6873f2d18700e914ff8 SHA512 9edd39008763b56eb7697562536c4c4d476880a414ae1a305d1af64cee04e4ccb82585cfd15d2f7608b5200e39863a9a97c2a152110b28e501fbd055737ce015 DIST chemkit-0.1.tar.gz 5842235 BLAKE2B 9cf28dc6d2c067403172c4f54a057bf38ea9aeaebc96b9be819f4861d1559c1db440dd33baf15f739b2b0e6dc6ba3e73010e0b5aa1b46309435e7bbffb889259 SHA512 0273f8735333000b04007ccd7adc58f0c4809a570fa5a72e4161652d72e8953bf89cad0893c20ecbb3484d6c13a8828c92f12366dddeedaf591815c35f6ef011 -EBUILD chemkit-0.1-r2.ebuild 2000 BLAKE2B d6290e3de5dc1118bf89065d820cbfc1d44514e7aaf679d48d61beac4ef82c4a81cac93d34e6532601ed9f82572653d0524f136a6083cbdf152b64e87df75772 SHA512 14236546b1e91a844c32c0085d262962503c4ab5388ea0de6a3124920ee2975d1e5930509969d1ac1678acdeda6a35849666dc6b7e26babfeac2ce86a38de87a +EBUILD chemkit-0.1-r2.ebuild 1901 BLAKE2B 2ffeacbbe0d24820327b0f19b3e876da35c654ab029ccafd0aaba9cea23c4c2489c5c584643f4383de7fa298299dc9d19ecdf2f9b90d19b130e2c78aed808891 SHA512 261ec048b4e31e7f73a82277bf3cac0721e92f83a849973dad0f74a6fd388adcaaa29dbbb5bd3f9ea45070d00cd7e3d47a87647ec09186f54e94e7a57b7ab4ef MISC metadata.xml 352 BLAKE2B fbab9c9aa637ace5d90660942c8a34550c45bdf692b98ef583a77e5ed8d666877c09076314f6ec4081f91d12803fd1d8f50b7a715991e8e0ed0541e8473563b3 SHA512 b197aa62c04a5f668822db2e277407e7e871505f7adf5cfceaab36b5bc808f0b7582f17f9a00c7d4013eb4728b7a6ef61a52325deb182d6cd4a344e5d1e98cb1 diff --git a/sci-libs/chemkit/chemkit-0.1-r2.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild index c1cb99bc9455..987c32161c18 100644 --- a/sci-libs/chemkit/chemkit-0.1-r2.ebuild +++ b/sci-libs/chemkit/chemkit-0.1-r2.ebuild @@ -14,10 +14,9 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD PSF-2.2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples python qt4 test" +IUSE="examples python test" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( python qt4 )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" dev-cpp/eigen:3 @@ -32,14 +31,11 @@ RDEPEND=" x11-libs/libXext ) python? ( ${PYTHON_DEPS} ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - ) " DEPEND="${RDEPEND}" +RESTRICT="test" # requires disabled Qt4 + S="${WORKDIR}"/${PN} PATCHES=( @@ -63,12 +59,12 @@ src_configure() { -DCHEMKIT_BUILD_EXAMPLES=$(usex examples) -DCHEMKIT_BUILD_DEMOS=$(usex examples) -DCHEMKIT_BUILD_BINDINGS_PYTHON=$(usex python) - -DCHEMKIT_BUILD_APPS=$(usex qt4) - -DCHEMKIT_BUILD_PLUGIN_BABEL=$(usex qt4) - -DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=$(usex qt4) - -DCHEMKIT_WITH_GRAPHICS=$(usex qt4) - -DCHEMKIT_WITH_GUI=$(usex qt4) - -DCHEMKIT_WITH_WEB=$(usex qt4) + -DCHEMKIT_BUILD_APPS=OFF + -DCHEMKIT_BUILD_PLUGIN_BABEL=OFF + -DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=OFF + -DCHEMKIT_WITH_GRAPHICS=OFF + -DCHEMKIT_WITH_GUI=OFF + -DCHEMKIT_WITH_WEB=OFF -DCHEMKIT_BUILD_TESTS=$(usex test) -DUSE_SYSTEM_INCHI=ON -DUSE_SYSTEM_JSONCPP=OFF diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 57ca02e02712..834aa9d4ad59 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,12 +1,8 @@ -AUX plplot-5.11.0-multiarch.patch 1937 BLAKE2B ebdb27cbb46103e0af2554d05a671a8443febb926842a7ee5967a9dd24d7de9d64a4bcda0ed481c60a866fa8d80231fb71eb08b6ca9e065064b5ee184353c742 SHA512 505fbd1d1c6700ba7d16795e262a930f58b77c3565ca844a3cca1313f004057c1432ad60132d3844d0f04f959c005236b9ebd10f3615d4368e4fa968141d147d -AUX plplot-5.11.0-ocaml.patch 2736 BLAKE2B 199e4892541a62d79fcc743e38eb867da82592eb648551832e1ed3232c0941d94648e80694ed2a069622f5a404ca3064a51a1af218f9c583c42cdbfb99a6ae1d SHA512 3d41fec8b2c2a07771fefab7c0f9199f1b31376d71d0c0c8f7d3ddedea3889eebfd9d44432b8f22e6d6dca233d6011d0b1645b193d319eb953b18543ec212412 AUX plplot-5.11.0-octave.patch 669 BLAKE2B 43361aa8c31f6b743b1a6d20b27701655ab4db475d330d5cde62e9f9774555d94ba8f26f2f5621e3625a7f86dce55d369ec387c8dcf5946ced4208ffe7463d9a SHA512 7ddd8105aa8ba684e423cac3657f2d1bc753b86eb2054edd2ff9497ec235354134da4ecfff5d26e26f01efced2f630f0e2488d114ce7dc887e7761f5ee060814 AUX plplot-5.12.0-java-install-path.patch 393 BLAKE2B bd6860e694b5132a349699e25b79951308001b04b49d4ac1f070cd2ce51dc1e6ea76a7721e925c123669beb981ba756c3ae4e29bc0dee6f85f4e44fb61ac5f91 SHA512 0e87a67fd6821be07a56b68d8f9c23e4c25efea4fc9b56a2cec06d804202946917abd58271c71674d6b3b3ecda688be44920649095da3b125fe3a119fd22f1dd AUX plplot-5.12.0-multiarch.patch 1309 BLAKE2B 8bce8e12a82b361989e5b8a7c11c25a642fc2d62af37b74764db675ed6d91bc4b011318633b42a942abd0b59db70658f1cb28bf4873722095a998d5e63a00d51 SHA512 4fe0992ccc8f7f9dcab956c1ec06a647e4a7bab67c0f2a78c4e004491a5d8685240dadfd2c248e4fd6a58747a5da67ab8c8dc35c1a0de5a85431da431a00607f AUX plplot-5.12.0-ocaml-remove-rpath.patch 2012 BLAKE2B 47bbcc2c7e49b50f045c786ae3d5a799b45ab734e24e815168d9a6364fe09fc63869b57dd0a12b5c70ef5b69444ad6dba31bcc123faada6df9ac0af8cb0984d5 SHA512 6c40de6ab578ab8c347f12335b8a91976e5e4d8eee039512048039507c5e2b4a75b5bbfdde5ae347d2ccb167679b6574460d3f737ad37ee8902c7bcdc96af05d AUX plplot-5.9.6-python.patch 379 BLAKE2B cf08250c851c3405517183e8f3425f42ede2f850cc8bcd89828e3e1b89035731a8a3face0988750e9f9e5dce2fa0404b23b2721c5b315ff61aeac552fd6e05f2 SHA512 cb2022bda3d5408ef0b2dc280981ad8bdb2f7ecb20d827f7e71ce063fba60963e68aeaa5efd8eef87da8e3dc270b609f7cb342c1da175cd757c9f135173842e4 -DIST plplot-5.11.1.tar.gz 15445404 BLAKE2B ea3d0cac2d47e9028f604c5665842aae95dd058c0b522f477e2a4397f686f1dd01321660c2b2d259771dbc30ce758721bc8db085b29f35d170ea8b89b539aa91 SHA512 663da681a2e1ab2cb551e028485a55dfa111d8828187e84a50f5605c3346288ebd07a0e20ff4c50f00efc4f52be84bc100602de42e5713868ad32fdb431b80fd DIST plplot-5.12.0.tar.gz 16253895 BLAKE2B 5b89c0a6a478c6faf9bff2e2765eb6b13b6b1fc5644dbcdbc6aa88c510ad82a04253a7cb33d16816ff128eb866aad0f5cbccc365687ebb62022926f3c8545a0b SHA512 5566b9db0ddbb5ecaa677168f65f240197b2b8b23a02a812efc7e97fc79686b523591edad9c83de2e72935090d426b4cb9fe82496d9eb5a5a521c42161e9848b -EBUILD plplot-5.11.1-r1.ebuild 6610 BLAKE2B 3ada422069f80f73b43f9002740b58076c331d0762506e76389c27d6d8505c9275c71438494a919b53ed201387607b893e6bd023f1220eacc0148e6b4224566e SHA512 bbf20a0bdc49f23b3fcf4e58b8869ae701b8bb785b9ba31380d8ce7d8cf233e7eabecb78d5ae77dcc7158b1b6359fb5c54a2e0ae52dc440da1a4bee081f7a187 EBUILD plplot-5.12.0-r1.ebuild 7230 BLAKE2B e2b765ed474958cb34f2f92a26c634ed70a728081a22d0886b89e8aa43aff43499e9c8c1ffc0588fc6c3e388e270715273d7d809a1aca522774b33524b792aaa SHA512 0ac1a50359de3c0c5b6fedcf9ee9ab0393a5e1bf38dac7ae02cf00c8555d3d5d3ee3e546b0ed7d21e079b011629c7af4fed423b62494b2bd6c6aaf26a00a94a7 MISC metadata.xml 1487 BLAKE2B 33e45227a6094c8b7e8602081e267b5aad51cf90638269b544feb308f95e32757ae5784edc14cda97d8d0e4d5e209e9ba3528f8f763adada95ceb8c61d11fdc8 SHA512 ebace14f95cf9d6e3c71b8a4fa3ed411052183e2fa67197173f99045e22503b0e80dac6762ddb38fa97b7e36b67693b9c7352cba31d399d0b819d8da9cbf27ea diff --git a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch b/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch deleted file mode 100644 index cb6f7d01cf16..000000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-multiarch.patch +++ /dev/null @@ -1,60 +0,0 @@ - examples/c++/Makefile.examples.in | 3 --- - examples/c/Makefile.examples.in | 2 -- - examples/f95/Makefile.examples.in | 2 -- - examples/tk/Makefile.examples.in | 2 -- - 4 files changed, 9 deletions(-) - -diff --git a/examples/c++/Makefile.examples.in b/examples/c++/Makefile.examples.in -index bb067e7..176706b 100644 ---- a/examples/c++/Makefile.examples.in -+++ b/examples/c++/Makefile.examples.in -@@ -25,10 +25,7 @@ SHELL = @SH_EXECUTABLE@ - CXX = @CXX@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - @qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ --@qt_gui_true@qt_RPATHCMD = @qt_RPATHCMD@ - - @wxwidgets_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ - @wxwidgets_true@ wxPLplotDemo$(EXEEXT) -diff --git a/examples/c/Makefile.examples.in b/examples/c/Makefile.examples.in -index bc47762..56d1f49 100644 ---- a/examples/c/Makefile.examples.in -+++ b/examples/c/Makefile.examples.in -@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - - @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \ - @gcw_true@ plplotcanvas_demo$(EXEEXT) \ -diff --git a/examples/f95/Makefile.examples.in b/examples/f95/Makefile.examples.in -index 29631b7..32823d6 100644 ---- a/examples/f95/Makefile.examples.in -+++ b/examples/f95/Makefile.examples.in -@@ -25,8 +25,6 @@ SHELL = @SH_EXECUTABLE@ - F95 = @FC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --RPATHCMD = @RPATHCMD@ - - EXECUTABLES_list = \ - x00f$(EXEEXT) \ -diff --git a/examples/tk/Makefile.examples.in b/examples/tk/Makefile.examples.in -index 98407fa..c15c94a 100644 ---- a/examples/tk/Makefile.examples.in -+++ b/examples/tk/Makefile.examples.in -@@ -24,8 +24,6 @@ SHELL = @SH_EXECUTABLE@ - CC = @CC@ - EXEEXT = @EXEEXT@ - --PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ --plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@ - - EXECUTABLES_list = xtk01$(EXEEXT) - # Second and fourth examples depend on itk. diff --git a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch b/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch deleted file mode 100644 index 32841825f0de..000000000000 --- a/sci-libs/plplot/files/plplot-5.11.0-ocaml.patch +++ /dev/null @@ -1,40 +0,0 @@ - bindings/ocaml/CMakeLists.txt | 4 ++-- - bindings/ocaml/plcairo/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bindings/ocaml/CMakeLists.txt b/bindings/ocaml/CMakeLists.txt -index 93d073a..d31a64f 100644 ---- a/bindings/ocaml/CMakeLists.txt -+++ b/bindings/ocaml/CMakeLists.txt -@@ -154,11 +154,11 @@ if(ENABLE_ocaml) - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma -- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS} -+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -dllib -lplplot_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplplot_stubs -ccopt -L${CAMLIDL_LIB_DIR} -cclib -lcamlidl -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src ${ocaml_STATIC_FLAGS} - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plplot_core.cmo - ${CMAKE_CURRENT_BINARY_DIR}/plplot.cmo -diff --git a/bindings/ocaml/plcairo/CMakeLists.txt b/bindings/ocaml/plcairo/CMakeLists.txt -index c4b4a41..ce1dc92 100644 ---- a/bindings/ocaml/plcairo/CMakeLists.txt -+++ b/bindings/ocaml/plcairo/CMakeLists.txt -@@ -84,11 +84,11 @@ if(ENABLE_ocaml AND OCAML_HAS_CAIRO) - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - ) - -- # ocamlc -a -custom builds a *.cma library from *.cmo -+ # ocamlc -a builds a *.cma library from *.cmo - add_custom_command( - OUTPUT - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -- COMMAND ${OCAMLC} -a -custom -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src -+ COMMAND ${OCAMLC} -a -o ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cma -I ${PATH_TO_PLPLOT_CMA} plplot.cma ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo -dllib -lplcairo_stubs -ccopt -L${CMAKE_CURRENT_BINARY_DIR} -cclib -lplcairo_stubs -ccopt -L${CMAKE_BINARY_DIR}/src -cclib -lplplot -dllpath ${CMAKE_BINARY_DIR}/src - DEPENDS - ${CMAKE_CURRENT_BINARY_DIR}/plcairo.cmo - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} diff --git a/sci-libs/plplot/plplot-5.11.1-r1.ebuild b/sci-libs/plplot/plplot-5.11.1-r1.ebuild deleted file mode 100644 index a46a090713e9..000000000000 --- a/sci-libs/plplot/plplot-5.11.1-r1.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" -FORTRAN_NEEDED=fortran -PYTHON_COMPAT=( python2_7 ) -VIRTUALX_REQUIRED=test - -inherit eutils fortran-2 cmake-utils python-single-r1 toolchain-funcs \ - virtualx wxwidgets java-pkg-opt-2 multilib - -DESCRIPTION="Multi-language scientific plotting library" -HOMEPAGE="http://plplot.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2" -SLOT="0/12" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="cairo cxx doc +dynamic examples fortran gd java jpeg latex lua - ocaml octave pdf pdl png python qhull qt4 shapefile svg tcl test - threads tk truetype wxwidgets X" - -RDEPEND=" - cairo? ( x11-libs/cairo:0=[svg?,X?] ) - gd? ( media-libs/gd:2=[jpeg?,png?] ) - java? ( >=virtual/jre-1.5:* ) - latex? ( - app-text/ghostscript-gpl - virtual/latex-base - ) - lua? ( dev-lang/lua:0= ) - ocaml? ( - dev-lang/ocaml - dev-ml/camlidl - cairo? ( dev-ml/cairo-ocaml[gtk] ) - ) - octave? ( sci-mathematics/octave:0= ) - pdf? ( media-libs/libharu:0= ) - pdl? ( - dev-perl/PDL - dev-perl/XML-DOM - ) - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) - ) - qhull? ( media-libs/qhull:0= ) - qt4? ( - dev-qt/qtgui:4= - dev-qt/qtsvg:4= - ) - shapefile? ( sci-libs/shapelib:0= ) - tcl? ( - dev-lang/tcl:0= - dev-tcltk/itcl:0= - tk? ( - dev-lang/tk:0= - dev-tcltk/itk - ) - ) - truetype? ( - media-fonts/freefont - media-libs/lasi:0= - gd? ( media-libs/gd:2=[truetype] ) - ) - wxwidgets? ( - x11-libs/wxGTK:${WX_GTK_VER}=[X] - x11-libs/agg:0=[truetype?] - ) - X? ( - x11-libs/libX11:0= - x11-libs/libXau:0= - x11-libs/libXdmcp:0= - )" - -DEPEND="${RDEPEND} - virtual/pkgconfig - java? ( - >=virtual/jdk-1.5 - dev-lang/swig - ) - ocaml? ( dev-ml/findlib ) - octave? ( >=dev-lang/swig-2.0.12 ) - python? ( dev-lang/swig ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc - )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt4? ( dynamic ) test? ( latex ) tk? ( tcl )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.9.6-python.patch - "${FILESDIR}"/${PN}-5.11.0-ocaml.patch - "${FILESDIR}"/${PN}-5.11.0-octave.patch - "${FILESDIR}"/${PN}-5.11.0-multiarch.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - java-pkg-opt-2_pkg_setup - fortran-2_pkg_setup -} - -src_prepare() { - use wxwidgets && need-wxwidgets unicode - cmake-utils_src_prepare - # avoid installing license - sed -i -e '/COPYING.LIB/d' CMakeLists.txt || die - # prexify hard-coded /usr/include in cmake modules - sed -i \ - -e "s:/usr/include:${EPREFIX}/usr/include:g" \ - -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):g" \ - -e "s:/usr/share:${EPREFIX}/usr/share:g" \ - cmake/modules/*.cmake || die - # change default install directories for doc and examples - sed -i \ - -e 's:${DATA_DIR}/examples:${DOC_DIR}/examples:g' \ - $(find "${S}" -name CMakeLists.txt) || die - sed -i \ - -e 's:${VERSION}::g' \ - -e "s:doc/\${PACKAGE}:doc/${PF}:" \ - cmake/modules/instdirs.cmake || die - java-utils-2_src_prepare -} - -src_configure() { - # don't build doc, it brings a whole lot of horrible dependencies - - # -DPLPLOT_USE_QT5=ON - # Not recomended by upstream, check next release - - local mycmakeargs=( - -DPLD_plmeta=ON - -DPLD_cgm=ON - -DTEST_DYNDRIVERS=OFF - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -DENABLE_ada=OFF - -DENABLE_d=OFF - -DBUILD_DVI=OFF - -DDOX_DOC=OFF - -DBUILD_DOC=OFF - -DUSE_RPATH=OFF - -DPLD_wxpng=OFF - $(cmake-utils_use doc PREBUILT_DOC) - $(cmake-utils_use_build test) - $(cmake-utils_use_has python NUMPY) - $(cmake-utils_use_has shapefile SHAPELIB) - $(cmake-utils_use_with truetype FREETYPE) - $(cmake-utils_use_enable cxx) - $(cmake-utils_use_enable dynamic DYNDRIVERS) - $(cmake-utils_use_enable fortran f77) - $(cmake-utils_use_enable java) - $(cmake-utils_use_enable lua) - $(cmake-utils_use_enable ocaml) - $(cmake-utils_use_enable octave) - $(cmake-utils_use_enable pdl) - $(cmake-utils_use_enable python) - $(cmake-utils_use_enable qt4 qt) - $(cmake-utils_use_enable tcl) - $(cmake-utils_use_enable tcl itcl) - $(cmake-utils_use_enable tk) - $(cmake-utils_use_enable tk itk) - $(cmake-utils_use_enable wxwidgets) - $(cmake-utils_use threads PL_HAVE_PTHREAD) - $(cmake-utils_use qhull PL_HAVE_QHULL) - $(cmake-utils_use qt4 PLD_aqt) - $(cmake-utils_use qt4 PLD_bmpqt) - $(cmake-utils_use qt4 PLD_epsqt) - $(cmake-utils_use qt4 PLD_extqt) - $(cmake-utils_use qt4 PLD_jpgqt) - $(cmake-utils_use qt4 PLD_memqt) - $(cmake-utils_use qt4 PLD_pdfqt) - $(cmake-utils_use qt4 PLD_pngqt) - $(cmake-utils_use qt4 PLD_ppmqt) - $(cmake-utils_use qt4 PLD_svgqt) - $(cmake-utils_use qt4 PLD_qtwidget) - $(cmake-utils_use qt4 PLD_tiffqt) - $(cmake-utils_use cairo PLD_extcairo) - $(cmake-utils_use cairo PLD_memcairo) - $(cmake-utils_use cairo PLD_pdfcairo) - $(cmake-utils_use cairo PLD_pngcairo) - $(cmake-utils_use cairo PLD_pscairo) - $(cmake-utils_use cairo PLD_svgcairo) - $(cmake-utils_use cairo PLD_wincairo) - $(cmake-utils_use cairo PLD_xcairo) - $(usex cairo "" "-DDEFAULT_NO_CAIRO_DEVICES=ON") - $(cmake-utils_use tk PLD_ntk) - $(cmake-utils_use tk PLD_tk) - $(cmake-utils_use tk PLD_tkwin) - $(cmake-utils_use gd PLD_gif) - $(cmake-utils_use gd PLD_jpeg) - $(cmake-utils_use gd PLD_png) - $(cmake-utils_use pdf PLD_pdf) - $(cmake-utils_use latex PLD_ps) - $(cmake-utils_use latex PLD_pstex) - $(cmake-utils_use truetype PLD_psttf) - $(cmake-utils_use svg PLD_svg) - $(cmake-utils_use wxwidgets PLD_wxwidgets) - $(cmake-utils_use X PLD_xwin) - ) - - [[ $(tc-getFC) != *g77 ]] && \ - mycmakeargs+=( - $(cmake-utils_use_enable fortran f95) - ) - - use truetype && mycmakeargs+=( - -DPL_FREETYPE_FONT_PATH:PATH="${EPREFIX}/usr/share/fonts/freefont" - ) - use shapefile && mycmakeargs+=( - -DSHAPELIB_INCLUDE_DIR="${EPREFIX}/usr/include/libshp" - ) - use ocaml && mycmakeargs+=( - -DOCAML_INSTALL_DIR="$(ocamlc -where)" - ) - use python && mycmakeargs+=( - $(cmake-utils_use_enable qt4 pyqt4) - ) - - cmake-utils_src_configure - - # clean up bloated pkg-config files (help linking properly on prefix) - sed -i \ - -e "/Cflags/s:-I\(${EPREFIX}\|\)/usr/include[[:space:]]::g" \ - -e "/Libs/s:-L\(${EPREFIX}\|\)/usr/lib\(64\|\)[[:space:]]::g" \ - -e "s:${LDFLAGS}::g" \ - "${BUILD_DIR}"/pkgcfg/*pc || die -} - -src_test() { - virtx cmake-utils_src_test -} - -src_install() { - cmake-utils_src_install - if use examples; then - docompress -x /usr/share/doc/${PF}/examples - else - rm -r "${ED}"/usr/share/doc/${PF}/examples || die - fi - if use java; then - java-pkg_dojar "${BUILD_DIR}"/examples/java/${PN}.jar - java-pkg_regso "${ED}"/usr/$(get_libdir)/jni/plplotjavac_wrap.so - fi -} diff --git a/sci-libs/silo/Manifest b/sci-libs/silo/Manifest index 32a09c12fa0c..5d0679d11007 100644 --- a/sci-libs/silo/Manifest +++ b/sci-libs/silo/Manifest @@ -1,10 +1,12 @@ AUX silo-4.10.2-mpiposix.patch 1902 BLAKE2B c26f6681bbab0065f046414c406bcfac3cc1a993729bb67e1178e67261201afbaad3f0469b8859d5c34261ea00f4be4f131a9db9f981dbbe18f137b53dc9a435 SHA512 626a7b8084a936b667f704a1a35edb8f6ce9ab42b58857024b87f280364d99b452e3f149b577e45898eb08523f0741eecc1c4ad20a46018dae377ca17adcf97a -AUX silo-4.10.2-qtlibs.patch 3558 BLAKE2B cd14024e9c32e1bb48359ce9a3375b31ce434828d24a957f9b8a3eea52708dc24481cd2f7090fa8d0b8bf839c5413f5d9e47ee5782ea777cac9405c92c5032d9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966 +AUX silo-4.10.2-qt5.patch 1414 BLAKE2B 3b33d1228f9b26340d851a97dfcdde38b1ab66632a05ef0a3a5d7b9cec2c9c7186c922d0630bf6600830c53263218b90fe66ab0156cdf143a4df5577b200f5ab SHA512 a6a22b7ef04179b8d101d38b72244be6c59d4d23bb8dd0855ba5f3267a181e2b175806dbfa6c1184bd5f3542e842701f096a389e6cae6df5d26209319d96316f +AUX silo-4.10.2-qtlibs.patch 4320 BLAKE2B 34fbff942d4caa73bf18302873ba4dc63de063eec84b3e0cd3bf3b24a5aeb44d40b74567f8001c3d14e19dabdb5133ea4ca32af067b16398a6aaaaac664209c5 SHA512 3f2e63ee943463fc23d7ba3542c756bd158c8b8f8280ec87eef53e30add0b335edfd202c592885e2f4002c7f975324ca7e96351c1d9c25ffb1adf2b67cd034d9 AUX silo-4.10.2-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3 AUX silo-4.9.1-qtlibs.patch 3558 BLAKE2B cd14024e9c32e1bb48359ce9a3375b31ce434828d24a957f9b8a3eea52708dc24481cd2f7090fa8d0b8bf839c5413f5d9e47ee5782ea777cac9405c92c5032d9 SHA512 629a16392ce32d7b9d79cd4870f6236e0129bc2ef570afc515b2af698dc67a4a773fc7d1a92c65ea8663ca1f993cac4d81a326ac6f10e474adcb614599863966 AUX silo-4.9.1-tests.patch 562 BLAKE2B 27a15c9b6561101610774fd5f69b3bde7c0bca13943f37792562a0af66924566852ff67d5eee208bfcf1dd7790be602809c552a3f5a3b98cfc971aa1e90fd560 SHA512 c54c9cd7934f94e572302c8afabf20b4bfe84c34e602afe37fde2c0953598c5c91cb5a9351669da2dd44226cf269a4d762a38af5a23896677d8260cfcff032f3 DIST silo-4.10.2.tar.gz 13135900 BLAKE2B 6326a42df43c4bb6936522d1730db8ce45c6b74779cf37b7a5a0b7a72def9e9a4f174b68392adbda59936113ccac4ae5e7bf7266effb364eac7e5d0cff8bb37c SHA512 8cd1340ed641c8be77f310b286da344e2fed7ae469ed7bebf5deebaa1a369ca91c283b38eae2c57b7ad046f65343cfaa56a1c07b6c8b07b79aad69c4e5617f6e DIST silo-4.9.1.tar.gz 12038537 BLAKE2B 4c5bf6a4390333d659df96a302f6ee8f7a81325194cb6853c278e94b6c229da964103874c02fcb4b4f9f4985cf9b023ee3a553e1ca6237ccdbc5e7d9f64c1906 SHA512 512e16ec6bd62deb3596d918895a0c82606a9f519345e4c4abd1a19eb40172576b70313472b75ae4183ee9d86a0f19443504f232ca6e633b1652f9d547927b83 +EBUILD silo-4.10.2-r1.ebuild 1179 BLAKE2B e785939ebf112b33777b56f99abfddfe68d042dd5e149dffc198e91378a8af86e3c647d3f0e5de707b0ff90ef4e425cbe4aed2b56ab4575d245f8f149280c056 SHA512 641e8e2f98ce7d916b565014760ca21dd43447080b8c47e186575414820868d7bba91ef7c951f57af35a7cee4e5ea6ea7f5d4f4db60e1dab6bd63a8ffb7bafb8 EBUILD silo-4.10.2.ebuild 1099 BLAKE2B aa5bbf3d5f0451a5a8e711f594f315997247b4415e43845f8b94259979c1c4ec129de72184096bf22de0ab0862672fe91c15d55e100bf3695a6676e08c201a0d SHA512 1cd5333c6f337d876347b8f946365fbb9ccc1e4aec90ed00399eff2b2021ba60231a59db17312d993e25d99c28665511866d03fe4f6990652022e168a72143d4 EBUILD silo-4.9.1.ebuild 989 BLAKE2B 68f2b46491e44c6ab2f60c3756195d316ad3ffeac91071338ad607e8daa32f5c36074880e5630ba5949c15435fe6678e8251332cf9643e6724c8a2456fa32978 SHA512 55f52bab2e917ff99fdfed8e2943be770981d064a5a29c7406d097b6667c6b99508a602a11c6a6a199e82362503791aee577f3fef794eb37809576eafe329c1f MISC metadata.xml 751 BLAKE2B 15f217d9eeeedb7889e47a18d81715f674156e59aef6901ec3873a731484a645a74c1840d2b41e1ca53d0247b43c5f401353b86e419f74f0aeb965146a53b9c1 SHA512 be9db7766bd0e0ea6c5f7f4505ee48ab6ea8b7da1ccc78ab68868072d15d068dab3f6eeeb53cf5cd348da92d52e32d8ad363798de55cd4a79fb1c19ad8456f5e diff --git a/sci-libs/silo/files/silo-4.10.2-qt5.patch b/sci-libs/silo/files/silo-4.10.2-qt5.patch new file mode 100644 index 000000000000..1e1fe8803a37 --- /dev/null +++ b/sci-libs/silo/files/silo-4.10.2-qt5.patch @@ -0,0 +1,44 @@ +--- tools/silex/SiloFile.h.orig 2018-01-24 11:01:23.354705068 +0100 ++++ tools/silex/SiloFile.h 2018-01-24 11:01:34.843705761 +0100 +@@ -61,6 +61,8 @@ + #include + using std::vector; + ++#define toAscii toLatin1 ++ + // **************************************************************************** + // Class: SiloDir + // +--- tools/silex/main.cpp.orig 2018-01-24 11:02:21.201708556 +0100 ++++ tools/silex/main.cpp 2018-01-24 11:02:34.146709336 +0100 +@@ -58,7 +58,7 @@ + #include + + #ifndef Q_WS_MACX +-#include "qwindowsstyle.h" ++//#include "qwindowsstyle.h" + #endif + #include "qfiledialog.h" + #include "qstring.h" +@@ -91,7 +91,7 @@ + QApplication::setColorSpec(QApplication::ManyColor); + QApplication a(argc, argv); + #ifndef Q_WS_MACX +- a.setStyle(new QWindowsStyle); ++// a.setStyle(new QWindowsStyle); + #endif + Explorer *w = 0; + if (argc > 1) +--- tools/silex/SiloView.cpp.orig 2018-01-24 11:03:13.775711725 +0100 ++++ tools/silex/SiloView.cpp 2018-01-24 11:03:30.032712706 +0100 +@@ -109,8 +109,8 @@ + dirTreeView->OpenRootDir(); + dirView->Set(silo->root); + +- dirTreeView->header()->setResizeMode(QHeaderView::Interactive); +- dirView->header()->setResizeMode(QHeaderView::Interactive); ++ dirTreeView->header()->setSectionResizeMode(QHeaderView::Interactive); ++ dirView->header()->setSectionResizeMode(QHeaderView::Interactive); + } + } + diff --git a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch index e8fc4284cac0..ecd5297c281f 100644 --- a/sci-libs/silo/files/silo-4.10.2-qtlibs.patch +++ b/sci-libs/silo/files/silo-4.10.2-qtlibs.patch @@ -1,66 +1,78 @@ -diff -ru silo-4.9.1-old/configure silo-4.9.1-new/configure ---- silo-4.9.1-old/configure 2014-01-18 23:19:15.755030306 +0100 -+++ silo-4.9.1-new/configure 2014-01-18 23:20:52.595031159 +0100 -@@ -27503,7 +27503,7 @@ +--- configure.orig 2018-01-24 10:50:10.458664501 +0100 ++++ configure 2018-01-24 10:50:42.967666461 +0100 +@@ -27541,7 +27541,7 @@ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" fi - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" else # Use cached value or do search, starting with suggestions from # the command line -@@ -27577,7 +27577,7 @@ +@@ -27615,7 +27615,7 @@ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" fi - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" else # There is no valid definition for $QTDIR as Trolltech likes to see it ax_qt_dir= -@@ -27589,7 +27589,7 @@ +@@ -27627,7 +27627,7 @@ ax_qt_lib="`ls $ax_qt_lib_dir/libQt* | sed -n 1p | sed s@$ax_qt_lib_dir/lib@@ | sed s@[.].*@@`" fi - ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ ax_qt_LIBS="-L$ax_qt_lib_dir -l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" else # Normally, when there is no traditional Trolltech installation, # the library is installed in a place where the linker finds it -@@ -27607,7 +27607,7 @@ +@@ -27645,10 +27645,10 @@ # See if we find the library without any special options. # Don't add top $LIBS permanently yet ax_save_LIBS="$LIBS" - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ax_qt_LIBS="$LIBS" ax_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" -@@ -27668,7 +27668,7 @@ +- CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" ++ CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27706,7 +27706,7 @@ # That did not work. Try the multi-threaded version echo "Non-critical error, please neglect the above." >&5 ax_qt_lib=qt-mt - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27726,7 +27726,7 @@ +@@ -27764,7 +27764,7 @@ # That did not work. Try the OpenGL version echo "Non-critical error, please neglect the above." >&5 ax_qt_lib=qt-gl - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -27809,7 +27809,7 @@ +@@ -27847,7 +27847,7 @@ fi done # Try with that one - LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" -+ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQtCore -lQtGui -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" ++ LIBS="-l$ax_qt_lib $X_PRE_LIBS $X_LIBS -lQt5Core -lQt5Gui -lQt5Widgets -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF +@@ -27955,7 +27955,7 @@ + fi # all $ax_qt_* are set + fi # $have_qt reflects the system status + if test x"$have_qt" = xyes; then +- QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui" ++ QT_CXXFLAGS="-I$ax_qt_include_dir -I$ax_qt_include_dir/Qt -I$ax_qt_include_dir/QtCore -I$ax_qt_include_dir/QtGui -I$ax_qt_include_dir/QtWidgets -fPIC" + if test x"$ax_qt_lib" = xqt-mt; then + QT_CXXFLAGS="$QT_CXXFLAGS -DQT_THREAD_SUPPORT" + fi diff --git a/sci-libs/silo/silo-4.10.2-r1.ebuild b/sci-libs/silo/silo-4.10.2-r1.ebuild new file mode 100644 index 000000000000..b8c03cde0cde --- /dev/null +++ b/sci-libs/silo/silo-4.10.2-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit eutils fortran-2 + +DESCRIPTION="A mesh and field I/O library and scientific database" +HOMEPAGE="https://wci.llnl.gov/simulation/computer-codes/silo" +SRC_URI="https://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PN}/${P}/${P}.tar.gz" +SLOT="0" +LICENSE="BSD" +KEYWORDS="~amd64 ~x86" +IUSE="hdf5 +silex static-libs qt5 test" + +REQUIRED_USE="silex? ( qt5 )" + +RDEPEND=" + hdf5? ( sci-libs/hdf5 ) + qt5? ( dev-qt/qtgui:5 )" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${P}-qtlibs.patch" + epatch "${FILESDIR}/${P}-qt5.patch" + epatch "${FILESDIR}/${P}-tests.patch" + epatch "${FILESDIR}/${P}-mpiposix.patch" +} + +src_configure() { + econf \ + --enable-install-lite-headers \ + --enable-shared \ + $(use_enable silex silex ) \ + $(use_enable static-libs static ) \ + $(use_with qt5 Qt-lib-dir "${EPREFIX}"/usr/$(get_libdir) ) \ + $(use_with qt5 Qt-include-dir "${EPREFIX}"/usr/include/qt5 ) \ + $(use_with qt5 Qt-bin-dir "${EPREFIX}"/usr/$(get_libdir)/qt5/bin ) \ + $(use_with hdf5 hdf5 ${EPREFIX}"/usr/include,${EPREFIX}"/usr/$(get_libdir) ) +} diff --git a/sci-libs/vtk/Manifest b/sci-libs/vtk/Manifest index ecbefaa7071b..74162b392cc3 100644 --- a/sci-libs/vtk/Manifest +++ b/sci-libs/vtk/Manifest @@ -10,12 +10,17 @@ AUX vtk-6.1.0-web.patch 776 BLAKE2B e92d3abb96161f0d955c3c653ce67a2427538fcabcb3 AUX vtk-7.0.0-glext.patch 393 BLAKE2B 416612e5a587378287d99c447a30703c66aabd8ad07cea83a984bd7b5feaa0f619e152d70a4c514b9e31a85a9e57693884918047e25609d5cca394e623929045 SHA512 67fcdbf128ea3bc32dbc5ea8de350fcb3e8447a90a7cb23501658d624703623c1d67c31e8783607fa995e8ac666075cbf00417c702a9a4a357e933b8e2153d64 DIST VTK-6.1.0.tar.gz 27608882 BLAKE2B 10cef62e2fc3bf7109f7b3e9858721850243a7798fe885c6a584dba9a6f74c526c58b009f2cba6c56512a6ec159dbf29ac965f9ae6533128f3a20e7224bdddc0 SHA512 3ab922166502348e5cdd68e14dbf4717c0405c9d8881c04aa8be8f95d8516af39cd02aaca5171c6de8af1b462ca386399b7a87a843ec62999f0f32c11788a2dc DIST VTK-7.1.0.tar.gz 31171521 BLAKE2B e607aa8437b4b4546cf3be5fa1fd771d07e2c0e5f85faeeb4585aae139fc40564939ccd3ec5efd4e63711789de300cf70edede46bfb54228bf6ea783d9dec39b SHA512 83f0c9291cd2bc517a4bc449ad28a1d77e7ece169e846c7beab0b1140b9ef4b7bad30e3fa6e5a59826a707df78e2e336e07fa8bd30cf7498096ee80feef16534 +DIST VTK-8.1.0.tar.gz 33482506 BLAKE2B 82aecb497847254595f20294120ae793432348fc3fd881924b52c004335d9bae3d052f168bbe291b307af67845a80e740d8996d36991c38fbec7213438e2395d SHA512 3d5efd1a18939e21045278a387817421a98919cbaaa6ed65167c16999e1bb882b849b698d201a294da9920dbc96d1fbc987013462b1c7cbb12920bfff9b6f2a3 DIST VTKData-6.1.0.tar.gz 94452190 BLAKE2B 55e1af454f1c54c0a182552c41e08549781532b510bf29cb28fcd12510c1cef2c4e09274507d658b700f22d0da1961d7b4e6dc289d9ee39c6b1e1fac348ba153 SHA512 4e23cc3de3b81a852458849f2bd4dfe2e84e9df4f77f5f0d4ac249b04a7f74144a483a91876bd748bb90685d1943071e9b36fce8dd618376621bc37e63365e65 DIST VTKData-7.1.0.tar.gz 249106922 BLAKE2B 01505bd5e01c790d40be6966c6261de4eba2ec36b515580112b3291f894c9d2e361f31d20bb14faf40f125b82e5ea6a1b0002acbb598c79f11d541e0fe5de4df SHA512 8f78fdce36fc683c8b8b7137a02fd727f322ceecce66f20a4b1b3f8d260e8e894c1ec1ed46eb2427e501239f12b02b1476ca3a302fa1f9287584110598972f9e +DIST VTKData-8.1.0.tar.gz 282986441 BLAKE2B 885f35c5386cc5db8db905a868a3ad79c246f1b0e41a3e5b81312b1f3de90483a1e34886d4764c60fe8006acaace2405b25acf047ec0e25a957f7a2d563d3380 SHA512 0a63f87896320aa38970932bf47c9e3f65a8bdd5413e51f95c53e321348b5b4e1eca2405d755eabb785c03939e1936245cc9f1b0f7ad0988c41362ac6f1e3047 DIST VTKLargeData-6.1.0.tar.gz 166019220 BLAKE2B 94180c9fd73655cbc08914a2309925d40ac2c99ce8652a7db37bb3ddc3b9dd654e8286be97a764c9029a6de21ae847f1f2c46c07ec974e5da802f23a7d277836 SHA512 3663a124c16448882ad3aef0fb15f55f438863ba2176106803ad9c6fb561325accd74f2675d8b6e1de791babfa8b992e516d87640efedda4a6daeb5affc2cf3f DIST VTKLargeData-7.1.0.tar.gz 166680011 BLAKE2B 6b630d13a7cf22909f2fd42a89eccfe2ae79c16ec46b99229f349ff47d20e38cf22b9b63803087d319d43915fce116d2874e450c439727dde5a795d003cd1c4a SHA512 79d058732932837f2873a14850e18375d6a43f07de7cf4b71570ae32cf7abb7651052378ff9cbd1e221c95f78e46c13c9852425a509ae02c826f5345e836e455 +DIST VTKLargeData-8.1.0.tar.gz 166992034 BLAKE2B ac98861ccac2aacfab7547a4b56de5c9e611b8655f077bb85e6ab850fb0cfd79f4722a0486f73eafcde2cd77d6be305201857f3e729b1f60f710c45bcf0bb63f SHA512 9dfd64b5125205ba7d8cba5665da40874d0a9781f3bd2595058d939207d96980c9a68009ce9ed1476931e1b929199c4888ccf6d590f23d2412873ca6907abc31 DIST vtkDocHtml-6.1.0.tar.gz 230827905 BLAKE2B a323728450c5054d715dac137e54ed9b901019af595ea3abca9e7865d0b420d7b5f87789a9489df116f982633984d74721153dc3ab735e97455f64c2ffc4aa95 SHA512 fcae74a65157d87b39a162facdecbb0ab0a9b95b9f2555ed2b15d635b82034bfc62181eea441caf0b1edbe036b792a8231d409908b943398ce7f662c149d3a60 DIST vtkDocHtml-7.1.0.tar.gz 128927849 BLAKE2B 93ad088ec0578bf8008a789f71d7d70eff13899ab216af1499c88870189fe53c426fd23fea5f1c0ff5e8cfd9ec5c6fe03ad2b691edf88d0fbf55b7593778b3fd SHA512 cac6d005262d3849f84c2632dd737c4dcd9f23d5015266d683bcc8c65fad0d88e87faf9b1d5f68fdabe7b2ed97927a9f907020cbeae2b6e7223a5ffee54f2679 +DIST vtkDocHtml-8.1.0.tar.gz 132655967 BLAKE2B a27d9631fa9fe42e9b8076aa3b33e03b3835db0f348ed60cfdc866ffe7accd9c5d99b6525523113a4d628253e28d6d9121e78942d89b6ee281d5e7ecee7c289e SHA512 c49338ad2c121ab16098195e5a1f2c9539137a85ae5edaa64d4a887ece0c64efb8840162942f47b70ab2d82d341bba2e706a6ff007fe6bdfbce12ad92bca883c EBUILD vtk-6.1.0-r4.ebuild 10518 BLAKE2B a303880cb6d411975e5e2d2b455385289390411a7bff4fc63fa69121e0f75749a6d235d5581b9bdc63475f87126f5ca6721cca9e7e7ab742a0cfe1fb2a799c24 SHA512 27a5deff359c5fae24ea08b3b697dcdd27e6457d44c594186ff4057ab3d18738cb52af787824c104645d116f44de46081bd3bf48182e29cc3c7b0877bd6d12f2 EBUILD vtk-7.1.0.ebuild 9334 BLAKE2B 07ec2edf00e7e559fccbec16815d0780b2c1bb21cde482a14eeeb2301a9a732b16ea567fc39593bc2087269b3a34ca86020d8cee23705d3d9fdcfb9e7729fc8f SHA512 93bd46a125ef9993cdf9adde1f2f5ab0ba48bb0d4d9f81d01b792c40aa6a4280a01bfcaf1733c3451344d95fd6a809adf451707cb250499f403aa333f66627b1 +EBUILD vtk-8.1.0.ebuild 9257 BLAKE2B 32f7e2cc11edd4df3448b518e2f787c3240cf2c269591e3056927f088d3d446754c1010fec90e1add1dc218a0d271f21823a170918f3448ef941f06b07238c79 SHA512 e7c313462601ff5a19c6cc1a744c58dc887de1a752446028fba10de4c8f42bc8b48306159f3b76efb2601f917f6e4a93371d59bd99ca3b9324954b94e8edd7e5 MISC metadata.xml 1120 BLAKE2B 17456da598e4b7dfddec75a323def586e3b099ddfaa2e5883410afdd9143d317a6db53ead747b097cf8631f738d6a0b38a1e27ea37b445ba667a403053223e02 SHA512 d0d9ccd1922afe496e24d38fee05793fdf3983f798bef817a00c77bb632f2cabe3d2be554d0e979c223fd4005f3186b9ef78d394050539bd21cba5c2b6e56143 diff --git a/sci-libs/vtk/vtk-8.1.0.ebuild b/sci-libs/vtk/vtk-8.1.0.ebuild new file mode 100644 index 000000000000..eeafc5ca3c22 --- /dev/null +++ b/sci-libs/vtk/vtk-8.1.0.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +WEBAPP_OPTIONAL=yes +WEBAPP_MANUAL_SLOT=yes + +inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator toolchain-funcs cmake-utils virtualx webapp + +# Short package version +SPV="$(get_version_component_range 1-2)" + +DESCRIPTION="The Visualization Toolkit" +HOMEPAGE="https://www.vtk.org/" +SRC_URI=" + https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz + doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz ) + examples? ( + https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz + https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz + )" + +LICENSE="BSD LGPL-2" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +SLOT="0" +IUSE=" + all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi mpi + mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl + video_cards_nvidia views web R +X xdmf2" + +REQUIRED_USE=" + all-modules? ( python xdmf2 boost ) + java? ( qt5 ) + python? ( ${PYTHON_REQUIRED_USE} ) + tcl? ( rendering ) + examples? ( python ) + tk? ( tcl ) + web? ( python ) + ^^ ( X aqua offscreen )" + +RDEPEND=" + app-arch/lz4 + dev-libs/expat + dev-libs/jsoncpp:= + dev-libs/libxml2:2 + >=media-libs/freetype-2.5.4 + >=media-libs/libharu-2.3.0-r2 + media-libs/libpng:0= + media-libs/libtheora + media-libs/mesa + media-libs/tiff:0 + sci-libs/exodusii + sci-libs/hdf5:= + sci-libs/netcdf-cxx:3 + sys-libs/zlib + virtual/jpeg:0 + virtual/opengl + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXt + boost? ( dev-libs/boost:=[mpi?] ) + examples? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + ) + ffmpeg? ( virtual/ffmpeg ) + gdal? ( sci-libs/gdal ) + java? ( >=virtual/jdk-1.7:* ) + kaapi? ( > "${T}"/40${PN} <<- EOF || die + VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data + VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV} + VTKHOME=${EPREFIX}/usr + EOF + doenvd "${T}"/40${PN} + + use web && webapp_src_install +} + +# webapp.eclass exports these but we want it optional #534036 +pkg_postinst() { + use web && webapp_pkg_postinst +} + +pkg_prerm() { + use web && webapp_pkg_prerm +} -- cgit v1.2.3