diff options
Diffstat (limited to 'sci-libs')
20 files changed, 479 insertions, 418 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 6d08dad05446..523f161cd31f 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest index 56358d0a3bca..106cb7ee7cf4 100644 --- a/sci-libs/ViSP/Manifest +++ b/sci-libs/ViSP/Manifest @@ -1,5 +1,7 @@ AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caab7ead381219113cd48ccc71c9b59832f315ca784d8bfd3b6d2d2b27ce918341dbbab88c2f66d0749e20cbaa63c SHA512 fed1699ccaba5baa67e0fde19abc5ae828c51c88bf761a9d6784b8ad858230cca7e11bfbc1fb7661bca0a666c49ff9915e0a771909bf42493229165d1131b3a9 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4 DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa +DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5 EBUILD ViSP-3.0.1.ebuild 3154 BLAKE2B 35ff3e8fea605350c55383a1754d85d8781286f9114c70b0fafdb7ae1d7a74bf0d1d78582625148ee345f20ae5ee02b964bc0636abc36868573e7510d039214e SHA512 a47e3d09ebcf9d27349fd9f568168efe56b503479e887a4e4f4b308293e4d65db2a10a2a1727245c3d7bd84124473f1dc5cd248dc5bf9fc091dbf1e8675dedb6 +EBUILD ViSP-3.1.0.ebuild 3022 BLAKE2B 051f344a7e980d42d34142161fd1303f2490ef46b63429e4ba07b3134f814a421ed43d8ff2dd9e6d1891374228548a2f54e323194cfbb82e0b4d4df244d54597 SHA512 d2a044de8da68ca3c808fe52c3fa32f95f852957540bbe2691760e4eb35628dc75cc463f1836f70c3b5b6f7191e1c42b4ac410740cfac137e23937d33986b07e MISC metadata.xml 1393 BLAKE2B f891f74d6a7a334f7ee024f188c70ee031b391bbbebe4f67ff45efa6fe5def3eff0515a769a312e691e8acfda5e3633daa11ed1c590f43110a0ab1a190f39473 SHA512 c66184a7997d1682047605e6773a341f3f8503b765c36aa6931ac13eda2a78b866cf2db3c8ca68eabca206235b4c4bea534e176bd07cd9f5dcad3d9e67583d5e diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0.ebuild new file mode 100644 index 000000000000..07dfbbd91058 --- /dev/null +++ b/sci-libs/ViSP/ViSP-3.1.0.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit cmake-utils + +DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library" +HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html" +SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/3.1" +KEYWORDS="~amd64 ~arm" +IUSE=" + +coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre + ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib + cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 +" + +RDEPEND=" + coin? ( media-libs/coin virtual/opengl ) + dmtx? ( media-libs/libdmtx ) + gsl? ( sci-libs/gsl ) + ieee1394? ( media-libs/libdc1394 ) + jpeg? ( virtual/jpeg:0 ) + lapack? ( virtual/lapack ) + !qt4? ( motif? ( media-libs/SoXt ) ) + ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) + opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) + png? ( media-libs/libpng:0= ) + qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) + usb? ( virtual/libusb:1 ) + v4l? ( media-libs/libv4l ) + X? ( x11-libs/libX11 ) + xml? ( dev-libs/libxml2 ) + zbar? ( media-gfx/zbar ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) + virtual/pkgconfig + test? ( sci-misc/ViSP-images ) + v4l? ( virtual/os-headers )" +RDEPEND="${RDEPEND} + demos? ( sci-misc/ViSP-images )" +REQUIRED_USE=" + ois? ( ogre ) + qt4? ( coin ) + motif? ( coin ) +" + +S="${WORKDIR}/visp-${PV}" +PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" ) + +src_configure() { + local mycmakeargs=( + "-DBUILD_EXAMPLES=$(usex examples ON OFF)" + "-DBUILD_TESTS=$(usex test ON OFF)" + "-DBUILD_DEMOS=$(usex demos ON OFF)" + "-DBUILD_TUTORIALS=$(usex tutorials ON OFF)" + "-DUSE_COIN3D=$(usex coin ON OFF)" + "-DUSE_DC1394=$(usex ieee1394 ON OFF)" + "-DUSE_DMTX=$(usex dmtx ON OFF)" + "-DUSE_GSL=$(usex gsl ON OFF)" + "-DUSE_LAPACK=$(usex lapack ON OFF)" + "-DUSE_JPEG=$(usex jpeg ON OFF)" + "-DUSE_PNG=$(usex png ON OFF)" + "-DUSE_LIBUSB_1=$(usex usb ON OFF)" + "-DUSE_OGRE=$(usex ogre ON OFF)" + "-DUSE_OIS=$(usex ois ON OFF)" + "-DUSE_OPENCV=$(usex opencv ON OFF)" + "-DUSE_SOQT=$(usex qt4 ON OFF)" + "-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)" + "-DUSE_V4L2=$(usex v4l ON OFF)" + "-DUSE_X11=$(usex X ON OFF)" + "-DUSE_XML2=$(usex xml ON OFF)" + "-DUSE_ZBAR=$(usex zbar ON OFF)" + "-DUSE_ZLIB=$(usex zlib ON OFF)" + "-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin" + "-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin" + "-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)" + "-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)" + "-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + cd "${BUILD_DIR}" + use doc && emake visp_doc +} + +src_install() { + cmake-utils_src_install + if use tutorials ; then + dodoc -r tutorial + docompress -x /usr/share/doc/${PF}/tutorial + fi + cd "${BUILD_DIR}" + use doc && dohtml -r doc/html/* +} diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest index e01fea83f108..fd0ff3c18502 100644 --- a/sci-libs/avogadrolibs/Manifest +++ b/sci-libs/avogadrolibs/Manifest @@ -1,9 +1,5 @@ AUX avogadrolibs-0.7.2-6464.patch 902 BLAKE2B 29a06e0d5e814aee4c1aff30af3642e374d32813e4e9837706ef652f89ffde173ff043fc3589fc08b22592e3ded2c0d8ef9c544e54a561ac658ae43651403633 SHA512 3851a3c5f7c599e439b4faa491ea080264e60bf2a7c4d35e01a10726f901a5797026bf32535107b46ca44335c5723d9ec7f0b6a46e9eebf7ffd9f90c7f2103d3 AUX avogadrolibs-0.8.0-underlinking.patch 1170 BLAKE2B 4edc41c544ca71fea851ac0248903234129fabe8fed1c1dff09f788702cebee28619736941f8c88363c987a6b0cf1fa7376e3ccdef1e0ae413dec31d93b6d4c9 SHA512 2520af361e250dc2459beec78d073686f44b41166cf81fd7c2a98e2ed30c5f20b5c910fb3808a56202420068043044900e7a504657506a12d16bd0acac87a466 -DIST avogadrolibs-0.7.2.tar.gz 637001 BLAKE2B 4bcb57b81ed11e6132f3748ac19119cbeff5c5ce80764659813650369bebeb439348f50e7b1c6ffe0a177035d441f43d18eedb0bcbb78a86a85d5fa845f384bb SHA512 a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8 -DIST avogadrolibs-0.8.0.tar.bz2 619784 BLAKE2B d94b726bc7a6a91b2cd69d3ac4f8002bf33310c8d72e154b4022ec026cac4af8cde18f1d2d3046db811c171e35b4c6529757761bb5f7b97c6b645f3d5045744b SHA512 edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7 DIST avogadrolibs-0.9.0.tar.gz 742370 BLAKE2B cd104cea48b82a1ac86fdb9e93717e2647f57a0d713673d8b340d259f73d6d9985decf0c4e4d83f13d54d12ae2aefee8e75b5d04861f8ab67b9b42690c3c74f7 SHA512 7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f -EBUILD avogadrolibs-0.7.2-r1.ebuild 1134 BLAKE2B c3f9899537cb6cb33c55e6c9a29bb9a44ff9a46bc2362480d426159fd42f9316e381130d183bb11600f68877491da31b023061effe6d7c1379f97c25ade781a8 SHA512 647996bc7599e95c89f65e0527d682bab720a0b3c34f96ba979a41d8c4b5efde12de572d98146310a67cff8a8709cf0cc67f4ea49f93aab4cabbf80eb45f6572 -EBUILD avogadrolibs-0.8.0.ebuild 1287 BLAKE2B 49789553f843f93dd338e45b8b8271077f0f9a0210547ae73f6264d866f5fc709849dfe6e758bffc795f7e8f16bc68fb369a2f758daccf79ea0a8970f5ffcacc SHA512 d233f1bec425686d2a8984fd63b135c6391e10db0b21ec95dcb9bd2014fea7bbb9ce16c4c03b9dcb928fc79e53160d26ef5fe2918623b9246a07482c309acff6 EBUILD avogadrolibs-0.9.0.ebuild 1399 BLAKE2B 912eda5882b0e2caa12d1684684c9d3d74579e51f645673ae99482438d6a57b8fdb847ceceed5709e56a742cdf4061fbff55627131d8a4666865129ed173a9b2 SHA512 321dff768e0ec9984630900adb06eea78f2d30f78da5f6ca53f1405d1aae6f24c4c7a2d0c4dc6d2abe9615e19221abd119baeb8bb8dbfa093ce684082a1b2cba MISC metadata.xml 561 BLAKE2B 92ca6dca915abd65a8b8a3b9a00bdc2314590839d4bf61e3991477f5e53abfb9c6075d4dbfb31b8c8bb3ae4bd822ab7fc4d68cd0cf612582e77a56efd4278a9b SHA512 20bee27014f13bcb3d1ca6addad61f4553fb77197c6113d65e71f97cbd6bda4a69e5db7f3ca12db41dc5d4afb09882bb89312a8e4babf5110957d6e86c1cbc81 diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild deleted file mode 100644 index ea3c49c5231f..000000000000 --- a/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" -HOMEPAGE="http://www.openchemistry.org/" -SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD GPL-2+" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc opengl qt4 static-plugins test vtk" - -REQUIRED_USE="qt4? ( opengl )" - -RDEPEND=" - >=sci-chemistry/molequeue-0.7 - sci-libs/chemkit - sci-libs/hdf5:= - opengl? ( - dev-qt/qtopengl:4 - media-libs/glew - ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - vtk? ( sci-libs/vtk ) -" -DEPEND="${DEPEND} - test? ( dev-cpp/gtest )" - -PATCHES=( "${FILESDIR}"/${P}-6464.patch ) - -src_configure() { - local mycmakeargs=( - -DUSE_PROTOCALL=OFF - -DBUILD_GPL_PLUGINS=ON - $(cmake-utils_use_build doc DOCUMENTATION) - $(cmake-utils_use_use opengl OPENGL) - $(cmake-utils_use_use qt4 QT) - $(cmake-utils_use_build static-plugins STATIC_PLUGINS) - $(cmake-utils_use_enable test TESTING) - $(cmake-utils_use_use vtk VTK) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild deleted file mode 100644 index 489784bb1736..000000000000 --- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils - -DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries" -HOMEPAGE="http://www.openchemistry.org/" -SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.bz2" - -SLOT="0" -LICENSE="BSD GPL-2+" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc opengl qt5 static-plugins test vtk" - -REQUIRED_USE="qt5? ( opengl )" - -RDEPEND=" - >=sci-chemistry/molequeue-0.7 - sci-libs/chemkit - sci-libs/hdf5:= - opengl? ( - dev-qt/qtopengl:5 - media-libs/glew - ) - qt5? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - ) - vtk? ( sci-libs/vtk ) -" -DEPEND="${DEPEND} - dev-cpp/eigen:3 - test? ( dev-cpp/gtest )" - -PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch "${FILESDIR}/"${P}-underlinking.patch ) - -src_configure() { - local mycmakeargs=( - -DUSE_PROTOCALL=OFF - -DBUILD_GPL_PLUGINS=ON - -DUSE_MOLEQUEUE=ON - $(cmake-utils_use_build doc DOCUMENTATION) - $(cmake-utils_use_use opengl OPENGL) - $(cmake-utils_use_use qt5 QT) - $(cmake-utils_use_build static-plugins STATIC_PLUGINS) - $(cmake-utils_use_enable test TESTING) - $(cmake-utils_use_use vtk VTK) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest index ed6649477d5d..30329518411d 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-r1.ebuild 1838 BLAKE2B 31d611c5f385ab013ba8e0886cf7acc28e9c0a28fb305530f064d4665def5623403ae5891726f158b2ca217e63348f1905a850746d9ae0002e09ff2a6563ad0c SHA512 d1726b0239454b00623c807337341ff4bf5ad5da889e492da0613e09e34422c566322d2ceb68ebffcea52fd499d42c7678c7640b044d7b7a7312c84b4e322cb0 -MISC metadata.xml 453 BLAKE2B 4f54716d22e75ff9aae66893f194f7e52b12c632594e017d90682ffecfe6c51e85ea58cab892c63028f712c412f70401a87ca02d245568d108d16d3963f27f62 SHA512 4a492fc1856ccc3eda100f356ef4699bbbc9e51719015ffab0d14d6bf1077cd07f7be3a7113e93f9a1fb2acdc347dffe2fb68e6076c00e80f265cd35ec80019a +EBUILD chemkit-0.1-r2.ebuild 2000 BLAKE2B d6290e3de5dc1118bf89065d820cbfc1d44514e7aaf679d48d61beac4ef82c4a81cac93d34e6532601ed9f82572653d0524f136a6083cbdf152b64e87df75772 SHA512 14236546b1e91a844c32c0085d262962503c4ab5388ea0de6a3124920ee2975d1e5930509969d1ac1678acdeda6a35849666dc6b7e26babfeac2ce86a38de87a +MISC metadata.xml 352 BLAKE2B fbab9c9aa637ace5d90660942c8a34550c45bdf692b98ef583a77e5ed8d666877c09076314f6ec4081f91d12803fd1d8f50b7a715991e8e0ed0541e8473563b3 SHA512 b197aa62c04a5f668822db2e277407e7e871505f7adf5cfceaab36b5bc808f0b7582f17f9a00c7d4013eb4728b7a6ef61a52325deb182d6cd4a344e5d1e98cb1 diff --git a/sci-libs/chemkit/chemkit-0.1-r1.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild index b620a1e9f7fd..c1cb99bc9455 100644 --- a/sci-libs/chemkit/chemkit-0.1-r1.ebuild +++ b/sci-libs/chemkit/chemkit-0.1-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) @@ -14,18 +14,15 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD PSF-2.2" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="applications examples python test" +IUSE="examples python qt4 test" REQUIRED_USE="${PYTHON_REQUIRED_USE} - test? ( applications python )" + test? ( python qt4 )" RDEPEND=" - dev-libs/boost - dev-libs/rapidxml dev-cpp/eigen:3 - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 + dev-libs/boost:= + dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon @@ -35,6 +32,11 @@ RDEPEND=" x11-libs/libXext ) python? ( ${PYTHON_DEPS} ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + ) " DEPEND="${RDEPEND}" @@ -43,28 +45,35 @@ S="${WORKDIR}"/${PN} PATCHES=( "${FILESDIR}"/${P}-multilib.patch "${FILESDIR}"/${P}-unbundle.patch - ) +) src_prepare() { # jsoncpp API change # xdrf != xdrfile rm -rvf src/3rdparty/{inchi,khronos,lemon,rapidxml} || die cmake-utils_src_prepare + + # bug 640206 + sed -e "/add_subdirectory(xtc/s/^/#DONT /" \ + -i src/plugins/CMakeLists.txt || die "Failed to disable xtc" } src_configure() { local mycmakeargs=( - -DCHEMKIT_BUILD_PLUGIN_BABEL=on + -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_TESTS=$(usex test) -DUSE_SYSTEM_INCHI=ON -DUSE_SYSTEM_JSONCPP=OFF -DUSE_SYSTEM_RAPIDXML=ON -DUSE_SYSTEM_XDRF=OFF - $(cmake-utils_use applications CHEMKIT_BUILD_APPS) - $(cmake-utils_use applications CHEMKIT_BUILD_QT_DESIGNER_PLUGINS) - $(cmake-utils_use examples CHEMKIT_BUILD_EXAMPLES) - $(cmake-utils_use examples CHEMKIT_BUILD_DEMOS) - $(cmake-utils_use python CHEMKIT_BUILD_BINDINGS_PYTHON) - $(cmake-utils_use test CHEMKIT_BUILD_TESTS) ) cmake-utils_src_configure } diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml index d2802f9728df..ec37d80cac64 100644 --- a/sci-libs/chemkit/metadata.xml +++ b/sci-libs/chemkit/metadata.xml @@ -5,9 +5,6 @@ <email>sci-chemistry@gentoo.org</email> <name>Gentoo Chemistry Project</name> </maintainer> - <use> - <flag name="applications">Build also applications not only the libraries</flag> - </use> <upstream> <remote-id type="sourceforge">chemkit</remote-id> </upstream> diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest index 68d2a5d7ed84..c368e3951475 100644 --- a/sci-libs/octomap/Manifest +++ b/sci-libs/octomap/Manifest @@ -1,4 +1,7 @@ +AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea DIST octomap-1.8.1.tar.gz 1679526 BLAKE2B 89d71ca43ce4e353d8cf758420907c8bb1e11aa42854178174594d03aaf04ed753a35c6e4ffc60a5ebe0297307aedee92bd69138af8598a8b5ae7ac716193c44 SHA512 e35567da0d6741747abbc87de49733d0e92bae8aedfe66a63766740cc6566f3cfdbc3c986369177497cc9a8fb208ed9b727da496cec48e2ad23328df06fbc8d6 +DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237 EBUILD octomap-1.8.1.ebuild 1839 BLAKE2B c23b4ec0a80d5e228072415465a53a82f10f008c49f9a0a4de42bfdc7018d56086e0392e01b3300ab223bfcd86f6d0d0534f2a526a777ef2940f405ecb9c9605 SHA512 d5b238fd8dcfa388bf9c8f9a6804766b7433e6e6c79e63846b0890963c994293ea955af6639eaf2cefd16a804a7077c5af36d91fbe50196796fdf6f37d36f74a -EBUILD octomap-9999.ebuild 1839 BLAKE2B c23b4ec0a80d5e228072415465a53a82f10f008c49f9a0a4de42bfdc7018d56086e0392e01b3300ab223bfcd86f6d0d0534f2a526a777ef2940f405ecb9c9605 SHA512 d5b238fd8dcfa388bf9c8f9a6804766b7433e6e6c79e63846b0890963c994293ea955af6639eaf2cefd16a804a7077c5af36d91fbe50196796fdf6f37d36f74a +EBUILD octomap-1.9.0.ebuild 2015 BLAKE2B 2f504d3e91d967338f6831af1e93a38d3d59949f470f52e41a1ae2914fc52814c532bb8db3ae1a9f5e35ba4280c4643b29101c077c05847753eb229343f9effa SHA512 71af329bdd24260600d9fd79f474b0e587ce674c8746935eb673b50a9374347d340bf00313dc32b71575f3ea92900cacf04a2f369da47387010188da4a666899 +EBUILD octomap-9999.ebuild 1975 BLAKE2B 63b34fd1c61e447e16c9e4b988e5b564d421cea9f15fad3a5e8579222c0f7f174e6c84167d7960c1e6e7d660aaa645ce88d92eba0ceb33c5254db3ef6bea7793 SHA512 018a25e757235bb8509c2e502bd87b286d484037aa4738e06014051675da58a24562580fc284276f18cbe2492779fa4214dd361aed49dbfa8170df6e81ea9f8d MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0 diff --git a/sci-libs/octomap/files/qglqt5.patch b/sci-libs/octomap/files/qglqt5.patch new file mode 100644 index 000000000000..3fad0a0fc63f --- /dev/null +++ b/sci-libs/octomap/files/qglqt5.patch @@ -0,0 +1,231 @@ +Index: octomap-1.9.0/octovis/src/ViewerGui.cpp +=================================================================== +--- octomap-1.9.0.orig/octovis/src/ViewerGui.cpp ++++ octomap-1.9.0/octovis/src/ViewerGui.cpp +@@ -286,7 +286,7 @@ void ViewerGui::showOcTree() { + m_mapSizeStatus->setText(size); + //} + +- m_glwidget->updateGL(); ++ m_glwidget->update(); + + // generate cubes -> display + // timeval start; +@@ -299,7 +299,7 @@ void ViewerGui::showOcTree() { + // gettimeofday(&stop, NULL); // stop timer + // double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec); + // fprintf(stderr, "setOcTree took %f sec\n", time_to_generate); +- m_glwidget->updateGL(); ++ m_glwidget->update(); + } + + +@@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_t + m_glwidget->enableSelectionBox(checked); + + +- m_glwidget->updateGL(); ++ m_glwidget->update(); + } + + void ViewerGui::on_actionHeight_map_toggled(bool checked){ +@@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bo + it != m_octrees.end(); ++it) { + it->second.octree_drawer->enableAxes(checked); + } +- m_glwidget->updateGL(); ++ m_glwidget->update(); + } + + void ViewerGui::on_actionHideBackground_toggled(bool checked) { +@@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_ + if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) { + if (checked) m_glwidget->removeSceneObject(r->octree_drawer); + else m_glwidget->addSceneObject(r->octree_drawer); +- m_glwidget->updateGL(); ++ m_glwidget->update(); + } + } + +@@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_to + it != m_octrees.end(); ++it) { + it->second.octree_drawer->enableOcTreeCells(enabled); + } +- m_glwidget->updateGL(); ++ m_glwidget->update(); + } + + void ViewerGui::on_actionOctree_structure_toggled(bool enabled) { +@@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structur + it != m_octrees.end(); ++it) { + it->second.octree_drawer->enableOcTree(enabled); + } +- m_glwidget->updateGL(); ++ m_glwidget->update(); + } + + void ViewerGui::on_actionFree_toggled(bool enabled) { +@@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bo + it != m_octrees.end(); ++it) { + it->second.octree_drawer->enableFreespace(enabled); + } +- m_glwidget->updateGL(); ++ m_glwidget->update(); + + } + +@@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggle + // } else{ + // m_octreeDrawer->clearOcTreeSelection(); + // } +- // m_glwidget->updateGL(); ++ // m_glwidget->update(); + // } + } + + + void ViewerGui::on_action_bg_black_triggered() { + m_glwidget->setBackgroundColor( QColor(0,0,0) ); +- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); + } + + void ViewerGui::on_action_bg_white_triggered() { + m_glwidget->setBackgroundColor( QColor(255,255,255) ); +- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); + } + + void ViewerGui::on_action_bg_gray_triggered() { + m_glwidget->setBackgroundColor( QColor(117,117,117) ); +- m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); + } + + void ViewerGui::on_savecampose_triggered() { +Index: octomap-1.9.0/octovis/src/ViewerWidget.cpp +=================================================================== +--- octomap-1.9.0.orig/octovis/src/ViewerWidget.cpp ++++ octomap-1.9.0/octovis/src/ViewerWidget.cpp +@@ -67,13 +67,12 @@ void ViewerWidget::init() { + + // background color defaults to white + this->setBackgroundColor( QColor(255,255,255) ); +- this->qglClearColor( this->backgroundColor() ); + } + + void ViewerWidget::resetView(){ + this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2); + this->showEntireScene(); +- updateGL(); ++ update(); + } + + +@@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode + for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { + (*it)->enableHeightColorMode(enabled); + } +- updateGL(); ++ update(); + } + + void ViewerWidget::enablePrintoutMode(bool enabled) { +@@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bo + for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { + (*it)->enablePrintoutMode(enabled); + } +- updateGL(); ++ update(); + } + + void ViewerWidget::enableSemanticColoring (bool enabled) { +@@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColorin + for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { + (*it)->enableSemanticColoring(enabled); + } +- updateGL(); ++ update(); + } + + void ViewerWidget::enableSelectionBox(bool enabled) { + m_drawSelectionBox = enabled; +- updateGL(); ++ update(); + } + + +@@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double + camera()->setPosition(qglviewer::Vec(x, y, z)); + camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ)); + camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0)); +- updateGL(); ++ update(); + } + + void ViewerWidget::setCamPose(const octomath::Pose6D& pose){ +@@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id + } else { + std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl; + } +- updateGL(); ++ update(); + } + + void ViewerWidget::deleteCameraPath(int id) { + if(camera()->keyFrameInterpolator(id)) { +- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); ++ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); + disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); + disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); + camera()->deletePath(id); +@@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id + m_current_camera_frame = start_frame; + kfi->setInterpolationTime(kfi->keyFrameTime(start_frame)); + std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl; +- connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL())); ++ connect(kfi, SIGNAL(interpolated()), this, SLOT(update())); + connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); + connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished())); + kfi->startInterpolation(); +@@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id + + void ViewerWidget::stopCameraPath(int id) { + if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) { +- disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); ++ disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); + disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); + disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); + camera()->keyFrameInterpolator(id)->stopInterpolation(); +@@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id + + void ViewerWidget::cameraPathFinished() { + if(camera()->keyFrameInterpolator(m_current_camera_path)) { +- disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL())); ++ disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update())); + disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); + disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); + emit cameraPathStopped(m_current_camera_path); +@@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(c + void ViewerWidget::addSceneObject(SceneObject* obj){ + assert (obj); + m_sceneObjects.push_back(obj); +- updateGL(); ++ update(); + } + + void ViewerWidget::removeSceneObject(SceneObject* obj){ +@@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(Sce + else + ++it; + } +- updateGL(); ++ update(); + } + + void ViewerWidget::clearAll(){ +@@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){ + glPushAttrib(GL_ALL_ATTRIB_BITS); + + glDisable(GL_COLOR_MATERIAL); +- qglColor(foregroundColor()); + + if (gridIsDrawn()){ + glLineWidth(1.0); diff --git a/sci-libs/octomap/octomap-1.9.0.ebuild b/sci-libs/octomap/octomap-1.9.0.ebuild new file mode 100644 index 000000000000..0472eb73728e --- /dev/null +++ b/sci-libs/octomap/octomap-1.9.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/OctoMap/octomap" +fi + +inherit ${SCM} cmake-utils + +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm" + SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees" +HOMEPAGE="http://octomap.github.io/" +IUSE="qt5 dynamicEDT3D doc" +LICENSE="BSD qt5? ( GPL-2 )" +SLOT="0/19" + +RDEPEND=" + qt5? ( + virtual/opengl + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + x11-libs/libQGLViewer:= + ) +" +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" + +PATCHES=( "${FILESDIR}/qglqt5.patch" ) + +src_prepare() { + sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ + -i */CMakeLists.txt \ + -i */CMakeModules/InstallPkgConfigFile.cmake || die + sed -e 's/iewer-qt4/iewer-qt5/g' \ + -i octovis/CMakeModules/FindQGLViewer.cmake || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)" + "-DOCTOVIS_QT5=TRUE" + "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + if use doc ; then + cd "${BUILD_DIR}/octomap" + emake docs + if use dynamicEDT3D ; then + cd "${BUILD_DIR}/dynamicEDT3D" + emake docs_dynamicEDT3D + fi + fi +} + +src_install() { + cmake-utils_src_install + if use doc ; then + insinto /usr/share/doc/${PF}/html/octomap + doins -r "${S}/octomap/doc/html/"* + if use dynamicEDT3D ; then + insinto /usr/share/doc/${PF}/html/dynamicEDT3D + doins -r "${S}/dynamicEDT3D/doc/html/"* + fi + fi + + insinto /usr/share/ros_packages/${PN} + doins "${ED}/usr/share/${PN}/package.xml" + if use qt5; then + insinto /usr/share/ros_packages/octovis + doins "${ED}/usr/share/octovis/package.xml" + fi +} diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild index 30141845c394..f5c2b0c615ac 100644 --- a/sci-libs/octomap/octomap-9999.ebuild +++ b/sci-libs/octomap/octomap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,15 +21,16 @@ fi DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees" HOMEPAGE="http://octomap.github.io/" -IUSE="qt4 dynamicEDT3D doc" -LICENSE="BSD qt4? ( GPL-2 )" -SLOT="0" +IUSE="qt5 dynamicEDT3D doc" +LICENSE="BSD qt5? ( GPL-2 )" +SLOT="0/19" RDEPEND=" - qt4? ( + qt5? ( virtual/opengl - dev-qt/qtcore:4 - dev-qt/qtgui:4 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= ) " @@ -44,12 +45,15 @@ src_prepare() { sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ -i */CMakeLists.txt \ -i */CMakeModules/InstallPkgConfigFile.cmake || die + sed -e 's/iewer-qt4/iewer-qt5/g' \ + -i octovis/CMakeModules/FindQGLViewer.cmake || die cmake-utils_src_prepare } src_configure() { local mycmakeargs=( - "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)" + "-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)" + "-DOCTOVIS_QT5=TRUE" "-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)" ) cmake-utils_src_configure @@ -80,7 +84,7 @@ src_install() { insinto /usr/share/ros_packages/${PN} doins "${ED}/usr/share/${PN}/package.xml" - if use qt4; then + if use qt5; then insinto /usr/share/ros_packages/octovis doins "${ED}/usr/share/octovis/package.xml" fi diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 66534ecb7fc9..c447468e391f 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1,6 +1,4 @@ -DIST rtabmap-0.13.2.tar.gz 19488841 BLAKE2B 33157545066ddc3c5b133837cdc97de4122b899190445e5f53ea7bf2bd7131a3be6df7e98273b4eae035dd60590c728fb813fb0e9346c5c7fda7b4eb9f235be4 SHA512 ce80e55271e4b998c0ab11ad7d01c6a5b0df1be72057343ed0f4ffca9a2c95f946ea991c14d023772dee3bceee3ce97946207daf90a69eb6e450017c54495f2e DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f -EBUILD rtabmap-0.13.2.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6 EBUILD rtabmap-0.14.0.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6 EBUILD rtabmap-9999.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81 diff --git a/sci-libs/rtabmap/rtabmap-0.13.2.ebuild b/sci-libs/rtabmap/rtabmap-0.13.2.ebuild deleted file mode 100644 index ec181ba72d33..000000000000 --- a/sci-libs/rtabmap/rtabmap-0.13.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/introlab/rtabmap" -fi - -inherit ${SCM} cmake-utils multilib - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" -HOMEPAGE="http://introlab.github.io/rtabmap/" -LICENSE="BSD" -SLOT="0" -IUSE="examples ieee1394 openni2 qt5" - -RDEPEND=" - media-libs/opencv:=[qt5(-)?] - sci-libs/pcl:=[openni,vtk] - sci-libs/vtk:=[qt5(-)?] - sys-libs/zlib - sci-libs/octomap:= - dev-libs/boost:= - ieee1394? ( media-libs/libdc1394 ) - openni2? ( dev-libs/OpenNI2 ) - qt5? ( - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( - "-DWITH_QT=$(usex qt5 ON OFF)" - "-DWITH_DC1394=$(usex ieee1394 ON OFF)" - "-DWITH_OPENNI2=$(usex openni2 ON OFF)" - "-DBUILD_EXAMPLES=$(usex examples ON OFF)" - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - # Needed since we force ros crawling to be done only in - # /usr/share/ros_packages/ - insinto /usr/share/ros_packages/${PN} - doins "${ED}/usr/share/${PN}/package.xml" -} diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest index 23090976310c..ef515e64f22f 100644 --- a/sci-libs/scikits_image/Manifest +++ b/sci-libs/scikits_image/Manifest @@ -1,8 +1,3 @@ -AUX scikits_image-0.11.3-adapthist-backport.patch 3489 BLAKE2B 3f280a69a9a8c462934efdd081963327da84b0a159a5775fd140f1e5462e1d0c0c5d36ce71fce2f2d6bce8e36e446ea6ec64122640d961aca259670bec0e7041 SHA512 5f4e063bc2456f7e78f8485d8a2d68a19e77ab7a171332f758761173cc7608d64c81e69ea785265b71763ab6a0c43c35b17699b954064a38498ebdf0db92e91b -DIST scikit-image-0.11.3.tar.gz 18589296 BLAKE2B 2b305bc1490050f893035cd727588ad624b66d2dceaceea8935bd2b768cf737d89156fc8b3017f67cdee41d805348ddfcf3e163db3d4f790606457064e618ddb SHA512 595acb66581ed3ca9679b7f031876e1974000a82ec0eccd14bfd283f829aa3db0fcca10166f4260138698f82b3a772fea83d77761a64fab45bbc35418ade7108 -DIST scikit-image-0.12.3.tar.gz 20701373 BLAKE2B 131c7bed2af0b52a86293f85107f069ca77b71028af22c14a331d8a4563f68470543b5898d534055306db9b7fb58f50cc1b767a168ff9bb780c7446c4888e92f SHA512 3a2d51f7b826569e5fc2a4502c62b85559ae9fa05555240894af1bb8bd2bad1798b786a2070b1f90b4c07339d8186fe5c118a89994503cce920e8e25fc5f3b51 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550 -EBUILD scikits_image-0.11.3.ebuild 1907 BLAKE2B 165ea16486fddeed229a9b29e71fe5bd92154e4754d63065a94165cee4d06def8c6653dcbf91ffee577e7fd7a9dfae81d0091d87120bb8d4c141ce044ccdde14 SHA512 449771233b266efe32d64093f0e02ced1c959958788bcce4e5902a0035b053428a17eee2b5aa61facdd2068389d6d5574929dfccfca03d722588d8c7d46e1d4d -EBUILD scikits_image-0.12.3.ebuild 1826 BLAKE2B c04544ccd2d75ea10d71d008ab8ee4cad0ca54f95c26720265d8de0f22f9d09afac115249aa2f901303c32c6483631b29d830b23f9e5b6d8a0d7b4e39bab646c SHA512 d0788a9af25066908e6b83496619728bed1dbd551ef55a01a720a4a4e444cf1020a87cacaea367c90922bc6a883118b4b663e4bb9e5f9463e88d52b857bfa7b8 -EBUILD scikits_image-0.13.0.ebuild 1852 BLAKE2B 6cac72e3f7b22013bda6f60181c78eda7a0296b673b4014ffe6a6e1fade2a70d35f872b16a2e4ab75b88de3bb83479babb6ebcbf28a38838d2cd858c63f9bb43 SHA512 ecace053bf601c3b2133b2c1f965ac2bb303d12bb7e1e8aabc9997fbeb46876a4d083f8a279a38b96422adb4afafc801d979686188b1cda7e65f74f92f3da57a +EBUILD scikits_image-0.13.0.ebuild 1804 BLAKE2B f4c2d48daf3d850951e757347420efbe2718a5376c34d07899694b0218ca5c597b79e7e0dc75085b4c62906d1ddbbe29b0fb2be358133315b5338a85642efc56 SHA512 830b93b83a1b595a28d0d24a7e3109dac0109925fee66de25d09e55eb558a1f84668b11b52fa7bede42f0d6b0c54d06775735806a0a3d27347f59f83b0240499 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40 diff --git a/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch b/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch deleted file mode 100644 index 0bd96916bfc1..000000000000 --- a/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 41159f3fd24e7653c556ddbf6ba93ad2aa8b541f Mon Sep 17 00:00:00 2001 -From: Steven Silvester <steven.silvester@ieee.org> -Date: Mon, 19 Oct 2015 18:07:32 -0500 -Subject: [PATCH] Fix adapthist mask logic - -Use minlength in bincount - -Fix mask logic ---- - skimage/exposure/_adapthist.py | 8 +++++--- - skimage/exposure/tests/test_exposure.py | 14 +++++++------- - 2 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/skimage/exposure/_adapthist.py b/skimage/exposure/_adapthist.py -index 343f71b..757daff 100644 ---- a/skimage/exposure/_adapthist.py -+++ b/skimage/exposure/_adapthist.py -@@ -247,12 +247,14 @@ def clip_histogram(hist, clip_limit): - while n_excess > 0: # Redistribute remaining excess - index = 0 - while n_excess > 0 and index < hist.size: -+ under_mask = hist < 0 - step_size = int(hist[hist < clip_limit].size / n_excess) - step_size = max(step_size, 1) - indices = np.arange(index, hist.size, step_size) -- under = hist[indices] < clip_limit -- hist[under] += 1 -- n_excess -= hist[under].size -+ under_mask[indices] = True -+ under_mask = (under_mask) & (hist < clip_limit) -+ hist[under_mask] += 1 -+ n_excess -= under_mask.sum() - index += 1 - - return hist -diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py -index 8fb6d62..1b9c778 100644 ---- a/skimage/exposure/tests/test_exposure.py -+++ b/skimage/exposure/tests/test_exposure.py -@@ -199,9 +199,9 @@ def test_adapthist_scalar(): - full_scale = skimage.exposure.rescale_intensity(skimage.img_as_float(img)) - - assert_almost_equal = np.testing.assert_almost_equal -- assert_almost_equal(peak_snr(full_scale, adapted), 101.2295, 3) -+ assert_almost_equal(peak_snr(full_scale, adapted), 102.066, 3) - assert_almost_equal(norm_brightness_err(full_scale, adapted), -- 0.041, 3) -+ 0.038, 3) - return img, adapted - - -@@ -217,8 +217,8 @@ def test_adapthist_grayscale(): - nbins=128) - assert_almost_equal = np.testing.assert_almost_equal - assert img.shape == adapted.shape -- assert_almost_equal(peak_snr(img, adapted), 97.6876, 3) -- assert_almost_equal(norm_brightness_err(img, adapted), 0.0591, 3) -+ assert_almost_equal(peak_snr(img, adapted), 102.078, 3) -+ assert_almost_equal(norm_brightness_err(img, adapted), 0.0529, 3) - return data, adapted - - -@@ -238,7 +238,7 @@ def test_adapthist_color(): - assert adapted.max() == 1.0 - assert img.shape == adapted.shape - full_scale = skimage.exposure.rescale_intensity(img) -- assert_almost_equal(peak_snr(full_scale, adapted), 109.6, 1) -+ assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 1) - assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.02, 2) - return data, adapted - -@@ -256,8 +256,8 @@ def test_adapthist_alpha(): - full_scale = skimage.exposure.rescale_intensity(img) - assert img.shape == adapted.shape - assert_almost_equal = np.testing.assert_almost_equal -- assert_almost_equal(peak_snr(full_scale, adapted), 109.60, 2) -- assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0235, 3) -+ assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 2) -+ assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0248, 3) - - - def peak_snr(img1, img2): diff --git a/sci-libs/scikits_image/scikits_image-0.11.3.ebuild b/sci-libs/scikits_image/scikits_image-0.11.3.ebuild deleted file mode 100644 index 99d76385d71a..000000000000 --- a/sci-libs/scikits_image/scikits_image-0.11.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_4 ) - -inherit distutils-r1 eutils virtualx - -MYPN="${PN/scikits_/scikit-}" -MYP="${MYPN}-${PV}" - -DESCRIPTION="Image processing routines for SciPy" -HOMEPAGE="http://scikit-image.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc freeimage gtk pyamg qt4 test" - -RDEPEND=" - >=dev-python/matplotlib-1.1.0[${PYTHON_USEDEP}] - >=dev-python/networkx-1.8[${PYTHON_USEDEP}] - >=dev-python/numpy-1.6.1[${PYTHON_USEDEP}] - >=dev-python/pillow-1.7.8[${PYTHON_USEDEP}] - >=dev-python/six-1.3[${PYTHON_USEDEP}] - >=sci-libs/scipy-0.9[sparse,${PYTHON_USEDEP}] - freeimage? ( media-libs/freeimage ) - gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] ) - pyamg? ( dev-python/pyamg[$(python_gen_usedep 'python2*')] ) - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - >=dev-python/cython-0.21[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - )" - -S="${WORKDIR}/${MYP}" - -DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt ) - -PATCHES=( - "${FILESDIR}"/${P}-adapthist-backport.patch -) - -python_test() { - distutils_install_for_testing - mkdir for_test && cd for_test || die - echo "backend : Agg" > matplotlibrc || die - echo "backend.qt4 : PyQt4" >> matplotlibrc || die - #echo "backend.qt4 : PySide" >> matplotlibrc || die - VIRTUALX_COMMAND=nosetests - MPLCONFIGDIR=. virtualmake --exe -v skimage || die -} - -pkg_postinst() { - optfeature "FITS io capability" dev-python/astropy - #optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk - #optfeature "io plugin providing most standard formats" dev-python/imread -} diff --git a/sci-libs/scikits_image/scikits_image-0.12.3.ebuild b/sci-libs/scikits_image/scikits_image-0.12.3.ebuild deleted file mode 100644 index ed088bd06527..000000000000 --- a/sci-libs/scikits_image/scikits_image-0.12.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5} ) - -inherit distutils-r1 eutils virtualx - -MYPN="${PN/scikits_/scikit-}" -MYP="${MYPN}-${PV}" - -DESCRIPTION="Image processing routines for SciPy" -HOMEPAGE="http://scikit-image.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc freeimage pyamg qt4 test" - -RDEPEND=" - dev-python/matplotlib[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - sci-libs/scipy[sparse,${PYTHON_USEDEP}] - freeimage? ( media-libs/freeimage ) - pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - >=dev-python/cython-0.23[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MYP}" - -DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt ) - -python_test() { - distutils_install_for_testing - cd "${TEST_DIR}" || die "no ${TEST_DIR} available" - echo "backend : Agg" > matplotlibrc || die - echo "backend.qt4 : PyQt4" >> matplotlibrc || die - #echo "backend.qt4 : PySide" >> matplotlibrc || die - MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die -} - -pkg_postinst() { - optfeature "FITS io capability" dev-python/astropy - optfeature "GTK" dev-python/pygtk - optfeature "Parallel computation" dev-python/dask - # not in portage yet - #optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk - #optfeature "io plugin providing most standard formats" dev-python/imread -} diff --git a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild index cc09ed813cb9..fb9abe7e7c78 100644 --- a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild +++ b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc freeimage pyamg qt4 test" +IUSE="doc freeimage pyamg test" RDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] @@ -28,8 +28,7 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] sci-libs/scipy[sparse,${PYTHON_USEDEP}] freeimage? ( media-libs/freeimage ) - pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] ) - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )" + pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} >=dev-python/cython-0.23[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] @@ -43,7 +42,7 @@ python_test() { distutils_install_for_testing cd "${TEST_DIR}" || die "no ${TEST_DIR} available" echo "backend : Agg" > matplotlibrc || die - echo "backend.qt4 : PyQt4" >> matplotlibrc || die + #echo "backend.qt4 : PyQt4" >> matplotlibrc || die #echo "backend.qt4 : PySide" >> matplotlibrc || die MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die } |