diff --git a/app-emulation/dxvk-bin/Manifest b/app-emulation/dxvk-bin/Manifest index 07d6ee2ed6..f7159ed899 100644 --- a/app-emulation/dxvk-bin/Manifest +++ b/app-emulation/dxvk-bin/Manifest @@ -1,2 +1,2 @@ -DIST dxvk-bin-1.8.1.tar.gz 7942210 BLAKE2B 9c27d473037d28eb4999260f871c338e96ed08522ba9497e20eee9d5a951a73e5606ef684f67adad0f7a5ebb9559b43d42c589774666be66369ea6f605f5d8f7 SHA512 485a1fe584aa3607997d4405e61df7b67d87aec47d56bb645901b20ea6cbf2024e8ce135cd5bef6591587dc3d058650f2b6889b5cde321a8a4e4137a68cd541b +DIST dxvk-bin-1.9.1.tar.gz 8130256 BLAKE2B 50e49c69f7f43df09098e9c65089826cc4bb92bab53aeb9e07c2876fa1c07c04b600ca0598c790fb4eab6b076cc61f815e8566f6c0adbd6fc5462862fee19324 SHA512 4ab2be529c295ace85ac5731053e894383f72cb1b601b74a6fcfb581fb61568657a7e7f6842f5af1339a58ab57e33e79209f63e659732bd9774f956be2d88b31 DIST dxvk-bin-1.9.tar.gz 8111449 BLAKE2B 3800f38b26ba72fa22b59ce94f64b5cbdacefcad3515fb0c769f672c6add7d8c040e871ec412d11637bf3cbfcd30930c5a6c47917a00ce8c90e1c1d6a23197d2 SHA512 d8fadd0e88ebc11e281b75b59bb980ac8908ea5ce1c7e5849c557cd7eb257ff125b54351adbc9b04241ff2a72705f3a5fa5a9598bf571503a5808b80708f16c5 diff --git a/app-emulation/dxvk-bin/dxvk-bin-1.8.1.ebuild b/app-emulation/dxvk-bin/dxvk-bin-1.9.1.ebuild similarity index 98% rename from app-emulation/dxvk-bin/dxvk-bin-1.8.1.ebuild rename to app-emulation/dxvk-bin/dxvk-bin-1.9.1.ebuild index e705789d51..2db44fbf3b 100644 --- a/app-emulation/dxvk-bin/dxvk-bin-1.8.1.ebuild +++ b/app-emulation/dxvk-bin/dxvk-bin-1.9.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MULTILIB_COMPAT=( abi_x86_{32,64} ) inherit multilib-minimal @@ -20,7 +20,7 @@ DEPEND="" RDEPEND=" || ( video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-440.31 ) - >=media-libs/mesa-19.2 + >=media-libs/mesa-20.2 ) || ( >=app-emulation/wine-staging-4.5[${MULTILIB_USEDEP},vulkan] diff --git a/dev-cpp/cli11/Manifest b/dev-cpp/cli11/Manifest index b627eb8602..d48ce376af 100644 --- a/dev-cpp/cli11/Manifest +++ b/dev-cpp/cli11/Manifest @@ -1 +1,2 @@ DIST cli11-1.9.1.tar.gz 262925 BLAKE2B 30c0c35827992ca8f1527ace9dda076a89666f1598be423bead85fff2006ca82f59937348b914a9b058878a7e68467501226c704b4ecaeefe09508657f346a14 SHA512 bcccfe88695ceddd73d87738e1d5ed4372f5cf43e3866e88053dd486ea8973804022029775de781e1dbdd2e1566b77e072de00202033983217276954a07c5718 +DIST cli11-2.0.0.tar.gz 280797 BLAKE2B 5ce65d6c23f98d4128d1e7d4711f9dcd258b1705317b7e94b094d172c090c27a26b43580df16fee8d0a1a1cb993b763d7d43cc8fda7dad231f0ca018c816b9e7 SHA512 5ac06623383c003286b915e585e85ad419449735770e9a164665395f33d9e03ec6340445ab782200e2cfe5f40123b5843a7401211b6ece5b16342321e3e7a10a diff --git a/dev-cpp/cli11/cli11-2.0.0.ebuild b/dev-cpp/cli11/cli11-2.0.0.ebuild new file mode 100644 index 0000000000..5322d14d31 --- /dev/null +++ b/dev-cpp/cli11/cli11-2.0.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DOCS_BUILDER="doxygen" +DOCS_DIR="docs" +inherit cmake docs + +DESCRIPTION="Command line parser for C++11" +HOMEPAGE="https://github.com/CLIUtils/CLI11 https://cliutils.github.io/CLI11/book" +SRC_URI="https://github.com/CLIUtils/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CLI11-${PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +DOCS=( README.md CHANGELOG.md ) + +src_configure() { + local mycmakeargs=( + -DCLI11_BUILD_DOCS=OFF # handled by docs.eclass + -DCLI11_BUILD_TESTS=OFF # requires download of catch.hpp + -DCLI11_BUILD_EXAMPLES=$(usex test) # ...so examples are tested instead + -DCLI11_BUILD_EXAMPLES_JSON=OFF + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + docs_compile +} diff --git a/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild b/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild index 23f3e75485..77afcce741 100644 --- a/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild +++ b/dev-libs/properties-cpp/properties-cpp-0.0.2.ebuild @@ -31,6 +31,5 @@ MAKEOPTS="${MAKEOPTS} -j1" src_prepare() { use !doc && truncate -s0 doc/CMakeLists.txt - use !test && truncate -s0 tests/CMakeLists.txt cmake_src_prepare } diff --git a/dev-python/ffmpeg-python/Manifest b/dev-python/ffmpeg-python/Manifest index c1f30ed46f..3efba39965 100644 --- a/dev-python/ffmpeg-python/Manifest +++ b/dev-python/ffmpeg-python/Manifest @@ -1 +1 @@ -DIST ffmpeg-python-0.2.0.tar.gz 3267771 BLAKE2B 8bca4a24434b6c7a542e3c178cb7bf1e5650f9763636d5378f9652cdd07ef19b0e96007d6bb71fdf1664efb6e33d597844c7d6a44dc8dcb1c083e21f53649469 SHA512 933ed958d61536bbbc0e0b08e19521c4b1f7df1cfe97de0b3d149a2748c5bd74915a3134861e8ecb1f92d5860315228b76aefcd087fcf07e188a56c651f5e301 +DIST ffmpeg-python-0.2.0.tar.gz 21543 BLAKE2B ba16c57dfd8764f541ffbadf5fd62805877b5fbce230c9bcde230074c9b95b6d504587b5d98dc67f27b0d08deeddca4639506a2e97174924d130bb297d9d5f83 SHA512 9484a580d3f215fd8a26fa901b9487d80cb02717233d8932f5ecfab401af12e1d119f5ff991db8823aab7aaae54f21709d4d091ecb08c2f993ba1e0708ed88fa diff --git a/dev-python/jplephem/Manifest b/dev-python/jplephem/Manifest new file mode 100644 index 0000000000..26ee80c32c --- /dev/null +++ b/dev-python/jplephem/Manifest @@ -0,0 +1 @@ +DIST jplephem-2.16.tar.gz 40918 BLAKE2B 90a14b424f4c48bb754bd4cca6a9e1d5e2a4cc51821234118889cc854c119c60b66c0157deae60f88b7368d8914124ec95ec1ac7646479cd79ee759515a1af09 SHA512 02bd3bac834726f1f41fbed9e3e7edc9ba3d00c394099248f9e1da48730c620d83880e24a3b29916becd7ced284efc7388ed98d5bf204a6fc53ec9e016ce0cf0 diff --git a/dev-python/jplephem/jplephem-2.16.ebuild b/dev-python/jplephem/jplephem-2.16.ebuild new file mode 100644 index 0000000000..c2234c35e6 --- /dev/null +++ b/dev-python/jplephem/jplephem-2.16.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +DESCRIPTION="Python version of NASA DE4xx ephemerides for Astronomical Alamanac" +HOMEPAGE="https://pypi.org/project/jplephem/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/dev-python/jplephem/metadata.xml b/dev-python/jplephem/metadata.xml new file mode 100644 index 0000000000..129c347532 --- /dev/null +++ b/dev-python/jplephem/metadata.xml @@ -0,0 +1,17 @@ + + + + + davidroman96@gmail.com + David Roman + + + This package can load and use a Jet Propulsion Laboratory (JPL) + ephemeris for predicting the position and velocity of a planet or + other Solar System body. + + + jplephem + brandon-rhodes/python-jplephem + + diff --git a/dev-python/pydub/Manifest b/dev-python/pydub/Manifest new file mode 100644 index 0000000000..debead7054 --- /dev/null +++ b/dev-python/pydub/Manifest @@ -0,0 +1 @@ +DIST pydub-0.25.1.tar.gz 27555582 BLAKE2B 5a7aa4af4f2bb75306c3eef7052e403a09f6dc638e2805f7dd9269cb12149fec3962ab9b84b6c6744de75c34bde0cbe6daab711a8df050eb9861c21e70e98ef6 SHA512 8c3fb3714c4b0aed37ba7ab6727776bf4cd7568c1f5060cf43c30ede8da2ce4b498fb83326daa19ef44635250d552295407289c3945681e028eedde1b2b418e0 diff --git a/dev-python/pydub/metadata.xml b/dev-python/pydub/metadata.xml new file mode 100644 index 0000000000..cbe3c6a539 --- /dev/null +++ b/dev-python/pydub/metadata.xml @@ -0,0 +1,8 @@ + + + + + smaniotto.nicola@gmail.com + Nicola Smaniotto + + diff --git a/dev-python/pydub/pydub-0.25.1.ebuild b/dev-python/pydub/pydub-0.25.1.ebuild new file mode 100644 index 0000000000..613b9b83c1 --- /dev/null +++ b/dev-python/pydub/pydub-0.25.1.ebuild @@ -0,0 +1,22 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..9} ) + +inherit distutils-r1 + +DESCRIPTION="Manipulate audio with an simple and easy high level interface" +HOMEPAGE="http://pydub.com/" +SRC_URI="https://github.com/jiaaro/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +distutils_enable_tests unittest + +python_test() { + eunittest test/ +} diff --git a/dev-python/srt/srt-3.4.1.ebuild b/dev-python/srt/srt-3.4.1.ebuild index 5b60b2ff67..b6159b07a2 100644 --- a/dev-python/srt/srt-3.4.1.ebuild +++ b/dev-python/srt/srt-3.4.1.ebuild @@ -15,6 +15,14 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64" +distutils_enable_tests pytest + +DEPEND=" + test? ( + dev-python/hypothesis[${PYTHON_USEDEP}] + ) + " + src_prepare() { default diff --git a/dev-python/webrtcvad/Manifest b/dev-python/webrtcvad/Manifest index 47255637fe..6c9714040b 100644 --- a/dev-python/webrtcvad/Manifest +++ b/dev-python/webrtcvad/Manifest @@ -1 +1 @@ -DIST webrtcvad-2.0.10.tar.gz 66156 BLAKE2B 7897903e66e1693ba780f4f4a821cab971206b6a1d6ff2d87d37164a3759f4cde249943e6defd1d548196bb057b726e2af715ad0594c45400735e4f4da27f014 SHA512 375c2161446dda62df7c8a81540b141663ada44f8b335338d1552dff97286d1f28e045a900a079ea42fb1fe11370252e014b31b140a44c7ae0a10bf8a4ac6333 +DIST webrtcvad-2.0.10.tar.gz 183166 BLAKE2B aa36c895c23cb9d4ea9679c3a7231abac7ef5be4adf61f06fc557fff69ab84181cabf737d4c0a7255d518454a94ca3c4c0fc969405777f02ab3c1a7c0403eac2 SHA512 ce414e39c3128e22495e8e21e46d09485952168ca763937cebb654dab87ffcfecea8198c74c009a47d8caed2a8ebc22572036fda4be36597d82e6e7057f80ae2 diff --git a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild index 8770688deb..389b09dca4 100644 --- a/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild +++ b/dev-python/webrtcvad/webrtcvad-2.0.10.ebuild @@ -9,8 +9,18 @@ inherit distutils-r1 DESCRIPTION="Python interface to the Google WebRTC Voice Activity Detector (VAD)" HOMEPAGE="https://github.com/wiseman/py-webrtcvad" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/wiseman/py-${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" + +S="${WORKDIR}/py-${P}" + +distutils_enable_tests nose + +DEPEND=" + test? ( + dev-python/memory_profiler[${PYTHON_USEDEP}] + ) + " diff --git a/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.07.19.ebuild b/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.07.26.ebuild similarity index 90% rename from dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.07.19.ebuild rename to dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.07.26.ebuild index a8b2b0ab6b..748f687877 100644 --- a/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.07.19.ebuild +++ b/dev-util/rust-analyzer-bin/rust-analyzer-bin-2021.07.26.ebuild @@ -5,7 +5,7 @@ EAPI=7 DESCRIPTION="An implementation of Language Server Protocol for the Rust programming language" HOMEPAGE="https://rust-analyzer.github.io" -SRC_URI="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-07-19/rust-analyzer-x86_64-unknown-linux-gnu.gz" +SRC_URI="https://github.com/rust-analyzer/rust-analyzer/releases/download/2021-07-26/rust-analyzer-x86_64-unknown-linux-gnu.gz" LICENSE="Apache-2.0 MIT-with-advertising" SLOT="0" diff --git a/gui-apps/yambar/Manifest b/gui-apps/yambar/Manifest new file mode 100644 index 0000000000..ef709545a2 --- /dev/null +++ b/gui-apps/yambar/Manifest @@ -0,0 +1 @@ +DIST yambar-1.6.2.tar.gz 135455 BLAKE2B 71d5b584bf04a7212ac84d8e0d8cb71c1abd7c7548c5ec998aff480d76afbd09825b059fe642edd4dd2537af6a5b811bd333a45bfa53f6a3a814a2be95eb58b4 SHA512 64a5e983be6dc99feb2f39d06fe265163c3b8f3f23f33a58c386891b63a9c915816cbde22d031473e700e839522c86c53b06f0cce1a57ebdab8ed6aeebe627e1 diff --git a/gui-apps/yambar/metadata.xml b/gui-apps/yambar/metadata.xml new file mode 100644 index 0000000000..f30b9742f4 --- /dev/null +++ b/gui-apps/yambar/metadata.xml @@ -0,0 +1,18 @@ + + + + + leonardohn@null.net + Leonardo H. Neumann + + + Simplistic and highly configurable status panel for X and Wayland + + + Build with Link Time Optimization (LTO) + + + https://codeberg.org/dnkl/yambar/issues + https://codeberg.org/dnkl/yambar/releases + + diff --git a/gui-apps/yambar/yambar-1.6.2.ebuild b/gui-apps/yambar/yambar-1.6.2.ebuild new file mode 100644 index 0000000000..1f4199e173 --- /dev/null +++ b/gui-apps/yambar/yambar-1.6.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}" +else + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git" +fi + +DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland" +HOMEPAGE="https://codeberg.org/dnkl/yambar" +LICENSE="MIT" +SLOT="0" +IUSE="lto wayland X" +REQUIRED_USE="|| ( wayland X )" + +RDEPEND=" + >=media-libs/fcft-2.4.0 + dev-libs/json-c + dev-libs/libyaml + media-libs/alsa-lib + media-libs/libmpdclient + virtual/libudev:= + x11-libs/pixman + wayland? ( dev-libs/wayland ) + X? ( + x11-libs/libxcb:0=[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-wm + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/scdoc + >=dev-libs/tllist-1.0.1 + >=dev-util/meson-0.53.0 + virtual/pkgconfig + wayland? ( + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) +" + +src_configure() { + local emesonargs=( + $(meson_feature wayland backend-wayland) + $(meson_feature X backend-x11) + $(meson_use lto b_lto) + -Dwerror=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + rm -rf "${D}/usr/share/doc/${PN}" +} diff --git a/gui-apps/yambar/yambar-9999.ebuild b/gui-apps/yambar/yambar-9999.ebuild new file mode 100644 index 0000000000..1f4199e173 --- /dev/null +++ b/gui-apps/yambar/yambar-9999.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://codeberg.org/dnkl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/${PN}" +else + inherit git-r3 + EGIT_REPO_URI="https://codeberg.org/dnkl/${PN}.git" +fi + +DESCRIPTION="Simplistic and highly configurable status panel for X and Wayland" +HOMEPAGE="https://codeberg.org/dnkl/yambar" +LICENSE="MIT" +SLOT="0" +IUSE="lto wayland X" +REQUIRED_USE="|| ( wayland X )" + +RDEPEND=" + >=media-libs/fcft-2.4.0 + dev-libs/json-c + dev-libs/libyaml + media-libs/alsa-lib + media-libs/libmpdclient + virtual/libudev:= + x11-libs/pixman + wayland? ( dev-libs/wayland ) + X? ( + x11-libs/libxcb:0=[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-wm + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/scdoc + >=dev-libs/tllist-1.0.1 + >=dev-util/meson-0.53.0 + virtual/pkgconfig + wayland? ( + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) +" + +src_configure() { + local emesonargs=( + $(meson_feature wayland backend-wayland) + $(meson_feature X backend-x11) + $(meson_use lto b_lto) + -Dwerror=false + ) + meson_src_configure +} + +src_install() { + meson_src_install + rm -rf "${D}/usr/share/doc/${PN}" +} diff --git a/kde-apps/alligator/Manifest b/kde-apps/alligator/Manifest index 0c4847de66..8d4851c1d9 100644 --- a/kde-apps/alligator/Manifest +++ b/kde-apps/alligator/Manifest @@ -1,2 +1,2 @@ -DIST alligator-21.05.tar.xz 170288 BLAKE2B 947e05a122b083c860ee35802602f5994b98716ad506ba175b29b00149b8f4c4c8d50a9ed7a5c2537f932de393b4a713470abf17cb94724d4638e1dc72b6304b SHA512 b0825f067d52a4903d924cf224597acd17bf64d496e0ca5ceebc80a1707a4f6d8620eb2b727f021a12f3ff838782d14362f6a72758c7154e2bbffabbbbdc2f71 DIST alligator-21.06.tar.xz 175080 BLAKE2B b7cfcf483601588f65b47ca38ef068301a50ac218037f617d59133cc3a4e415f379e7207e9bef0ad960d17d90f0f378de01f3f1a7445175d06badbb7573ec12c SHA512 d81a8f242294cb6666897f6167aa339ad2ac15fdca5322bd138c0fedd333153833ca090d6a0d2ab048ccd0e6aebde813f6238df6636bee0db20b37cabcb66aec +DIST alligator-21.07.tar.xz 174760 BLAKE2B c42ef36342c3ab5401ab4e5e0e287d1f223fd725c6f04658e32b2bac4c071fb6624e208a53acb15fe717c40599f843b63a657fc575b0bd5d8dbde9a3afce4197 SHA512 1d8645b4a51e0961b4af89559d285c8ddf2ed43566631d04c78dd50e1299e63fb52a4851aa738a697e2c309ee8b754cf26f8bd615e6ac0b53c62d4e81d46b9fe diff --git a/kde-apps/alligator/alligator-21.05.ebuild b/kde-apps/alligator/alligator-21.07.ebuild similarity index 100% rename from kde-apps/alligator/alligator-21.05.ebuild rename to kde-apps/alligator/alligator-21.07.ebuild diff --git a/kde-apps/kclock/Manifest b/kde-apps/kclock/Manifest index bdabc04ee1..4072707a7b 100644 --- a/kde-apps/kclock/Manifest +++ b/kde-apps/kclock/Manifest @@ -1,2 +1,2 @@ -DIST kclock-21.05.tar.xz 1493000 BLAKE2B 9d994cc97028bd2a5f7142c067cb1e42f784456ac0815945d781a1addcac3fce00dccfc22cef2df63e3247a62778f10c34e0ba80f7aa5504e2c2e3ae72880bc8 SHA512 92a46f95c77edc1bfd51799ed778f2baa79fdb5e249370762f95d17b844e43aec4d280a43196090b0498c46b8a0b9ec6c5216b8399da7d913461098978eafe85 DIST kclock-21.06.tar.xz 695692 BLAKE2B bdb94b947c3c302c4d690f60e9d875e0d043d63ffde16e1fd80110dcdc2e8c10a3cbcda4c6e128d6e58d8f86629b91060e0fe1a3833140514517dc662fcdcd5e SHA512 225175a2850f9e04a1025a67b180cdd813e9ee0bfade05313ec77d33a5e8c62f88e05b880f52bacd417c4b08e390e44855518ae1e6e66d5e4ba9cbc175efa411 +DIST kclock-21.07.tar.xz 696532 BLAKE2B a4b58327bc24e60106cd31a99f709f56fda85ad11fcd889665c1897424c7493972654d660d4f85bd8463be4bc9e14fcdcb0127313ce7c233c649f24f9486da61 SHA512 1f79016e451319f5e288c7c4dde17450dd393cf7ec2eb0f0380fd74d503313cce4a1716eda142ab6f267499b0b85cf873baf0568eb694782cbea32478f1b2fd5 diff --git a/kde-apps/kclock/kclock-21.05.ebuild b/kde-apps/kclock/kclock-21.07.ebuild similarity index 100% rename from kde-apps/kclock/kclock-21.05.ebuild rename to kde-apps/kclock/kclock-21.07.ebuild diff --git a/media-libs/fcft/fcft-2.4.0.ebuild b/media-libs/fcft/fcft-2.4.0.ebuild index 979d903ad0..b0405660b1 100644 --- a/media-libs/fcft/fcft-2.4.0.ebuild +++ b/media-libs/fcft/fcft-2.4.0.ebuild @@ -21,7 +21,7 @@ SLOT="0/3" IUSE="examples +text-shaping test" RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/tllist media-libs/fontconfig media-libs/freetype diff --git a/media-libs/fcft/fcft-2.4.1.ebuild b/media-libs/fcft/fcft-2.4.1.ebuild index 979d903ad0..b0405660b1 100644 --- a/media-libs/fcft/fcft-2.4.1.ebuild +++ b/media-libs/fcft/fcft-2.4.1.ebuild @@ -21,7 +21,7 @@ SLOT="0/3" IUSE="examples +text-shaping test" RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/tllist media-libs/fontconfig media-libs/freetype diff --git a/media-libs/fcft/fcft-2.4.2.ebuild b/media-libs/fcft/fcft-2.4.2.ebuild index 979d903ad0..b0405660b1 100644 --- a/media-libs/fcft/fcft-2.4.2.ebuild +++ b/media-libs/fcft/fcft-2.4.2.ebuild @@ -21,7 +21,7 @@ SLOT="0/3" IUSE="examples +text-shaping test" RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/tllist media-libs/fontconfig media-libs/freetype diff --git a/media-libs/fcft/fcft-2.4.3.ebuild b/media-libs/fcft/fcft-2.4.3.ebuild index 979d903ad0..b0405660b1 100644 --- a/media-libs/fcft/fcft-2.4.3.ebuild +++ b/media-libs/fcft/fcft-2.4.3.ebuild @@ -21,7 +21,7 @@ SLOT="0/3" IUSE="examples +text-shaping test" RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/tllist media-libs/fontconfig media-libs/freetype diff --git a/media-libs/fcft/fcft-2.4.4.ebuild b/media-libs/fcft/fcft-2.4.4.ebuild index 979d903ad0..b0405660b1 100644 --- a/media-libs/fcft/fcft-2.4.4.ebuild +++ b/media-libs/fcft/fcft-2.4.4.ebuild @@ -21,7 +21,7 @@ SLOT="0/3" IUSE="examples +text-shaping test" RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/tllist media-libs/fontconfig media-libs/freetype diff --git a/media-libs/fcft/fcft-9999.ebuild b/media-libs/fcft/fcft-9999.ebuild index 979d903ad0..b0405660b1 100644 --- a/media-libs/fcft/fcft-9999.ebuild +++ b/media-libs/fcft/fcft-9999.ebuild @@ -21,7 +21,7 @@ SLOT="0/3" IUSE="examples +text-shaping test" RESTRICT="!test? ( test )" -DEPEND=" +RDEPEND=" dev-libs/tllist media-libs/fontconfig media-libs/freetype diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest index 3339c7b3c3..6dd8ea9167 100644 --- a/net-irc/srain/Manifest +++ b/net-irc/srain/Manifest @@ -1,2 +1,2 @@ -DIST srain-1.1.3.tar.gz 944319 BLAKE2B 74beb34a8e10716392aaaf07586c399f7a66601015c7761c116a3dcf822d6f9c69d3bc3e40b1b5ed780aed24ce1b2fa8496f2c8f4a77484acce294edfb653d00 SHA512 ad1c47bb249dae27cea3d4a044bbd10c034f2bb44fbec34053eeb878405caf9cf6236a03a7ff922f4eb4c189e5ccab4a307c208569bf0fdeb654a9de03a6d4fe DIST srain-1.2.1.tar.gz 954668 BLAKE2B 20beb88761a387a041659ea11f852655daab9fdcd4b1d2f2b080bfa4dd9c19a61c12ebba9a581a10355d9249a6063dcdfea486dccb625622e68b57a4445afae7 SHA512 594cb65827ba3f4cf99820640103bdd1d67577df31e1fcb27f98722e243bcbab68420aff0c3f26cc7d0c149a4a8c256fc386709b8ff86d6b617c170f00c076f3 +DIST srain-1.2.4.tar.gz 954684 BLAKE2B 9989715380f0fb702a8f43be77ee5cd6360f2e8ddb2d21e8f1e0741fe6aabe3869b42e9e1f36c642b8cbfb6e2419f14d4ccc682f7fd7b1dda0f3b1af5b69e59f SHA512 96d15f9d8bccc197b1bcda2c4707bdeea8e5cb33e3a8ad88ea5431b059c64e2ccb2e82897fcb1c02198420fed2c59148ff1c32f5f305cfffa88f096e41b42cb4 diff --git a/net-irc/srain/srain-1.1.3.ebuild b/net-irc/srain/srain-1.1.3.ebuild deleted file mode 100644 index eb3b3c4643..0000000000 --- a/net-irc/srain/srain-1.1.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs xdg - -DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3" -HOMEPAGE="https://github.com/SrainApp/srain" -SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="debug" - -RDEPEND=" - >=x11-libs/gtk+-3.22.0 - x11-libs/libnotify -" -DEPEND=" - ${RDEPEND} - app-crypt/libsecret - dev-libs/libconfig - net-libs/libsoup -" - -src_configure() { - econf $(use_enable debug) -} - -src_compile() { - tc-export CC - default -} diff --git a/net-irc/srain/srain-1.2.4.ebuild b/net-irc/srain/srain-1.2.4.ebuild new file mode 100644 index 0000000000..a1091c151e --- /dev/null +++ b/net-irc/srain/srain-1.2.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +DOCS_BUILDER="sphinx" +DOCS_DIR="doc" +DOCS_AUTODOC=0 + +inherit python-any-r1 docs meson xdg + +DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3" +HOMEPAGE="https://github.com/SrainApp/srain" +SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+man" + +RDEPEND=" + app-crypt/libsecret + >=dev-libs/glib-2.39.3 + >=dev-libs/libconfig-1.5 + dev-libs/openssl + net-libs/libsoup:2.4 + >=x11-libs/gtk+-3.22.15 +" +DEPEND="${RDEPEND}" +BDEPEND="man? ( ${DOCS_DEPEND} )" + +src_prepare() { + sed -i "s/\('doc', meson.project_name()\)/\1 + '-${PF}'/" \ + meson.build || die + + xdg_src_prepare +} + +src_configure() { + use man && emesonargs=( -Ddoc_builders='["man"]' ) + meson_src_configure +} + +src_compile() { + docs_compile + meson_src_compile +} diff --git a/net-misc/lagrange/Manifest b/net-misc/lagrange/Manifest index 8acd7b87a0..f5e24e4ac9 100644 --- a/net-misc/lagrange/Manifest +++ b/net-misc/lagrange/Manifest @@ -1 +1,2 @@ DIST lagrange-1.5.2.tar.gz 20409523 BLAKE2B 3f8888d7012f7886a61c938c5527639495d0dc424185133b663aec4e90e8de604863bac481a87606cfc5af80a3974503124a8ac7e5924a034053a1cbca705abd SHA512 971d54d072799cc03bc2521571c74e3da996f390198c3a7e04ff8480040aa1ae96d1407dec68ecb02225ece14c0032304ad1c605b6619b4538d9078c8180f9d6 +DIST lagrange-1.6.0.tar.gz 22693081 BLAKE2B 447e2d45736b476ea060804ca9b4f382e8e396e4dab6a826756b44742403b35619440e51f59f27ea9e4456677383b069554f7eb034f8b23177dbb0c9a060dfba SHA512 db0e958b959b4dbcb1d34e4fb7c7683750aa8216dcfa7868aa32397b4740552f96d21f6409320ff2a4353fb695e7aa91efafe12ec5db3be00872cd387641efec diff --git a/net-misc/lagrange/lagrange-1.6.0.ebuild b/net-misc/lagrange/lagrange-1.6.0.ebuild new file mode 100644 index 0000000000..815cc5cff7 --- /dev/null +++ b/net-misc/lagrange/lagrange-1.6.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg cmake + +DESCRIPTION="Desktop GUI client for browsing Geminispace" +HOMEPAGE="https://gmi.skyjake.fi/lagrange/ +https://git.skyjake.fi/gemini/lagrange" +SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_sse4_1 +fribidi +harfbuzz +mp3" + +DEPEND=" + dev-libs/libpcre:3 + dev-libs/libunistring + dev-libs/openssl + media-libs/libsdl2[sound(+),video(+)] + sys-libs/zlib + fribidi? ( dev-libs/fribidi ) + harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) + mp3? ( media-sound/mpg123 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + # do not add use flags that don't pull dependencies + # and only choose which files to compile (e.g. "ipc") + local mycmakeargs=( + -DENABLE_FRIBIDI=$(usex fribidi) + -DENABLE_HARFBUZZ=$(usex harfbuzz) + -DENABLE_MPG123=$(usex mp3) + + # lib/the_Foundation + -DTFDN_ENABLE_WARN_ERROR=OFF + -DTFDN_ENABLE_SSE41=$(usex cpu_flags_x86_sse4_1) + ) + + cmake_src_configure +} + +pkg_postinst() { + ewarn "Lagrange 1.6 introduces some breaking changes:" + ewarn + ewarn "- A new TOFU trust store will be created. The old one is kept around but ignored." + ewarn "- App state serialization format has been updated. Downgrading to a previous release" + ewarn " will cause app state to be reset (e.g., tabs closed, navigation history cleared)." +} diff --git a/net-misc/lagrange/metadata.xml b/net-misc/lagrange/metadata.xml index 7773e45cfa..602caa8e9b 100644 --- a/net-misc/lagrange/metadata.xml +++ b/net-misc/lagrange/metadata.xml @@ -22,6 +22,14 @@ hardware-accelerated graphics. OpenSSL is used for secure communications. + + + Use dev-libs/fribidi for bidirectional text + + + Use media-libs/harfbuzz to shape text + + jaakko.keranen@iki.fi diff --git a/profiles/package.use.mask b/profiles/package.use.mask new file mode 100644 index 0000000000..f25023ca39 --- /dev/null +++ b/profiles/package.use.mask @@ -0,0 +1,12 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Alessandro Barbieri (2021-07-26) +# treedbscan needs old cgal +# https://github.com/bsc-performance-tools/clustering-suite/issues/8 +sys-cluster/clusteringsuite treedbscan + +# Alessandro Barbieri (2021-07-26) +# current muster doesn't provide density.h +# https://github.com/bsc-performance-tools/clustering-suite/issues/9 +sys-cluster/clusteringsuite muster diff --git a/sys-cluster/SIONfwd/Manifest b/sys-cluster/SIONfwd/Manifest new file mode 100644 index 0000000000..ca547bc19b --- /dev/null +++ b/sys-cluster/SIONfwd/Manifest @@ -0,0 +1 @@ +DIST SIONfwd-v1.0.1.tar.bz2 9531 BLAKE2B fd998f9785e2d5de7c9431121109ca1a02ab3de648672db2fa2f45957788407850c8ffb75f93d283e4bd39c53f6627c8c93c637428812eaa86602c855cbd2fdd SHA512 3e71d0fbab76ae89b1a21be38a95986f1e5e913ea7bb5b17f3c21a905f5bda04634889264bdd101de833db8f069bc473093b805e5f6f453ac40290059fa2c51e diff --git a/sys-cluster/SIONfwd/SIONfwd-1.0.1.ebuild b/sys-cluster/SIONfwd/SIONfwd-1.0.1.ebuild new file mode 100644 index 0000000000..84a9793190 --- /dev/null +++ b/sys-cluster/SIONfwd/SIONfwd-1.0.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MYP="${PN}-v${PV}" + +inherit cmake + +DESCRIPTION="A minimalistic I/O forwarding server and client library for SIONlib" +HOMEPAGE="https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONfwd" +SRC_URI="https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONfwd/-/archive/v${PV}/${MYP}.tar.bz2" +S="${WORKDIR}/${MYP}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND="virtual/mpi" +DEPEND="${RDEPEND}" + +#RESTRICT="!test? ( test )" +RESTRICT="test" #test failures related to MPI + +src_configure() { + mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DCMAKE_BUILD_TYPE=Release + -DSIONfwd_BUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_test() { + ./test.sh || die +} diff --git a/sys-cluster/SIONfwd/metadata.xml b/sys-cluster/SIONfwd/metadata.xml new file mode 100644 index 0000000000..962be06f50 --- /dev/null +++ b/sys-cluster/SIONfwd/metadata.xml @@ -0,0 +1,19 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + +SIONfwd uses MPI's port mechanism to establish dynamic connections between server and client which are then used to transmit remote procedure calls (RPCs). +Both client and server have to be launched trough an MPI process startup mechanism (e.g. the mpiexec program), but using different MPI_COMM_WORLD, i.e. separate invocations of the startup mechanism. +The server prints the information that the client needs to connect to its stdout. +The client expects to find this information in certain environment variables. +A shell function that reads the information from the server and exports the environment variables required by the client is provided by the server (sionfwd-server bash-defs). +See the file test.sh for details. + + + https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONfwd/-/issues + + diff --git a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild index efb4a40901..82532ed993 100644 --- a/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild +++ b/sys-cluster/clusteringsuite/clusteringsuite-2.6.9-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( pypy3 python3_{8..10} ) @@ -18,30 +18,32 @@ S="${WORKDIR}/clustering-suite-${PV}" LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="~amd64" -IUSE="doc mpi muster" # treedbscan +IUSE="doc mpi muster treedbscan" PATCHES=( "${FILESDIR}/${P}-unbundle-libANN.patch" "${FILESDIR}/${P}-do-not-add-boost-thread-ldpath.patch" + "${FILESDIR}/${P}-Build-fix-for-GCC-11-invocable-as-const.patch" ) +# attempt at unbundling libbsctools failed +# current libbsctools seems to be too old (missing headers) +# "${FILESDIR}/${PN}-unbundle-libbsctools.patch" RDEPEND=" app-arch/bzip2 dev-libs/boost:= sci-libs/ann - sys-cluster/libbsctools + !sys-cluster/libbsctools mpi? ( virtual/mpi ) muster? ( sys-cluster/muster ) + treedbscan? ( + dev-libs/boost:=[threads] + dev-libs/gmp + dev-libs/mpfr + sci-mathematics/cgal[shared(-)] + sys-cluster/synapse + ) " -# https://github.com/bsc-performance-tools/clustering-suite/issues/8 -# treedbscan? ( -# dev-libs/boost:=[threads] -# dev-libs/gmp -# dev-libs/mpfr -# sci-mathematics/cgal[shared] -# sys-cluster/synapse -# ) -#" DEPEND=" ${RDEPEND} @@ -53,6 +55,7 @@ src_prepare() { use muster && PATCHES+=( "${FILESDIR}/${P}-force-muster-discovery.patch" ) rm -r src/libANN || die # rm -r pcfparser_svn3942 || die +# rm -r src/libParaverTraceParser || die default sed -e "s|iterate/lib|iterate/$(get_libdir)|g" -i config/gmp_mpfr.m4 || die sed -e "s|dir/lib|dir/$(get_libdir)|g" -i config/ax_muster.m4 || die @@ -88,18 +91,18 @@ src_configure() { else myconf+=( "--without-muster" ) fi -# if use treedbscan; then -# myconf+=( "--enable-treedbscan" ) -# myconf+=( "--with-cgal=${EPREFIX}/usr" ) -# myconf+=( "--with-gmp=${EPREFIX}/usr" ) -# myconf+=( "--with-mpfr=${EPREFIX}/usr" ) -# myconf+=( "--with-synapse=${EPREFIX}/usr" ) -# else + if use treedbscan; then + myconf+=( "--enable-treedbscan" ) + myconf+=( "--with-cgal=${EPREFIX}/usr" ) + myconf+=( "--with-gmp=${EPREFIX}/usr" ) + myconf+=( "--with-mpfr=${EPREFIX}/usr" ) + myconf+=( "--with-synapse=${EPREFIX}/usr" ) + else myconf+=( "--without-cgal" ) myconf+=( "--without-gmp" ) myconf+=( "--without-mpfr" ) myconf+=( "--without-synapse" ) -# fi + fi econf "${myconf[@]}" || die } diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-Build-fix-for-GCC-11-invocable-as-const.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-Build-fix-for-GCC-11-invocable-as-const.patch new file mode 100644 index 0000000000..85d19e9bd6 --- /dev/null +++ b/sys-cluster/clusteringsuite/files/clusteringsuite-2.6.9-Build-fix-for-GCC-11-invocable-as-const.patch @@ -0,0 +1,11 @@ +--- a/src/libSharedComponents/SequenceScore.hpp ++++ b/src/libSharedComponents/SequenceScore.hpp +@@ -73,7 +73,7 @@ static const cluster_id_t SEQUENCE_GAP = NOISE_CLUSTERID-1; + struct TraceObjectsCompare + { + bool operator()(const pair& obj1, +- const pair& obj2) ++ const pair& obj2) const + { + if (obj1.first < obj2.first) + { diff --git a/sys-cluster/clusteringsuite/files/clusteringsuite-unbundle-libbsctools.patch b/sys-cluster/clusteringsuite/files/clusteringsuite-unbundle-libbsctools.patch new file mode 100644 index 0000000000..1746a84236 --- /dev/null +++ b/sys-cluster/clusteringsuite/files/clusteringsuite-unbundle-libbsctools.patch @@ -0,0 +1,123 @@ +--- a/configure.ac.template ++++ b/configure.ac.template +@@ -533,17 +533,12 @@ + AC_SUBST(CLUSTERING_LIBS) + AC_SUBST(CLUSTERING_LD_LIBRARY_PATH) + +-dnl NOTE: the 'pcfparser_svn3942' is a temporary dependency until the new +-dnl 'common_files' package is defined +- + AC_CONFIG_FILES([ + Makefile + include/Makefile + common_utilities/Makefile +-pcfparser_svn3942/Makefile + src/Makefile + src/BasicClasses/Makefile +-src/libParaverTraceParser/Makefile + src/libSharedComponents/Makefile + src/libSharedComponents/kalign2/Makefile + src/libClustering/gmeans/Makefile +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,9 +8,7 @@ + + ## -I@common_filesdir@ + +-## The 'pcfparser_svn3942' and 'common_utilities' directory will +-## be merged in the new 'common-files' package +-SUBDIRS = include pcfparser_svn3942 common_utilities src scripts doc ++SUBDIRS = include common_utilities src scripts doc + + instdir = $(includedir) + +--- a/src/ClustersSequenceScore/Makefile.am ++++ b/src/ClustersSequenceScore/Makefile.am +@@ -9,8 +9,7 @@ + @CLUSTERING_CPPFLAGS@\ + -I$(top_srcdir)/src/libClustering\ + -I$(top_srcdir)/src/libTraceClustering\ +- -I$(top_srcdir)/src/libSharedComponents\ +- -I$(top_srcdir)/pcfparser_svn3942 ++ -I$(top_srcdir)/src/libSharedComponents + + ClustersSequenceScore_bin_LDFLAGS = @CLUSTERING_LDFLAGS@ + +--- a/src/libDistributedClustering/Makefile.am ++++ b/src/libDistributedClustering/Makefile.am +@@ -30,8 +30,6 @@ + libDistributedClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@\ + -I$(top_srcdir)/src/libClustering\ + -I$(top_srcdir)/src/libSharedComponents\ +- -I$(top_srcdir)/pcfparser_svn3942\ +- -I$(top_srcdir)/src/libParaverTraceParser\ + -I/usr/include/ANN + + libDistributedClustering_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@ +--- a/src/libSharedComponents/Makefile.am ++++ b/src/libSharedComponents/Makefile.am +@@ -75,21 +75,12 @@ + + libSharedComponents_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@\ + -I${top_srcdir}/src/libClustering\ +- -I${top_srcdir}/src/libParaverTraceParser\ + -I/usr/include/ANN +-if MAKE_OLD_PCFPARSER +- libSharedComponents_la_CPPFLAGS += -I${top_srcdir}/pcfparser_svn3942/old +-else +- libSharedComponents_la_CPPFLAGS += -I${top_srcdir}/pcfparser_svn3942 +-endif +- + + libSharedComponents_la_LDFLAGS = @CLUSTERING_LDFLAGS@ @CLUSTERING_CPPFLAGS@ + + libSharedComponents_la_LIBADD = \ +- $(top_builddir)/pcfparser_svn3942/libparavertraceconfig.la \ + $(top_builddir)/src/libClustering/libClustering.la \ +- $(top_builddir)/src/libParaverTraceParser/libParaverTraceParser.la \ + ./kalign2/libKalign2.la \ + @CLUSTERING_LIBS@ + +--- a/src/libTraceClustering/Makefile.am ++++ b/src/libTraceClustering/Makefile.am +@@ -9,9 +9,7 @@ + -I$(top_srcdir)/src/BasicClasses \ + -I/usr/include/ANN \ + -I$(top_srcdir)/src/libSharedComponents \ +- -I$(top_srcdir)/src/libParaverTraceParser \ +- -I$(top_srcdir)/common_utilities \ +- -I$(top_srcdir)/pcfparser_svn3942 ++ -I$(top_srcdir)/common_utilities + + instdir = $(includedir) + +@@ -27,9 +25,7 @@ + libTraceClustering_la_CPPFLAGS = @CLUSTERING_CPPFLAGS@\ + -I$(top_srcdir)/src/libClustering\ + -I$(top_srcdir)/src/libSharedComponents\ +- -I$(top_srcdir)/pcfparser_svn3942\ +- -I/usr/include/ANN\ +- -I$(top_srcdir)/src/libParaverTraceParser ++ -I/usr/include/ANN + + libTraceClustering_la_LDFLAGS = @CLUSTERING_CPPFLAGS@ @CLUSTERING_LDFLAGS@ + libTraceClustering_la_LIBADD = \ +@@ -37,8 +33,5 @@ + $(top_builddir)/src/libSharedComponents/libSharedComponents.la \ + @CLUSTERING_LIBS@ + +-## $(top_srcdir)/src/libParaverTraceParser/libParaverTraceParser.la +- +- + + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,7 +4,6 @@ + + SUBDIRS = \ + BasicClasses \ +- libParaverTraceParser \ + libClustering \ + libSharedComponents \ + libTraceClustering \ diff --git a/sys-cluster/clusteringsuite/metadata.xml b/sys-cluster/clusteringsuite/metadata.xml index 90dc13e20b..e1713f0515 100644 --- a/sys-cluster/clusteringsuite/metadata.xml +++ b/sys-cluster/clusteringsuite/metadata.xml @@ -8,7 +8,7 @@ enable mpi for distributed version enable support for sys-cluster/muster algorithms - + enable compilation of TreeDBSCAN support for sys-cluster/extrae https://github.com/bsc-performance-tools/clustering-suite/issues diff --git a/sys-cluster/extrae/extrae-3.8.3-r6.ebuild b/sys-cluster/extrae/extrae-3.8.3-r8.ebuild similarity index 91% rename from sys-cluster/extrae/extrae-3.8.3-r6.ebuild rename to sys-cluster/extrae/extrae-3.8.3-r8.ebuild index 4baf807be3..49144b4b85 100644 --- a/sys-cluster/extrae/extrae-3.8.3-r6.ebuild +++ b/sys-cluster/extrae/extrae-3.8.3-r8.ebuild @@ -15,15 +15,16 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64" IUSE="boost clustering doc dwarf elf heterogeneous inotify +instrument-dynamic-memory -+instrument-io +instrument-syscall memkind merge-in-trace nanos opencl openmp +parallel-merge -pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml" ++instrument-io +instrument-syscall memkind merge-in-trace nanos online opencl openmp ++parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib sionlib smpss +spectral +xml" #aspectj and aspectj-weaver need to both be enabled at the same time #current dev-java/aspectj package only provides aspectj.jar #aspectj needs foo/lib/aspectj.jar and foo/bin/ajc #aspectj-weaver needs bar/aspectjweaver.jar #TODO: remove some useflags (boost elf dwarf) -#TODO: pmapi online dyninst cuda cupti openshmem gm mx synapse aspectj +#TODO: pmapi online dyninst cuda cupti openshmem gm mx aspectj #TODO: support llvm libunwind, llvm rt, elftoolchain CDEPEND=" @@ -44,6 +45,7 @@ CDEPEND=" elf? ( virtual/libelf ) inotify? ( dev-libs/libevent ) memkind? ( dev-libs/memkind ) + online? ( sys-cluster/synapse ) opencl? ( dev-util/opencl-headers ) sionlib? ( sys-cluster/sionlib:= ) spectral? ( @@ -75,7 +77,6 @@ REQUIRED_USE=" " # cupti? ( cuda ) # dyninst? ( boost dwarf elf ) -# online? ( synapse ) # aspectj? ( java ) src_prepare() { @@ -106,7 +107,6 @@ src_configure() { --without-dyninst --without-cupti - --without-synapse --without-openshmem --without-gm --without-mx @@ -168,11 +168,20 @@ src_configure() { else myconf+=( "--without-memkind" ) fi + if use online; then + myconf+=( "--with-synapse=${EPREFIX}/usr" ) + else + myconf+=( "--without-synapse" ) + fi if use opencl; then myconf+=( "--with-opencl=${EPREFIX}/usr" ) else myconf+=( "--without-opencl" ) fi + if use sionlib; then + myconf+=( "--with-sionlib=${EPREFIX}/usr" ) + myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlib" ) + fi if use spectral; then myconf+=( "--with-fft=${EPREFIX}/usr" ) myconf+=( "--with-spectral=${EPREFIX}/usr" ) @@ -181,8 +190,6 @@ src_configure() { myconf+=( "--without-spectral" ) fi - use sionlib && myconf+=( "--with-sionlib=${EPREFIX}/usr" ) - econf "${myconf[@]}" } diff --git a/sys-cluster/extrae/metadata.xml b/sys-cluster/extrae/metadata.xml index 4a9abda54c..3db14b4bc7 100644 --- a/sys-cluster/extrae/metadata.xml +++ b/sys-cluster/extrae/metadata.xml @@ -34,7 +34,7 @@ process). Extrae generates trace files that can be later visualized with sys-clu Enable dev-libs/memkind support Embed the merging process in the tracing library so the final tracefile can be generated automatically from the application run Enable support for tracing sys-cluster/nanos6 run-time - + Enable on-line analysis Enable support for tracing OpenCL Enable support for tracing OpenMP Build the parallel mergers (mpimpi2prv/mpimpi2dim) based on MPI diff --git a/sys-cluster/otf2/metadata.xml b/sys-cluster/otf2/metadata.xml index 0c04defaed..2edcd3ced1 100644 --- a/sys-cluster/otf2/metadata.xml +++ b/sys-cluster/otf2/metadata.xml @@ -6,6 +6,6 @@ Alessandro Barbieri - Enable sys-cluster/sionlib support + Enable sys-cluster/sionlibl support diff --git a/sys-cluster/otf2/otf2-2.3.ebuild b/sys-cluster/otf2/otf2-2.3-r1.ebuild similarity index 80% rename from sys-cluster/otf2/otf2-2.3.ebuild rename to sys-cluster/otf2/otf2-2.3-r1.ebuild index 078fda8688..bfe7036fa0 100644 --- a/sys-cluster/otf2/otf2-2.3.ebuild +++ b/sys-cluster/otf2/otf2-2.3-r1.ebuild @@ -20,7 +20,7 @@ RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]') - sionlib? ( sys-cluster/sionlib[tools] ) + sionlib? ( sys-cluster/sionlibl:= ) " DEPEND="${RDEPEND}" @@ -36,9 +36,15 @@ src_configure() { $(use_enable test backend-test-runs) $(use_enable debug) - $(use_with sionlib) ) + if use sionlib; then + myconf+=( "--with-sionlib=${EPREFIX}/usr" ) + myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlibl" ) + else + myconf+=( "--without-sionlib" ) + fi + econf "${myconf[@]}" } diff --git a/sys-cluster/sionlib/Manifest b/sys-cluster/sionlib/Manifest index 8fc118f36b..2929984210 100644 --- a/sys-cluster/sionlib/Manifest +++ b/sys-cluster/sionlib/Manifest @@ -1,2 +1 @@ DIST sionlib-1.7.7.tar.gz 489080 BLAKE2B 1ffd06d1b245034b28700af1249135347cdd731a7af23ad96a27b5b5a11d64d9a67249fcd1c44cea43face1066e7ae1d59681e84cef2041e18f02e0c3e8f70ee SHA512 f270467e09893adf1af6103557365acbc9a3e73fe08716a21de6f59b25be9b187ee1c1ec1d878a9599e735f98da470b5e2e184774c27ed0ff0c330c5bf0a5677 -DIST sionlibl-1.7.7.tar.gz 490515 BLAKE2B 76971dd6d80222144b40da345d58311911aab09c6a5250b85d4a2731d2f93cdbd39d87dd6bbafdeaba88f06603105076267f6956417916f118ec45e07fa59269 SHA512 6ef46a0905552c558595bf6b72225a290d73dc87fa33c9862de5e4bd4d683792437646f7b4ab8a463b4a50d1b4a79aec96a66e577e815de3f23e9274be2681af diff --git a/sys-cluster/sionlib/metadata.xml b/sys-cluster/sionlib/metadata.xml index df4593cce9..0f8c4f1a83 100644 --- a/sys-cluster/sionlib/metadata.xml +++ b/sys-cluster/sionlib/metadata.xml @@ -18,18 +18,22 @@ Both, the estimated chunk size and file system block size are used to align indi SIONlib provides two different interfaces: one for parallel access (with implementations for different parallel programming technologies such as MPI, OpenMP and hybrid MPI+OpenMP) and one for sequential access which is also used internally by the SIONlib utilities. + + https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONlib/-/issues + Enable C++ support enable SIONlib debug + deep-est-sdv collector selection plug-in for MSA-aware collective I/O Enable Fortran support + hostname-regex collector selection plug-in for MSA-aware collective I/O enable mpi enable python support enable hybrid openmp mpi enable openmp Enable compilation of parutils (used for benchmarking) configure SIONlib to use pthreads for locking - - Build the tooling version instead + enable I/O forwarding with sys-cluster/SIONfwd diff --git a/sys-cluster/sionlib/sionlib-1.7.7.ebuild b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild similarity index 79% rename from sys-cluster/sionlib/sionlib-1.7.7.ebuild rename to sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild index e00956e3af..ba466e09be 100644 --- a/sys-cluster/sionlib/sionlib-1.7.7.ebuild +++ b/sys-cluster/sionlib/sionlib-1.7.7-r2.ebuild @@ -12,20 +12,15 @@ inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs DESCRIPTION="Scalable I/O library for parallel access to task-local files" HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html" -SRC_URI=" - !tools? ( http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P}.tar.gz ) - tools? ( http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV}l -> ${PN}l-${PV}.tar.gz ) -" +SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV} -> ${P}.tar.gz" S="${WORKDIR}/${PN}" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64" -IUSE="+cxx debug doc examples +fortran +mpi +ompi +openmp +parutils +pthreads python tools" -#TODO: cuda sionfwd msa -#--enable-sionfwd=/path/to/sionfwd -#--msa=(hostname-regex|deep-est-sdv)] MSA aware collective operations for the given system +IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda +REQUIRED_USE="?? ( hostname-regex deep-est-sdv )" PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" ) RDEPEND=" @@ -35,6 +30,7 @@ RDEPEND=" virtual/mpi ) openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) ) + sionfwd? ( sys-cluster/SIONfwd ) " DEPEND=" ${RDEPEND} @@ -67,8 +63,13 @@ src_configure() { append-fflags -fallow-argument-mismatch + local msa="none" + use deep-est-sdv && msa="deep-est-sdv" + use hostname-regex && msa="hostname-regex" + local myconf=( --disable-mic + --msa="${msa}" --prefix="${T}/prefix/usr" ) @@ -83,6 +84,7 @@ src_configure() { use debug && myconf+=( "--enable-debug" ) use python && myconf+=( "--enable-python=3" ) + use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" ) ./configure "${myconf[@]}" || die } @@ -103,6 +105,14 @@ src_install() { rm -r "${T}/prefix/usr/examples" || die fi + insinto "/usr/include/sionlib" + doins -r "${T}"/prefix/usr/include/* + rm -r "${T}/prefix/usr/include" || die + + exeinto "/usr/libexec/${PN}" + doexe "${T}"/prefix/usr/bin/*partest + rm "${T}"/prefix/usr/bin/*partest || die + # move 64 bit libraries to lib64 libs64=( "${T}"/prefix/usr/lib/*64* ) if [[ ${#libs64[@]} -gt 0 ]]; then diff --git a/sys-cluster/sionlibl/Manifest b/sys-cluster/sionlibl/Manifest new file mode 100644 index 0000000000..a16495014b --- /dev/null +++ b/sys-cluster/sionlibl/Manifest @@ -0,0 +1 @@ +DIST sionlibll-1.7.7.tar.gz 490515 BLAKE2B 76971dd6d80222144b40da345d58311911aab09c6a5250b85d4a2731d2f93cdbd39d87dd6bbafdeaba88f06603105076267f6956417916f118ec45e07fa59269 SHA512 6ef46a0905552c558595bf6b72225a290d73dc87fa33c9862de5e4bd4d683792437646f7b4ab8a463b4a50d1b4a79aec96a66e577e815de3f23e9274be2681af diff --git a/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch b/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch new file mode 100644 index 0000000000..a7ac351ea7 --- /dev/null +++ b/sys-cluster/sionlibl/files/sionlibl-respect-flags.patch @@ -0,0 +1,120 @@ +--- a/config/determine-cc.sh ++++ b/config/determine-cc.sh +@@ -1,7 +1,6 @@ + #!/bin/sh + # determine what compiler is behind "cc" (and presumably "CC" and "ftn") wrapper + +-CC=`which cc 2>/dev/null` + COMP= + if [ -z "$CC" ]; then + echo "No 'cc' located!" +--- a/config/select-compiler.sh ++++ b/config/select-compiler.sh +@@ -9,7 +9,7 @@ + CPS="" + COMP="" + +-GNU=`which gcc 2> /dev/null` ++GNU="${CC}" + if [ -n "${GNU}" ] + then + NCPS=`expr ${NCPS} + 1` +--- a/config/select-mpi.sh ++++ b/config/select-mpi.sh +@@ -76,7 +76,6 @@ + if [ -z "${MPIS}" ]; then MPIS="${MPI}"; else MPIS="${MPIS}|${MPI}"; fi + fi + +-MPICC=`which mpicc 2> /dev/null` + if [ -n "${MPICC}" ] + then + FMPI="" +@@ -86,7 +85,7 @@ + MPIROOTDIR1=`dirname ${MBINDIR}` + + echo "#include " > conftest.c +- mpicc -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt ++ "${MPICC}" -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt + MINCDIR=`cat mpiconf.txt | sed -e 's#^.* "##' -e 's#/mpi.h".*##'` + if [ -n "${MINCDIR}" ] + then +--- a/mf/Makefile.defs.linux-gomp ++++ b/mf/Makefile.defs.linux-gomp +@@ -23,24 +23,19 @@ + #------------------------------------------------------------------------------ + # SIONlib General Settings + #------------------------------------------------------------------------------ +-OPTFLAGS = -g -O0 -Wall ++CFLAGS += -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC + +-CC = gcc +-CFLAGS = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC ++CXXFLAGS += $(PFLAG) $(OPTFLAGS) -fPIC + +-CXX = g++ +-CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3 +- +-F77 = gfortran +-FFLAGS = $(PFLAG) $(OPTFLAGS) ++FFLAGS += $(PFLAG) $(OPTFLAGS) -fPIC + + F90 = $(F77) +-F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form ++F90FLAGS += $(PFLAG) $(OPTFLAGS) -ffree-form -fPIC $(FCFLAGS) + + FPP = + FDOPT = -D + +-LDFLAGS = $(PFLAG) $(OPTFLAGS) $(HINTSLIB) ++LDFLAGS += $(PFLAG) $(OPTFLAGS) $(HINTSLIB) + UTILLIB = + FOBASE = pomp_fwrapper_base.o + +@@ -101,10 +96,6 @@ + #------------------------------------------------------------------------------ + + MPIENABLE = 1 +-MPICC = mpicc +-MPICXX = mpicxx +-MPIF77 = mpif77 +-MPIF90 = mpif90 + MPILIB = -lmpich + PMPILIB = -lpmpich + #PMPILIB = # MPICH2 +@@ -139,8 +130,7 @@ + #------------------------------------------------------------------------------ + + SZLIB = szlib +-SZLIB_OPTFLAGS = -O3 +-SZLIB_CFLAGS = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED ++SZLIB_CFLAGS = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED $(CFLAGS) + SZLIB_LIBPATH = -L$(TOPDIR)/utils/szlib + SZLIB_LIB = -lsc.z + +--- a/src/fortraninterface/Makefile ++++ b/src/fortraninterface/Makefile +@@ -121,21 +122,21 @@ + $(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib sion_f90_mpi.F90 > sion_f90_mpi.f90 + sion_f90_mpi.mod : sion_f90_mpi.o + sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS) +- $(MPIF90) $(F90FLAGS) -c sion_f90_mpi.f90 ++ $(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_mpi.f90 + + # F90 Interface (OMP) + sion_f90_omp.f90: sion_f90_omp.F90 + $(CPP) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_omp.F90 > sion_f90_omp.f90 + sion_f90_omp.mod : sion_f90_omp.o + sion_f90_omp.o : sion_f90_omp.f90 sion_f90.mod $(SION_HDRS) +- $(OMPF90) $(F90FLAGS) -c sion_f90_omp.f90 ++ $(OMPF90) $(F90FLAGS) $(F90OMPFLAGS) -c sion_f90_omp.f90 + + # F90 Interface (OMPI) + sion_f90_ompi.f90: sion_f90_ompi.F90 $(SION_HDRS) + $(CPP) $(F90MPIFLAGS) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_ompi.F90 > sion_f90_ompi.f90 + sion_f90_ompi.mod : sion_f90_ompi.o + sion_f90_ompi.o : sion_f90_ompi.f90 $(SION_HDRS) +- $(MPIF90) $(F90FLAGS) -c sion_f90_ompi.f90 ++ $(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_ompi.f90 + + + diff --git a/sys-cluster/sionlibl/metadata.xml b/sys-cluster/sionlibl/metadata.xml new file mode 100644 index 0000000000..0f8c4f1a83 --- /dev/null +++ b/sys-cluster/sionlibl/metadata.xml @@ -0,0 +1,39 @@ + + + + + lssndrbarbieri@gmail.com + Alessandro Barbieri + + +SIONlib is a library for writing and reading data from several thousands of parallel tasks into/from one or a small number of physical files. Only the open and close functions are collective while file access can be performed independently. + +SIONlib can be used as a replacement for standard I/O APIs (e.g. POSIX) that are used to access distinct files from every parallel process. SIONlib will bundle the data into one or few files in a coordinated fashion in order to sidestep sequentialising mechanism in the file system. At the same time, the task-per-file picture is maintained for the application, every process has access to its logical file only. File access is performed using SIONlib equivalents to standard C-I/O functionality (fwrite becomes sion_write, fseek becomes sion_seek, etc.) which have similar semantics as their C counterparts. + +Internally, the physical files are sub-divided into sequences of blocks, which themselves contain one chunk of data belonging to every logical file. In case the amount to be written to a file is known up front, it can optionally be specified when opening the file and the sequence of blocks collapses into a single block with one chunk per task containing all of its data. If a chunk size cannot be specified ahead of time, a sensible default is chosen and reads and writes that cross chunk boundaries are handled transparently by SIONlib. + +SIONlib also uses information about the block size of the underlying file system, because access to the same block from different tasks often leads to contention. + +Both, the estimated chunk size and file system block size are used to align individual chunks with file system blocks. Ensuring contention-free access to file system blocks enables efficient parallel writing and reading. + +SIONlib provides two different interfaces: one for parallel access (with implementations for different parallel programming technologies such as MPI, OpenMP and hybrid MPI+OpenMP) and one for sequential access which is also used internally by the SIONlib utilities. + + + https://gitlab.jsc.fz-juelich.de/cstao-public/SIONlib/SIONlib/-/issues + + + + Enable C++ support + enable SIONlib debug + deep-est-sdv collector selection plug-in for MSA-aware collective I/O + Enable Fortran support + hostname-regex collector selection plug-in for MSA-aware collective I/O + enable mpi + enable python support + enable hybrid openmp mpi + enable openmp + Enable compilation of parutils (used for benchmarking) + configure SIONlib to use pthreads for locking + enable I/O forwarding with sys-cluster/SIONfwd + + diff --git a/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild new file mode 100644 index 0000000000..c31355c5aa --- /dev/null +++ b/sys-cluster/sionlibl/sionlibl-1.7.7-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_CONFIG_NAME="doxy" +FORTRAN_NEEDED="fortran" +PYTHON_COMPAT=( pypy3 python3_{8..10} ) + +inherit docs flag-o-matic fortran-2 python-any-r1 toolchain-funcs + +DESCRIPTION="Scalable I/O library for parallel access to task-local files" +HOMEPAGE="https://www.fz-juelich.de/ias/jsc/EN/Expertise/Support/Software/SIONlib/_node.html" +SRC_URI="http://apps.fz-juelich.de/jsc/sionlib/download.php?version=${PV}l -> ${PN}l-${PV}.tar.gz" +S="${WORKDIR}/sionlib" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+cxx debug deep-est-sdv doc examples +fortran hostname-regex +mpi +ompi +openmp +parutils +pthreads python sionfwd" #cuda + +RDEPEND=" + mpi? ( virtual/mpi ) + ompi? ( + || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) + virtual/mpi + ) + openmp? ( || ( sys-devel/gcc:*[openmp] sys-libs/libomp ) ) + sionfwd? ( sys-cluster/SIONfwd ) +" +DEPEND=" + ${RDEPEND} + ${PYTHON_DEPS} +" + +REQUIRED_USE="?? ( hostname-regex deep-est-sdv )" +PATCHES=( "${FILESDIR}/${PN}-respect-flags.patch" ) + +pkg_setup() { + FORTRAN_NEED_OPENMP=0 + use openmp && FORTRAN_NEED_OPENMP=1 + use ompi && FORTRAN_NEED_OPENMP=1 + + fortran-2_pkg_setup +} + +src_prepare() { + default + sed 's/CXXFLAGS = $(CXXFLAGS)/CXXFLAGS = /' -i test/serial/Makefile || die + sed 's/`gcc/`${CC}/' -i config/determine-compiler-version.sh || die +} + +src_configure() { + tc-export AR CC CXX F77 FC + export MPICC=/usr/bin/mpicc + export MPICXX=/usr/bin/mpicxx + export MPIF77=/usr/bin/mpif77 + export MPIF90=/usr/bin/mpif90 + export F90=$(tc-getFC) + export OMPF77=$(tc-getF77) + export OMPF90=$(tc-getFC) + + append-fflags -fallow-argument-mismatch + + local msa="none" + use deep-est-sdv && msa="deep-est-sdv" + use hostname-regex && msa="hostname-regex" + + local myconf=( + --disable-mic + --msa="${msa}" + --prefix="${T}/prefix/usr" + ) + + #custom configure? + use cxx || myconf+=( "--disable-cxx" ) + use fortran || myconf+=( "--disable-fortran" ) + use mpi || myconf+=( "--disable-mpi" ) + use ompi || myconf+=( "--disable-ompi" ) + use openmp || myconf+=( "--disable-omp" ) + use parutils || myconf+=( "--disable-parutils" ) + use pthreads || myconf+=( "--disable-pthreads" ) + + use debug && myconf+=( "--enable-debug" ) + use python && myconf+=( "--enable-python=3" ) + use sionfwd && myconf+=( "--enable-sionfwd=${EPREFIX}/usr" ) + + ./configure "${myconf[@]}" || die +} + +src_compile() { + export VARTEXFONTS="${T}/fonts" + emake C_AR=$(tc-getAR) F90=$(tc-getFC) + docs_compile +} + +src_install() { + mkdir -p "${T}/prefix/usr/share/doc/${PF}" || die + default + + if use examples ; then + mv "${T}/prefix/usr/examples" "${T}/prefix/usr/share/doc/${PF}/" || die + else + rm -r "${T}/prefix/usr/examples" || die + fi + + insinto "/usr/include/sionlibl" + doins -r "${T}"/prefix/usr/include/* + rm -r "${T}/prefix/usr/include" || die + + exeinto "/usr/libexec/${PN}" + doexe "${T}"/prefix/usr/bin/*partest + rm "${T}"/prefix/usr/bin/*partest || die + + for b in "${T}"/prefix/usr/bin/sion* ; do + n=$(basename "${b}") + newbin "${T}/prefix/usr/bin/${n}" "l${n}" + rm "${b}" || die + done + + # move 64 bit libraries to lib64 + libs64=( "${T}"/prefix/usr/lib/*64* ) + if [[ ${#libs64[@]} -gt 0 ]]; then + mkdir "${T}/prefix/usr/lib64" || die + for l in "${libs64[@]}" ; do + mv "${l}" "${T}/prefix/usr/lib64/" || die + done + fi + + rsync -ravXHA "${T}/prefix/usr" "${ED}/" || die + docompress -x "/usr/share/doc/${PF}/examples" + + #TODO: build shared libs + #find "${ED}" -name '*.a' -delete || die + find "${ED}" -name '*.la' -delete || die +}