diff options
Diffstat (limited to 'sys-cluster')
44 files changed, 1356 insertions, 1199 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex 354ffeac9cc5..f08ba957486f 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/ampi/Manifest b/sys-cluster/ampi/Manifest index e15050eca34a..b230f5d63a4d 100644 --- a/sys-cluster/ampi/Manifest +++ b/sys-cluster/ampi/Manifest @@ -1,3 +1,3 @@ DIST ampi-0_pre20140616.tar.gz 1127315 BLAKE2B e003f44f74449b40f5cb2c98ca4d0eebd39aa82363c519e86b58cdd11056153d8cf9b196819cb654fcfb9eaa12ef9ca8a819a1c06a1a1f34d599541b5ac6aece SHA512 b6a8790c1686a32546194fa6c3818aa9d2ba08911621d5251e85a4114dad75e350f18560cf0527811c487f804265bc09a4b80faeab5eafbd670e4dfa103fe078 -EBUILD ampi-0_pre20140616.ebuild 515 BLAKE2B 98e2756ae4ad2d45a4fc1f4a5a784f679c317bbe8a070667d69bbaa3ee8aaa29ca3459959f531880cb7b4a66b2407e57eaf61ae06f5bf191ea98403ddd65a227 SHA512 307290bea862b91024ea843bb05f12ff8e1def1cbf81d0c3124c220ac90eebedb156ae7a31486fdf9d0747b6e8ba3c9b68f55788c59cacd4e2a19b9fcd37ef9a +EBUILD ampi-0_pre20140616.ebuild 513 BLAKE2B cc3d3692902b902a43cf4b15f0fd2211eed366c33f6e313dbac753c6ee9c084862ff4bf2e19e72cbbaae450df874c0d823ac9172687137387c90aa7f66cced8f SHA512 3454c262955e56bc14377249940876ed1853bc36c506f7f5733e8df83e1a6f3b5fa0d73676fbc1d590cefc980827a8b6d090272eedd7c2cce024dc3222c1403a MISC metadata.xml 258 BLAKE2B 860964b9257d6437e63725fa62b938b40a4b80018b8bcfa3386f53c1c6c1f5821ae70c7e88646036c5f4994ea6db89dee0242f61d1d360f139a419c54786ffd8 SHA512 74b70b0b8db56c49badc858fa51b04c9839a10381bb8d13480509467f9729df1c7bc199b06398c872e10d29d6d8bea8e7b10ded491f7f1c149c7a9193d6cfa9b diff --git a/sys-cluster/ampi/ampi-0_pre20140616.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild index ecc74be35251..7516f251739f 100644 --- a/sys-cluster/ampi/ampi-0_pre20140616.ebuild +++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jauhien/distfiles/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" RDEPEND="virtual/mpi" DEPEND="${RDEPEND}" diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 426ee4be0219..d5c7a6e2c034 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -50,7 +50,8 @@ DIST ceph-15.2.15.tar.gz 148584988 BLAKE2B 6ff629846a74c9b30c7e5d54731e2c85c6794 DIST ceph-16.2.5.tar.gz 155933825 BLAKE2B 3c8f3f1663b91d4de1e3736317add0b88d9083db5ab2fc3e2e913278977deec076bd4410e309f4e47ccc169d74356c2ab1221c94532cc45ee75ec73673fc42a0 SHA512 5c32f9aa817ecfa788725bcfe5743756853ca9b3f9ee453242110f1b5e1bdd1feaef79ad9ccf2b185445c9644bcecb1355e151a2255bfd27edc9818e0d6d4c4a DIST ceph-16.2.6.tar.gz 156087762 BLAKE2B e2595d1a958200e4f1877e4597c53319a9eee2e95606ea1b3ba2966a0d17f1cfcf52e05cca59752cc6ac383e32d944c380920d111aec840631235aef273a4de1 SHA512 f01e29088ae566d4111c21b5d0c173ddb02badaa0d8272f7f1548eb8e66a95dc7052b3945d9fb342e6c97a65c57648fda394317340d1f4236a57af7580073658 EBUILD ceph-14.2.22-r1.ebuild 10462 BLAKE2B ac59404f02b137daea912fc891a3a77e420829b79656161268190402e5020e1a4ce19400c2a97fedb5148347f26cce24fad8e70629c3ba2e29f68665002016bd SHA512 283caeefb71e9911a735b6fb9db7314f263627da58650b3a68d26857b5f4dd7d489bf305289c7bab15a814178b1d5130142e0e85f0d4f7e2cd5c33a90117920c -EBUILD ceph-15.2.15.ebuild 10770 BLAKE2B 3d079cf7f1ebc1fd6d5ea02b360cfa90715f098d4d5b667dcb940582f4dd1e4610e0203480cfc0098c2c9eb3c623c40c5eda6cb5774a988ccb479412fc0db41b SHA512 405ce9a34e2df9fe6610e5f2a126719908fcfb4782e1478ce2d10a2b7d4daa12f9e2c20149637cf14a91576c6c92fdd17f537f37b1f69fd44ccbd376a353d13e +EBUILD ceph-15.2.15-r2.ebuild 10872 BLAKE2B 7ff08b83e79b39cc4a727af6f57765afa4ec10ad672a67c9496cceec59f9e913ed8ed9492a91eed3eb44a18460d9776fd089e2428f7eaae73550798b07fedf2d SHA512 c1e4519c0218e6a1a40cd9a46759716768d9d14bd76719372e3f11f967310c4d9f1a62ac649778b3d154a0ecf3b778f59bf40b31a1389c5475bce9d947f611cf EBUILD ceph-16.2.5.ebuild 12020 BLAKE2B 07add334a77f2da4c6c5f2b0fe564aea99d0a3d6be09360155873179e29271fc0844a62f33c279eaa9ad35b8b86f6b7d3dd96f21ecbf0ce2070193870ca14270 SHA512 15ae3d05777b333d4ec8ff5d80ed81e384fc2313b533d9a2b71c889543d0072ed1e65b2acc1ecb52a1af79cccb5e6a670c50785e7b94674ce54fe87a14578842 EBUILD ceph-16.2.6-r2.ebuild 12161 BLAKE2B fc64f1581df911862e1666e37316dfb8e011e791b103edd318641b992c8663581dc49104090ac10dfdb3b39cb5c77362ab44cc50219ff46e10352291435fdebe SHA512 48c00c0a0a233d2ab4f2720d4dd686db8c025f0724cb488f803e4c8991188da38df954c7f32d2954dbe4963364e34bf14879309082878edc20edfd122297ca88 +EBUILD ceph-16.2.6-r4.ebuild 12228 BLAKE2B 84a5f1e7df6fac047889b1d4537046eed3bfc5a00d366553e20c01bad82b91e78ca1cefc5b5789760316b5c6e1dc6466fb28d5fdc5d6a7b80b9fd6498db13c5d SHA512 604d1179fd1109c618846543a1e8b8c09d4dba0d3083c15a1d871eb3e923be33bbd715f37d271db21ae8f0aa6c4b4f9f83701c833153b61fad3f6cacf280b646 MISC metadata.xml 2319 BLAKE2B ed789868b8ce45fcdfd0125b296511c109815fa86c92e36371e32450a84a2b2415d8dcbdcbf7858f34a8db412157ae1242b66ef533272e6fa432532a1cac7c65 SHA512 36c8dae7ef1dc91d6f60279a61db96f3712ecf8c7a5844b8389105f2a1f8008a8744556d1addde5a50321153727bf8cd51d07142eeebcc87ab2ee86335ebad26 diff --git a/sys-cluster/ceph/ceph-15.2.15.ebuild b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild index 164f014af636..e9c79f993c8f 100644 --- a/sys-cluster/ceph/ceph-15.2.15.ebuild +++ b/sys-cluster/ceph/ceph-15.2.15-r2.ebuild @@ -9,7 +9,8 @@ CMAKE_MAKEFILE_GENERATOR=emake DISTUTILS_OPTIONAL=1 inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ - python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles + python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles \ + multiprocessing if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -30,7 +31,7 @@ CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc kafka kerberos ldap lttng +mgr numa pmdk rabbitmq +radosgw rbd-rwl +ssl spdk - system-boost systemd +tcmalloc test uring xfs zfs" + +system-boost systemd +tcmalloc test uring xfs zfs" IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" DEPEND=" @@ -39,7 +40,8 @@ DEPEND=" virtual/libudev:= app-arch/bzip2:= app-arch/lz4:= - >=app-arch/snappy-1.1.9:= + app-arch/snappy:= + || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) app-arch/zstd:= app-shells/bash:0 app-misc/jq:= @@ -89,6 +91,7 @@ DEPEND=" rbd-rwl? ( dev-libs/pmdk:= ) ssl? ( dev-libs/openssl:= ) system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] ) + !system-boost? ( <sys-libs/glibc-2.34 ) uring? ( sys-libs/liburing:= ) xfs? ( sys-fs/xfsprogs:= ) zfs? ( sys-fs/zfs:= ) @@ -99,7 +102,7 @@ BDEPEND=" x86? ( dev-lang/yasm ) app-arch/cpio >=dev-util/cmake-3.5.0 - <=dev-python/cython-0.29.24[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] dev-python/sphinx dev-util/cunit dev-util/gperf diff --git a/sys-cluster/ceph/ceph-16.2.6-r4.ebuild b/sys-cluster/ceph/ceph-16.2.6-r4.ebuild new file mode 100644 index 000000000000..5e495f15ee5b --- /dev/null +++ b/sys-cluster/ceph/ceph-16.2.6-r4.ebuild @@ -0,0 +1,460 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_OPTIONAL=1 +LUA_COMPAT=( lua5-3 ) + +CMAKE_MAKEFILE_GENERATOR=emake + +inherit check-reqs bash-completion-r1 cmake distutils-r1 flag-o-matic \ + lua-single python-r1 udev readme.gentoo-r1 toolchain-funcs \ + systemd tmpfiles multiprocessing + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ceph/ceph.git" + SRC_URI="" +else + SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64" +fi + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="https://ceph.com/" + +LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain" +SLOT="0" + +CPU_FLAGS_X86=(avx2 avx512f pclmul sse{,2,3,4_1,4_2} ssse3) + +IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana + jemalloc jaeger kafka kerberos ldap lttng +mgr numa pmdk rabbitmq + +radosgw rbd-rwl rbd-ssd rgw-lua +ssl spdk +sqlite +system-boost systemd + +tcmalloc test uring xfs zbd zfs" +IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +DEPEND=" + ${LUA_DEPS} + acct-group/ceph + acct-user/ceph + virtual/libudev:= + app-arch/bzip2:= + app-arch/lz4:= + app-arch/snappy + || ( >=app-arch/snappy-1.1.9-r1 <app-arch/snappy-1.1.9 ) + app-arch/zstd:= + app-shells/bash:0 + app-misc/jq:= + dev-libs/crypto++:= + dev-cpp/gflags:= + <dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?] + dev-libs/libaio:= + dev-libs/libfmt:= + dev-libs/libnl:3= + dev-libs/libxml2:= + dev-libs/libevent:= + <dev-libs/rocksdb-6.15:= + dev-libs/xmlsec:=[openssl] + dev-cpp/yaml-cpp:= + dev-libs/nss:= + dev-libs/protobuf:= + net-dns/c-ares:= + net-libs/gnutls:= + sys-auth/oath-toolkit:= + sys-apps/coreutils + sys-apps/grep + sys-apps/hwloc:= + sys-apps/keyutils:= + sys-apps/util-linux:= + sys-apps/sed + sys-apps/util-linux + sys-libs/libcap-ng:= + sys-libs/ncurses:0= + sys-libs/zlib:= + sys-process/numactl:= + virtual/libcrypt:= + x11-libs/libpciaccess:= + babeltrace? ( dev-util/babeltrace ) + fuse? ( sys-fs/fuse:0= ) + jemalloc? ( dev-libs/jemalloc:= ) + !jemalloc? ( >=dev-util/google-perftools-2.6.1:= ) + jaeger? ( dev-cpp/nlohmann_json:= ) + kafka? ( dev-libs/librdkafka:= ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap:= ) + lttng? ( dev-util/lttng-ust:= ) + pmdk? ( dev-libs/pmdk:= ) + rabbitmq? ( net-libs/rabbitmq-c:= ) + radosgw? ( + dev-libs/icu:= + dev-libs/expat:= + dev-libs/openssl:= + net-misc/curl:=[curl_ssl_openssl] + ) + rbd-rwl? ( dev-libs/pmdk:= ) + ssl? ( dev-libs/openssl:= ) + sqlite? ( dev-db/sqlite:= ) + system-boost? ( >=dev-libs/boost-1.72:=[threads(+),context,python,${PYTHON_USEDEP}] ) + uring? ( sys-libs/liburing:= ) + xfs? ( sys-fs/xfsprogs:= ) + zbd? ( sys-block/libzbd:= ) + zfs? ( sys-fs/zfs:= ) + ${PYTHON_DEPS} +" +BDEPEND=" + amd64? ( dev-lang/nasm ) + x86? ( dev-lang/yasm ) + app-arch/cpio + >=dev-util/cmake-3.5.0 + dev-python/cython[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/cunit + dev-util/gperf + dev-util/ragel + dev-util/valgrind + sys-apps/coreutils + sys-apps/findutils + sys-apps/grep + sys-apps/sed + sys-apps/which + sys-devel/bc + sys-devel/patch + virtual/pkgconfig + jaeger? ( + sys-devel/bison + sys-devel/flex + ) + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + sys-apps/grep[pcre] + sys-fs/btrfs-progs + ) +" +RDEPEND=" + ${DEPEND} + app-admin/sudo + net-misc/socat + sys-apps/gptfdisk + sys-apps/nvme-cli + >=sys-apps/smartmontools-7.0 + sys-block/parted + sys-fs/cryptsetup + sys-fs/lsscsi + sys-fs/lvm2[-device-mapper-only(-)] + virtual/awk + dev-python/bcrypt[${PYTHON_USEDEP}] + dev-python/cherrypy[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/pecan[${PYTHON_USEDEP}] + dev-python/prettytable[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/werkzeug[${PYTHON_USEDEP}] + mgr? ( + dev-python/jsonpatch[${PYTHON_USEDEP}] + dev-python/more-itertools[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyjwt[${PYTHON_USEDEP}] + dev-python/routes[${PYTHON_USEDEP}] + diskprediction? ( + >=dev-python/scipy-1.4.0[${PYTHON_USEDEP}] + ) + sci-libs/scikit-learn[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + ) +" +# diskprediction needs older scipy not compatible with py38 +# bug #724438 +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ${LUA_REQUIRED_USE} + ?? ( jemalloc tcmalloc ) + jaeger? ( !system-boost ) + diskprediction? ( mgr ) + kafka? ( radosgw ) + mgr? ( cephfs ) + rabbitmq? ( radosgw ) +" +RESTRICT="!test? ( test )" + +# the tests need root access +RESTRICT="test? ( userpriv )" + +# distribution tarball does not include everything needed for tests +RESTRICT+=" test" + +# create a non-debug release +CMAKE_BUILD_TYPE=RelWithDebInfo + +# false positives unless all USE flags are on +CMAKE_WARN_UNUSED_CLI=no + +PATCHES=( + "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" + "${FILESDIR}/ceph-14.2.0-cflags.patch" + "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" + "${FILESDIR}/ceph-16.2.2-cflags.patch" + "${FILESDIR}/ceph-16.2.2-no-virtualenvs.patch" + "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" + "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" + "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" + "${FILESDIR}/ceph-16.2.0-rocksdb-cmake.patch" + "${FILESDIR}/ceph-15.2.3-spdk-compile.patch" + "${FILESDIR}/ceph-16.2.0-spdk-tinfo.patch" + "${FILESDIR}/ceph-16.2.0-jaeger-system-boost.patch" + "${FILESDIR}/ceph-16.2.0-liburing.patch" + "${FILESDIR}/ceph-16.2.2-system-zstd.patch" +) + +check-reqs_export_vars() { + CHECKREQS_DISK_BUILD="6G" + + if use system-boost; then + CHECKREQS_DISK_USR="350M" + else + CHECKREQS_DISK_USR="510M" + fi + + export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR +} + +pkg_pretend() { + check-reqs_export_vars + check-reqs_pkg_pretend +} + +pkg_setup() { + python_setup + lua_setup + check-reqs_export_vars + check-reqs_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + if use system-boost; then + find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ + | xargs --null sed -r \ + -e 's|Boost::|boost_|g' \ + -e 's|Boost_|boost_|g' \ + -e 's|[Bb]oost_boost|boost_system|g' -i || die + fi + + if ! use systemd; then + find "${S}"/src/ceph-volume/ceph_volume -name '*.py' -print0 \ + | xargs --null sed \ + -e '/^from ceph_volume.systemd import systemctl/ d' \ + -i || die + fi + + sed -r -e "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ + -i src/bash_completion/CMakeLists.txt || die + + sed -e "s:objdump -p:$(tc-getOBJDUMP) -p:" -i CMakeLists.txt || die + + if ! use diskprediction; then + rm -rf src/pybind/mgr/diskprediction_local || die + fi + + # force lua version to use selected version + local lua_version + lua_version=$(ver_cut 1-2 $(lua_get_version)) + sed -i "s:find_package(Lua [0-9][.][0-9] REQUIRED):find_package(Lua ${lua_version} EXACT REQUIRED):" src/CMakeLists.txt + + # remove tests that need root access + rm src/test/cli/ceph-authtool/cap*.t || die +} + +ceph_src_configure() { + local flag + local mycmakeargs=( + -DWITH_BABELTRACE=$(usex babeltrace) + -DWITH_BLUESTORE_PMEM=$(usex pmdk) + -DWITH_CEPHFS=$(usex cephfs) + -DWITH_CEPHFS_SHELL=$(usex cephfs) + -DWITH_DPDK=$(usex dpdk) + -DWITH_SPDK=$(usex spdk) + -DWITH_FUSE=$(usex fuse) + -DWITH_LTTNG=$(usex lttng) + -DWITH_GSSAPI=$(usex kerberos) + -DWITH_GRAFANA=$(usex grafana) + -DWITH_MGR=$(usex mgr) + -DWITH_MGR_DASHBOARD_FRONTEND=OFF + -DWITH_NUMA=$(usex numa) + -DWITH_OPENLDAP=$(usex ldap) + -DWITH_PYTHON3=3 + -DWITH_RADOSGW=$(usex radosgw) + -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) + -DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka) + -DWITH_RADOSGW_LUA_PACKAGES=$(usex rgw-lua "$(usex radosgw)" "NO") + -DWITH_RBD_RWL=$(usex rbd-rwl) + -DWITH_RBD_SSD_CACHE=$(usex rbd-ssd) + -DWITH_SSL=$(usex ssl) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TESTS=$(usex test) + -DWITH_LIBURING=$(usex uring) + -DWITH_SYSTEM_LIBURING=$(usex uring) + -DWITH_LIBCEPHSQLITE=$(usex sqlite) + -DWITH_XFS=$(usex xfs) + -DWITH_ZBD=$(usex zbd) + -DWITH_ZFS=$(usex zfs) + -DENABLE_SHARED="ON" + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") + -DWITH_SYSTEM_PMDK=$(usex pmdk 'YES' "$(usex rbd-rwl)") + -DWITH_SYSTEM_BOOST=$(usex system-boost) + -DBOOST_J=$(makeopts_jobs) + -DWITH_SYSTEM_ROCKSDB=ON + -DWITH_RDMA=OFF + -DWITH_TBB=OFF + -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR=$(systemd_get_systemunitdir) + -DEPYTHON_VERSION="${EPYTHON#python}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -Wno-dev + ) + + # this breaks when re-configuring for python impl + [[ ${EBUILD_PHASE} == configure ]] && mycmakeargs+=(-DWITH_JAEGER=$(usex jaeger)) + + if use amd64 || use x86; then + for flag in ${CPU_FLAGS_X86[@]}; do + case "${flag}" in + avx*) + local var=${flag%f} + mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_NASM_X64_${var^^}=1")") + ;; + *) mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")");; + esac + done + fi + + # needed for >=glibc-2.32 + has_version '>=sys-libs/glibc-2.32' && mycmakeargs+=(-DWITH_REENTRANT_STRSIGNAL:BOOL=ON) + + rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ + || die "failed to remove cmake cache" + + cmake_src_configure + + # bug #630232 + sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ + || die "sed failed" +} + +src_configure() { + use custom-cflags || strip-flags + ceph_src_configure +} + +python_compile() { + local CMAKE_USE_DIR="${S}" + ceph_src_configure + + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + emake VERBOSE=1 clean + emake VERBOSE=1 all + + # python modules are only compiled with "make install" so we need to do this to + # prevent doing a bunch of compilation in src_install + DESTDIR="${T}" emake VERBOSE=1 install + popd >/dev/null || die +} + +src_compile() { + cmake_build VERBOSE=1 all + + # we have to do this here to prevent from building everything multiple times + python_copy_sources + python_foreach_impl python_compile +} + +src_test() { + make check || die "make check failed" +} + +python_install() { + local CMAKE_USE_DIR="${S}" + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + DESTDIR="${ED}" emake VERBOSE=1 install + popd >/dev/null || die + + python_optimize +} + +src_install() { + cmake_src_install + python_foreach_impl python_install + + find "${ED}" -name '*.la' -type f -delete || die + + exeinto /usr/$(get_libdir)/ceph + newexe "${BUILD_DIR}/bin/init-ceph" init-ceph + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} + + keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat + + fowners -R ceph:ceph /var/log/ceph + + newinitd "${FILESDIR}/rbdmap.initd-r1" rbdmap + newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} + + insinto /etc/sudoers.d + doins sudoers.d/* + + insinto /etc/sysctl.d + newins "${FILESDIR}"/sysctld 90-${PN}.conf + + use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc + + # units aren't installed by the build system unless systemd is enabled + # so no point installing these with the USE flag disabled + if use systemd; then + systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ + "ceph-mds@.service" + + systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ + "ceph-osd@.service" + + fi + + udev_dorules udev/*.rules + newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf + + readme.gentoo_create_doc + + python_setup + + # bug #630232 + sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ + || die "sed failed" + + python_fix_shebang "${ED}"/usr/{,s}bin/ + + # python_fix_shebang apparently is not idempotent + local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]' + grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \ + | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die + + local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${ED}}" +} + +pkg_postinst() { + readme.gentoo_print_elog + tmpfiles_process ${PN}.conf +} diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest index b44db651bcb3..8ac34e13c0e1 100644 --- a/sys-cluster/drbd-utils/Manifest +++ b/sys-cluster/drbd-utils/Manifest @@ -1,7 +1,10 @@ AUX drbd-utils-8.0.rc 3077 BLAKE2B 2f6820c0705d315a5d7b018d1aa77bd7bfb27281c8406682cc19f82af023aab2b0a62d29e43c25204ffb52464c6a2306252c7f532730f10e12ab074eceed02c7 SHA512 efc3ff5566e8eebe033f1d76a183d84d242eaf63d0322579af4cd005eeed0e12f5d4660d778a4fcc83c6a5e457908322853bdd3d9f02573dd415844551662f21 AUX drbd-utils-9.15.1-run-lock.patch 564 BLAKE2B f09107b53ee522976c40a91a4d6e267f1effb2bf3afadf77b2138af2031c59a88debc40ed06e1fe0d6fafe6773f3bf5358c315081eca3182853bf132632c617f SHA512 62faedab4668d31d86cfb634bde68aaeb7d9329d0e6948d46e2c0a90cf1988b68438ef1b71f9d84a4dd2230f0cef5179be80cf4a5aef22c30f59a0ab2906523c AUX drbd-utils-9.15.1-sysmacros.patch 950 BLAKE2B d5a81c0e13715c595ec25ae8e78a8176b46b437e01efa8d3a44d3ad6b143ac6ae723fa7f563b5d930d6b9dd82107ed02b5d67406732e2ff2675e1fe180cba657 SHA512 471877458ac9f8fbfe6c223f35ec51e487dfe0e8448ccbc17aabcfec002e9eeb1a3ab6d3477cce7e9791cab9b9db506519c409eee91bf45069fd35bb8bc81d58 +AUX drbd-utils-9.19.1-configure-posix.diff 397 BLAKE2B 3e430311b1d901a143343415d6f9c5ff18ae7cc1e8167f2bfe5582d7165b89b9bc5047beb13f12573ba46adf2c01c21d5446de31b186547d3d57ef1cdde3c7b4 SHA512 555960c82800d166e09fa29975a860ecf8a26ee5d01402aa43cf9d441293b037d2d67c9eb7cfa5baf26ee1545ec27987ca4f1b3222cf784d5c6f2a0495135564 AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de95c14e5abc89296f111a11ffe109723de1602aab39dfccdfb016734b4ffceecb0a7bf94aa6ed8cea SHA512 779ad53c9f019b9dcc748177d6017ca06f1b450bf0889307c9660c574c09414964e4c5e4d6f2f3e8fc540ba14a1d489d09991b813af1581b2f6cd4ba491455ab DIST drbd-utils-9.15.1.tar.gz 1229196 BLAKE2B c73cb624e4c35f2c5c001b4545c2ad806d3f13471aa25b0941d923020fe01a73405d1ed7c2ab2efe3afee0e59b8e9d401072edb788c57dc338fe3ddb4eebebf3 SHA512 bf9c46335500c0dd7afdc160221acaf8fd053afc453cb26cd76ef085c41580be5a62021ef1f1a57eac9df70d1158a008f489d1a8bb5c3329c5a187f79e4942de +DIST drbd-utils-9.19.1.tar.gz 1265184 BLAKE2B b26fd9abd6408df4ccaa46c4713ece1743386bb4727ad8206498c30189d6c119ced57ec2d528c0575c5192cf366998b5f7db99aaecf1a2ba6af028b87c4ae082 SHA512 65d8f5802c541781895c59a5f631b222746b21615049e53f77d6c36a7255c51fe5d062984174ab8578d64af104fe9d66df5ae185ba50a8c38813c12a69fceb22 EBUILD drbd-utils-9.15.1-r2.ebuild 2730 BLAKE2B 8dc9d7d8bf3bbd30aaa02552b0f3c8d5485b2f68f52f38eb2fe4daf5ddbc1ec020cb56ad5ff37bab5dbf889fa8eb32719536a293c74b39324f870474d4d5ead9 SHA512 9e1cf14d6f3e55f252a9fa7bb1bea5f184ee7ca435bc574cf0c28259dfb3a1da1d813db431df57725cf03b36c68c973d388d2beaef058f1ce154a1ca5076e494 +EBUILD drbd-utils-9.19.1.ebuild 3405 BLAKE2B 5a580efa3ca46c9aee54c7211325da70d5a9f3f218907000fd6013159c64bd0cb5cec3b2964e6716f81d68ac5a8ea1fd1047d29e5eb2e108cd0dc5b3f9bfe5db SHA512 99bcb0525415a934674c70493fd8c347a699edfcc0cd7c01683ad96743c39f5ed68ca57a565a010494e7faf35cb60c814dd6e16c78f8a69aa0a024a0efe3e93a MISC metadata.xml 617 BLAKE2B f724b64a762ce8f00e3ae3c9d69c16b947abda948c6979b37139e7306718db3102cd2a7735b9107317f0ef2f98658e0507782effa708e81f1b65adb9c2751037 SHA512 aff2a5533955421f813308ec3d1e32d176f7f873e2d9a367084fbd63fa02dd776084cb43eba99fa39faf9c457b7e7d4fe05332cedd304ee06bb7e913cfa10d46 diff --git a/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild new file mode 100644 index 000000000000..c54edf54fc3b --- /dev/null +++ b/sys-cluster/drbd-utils/drbd-utils-9.19.1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools bash-completion-r1 linux-info tmpfiles udev + +DESCRIPTION="mirror/replicate block-devices across a network-connection" +SRC_URI="https://pkg.linbit.com/downloads/drbd/utils/${P}.tar.gz" +HOMEPAGE="https://www.linbit.com/drbd" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="pacemaker +udev xen" + +DEPEND=" + pacemaker? ( sys-cluster/pacemaker ) + udev? ( virtual/udev )" +RDEPEND="${DEPEND}" +BDEPEND="sys-devel/flex" + +DOCS=( ChangeLog README.md ) + +PATCHES=( + "${FILESDIR}"/${PN}-9.15.1-run-lock.patch + "${FILESDIR}"/${PN}-9.15.1-sysmacros.patch + "${FILESDIR}"/${PN}-9.19.1-configure-posix.diff +) + +S="${WORKDIR}/${P/_/}" + +pkg_setup() { + # verify that CONFIG_BLK_DEV_DRBD is enabled in the kernel or + # warn otherwise + linux-info_pkg_setup + elog "Checking for suitable kernel configuration options..." + if linux_config_exists; then + if ! linux_chkconfig_present BLK_DEV_DRBD; then + ewarn "CONFIG_BLK_DEV_DRBD: is not set when it should be." + elog "Please check to make sure these options are set correctly." + fi + else + ewarn "Could not check if CONFIG_BLK_DEV_DRBD is enabled in your kernel." + elog "Please check to make sure these options are set correctly." + fi +} + +src_prepare() { + # respect LDFLAGS, #453442 + sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \ + -e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \ + -i user/*/Makefile.in || die + + # respect multilib + # bug #698304 + sed -i -e "s:/lib/:/$(get_libdir)/:g" \ + Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die + sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ + -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ + -i user/*/Makefile.in || die + + sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || die + + # correct install paths (really correct this time) + sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \ + scripts/Makefile.in || die + + # don't participate in user survey bug 360483 + sed -i -e '/usage-count/ s/yes/no/' scripts/global_common.conf || die + sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die + + default + eautoreconf +} + +src_configure() { + econf \ + --localstatedir="${EPREFIX}"/var \ + --with-bashcompletion \ + --with-distro=gentoo \ + --with-prebuiltman \ + --without-rgmanager \ + $(use_with pacemaker) \ + $(use_with udev) \ + $(use_with xen) +} + +src_compile() { + # only compile the tools + emake OPTFLAGS="${CFLAGS}" tools doc +} + +src_install() { + # only install the tools + emake DESTDIR="${D}" install-tools install-doc + + # install our own init script + newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN/-utils/} + + dodoc scripts/drbd.conf.example + + keepdir /var/lib/drbd + rm -r "${ED}"/var/run || die + + newtmpfiles scripts/drbd.tmpfiles.conf drbd.conf + + # https://bugs.gentoo.org/698304 + dodir lib/drbd + local i + for i in drbdadm-83 drbdadm-84 drbdsetup-83 drbdsetup-84; do + dosym ../../lib64/drbd/"${i}" lib/drbd/"${i}" + done + + einstalldocs +} + +pkg_postinst() { + tmpfiles_process drbd.conf + + einfo + einfo "Please copy and gunzip the configuration file:" + einfo "from /usr/share/doc/${PF}/${PN/-utils/}.conf.example.bz2 to /etc/${PN/-utils/}.conf" + einfo "and edit it to your needs. Helpful commands:" + einfo "man 5 drbd.conf" + einfo "man 8 drbdsetup" + einfo "man 8 drbdadm" + einfo "man 8 drbddisk" + einfo "man 8 drbdmeta" + einfo +} diff --git a/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff b/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff new file mode 100644 index 000000000000..bea7fd08f9d2 --- /dev/null +++ b/sys-cluster/drbd-utils/files/drbd-utils-9.19.1-configure-posix.diff @@ -0,0 +1,11 @@ +--- a/configure.ac 2021-12-02 12:37:16.175586192 +0000 ++++ b/configure.ac 2021-12-02 12:39:37.346871340 +0000 +@@ -248,7 +248,7 @@ if test -z $FLEX; then + AC_MSG_ERROR([Cannot build utils without flex.]) + fi + +-if [[ $WITH_DRBDMON == "yes" ]] ; then ++if test x"$WITH_DRBDMON" = x"yes"; then + AC_PROG_CXX + AX_CXX_COMPILE_STDCXX_11(, optional) + if test "$HAVE_CXX11" = "0"; then diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index b3c644dd1174..161ac46f96c4 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -7,12 +7,14 @@ AUX garb.cnf 612 BLAKE2B 6597e77fd29aacece48e89217004abc62ecaf7f6477b62d5a29ff1c AUX garb.init 905 BLAKE2B a6f64183587ae9815aedb491dc9dd06f9a625ca4d935099bfbe80bd9a97f7a4020a8ca8d6d9056c0b6a7556aa750e08e232a656da38451d5ae0a47246be7e39a SHA512 716443592e1bb2c8071e3ab5267c6d46ab4c7a1aea25d7cb4f732ef5fd192aff1e439138cab01166539d9509ef75d71ead52a702567744af39df23c021c808a7 DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5c7747175560905b68abb67d557dde752019c313ba1de961ac2970fbf89d277583ee9c55c142cb1822873d7ab611 SHA512 8ff135022e820fc6a1d33ea1fa6e8677702ed7a7fbf460d45c28cdfe287c666949027989c3152311641debf183f3e8062f561c9935e51d3355df8ba087c5d132 DIST galera-25.3.32.tar.gz 1277302 BLAKE2B 061e146054e530d8e95139749d345ddf5a94bfd5861fad7e7c3612400e766f80618f79e18434f93bd188ebfe46f103e805f2ba18eeca81dfee34eb4212a9b3d2 SHA512 e9aa97c0d0de61c25bc11181a99ee38e24a6ffe5ed71769b5034ea7f232502f082f2c88ccacbc832ab37c19b8f647b5e2c4f2e67efcd7c6d3e5880c6a95eaa53 +DIST galera-26.4.10.tar.gz 1424663 BLAKE2B 6be96cfaffd0af14a511f1f1aeaf2b7c18a3aa05216389e51a90834d9307bcd832005ee5da38acf530d40b2b6c11e62353be5aa4c0f678804808d1f74bbeea38 SHA512 97fd629d9f963459a9bce377ebcd35a5b4f533451f38011a03e440f0ac3ceddcaf45f4001afa8cd523626c03e64f27363e4b2e819d2b637551e579a3add44226 DIST galera-26.4.7.tar.gz 1339462 BLAKE2B 9d8ef6ba9e153de848005195edbd99234f282c4e7bda4ddf42f3d6c99088fc3e57536863eb244bfb90d37dbdb6d0cc71661ee5297e59f2faf666da84ee731975 SHA512 ae9c898756ed6cd180bb7bc6a25e7e6b533e4a15a88d3820a936ca203cb0215aca5840599214d2236013da6759981471b47e0e0759d1ccd24c05b8e3c59f3a8c DIST galera-26.4.8.tar.gz 1423256 BLAKE2B 9925207387b1ff5886bc0313fee3257a166fb7ad4cb4a93c508688e32467b5e048a8643d3ca0b2d190fe89883a9c7f450de10f488f1fb24988d62d9ab823bbd4 SHA512 5a99f733e38dffe648df6e313e82cc16066b81341e057e9fe7c7494327cc33db77bb9368d43c80d8b09ce2df95cd9079ad2fc6ff6a6a441a42c55bbf07947661 DIST galera-26.4.9.tar.gz 1422801 BLAKE2B 45840fd73083c292ca7b2f491dafdf9134066f66bee85e10d6be72a428272dbe8773bf8d7ba52793cbc63c388e59d900e2e7a7c861266d11a5d07640552cb42d SHA512 c089d76ec72c2b3ad8814119f24b0f46e562d469a029b43bffc5b25dc73334f23fd016084f69f4fe42152402db8e03528371e2fa9802c9fa39d4112300aa163d DIST galera-4-26.4.6.tar.gz 3531340 BLAKE2B fd3d29aa1a07d4f4a23fd2d1725e52fe1cf2bb4aada58eb1fa40b2c1b2ea7e804153b3ec045ccbaad616223847d895f450f50e5abe5f8708970d25d7da1a45d6 SHA512 25bb2786d7afcc62fa64fd3172dd1480ece76f33df1cc0e3fba5fa19c67a08a39f4645566d020a0c447062c790854377dfe4fc46318346b2f42763a42edeab3a EBUILD galera-25.3.28-r2.ebuild 1790 BLAKE2B cf5f207f092141d2e752e3dfe98caea8ad5439b0aebb36f45d60a091465231aff35edf04cfabfe12928bafc88488a18b34b7d0de977c68758cdcc879b956f2d1 SHA512 0ce6461300ed994c180eaf99d398a38936aa9df816e5e6345d304379a03fe074ab3bc4811f2d4704a34a97d013648db04766c5ebd7741d1ac57f0b1fdf426c95 EBUILD galera-25.3.32-r1.ebuild 1729 BLAKE2B 5450eb476eac4427b8c06e4b72e2cb6b312dfd505b45a9d2f1daaa10b87e1181443ee57589f52b92d8bdefe1ed3ee375acd0d2cb228b5e9ff125ed98bd9ad9e2 SHA512 ea84aa3176c6e22bafa95ebed3a115799f72a999e13170780901e55546bbfdcece523bc6182a671a3cf2ae703481dfa202b03fcaa3b5778aeb44a7c43a147af6 +EBUILD galera-26.4.10.ebuild 1915 BLAKE2B 3bca5d75c5eb56ae18f8b9c738a4e7ae9d05dde54daca2b67c5ffb1c422bae5a558bc6e756e50a7b16217e094ca19ec69101aa491862d110e09bf99711d22bab SHA512 4b138ce8e4f5a6ebc0ce8bf055d5606da9b818700673ea33b6a4fd410cd7cf43010d99882ee978e709c08e2e486f64f2ccdc6c04a4032690af522f2a60050e9b EBUILD galera-26.4.6-r1.ebuild 1886 BLAKE2B 78f23ae0b05f643c67777b1be3b6755f04708aa9d587f7c06ebe90be6c4f2d22b8f9fb9a46810e92bce6b2f7622c1a1d35126b0e7643c11845f083b10cb4f7d0 SHA512 f10b8b73a26c2e84d0fd98cfc7da68d03e44daa46cc7479d9a0f927489c5c5509475656ec5a32b32e53f8f52a11b9eaa6dd1c73aadbd1986a556009ca182b10b EBUILD galera-26.4.7-r1.ebuild 1783 BLAKE2B 50acb2d6f377a577a34b2a457a315bbffb5be6aed1f733d02096ebc929c890a4e88a02cc7bc124b00a484dcff6beb30c0285ecd67c7802e09ed68bce60ead575 SHA512 51cf3072911894d41c2e24ee09f0f61047dad11ef880e3a8b879be08589e711a8d4be7c0714d15fcb9c82d9e8fc9268cf49963f5b86c504f1d9382a58dcc56f8 EBUILD galera-26.4.8-r1.ebuild 1912 BLAKE2B a0c4f82160ffa3b1486fe333f245b0f202bb0e1370f094aa382a773c9b99dd368f8780f34486a8118180dc8436cc140ebfa9a7702a2649922e716b8502a0e8f1 SHA512 e19291122bbe795f8718b90694e68bf346fab85c14b5ae15181f73e0acbf3fd5c5fff93bef7d707623351577b7cc060fae646ede2753c60e78fd8f3461d365be diff --git a/sys-cluster/galera/galera-26.4.10.ebuild b/sys-cluster/galera/galera-26.4.10.ebuild new file mode 100644 index 000000000000..8c2638ef5bb9 --- /dev/null +++ b/sys-cluster/galera/galera-26.4.10.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic + +DESCRIPTION="Synchronous multi-master replication engine that provides the wsrep API" +HOMEPAGE="https://galeracluster.com" +SRC_URI="https://releases.galeracluster.com/galera-4/source/galera-4-${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="GPL-2 BSD" + +SLOT="0" + +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="cpu_flags_x86_sse4_2 garbd test" + +# Tests are currently broken, see +# - https://github.com/codership/galera/issues/595 +# - https://github.com/codership/galera/issues/596 +RESTRICT="test" + +CDEPEND=" + dev-libs/openssl:0= + >=dev-libs/boost-1.41:0= + " + +BDEPEND=">=sys-devel/gcc-4.4" + +DEPEND="${BDEPEND} + ${CDEPEND} + dev-libs/check + >=dev-cpp/asio-1.10.1[ssl(+)] + <dev-cpp/asio-1.12.0 + " + +#Run time only +RDEPEND="${CDEPEND}" + +# Respect {C,LD}FLAGS. +PATCHES=( + "${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch + "${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch +) + +S="${WORKDIR}/galera-4-${PV}" + +src_prepare() { + default + + # Remove bundled dev-cpp/asio + rm -r "${S}/asio" || die + + #Remove optional garbd daemon + if ! use garbd ; then + rm -r "${S}/garb" || die + fi +} + +src_configure() { + tc-export AR CC CXX OBJDUMP + + # strict_build_flags=0 disables -Werror, -pedantic, -Weffc++, + # and -Wold-style-cast + MYSCONS=( + crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1) + tests=$(usex test 1 0) + strict_build_flags=0 + system_asio=1 + ) +} + +src_compile() { + escons --warn=no-missing-sconscript "${MYSCONS[@]}" +} + +src_install() { + dodoc scripts/packages/README scripts/packages/README-MySQL + if use garbd ; then + dobin garb/garbd + newconfd "${FILESDIR}/garb.cnf" garbd + newinitd "${FILESDIR}/garb.init" garbd + doman man/garbd.8 + fi + exeinto /usr/$(get_libdir)/${PN} + doexe libgalera_smm.so +} diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index e0466d123a45..d84e0f7370ab 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -1,25 +1,15 @@ AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400d61a926e9d8499351b7e42377cc1bffce6dc2c2d7f3b50b1de016a336bad69c7a79bb800b973288eef542baed85 SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 -AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c AUX glusterd-r4.initd 747 BLAKE2B f0c1c6947e6c42d3fa1e52b7ee4d856aad9fb9218ae07df35d90039038437ca05bd5c382de609de9a8e35aea24592499dbd0f44d6f3c827e2667229242c3dc21 SHA512 9341b4f998bf5f0da24b84e5e83b2534b5693d018961800ac5ae19ab7246fe60b90b3a66f4c5576d7e1beebd3624e3e2d2c426d44f2ea4f766e1014b69441f60 -AUX glusterfs-7.7-flock.patch 2112 BLAKE2B d3fb045d06a1e574f162369b4730c8d88ddc880384e20a3ec13b0324e22728244b940c8533edbb8da1c8f9d6b331258778dd5975371e969a02ff27487fc8bff4 SHA512 9648371fb438e35b01c021e5cdf31b97d5107b9766e616178388dfa0978f981fde6463a5dec0083d5fadf3300dc27faf35ed00f69138a24697b7fcaea2489765 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7 -DIST glusterfs-7.9.tar.gz 7702149 BLAKE2B e23b5a45a8c2c4f02f0992dfc78bea942a1dcc621082cb5c6aebf73e0cba17a7c0334700aec8c82dc7d093fbddcf9f579320561412b94ec010cf51c0210f2654 SHA512 5683bf2ff3550b8286e27b70981cb176c445e432624db79f065eb5928bc4afdf009f54f3b1d5abde1f6d2c532c9c4820860685aea0d0f709dc78fcf35bfea688 -DIST glusterfs-8.3.tar.gz 7829522 BLAKE2B 1ba60f7209db4f1ce21237c3adea94df1b9eae04d15f99eb414bf961ea67aa7e08d01ea47c8793a33afbc0ff6cf63ecb81f78fa1ba74d66e2d4358ef2bdadacc SHA512 7ca9d3d8938eb27a7347461a07457e90d1ee6e8d5417970e38245c819cf09bf2ecf9de3954b75edf5cf14816e1059fb381b95935ae1f973ebd14ee7531322aa9 -DIST glusterfs-8.4.tar.gz 7833014 BLAKE2B c67f510c655465e9fbecaa7f391531543e37a2a84917592e699d88564b24fe55689b95770f385ac5b645069f287d4af974db76a77c0f44ea5d2e88f995b427f7 SHA512 a81394b3584c2e6c27060367b443c0879512054ed9287740bc24308603b9e3c11376179ed6589d5d38441982cd6415e3612f98ae4c97ddf7d5c747b42171d796 +DIST glusterfs-10.0.tar.gz 8277236 BLAKE2B f7f50311c6754a74a60b36f163d06a9888b92debfdb3a971f092fc18ca9f8c8fe44026101eb446d551a3b452070ef31d37a4f958691416cdd51884fbcf312a47 SHA512 5a9d292461fc8a0c61767b80d1013cdb104706fd564033aac23e87d68d56686df2e9c38a8890a6a50db0afe6a54cf57e05fe8e5a8883bc3157aa6c93e5aaa343 DIST glusterfs-8.5.tar.gz 7873397 BLAKE2B 6ababf15fda216c9a47c05859f7123847d711dd5a12e3ec2c5dcf8475f35830c9a32f7b21ad763ab1be59b06f1d93f83acc0cbb8f7635456a3638be73b162aa4 SHA512 e256141a76deb9a255be31422d76b0c81aad4a7e5b166d2be90a79d340ceb811cbff11f469166ef7582f40f58f47fb056aa05aafd4b35f094bf9c21a5c08f3bb DIST glusterfs-8.6.tar.gz 7826147 BLAKE2B 3a8a488c9a8e4b1daf3ed01fa5e52a62cf791349c1169aaf8609252bfb8bc0a0534f9fc23fac27cfab11ac6fb5e3e1d9588b4ec8080b02cf97e679bf2c8fb5c2 SHA512 bb1125e5d6b4d424234bc40786847f217e7a05cecad1462dd91248cf9559569914f04e1f909e829051cb1db4079ecf906440a38af9de2bbf3bcf53ca8fa1f349 -DIST glusterfs-9.1.tar.gz 8206207 BLAKE2B dea099eb1d366704010247964c24de404fb09c00a375dde4af30a2af836d3b35689fab91a75268aa01dba45860eb50a6e0572913c059e53fb5799d2302c2f005 SHA512 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da -DIST glusterfs-9.2.tar.gz 8212980 BLAKE2B 7fb42186c5d309c357f72e3037fc09d8b15f32770d74173dd4779bab91056d1ceb78a4a651fec2018faf1597357576d41593e9d7b04cf9af7f4742301b284b01 SHA512 34a0a1745029e2fad3c8fc6a044b4e4645f8cf11eddc3c8c8e94cce9733449248c577ce6066bc49010a65121d991daf67766393fe513ac694082f0efa1d4ef95 -DIST glusterfs-9.3.tar.gz 8167846 BLAKE2B 119e2c089ef250fafb2b2dfdcf71f40cc25fdda6ac1cbb38a8557a3c206f721227eceadd87b40341e6bf2b32a7cb24996910f45e061f25d193ab2ca4070ddc76 SHA512 0974cf57a6810505f767c490b53201e62bb73ca2fd3c5203d9882dcbe4088c816afb5445ef606d12fb797b1b1fa5e0994f2ea0816577f70e630637668a20f005 -EBUILD glusterfs-7.9-r1.ebuild 5919 BLAKE2B 5aaab652acccfea58034ad71ca937947fa4c38ab3629aa3da6a3f4e77960f18f813fb8781d04e142c248581c07afa44c8699bc5a13c9796d38f65c6341335c6c SHA512 2e9443235a9a7fe493f9df20115b33b4918f23c0af580e34ba232b09a52a658b536290573a8218ad64a6594cbe387d4dea7d8d0928b657f4e803c912a5b56449 -EBUILD glusterfs-8.3-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8 -EBUILD glusterfs-8.4-r1.ebuild 5433 BLAKE2B fef5fa52d039133126eb57fcd3578c487aceabe1776b5d6a5bc9ad07e3a9c1d6a6798c0c130b651a1430a09e67336bf5175f09e0fe811776045c8be4d0870fea SHA512 e850928695ea82b3f3257cd83be5f5d34de8d5dce807c5a86914caf4c796e5fd64be92a60cf5f71d02132e0575961c1d66ee7f735f5d1eab176c1b9139ca0db8 +DIST glusterfs-9.4.tar.gz 8173625 BLAKE2B c35c63696717bf09f8fbf77dca16a6f45de278253e768c6ffc40c0c097da9ea1b32888233da412a5333281995e89e08d9ed23fd47aba7c506de84b08f9f80cea SHA512 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf +EBUILD glusterfs-10.0.ebuild 5529 BLAKE2B d299dea9a5ef9575790c154e8c5ce8695ad640bcd901073fcdc8deb26c76665661a40c5459a9c40de5d81686be6bb2c8dc0e593de609436b3595c3ef2700d843 SHA512 a65a8a04e25c515de6a49b60da198f3f1c9cc26348fac8573d8d6278880dd124a4bf4faed3e92f1ce10fbf96e3e7006a75dbf5f2d8d4b57dd1ffdbf8926044ae EBUILD glusterfs-8.5-r1.ebuild 5434 BLAKE2B 7b819c7b98e882752f3c76a4df20d2c197c6d6b2bcdf6419972ce0a4bec33a6af72d9ae62307f87faf79b62980ab0a9d9aaaf221131625c3662c6e8e949881a6 SHA512 03a396e9b1c76ed932e8039945f007f71a137bd9966d598af6a3831a1af6b8e8c6a20b02ead72c896e1d312e221700c5843e507694e4189453e5c029b9986c4a EBUILD glusterfs-8.6.ebuild 5433 BLAKE2B 49ad2a5ccb48f2bfd4f76c994e72cc60e78d5965c022621d3947ccd0adfe7b9687f4f83497baea7e04f0f9a7655f886f0c7f80d2be10b547d3a3b891a766e0c9 SHA512 4c85260ae305d39a8d4f1cb8cb863066e5cad0356e121d12490da5843439829c47750fa6605ad6e5343ed90310a222b5ca2b28ba981c5c935f21f10eb7aaed28 -EBUILD glusterfs-9.1-r1.ebuild 5458 BLAKE2B a40723b4dcc5b58e363dd1be0fd00cd4f9b7c43f624cc4f89e083811d3bdbef166bd51f16c994f84ec67075f4d3ad47da4a7aff9d9771a2cb4a14356ec487f6c SHA512 26ad8356a77943c141344e1ba05d641398be4301ddb389e13462017a14c54a9c114167c4edd8fd495e636ed61bb0c0dbce1fbf886f60d61f583cf9e2a4e05b15 -EBUILD glusterfs-9.2-r1.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb -EBUILD glusterfs-9.3.ebuild 5458 BLAKE2B f44b0f014e5ae10f939ba1dec4815ca886ca4de737a69a45450089eb082c8d1d8eaf0ab70bcb0d741926c0daccb9faaf276c1e1a035da48d2a590a26707e7f41 SHA512 14ad8f4703bd2ee433a76f6b41e1740afcb7675ed16515845b092ce082619502b5b7305712a8c3531460f94310b4fa891aa22758f2d7b0182cd1b568ca9930bb -MISC metadata.xml 1517 BLAKE2B a6c5d95e4b88f94312fd1c5103fae3db276f8fd44aaa805da4b483ff79bdd4382148ab1dc90f8a838544564e23d44f2a81f21236ccb508adc0295d890a538eb8 SHA512 bd540edf12b945bd9359a2a0df62e738bcaf381726f662261059d041fa4f9f7b9869e05952aae031912afd4c9436db1c3ed2c8c4fd5a678f7956d64465eab55b +EBUILD glusterfs-9.4.ebuild 5459 BLAKE2B f3691f82fb49c5eca9de6a5eecc7b52aa55d561481740065b940f573c639f6028dac2ae4c40ea5d698d94ae033f0c38de087ff6e1ee708117985d6f8f0d00372 SHA512 09e644d1fc7862a285ea71f4d2293798d5171ce5d045388d3220a0957ee38fe561cb59f7b80057e7a4bb64d17fa7f2da155224a4afe9b9bf5561f45e2bb5ba90 +MISC metadata.xml 1393 BLAKE2B 6f76de3d00fd1625633c2ffe6e54ec8829dc68b21096418a0e9d61cff4d7ff29fa053a3821e3df036a70b797b95dd26474b135c40b1a5074ac3b2059971118ec SHA512 091ce1e57cd22608228bcf059686c67fe37001659d0d9f29bb2fbb1740b8eb00233f8882408ee2f75d30c325d6be4f1a19cecae171c8e88870b8008ab6eaec5a diff --git a/sys-cluster/glusterfs/files/glusterd-r3.initd b/sys-cluster/glusterfs/files/glusterd-r3.initd deleted file mode 100644 index 27682d06216d..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-r3.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Gluster elastic volume management daemon" -command="/usr/sbin/glusterd" -pidfile="/var/run/${SVCNAME}.pid" -command_args="-N" - -command_background="yes" - -depend() { - need net - before netmount -} - -start_pre() { - # Ensure that the GlusterFS auxiliary mount parent directory exists - checkpath --directory --owner gluster:gluster --mode 0775 /var/run/gluster -} - -start_post() { - local c=0 - ebegin "Waiting for glusterd to start up" - while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do - (( ++c )) - done - [ "${c}" -lt "${glusterd_max_wait_start-60}" ] - eend $? - - return 0 -} diff --git a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch b/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch deleted file mode 100644 index f7930406cd18..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-7.7-flock.patch +++ /dev/null @@ -1,65 +0,0 @@ -# https://bugs.gentoo.org/733228 -# https://bugzilla.redhat.com/show_bug.cgi?id=1718562 -# https://bugzilla.redhat.com/show_bug.cgi?id=1776152 -# https://review.gluster.org/#/c/glusterfs/+/23794/8/xlators/features/locks/src/common.c - -From 6ef82683064a87c434bd67e2004935281e4c04cc Mon Sep 17 00:00:00 2001 -From: l17zhou <cynthia.zhou@nokia-sbell.com> -Date: Tue, 03 Dec 2019 07:43:35 +0200 -Subject: [PATCH] add clean local after grant lock - -found by flock test, without correct ref number of fd, -lock will not be correctly released. - -Fixes: bz#1779089 -Change-Id: I3e466b17c852eb219c8778e43af8ad670a8449cc -Signed-off-by: l17zhou <cynthia.zhou@nokia-sbell.com> ---- - -diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c -index c78d537..4c6b78c 100644 ---- a/xlators/features/locks/src/common.c -+++ b/xlators/features/locks/src/common.c -@@ -962,7 +962,7 @@ - struct list_head granted_list; - posix_lock_t *tmp = NULL; - posix_lock_t *lock = NULL; -- -+ pl_local_t *local = NULL; - INIT_LIST_HEAD(&granted_list); - - pthread_mutex_lock(&pl_inode->mutex); -@@ -977,9 +977,9 @@ - - pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock, - 0, 0, NULL); -- -- STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL); -- -+ local = lock->frame->local; -+ PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0, -+ &lock->user_flock, NULL); - __destroy_lock(lock); - } - -@@ -999,6 +999,7 @@ - struct list_head granted_list; - posix_lock_t *tmp = NULL; - posix_lock_t *lock = NULL; -+ pl_local_t *local = NULL; - - int ret = -1; - -@@ -1026,9 +1027,9 @@ - - pl_trace_out(this, lock->frame, NULL, NULL, F_SETLKW, &lock->user_flock, - 0, 0, NULL); -- -- STACK_UNWIND_STRICT(lk, lock->frame, 0, 0, &lock->user_flock, NULL); -- -+ local = lock->frame->local; -+ PL_STACK_UNWIND_AND_FREE(local, lk, lock->frame, 0, 0, -+ &lock->user_flock, NULL); - __destroy_lock(lock); - } - diff --git a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild b/sys-cluster/glusterfs/glusterfs-10.0.ebuild index 8bc22e9cba26..d766c71646f4 100644 --- a/sys-cluster/glusterfs/glusterfs-9.2-r1.ebuild +++ b/sys-cluster/glusterfs/glusterfs-10.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools elisp-common python-single-r1 tmpfiles @@ -15,7 +15,7 @@ LICENSE="|| ( GPL-2 LGPL-3+ )" SLOT="0/${PV%%.*}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" +IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs tcmalloc test +xml" REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml ) ipv6? ( libtirpc )" @@ -28,19 +28,20 @@ RDEPEND=" acct-group/gluster acct-user/gluster dev-libs/libaio - dev-libs/userspace-rcu:= + dev-libs/openssl:=[-bindist(-)] net-libs/rpcsvc-proto + dev-libs/userspace-rcu:= sys-apps/util-linux sys-libs/liburing:= sys-libs/readline:= + !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( >=app-editors/emacs-23.1:* ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] + tcmalloc? ( dev-util/google-perftools ) + xml? ( dev-libs/libxml2 ) " DEPEND=" ${RDEPEND} @@ -90,15 +91,16 @@ src_prepare() { src_configure() { econf \ --disable-fusermount \ + --disable-lto \ $(use_enable debug) \ $(use_enable fuse fuse-client) \ $(use_enable georeplication) \ $(use_enable static-libs static) \ - $(use_enable syslog) \ $(use_enable test cmocka) \ $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ + $(usex ipv6 --with-ipv6-default "") \ + $(usex libtirpc "" --without-libtirpc) \ + $(usex tcmalloc "" --without-tcmalloc) \ --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ --localstatedir="${EPREFIX}"/var } diff --git a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild b/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild deleted file mode 100644 index 9fe0f1f7df80..000000000000 --- a/sys-cluster/glusterfs/glusterfs-7.9-r1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication infiniband ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} ) - ipv6? ( libtirpc )" - -# the tests must be run as root -RESTRICT="test" - -# sys-apps/util-linux is required for libuuid -RDEPEND=" - acct-group/gluster - acct-user/gluster - dev-libs/libaio - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/acl - test? ( >=dev-util/cmocka-1.0.1 - app-benchmarks/dbench - dev-vcs/git - net-fs/nfs-utils - virtual/perl-Test-Harness - dev-libs/yajl - sys-fs/xfsprogs - sys-apps/attr ) -" -BDEPEND=" - virtual/pkgconfig -" - -SITEFILE="50${PN}-mode-gentoo.el" - -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) - -PATCHES=( - "${FILESDIR}/${PN}-7.7-flock.patch" -) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - python_setup "python3*" - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am -exec \ - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die - - # fix execution permissions - chmod +x libglusterfs/src/gen-defaults.py || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-fusermount \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(use_enable infiniband ibverbs) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable test cmocka) \ - $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - default - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_test() { - ./run-tests.sh || die -} - -src_install() { - default - - rm \ - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - if use georeplication ; then - # move the gsync-sync-gfid tool to a binary path - # and set a symlink to be compliant with all other distros - mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die - dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid - fi - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd/{events,glusterfind/.keys} - - # QA - rm -r "${ED}/var/run/" || die - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi - - python_optimize "${ED}" -} - -pkg_postinst() { - tmpfiles_process gluster.conf - - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - echo - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild deleted file mode 100644 index e951ef2e84cd..000000000000 --- a/sys-cluster/glusterfs/glusterfs-8.3-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml ) - ipv6? ( libtirpc )" - -# the tests must be run as root -RESTRICT="test" - -# sys-apps/util-linux is required for libuuid -RDEPEND=" - acct-group/gluster - acct-user/gluster - dev-libs/libaio - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/acl - test? ( >=dev-util/cmocka-1.0.1 - app-benchmarks/dbench - dev-vcs/git - net-fs/nfs-utils - virtual/perl-Test-Harness - dev-libs/yajl - sys-fs/xfsprogs - sys-apps/attr ) -" -BDEPEND=" - virtual/pkgconfig -" - -SITEFILE="50${PN}-mode-gentoo.el" - -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - python_setup "python3*" - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am -exec \ - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die - - # fix execution permissions - chmod +x libglusterfs/src/gen-defaults.py || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-fusermount \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable test cmocka) \ - $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - default - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_test() { - ./run-tests.sh || die -} - -src_install() { - default - - rm \ - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd/{events,glusterfind/.keys} - - # QA - rm -r "${ED}/var/run/" || die - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi - - python_optimize "${ED}" -} - -pkg_postinst() { - tmpfiles_process gluster.conf - - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - echo - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild b/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild deleted file mode 100644 index e951ef2e84cd..000000000000 --- a/sys-cluster/glusterfs/glusterfs-8.4-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml ) - ipv6? ( libtirpc )" - -# the tests must be run as root -RESTRICT="test" - -# sys-apps/util-linux is required for libuuid -RDEPEND=" - acct-group/gluster - acct-user/gluster - dev-libs/libaio - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/acl - test? ( >=dev-util/cmocka-1.0.1 - app-benchmarks/dbench - dev-vcs/git - net-fs/nfs-utils - virtual/perl-Test-Harness - dev-libs/yajl - sys-fs/xfsprogs - sys-apps/attr ) -" -BDEPEND=" - virtual/pkgconfig -" - -SITEFILE="50${PN}-mode-gentoo.el" - -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - python_setup "python3*" - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am -exec \ - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die - - # fix execution permissions - chmod +x libglusterfs/src/gen-defaults.py || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-fusermount \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable test cmocka) \ - $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - default - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_test() { - ./run-tests.sh || die -} - -src_install() { - default - - rm \ - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd/{events,glusterfind/.keys} - - # QA - rm -r "${ED}/var/run/" || die - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi - - python_optimize "${ED}" -} - -pkg_postinst() { - tmpfiles_process gluster.conf - - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - echo - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild deleted file mode 100644 index 481163386a99..000000000000 --- a/sys-cluster/glusterfs/glusterfs-9.1-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools elisp-common python-single-r1 tmpfiles - -SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="https://www.gluster.org/ https://github.com/gluster/glusterfs/" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0/${PV%%.*}" -IUSE="debug emacs +fuse +georeplication ipv6 +libtirpc rsyslog static-libs +syslog test +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} xml ) - ipv6? ( libtirpc )" - -# the tests must be run as root -RESTRICT="test" - -# sys-apps/util-linux is required for libuuid -RDEPEND=" - acct-group/gluster - acct-user/gluster - dev-libs/libaio - dev-libs/userspace-rcu:= - net-libs/rpcsvc-proto - sys-apps/util-linux - sys-libs/liburing:= - sys-libs/readline:= - emacs? ( >=app-editors/emacs-23.1:* ) - fuse? ( >=sys-fs/fuse-2.7.0:0 ) - georeplication? ( ${PYTHON_DEPS} ) - xml? ( dev-libs/libxml2 ) - !elibc_glibc? ( sys-libs/argp-standalone ) - libtirpc? ( net-libs/libtirpc:= ) - !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) - dev-libs/openssl:=[-bindist(-)] -" -DEPEND=" - ${RDEPEND} - sys-devel/bison - sys-devel/flex - virtual/acl - test? ( >=dev-util/cmocka-1.0.1 - app-benchmarks/dbench - dev-vcs/git - net-fs/nfs-utils - virtual/perl-Test-Harness - dev-libs/yajl - sys-fs/xfsprogs - sys-apps/attr ) -" -BDEPEND=" - virtual/pkgconfig -" - -SITEFILE="50${PN}-mode-gentoo.el" - -DOCS=( AUTHORS ChangeLog NEWS README.md THANKS ) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - python_setup "python3*" - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # build rpc-transport and xlators only once as shared libs - find rpc/rpc-transport xlators -name Makefile.am -exec \ - sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' {} + || die - - # fix execution permissions - chmod +x libglusterfs/src/gen-defaults.py || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-fusermount \ - $(use_enable debug) \ - $(use_enable fuse fuse-client) \ - $(use_enable georeplication) \ - $(use_enable static-libs static) \ - $(use_enable syslog) \ - $(use_enable test cmocka) \ - $(use_enable xml xml-output) \ - $(use libtirpc || echo --without-libtirpc) \ - $(use ipv6 && echo --with-ipv6-default) \ - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - default - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_test() { - ./run-tests.sh || die -} - -src_install() { - default - - rm \ - "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r3.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd/{events,glusterfind/.keys} - - # QA - rm -r "${ED}/var/run/" || die - if ! use static-libs; then - find "${D}" -type f -name '*.la' -delete || die - fi - - python_optimize "${ED}" -} - -pkg_postinst() { - tmpfiles_process gluster.conf - - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - echo - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-cluster/glusterfs/glusterfs-9.3.ebuild b/sys-cluster/glusterfs/glusterfs-9.4.ebuild index 8bc22e9cba26..a259a27a6aa4 100644 --- a/sys-cluster/glusterfs/glusterfs-9.3.ebuild +++ b/sys-cluster/glusterfs/glusterfs-9.4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) inherit autotools elisp-common python-single-r1 tmpfiles diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml index 6ee302ff2dc3..73cd1d833a48 100644 --- a/sys-cluster/glusterfs/metadata.xml +++ b/sys-cluster/glusterfs/metadata.xml @@ -23,8 +23,6 @@ <use> <flag name="fuse">Add FUSE mount helper</flag> <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag> - <flag name="infiniband">Add support for Infiniband ibverbs transport. - Libraries can be found in science overlay</flag> <flag name="ipv6">Use IPv6 by default, requires libtirpc</flag> <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag> <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag> diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest index 3300849f2a4f..6a0de6014188 100644 --- a/sys-cluster/keepalived/Manifest +++ b/sys-cluster/keepalived/Manifest @@ -3,8 +3,6 @@ AUX keepalived.init-r1 539 BLAKE2B 90675bc2863c7a2b704c14807ca39c7cd35e2f9281384 AUX keepalived.service 293 BLAKE2B e80be18a91569d73e64d12ff74622c866efc03522640f33e1cb89e4d232f39bb65b3d2aa7c093e93a5fbe41937a5ab4fe3a77d6864f335e04dea6bf898d4ba84 SHA512 c9d9c190a7892b3c9535ab51da45893bf6ff6738e64f832f52e22f435e4ef4e014f74dcb63f51b76a624ba39dc4dbd3542ada1971d361fd3da966bb649355ec7 AUX keepalived.service-r1 349 BLAKE2B 8ad78799046d586a5f98ebd53b9f449918bea5947a818b88d92135f7269ec583e6c52c90f2e8ed365b8c96b66d019753a7f139b63d0cfd361d924372672a3d50 SHA512 4850d785ff6761c75a7f1a5cbf2d8ad0f96ab46287992123a3a8ae4085d7102fd8bbbbb6104ad35747beb8f04c9e0e3a0aceb95a900bb03f3b5575a9d8814d2e AUX keepalived.service.conf 47 BLAKE2B b6e32bf8c8a602186af776d85c6c457aad2408becfd24af4db6db6123946fba2443f51fae3df0d220a4ebf9ae81a02f4bc1ee0d1d1a7a4b050802336c029c87e SHA512 ecf081bd59c57d6be3627ab42183bdebe58f65355c9cfa3e753a9b1fbf64e7731a7b26ec3ef2bf0422c1a6de4eb1d8d84787ca4d3def2d1f12caed9b64b5063a -DIST keepalived-2.2.2.tar.gz 1159896 BLAKE2B 42ff86b4aa7c0a45a3472102107701262b44b780987ed93f3dde7005f61699c1488fd92fccb75f77ef5dcc83461428bbad79cc59cd4648a824a8bfbe7fbd2c34 SHA512 05bb589c76faa4d3f734ecb1a3e5ac40af006fe5dce962bcd9617f192e59bb5336a911b148c1530fb864333da87c3d42a6fbf7d0ef074f6a53ce5a71db8ec706 DIST keepalived-2.2.4.tar.gz 1151290 BLAKE2B 835198fb23312e87894e7740427411d974c00f71029b273d8da3e787ef92848127d896b456fb40db8d802b6c7555e6524872f136f868e19c62387a9471e44b0f SHA512 b8b0f3e7092b7b7093a9927259928076ee95ed176dd26b3a5c38e8c0dc7b83468433944905618dbc9e4b73b81b0cd3f16c2db4234ed4fcdf30f4fc0e532f9422 -EBUILD keepalived-2.2.2.ebuild 2143 BLAKE2B d546ec6c395f17c112846ee33a230a755d110bdc08ba33f4e7499e4b5f3d7872f7197e2d7dd8f365daffe3d950463a526fd0c292e89e85db2bd20493485c8348 SHA512 0cc2d2950552d0299afa49d394ae26c9a69d52d1ca7de97f216591f49696ec7592925b534d3d84f7aad02a060ffe429cd7e43bb1d8da8f91889d515a705049af EBUILD keepalived-2.2.4.ebuild 1920 BLAKE2B 6fb52201e9aac1bc6fda129c4ce05fea661cabfabe17e4e4f5c90e4c83096bfee14181409a65671c1f3d312ca1ef4f07b117268deaa6ef29ef2c8bdd68a74f68 SHA512 cab5d5977ec64b6786722d63f771c0d6d42be1abc539631dc4ccf92f18ebe687b65bf57c45dc672786c24dbc5a0ea2ffaba942a6a527aa4302ec07af3635606c MISC metadata.xml 613 BLAKE2B e9c0ffc59326021d01ca9003ed5e249d1d11672bcc27de65be9889bd8d20ed5818f15d327d9bfd53d9406da2a67a1be9df40da60f6584f969c4c3ce62b35a065 SHA512 b5681eda044f3a4c6fe91894c27d474e6a1109a4594d0955aac024906a687ef83613ac29b58cad04d70ffa9efc1305ccb9620bbea9acc89159e97b667e7c073f diff --git a/sys-cluster/keepalived/keepalived-2.2.2.ebuild b/sys-cluster/keepalived/keepalived-2.2.2.ebuild deleted file mode 100644 index c2eee560d645..000000000000 --- a/sys-cluster/keepalived/keepalived-2.2.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project" -HOMEPAGE="https://www.keepalived.org/" -SRC_URI="https://www.keepalived.org/software/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86" -IUSE="+bfd dbus json regex snmp systemd" - -RDEPEND="dev-libs/libnl:= - dev-libs/openssl:= - dev-libs/popt - net-libs/libnfnetlink - sys-apps/iproute2 - regex? ( >=dev-libs/libpcre2-8 ) - dbus? ( sys-apps/dbus dev-libs/glib:2 ) - json? ( dev-libs/json-c:= ) - snmp? ( net-analyzer/net-snmp ) - systemd? ( sys-apps/systemd )" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-4.4" - -DOCS=( - README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO - doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local init - if use systemd; then - init=systemd - else - init=custom - fi - - # keepalived has support to dynamically use some libraries instead of - # linking them: - #--enable-dynamic-linking \ - #--enable-libiptc-dynamic \ - #--enable-libnl-dynamic \ - #--enable-libxtables-dynamic \ - STRIP=/bin/true \ - econf \ - --with-init=${init} \ - --with-kernel-dir=/usr \ - --enable-sha1 \ - --enable-vrrp \ - $(use_enable bfd) \ - $(use_enable dbus) \ - $(use_enable json) \ - $(use_enable regex) \ - $(use_enable snmp) \ - $(use_enable snmp snmp-rfc) \ - $(use_enable systemd) -} - -src_install() { - default - - newinitd "${FILESDIR}"/keepalived.init-r1 keepalived - newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived - - systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service - systemd_install_serviced "${FILESDIR}/${PN}.service.conf" - - use snmp && dodoc doc/*MIB.txt - - docinto genhash - dodoc genhash/README genhash/AUTHOR genhash/ChangeLog - # This was badly named by upstream, it's more HOWTO than anything else. - newdoc INSTALL INSTALL+HOWTO - - # Security risk to bundle SSL certs - rm -v "${ED}"/etc/keepalived/samples/*.pem || die - # Clean up sysvinit files - rm -rv "${ED}"/etc/sysconfig || die -} diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest index 4e6fdb076247..42ae4e66281d 100644 --- a/sys-cluster/libqb/Manifest +++ b/sys-cluster/libqb/Manifest @@ -1,4 +1,6 @@ AUX libqb-2.0.1-slibtool.patch 620 BLAKE2B 5c5e3c699eb8b9d1d7e9e41a36e9be28e60cc1e0a978ec06cd018a3441f0bf3680991178466ea0ffea99d51c334404bae8f6b9397c49fa97ab5ade378b564e30 SHA512 9cb82b24a18282cf7364f1f413585f70e912ec46f94a2d37c45f643aa8046186cead8805f04b1e5d5daff393e35f99240a51d5a7873996d86b51480c5925b4f6 DIST libqb-2.0.1.tar.xz 480516 BLAKE2B 402ca20f16a232497c9a363c557556bbdcfffff5d0f075898bf4008bb51b30771f284c29b64421be1dae8215e153b8978ac06c9bd10f3e5e23632b597549d2c7 SHA512 6d989d30b381253c7d7c4ff1e6400ad3445b92184906c859f10d6352dd604a309d7e2d9c8298d8b8d59a0e884e2d821608a39f043db7e96db2118a867ef57672 +DIST libqb-2.0.4.tar.xz 504444 BLAKE2B a363a06bcfc34557e634b9be4f625db5b1aba15be89c5d2c7f897ae7c23f229410ce7d697daf6d27364c0cc4c58c13d61db775f8ffe2822673821c2726b7bef0 SHA512 a726b9c1828cbef741ba9c50b9588cbd421637a8fac0d8f4381e2bf6d349cb228935e86f4e8cf409656ef789f4f5c0d096914d7a13637ee1f1e607894349d330 EBUILD libqb-2.0.1-r1.ebuild 1374 BLAKE2B 76e9b4348a1330437661c2d2020fb40774e2084a1dbb06f990c2242a8c00d427101989576d1dba6d1bca5faf530a9e2305cd6d12c385fe517f23c835ce2f95b0 SHA512 89829b4ec8fdc17947d18416bb6f71d1372d3dd04f81e19ff8b5671615422c86ccc276df354ca0210527312c4462a6c955bf7bc8ed22a175cbe666346e2fe0df +EBUILD libqb-2.0.4.ebuild 1335 BLAKE2B 0eb88c39390397bb5d5d3aad2ea8a271757e16aae6ad3fe0defcf98973299f164e24bce4a511f92ab3a4918834ec8a197a670d40928225894feb88f311c81527 SHA512 3991fbb3573ad61fbf2f7ecb3230f8a0cff28ade0ee46bbbdcb52342cf73358bfb168c40b5a328dc2ef5b1c9a3cd79bcf5b3a502afb8dc928eb45f3a315e5023 MISC metadata.xml 340 BLAKE2B b2117bcb3b221578594558b78b54abee3a7adcea3a7e0343041740d19969da2ac089a18705fd2055ba4c14d153f0f0248efe15bac69d1d7112494b33fa88982b SHA512 717633ab4cbe91d0edbed8a6bc279fe255b0bbfd8b2efbf8056a37b4ab517fe6edd65a9926fdce2b74de6666511129ed7513d7040066c0f1fddc966f4708eaa2 diff --git a/sys-cluster/libqb/libqb-2.0.4.ebuild b/sys-cluster/libqb/libqb-2.0.4.ebuild new file mode 100644 index 000000000000..3713ef20b133 --- /dev/null +++ b/sys-cluster/libqb/libqb-2.0.4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Library providing high performance logging, tracing, ipc, and poll" +HOMEPAGE="https://github.com/ClusterLabs/libqb" +SRC_URI="https://github.com/ClusterLabs/${PN}/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="LGPL-2.1" +SLOT="0/100" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="debug doc examples systemd test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-libs/glib:2 + dev-libs/libxml2" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/xz-utils + test? ( dev-libs/check ) + doc? ( + app-doc/doxygen[dot] + )" + +DOCS=( ChangeLog README.markdown ) + +PATCHES=() + +src_prepare() { + default + + # Skip installation of text documents without value + sed -e '/dist_doc_DATA/d' -i Makefile.am || die + + # Do not append version suffix "-yank" + sed 's|1-yank|1|' -i configure.ac || die + + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + --with-socket-dir=/run \ + $(use_enable systemd systemd-journal) \ + $(use_enable debug) +} + +src_compile() { + default + use doc && emake doxygen +} + +src_install() { + emake install DESTDIR="${D}" + + if use examples ; then + docinto examples + dodoc examples/*.c + fi + + use doc && HTML_DOCS=("docs/html/.") + einstalldocs + + find "${D}" -name '*.la' -delete || die +} diff --git a/sys-cluster/lmod/Manifest b/sys-cluster/lmod/Manifest index 337454790715..fdd5586e7a56 100644 --- a/sys-cluster/lmod/Manifest +++ b/sys-cluster/lmod/Manifest @@ -2,6 +2,6 @@ AUX 99lmod 22 BLAKE2B 6a470f0e5796f21f10e10161ee1fdb4fb3d794a9261bee9887c9e2d179 AUX lmod-8.4.19-no-libsandbox.patch 374 BLAKE2B f4bf516a737f73cb547bd07933d2839748259bef017b740b2cb3e5e5fbba6909e932d3211edb1ba48fd16545ecfd7f3a2239046f5478bfad68f9d7ccdb296307 SHA512 9b5b5300588dda23efd82f8d55373be6f69289efad42260a721eb68dfc01475a8f18a9bba8eead8fe66724b8a8df0d75a4c6a85d51e0d3011cc1435cb8f148b6 AUX module.1-8.4.20 7580 BLAKE2B 6b4f8f721178326a4124bb9c907d4dc0e7c1b7251c724af2826aa3f495af4702f0c9a8cbb06847fec5d44f525cd463b4f0ec898a6cd3074d11c3195ede191af5 SHA512 cfc9eb011f5e5fb2a40b9dfe71e6a888f573e17a55d0d34fe529dbb887ff7932e17c0172663c95dfbd00b67f883608921ae7bb19d352b6d9ce8207d13ca13c8b DIST lmod-8.5.6.tar.gz 20986562 BLAKE2B 49a8062f92beb40ce364281f452d221df73ad540f4a510998a909d5733446c45e2cc017901ce5d2384b37a570b8dddcb16d0dc229209137e3a6483e29b97c8bf SHA512 652c678907740c89d6a86f1e403a3e8370e3e4666c03795340b4e70fab8c67a2e705c31fba84f05fd1bf15eb9868808896c73627e87617d2f2c0b5142c48fa97 -EBUILD lmod-8.5.6.ebuild 3350 BLAKE2B b8b1ed01bb89ae3fb14563f19840e52e8253259e6d26342f25e2fc2318eed3e571d5dffd647202ff338ecb5585d5e11da54b9d161a6e2d2384d92a9d0661afbe SHA512 e136eb34d6dacdd64f4e2e9d22e98353caed254e0f7a49a599fc66eb7a2cd8b555fb1958f4a0d5f2f310d97fe7856c3779264ce623d0dcda07ecc109c01b7819 -EBUILD lmod-9999.ebuild 3343 BLAKE2B 93530c3a728eac023cee887c5f46ead4ab742d33a17bac361dde5db593aaf182362dd4282f078ed421f7d138532b0ee95d84ba9d4114684d0b95dbf08175b5cd SHA512 8186c2ecdb9d4befe1f1725aedeb2b9652ec0607ac88b49e388e6820948bcd6f7eaea9ff140af615b6705d05ea231f037273a48ceda2373ff77dbfda330fd383 -MISC metadata.xml 1082 BLAKE2B e1c5bce422c3443f17bce9f852dbe768d0e36b54da5f65f8190f04b1d16cc824429370317a7f47c9f7859db476154c356f421746d1f0a23ff1a9b4ae96f15852 SHA512 24e13a07d9c620cd06ae54f92ef5c3f21fccd1582b0b6d5657b3fddbc5d29cbd1d7f046e279591d0894d9373ab5fa70f9eca120dda2b48b54369663b04525a19 +EBUILD lmod-8.5.6.ebuild 3432 BLAKE2B 460e4c3494a004e843eb6394b7644a11f72ab459b9976bb0a02eb6c1a4c570d4db34083f82106297ae1b31abea8051a0a970db66976024ee07ffbbc297ce6803 SHA512 c06e8633bd889d44906593e83e9297884996708bd2e642ba128d49d1f2415d91825d5a57ca02887a089ed09d32e27588538e57f4e15fc02967408c0d8ad86321 +EBUILD lmod-9999.ebuild 3432 BLAKE2B 460e4c3494a004e843eb6394b7644a11f72ab459b9976bb0a02eb6c1a4c570d4db34083f82106297ae1b31abea8051a0a970db66976024ee07ffbbc297ce6803 SHA512 c06e8633bd889d44906593e83e9297884996708bd2e642ba128d49d1f2415d91825d5a57ca02887a089ed09d32e27588538e57f4e15fc02967408c0d8ad86321 +MISC metadata.xml 965 BLAKE2B c463736b0fd3466f315c9aa58c3bbc5d1dd905cdcf0a3be52c4f425572c99da549fad92046581b5c2bff41a8b64f97a81b8b9f196e937e7073dd64ad1787f844 SHA512 26b650e51fbc0b1d81a73b74f8e3fea92757101398ecc4d9f932edd61fb7638b4fae3ad288ff825c9dc9539d9116311cb4ef784248d9cb618f0f66b414b6494a diff --git a/sys-cluster/lmod/lmod-8.5.6.ebuild b/sys-cluster/lmod/lmod-8.5.6.ebuild index aa8df1b4b7f0..a833cb1dde24 100644 --- a/sys-cluster/lmod/lmod-8.5.6.ebuild +++ b/sys-cluster/lmod/lmod-8.5.6.ebuild @@ -4,7 +4,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} ) -inherit autotools lua-single +inherit autotools lua-single prefix DESCRIPTION="Environment Module System based on Lua" HOMEPAGE="https://lmod.readthedocs.io/en/latest https://github.com/TACC/Lmod" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/Lmod-${PV} - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" fi LICENSE="MIT" @@ -61,6 +61,7 @@ src_prepare() { default rm -r pkgs/{luafilesystem,term} || die rm -r rt/{ck_mtree_syntax,colorize,end2end,help,ifur,settarg} || die + hprefixify -w '/#\!\/bin\/tcsh/' rt/csh_swap/csh_swap.tdesc || die eautoreconf } diff --git a/sys-cluster/lmod/lmod-9999.ebuild b/sys-cluster/lmod/lmod-9999.ebuild index b8c9fbcde3bf..a833cb1dde24 100644 --- a/sys-cluster/lmod/lmod-9999.ebuild +++ b/sys-cluster/lmod/lmod-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..3} ) -inherit autotools lua-single +inherit autotools lua-single prefix DESCRIPTION="Environment Module System based on Lua" HOMEPAGE="https://lmod.readthedocs.io/en/latest https://github.com/TACC/Lmod" @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then else SRC_URI="https://github.com/TACC/Lmod/archive/${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/Lmod-${PV} - KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" fi LICENSE="MIT" @@ -61,6 +61,7 @@ src_prepare() { default rm -r pkgs/{luafilesystem,term} || die rm -r rt/{ck_mtree_syntax,colorize,end2end,help,ifur,settarg} || die + hprefixify -w '/#\!\/bin\/tcsh/' rt/csh_swap/csh_swap.tdesc || die eautoreconf } diff --git a/sys-cluster/lmod/metadata.xml b/sys-cluster/lmod/metadata.xml index e6fd07192f51..98c99e2074d7 100644 --- a/sys-cluster/lmod/metadata.xml +++ b/sys-cluster/lmod/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> <maintainer type="project"> <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest index 387306799aea..2e87daccf6a6 100644 --- a/sys-cluster/openmpi/Manifest +++ b/sys-cluster/openmpi/Manifest @@ -12,7 +12,9 @@ DIST openmpi-4.0.3.tar.bz2 9856669 BLAKE2B 571e8038cdf125bfb452fbee44d8397f8e724 DIST openmpi-4.0.4.tar.bz2 9748444 BLAKE2B 3c3258b7cd71156deec317479ac1ea9766b09447b77174e448a63dab30f75a525c4142159ff58ad0b6208282e36d568e4cd4e7cc1f8b9b34cad8561ce2969a72 SHA512 6c193b4b5cbfd9d48fa5efcef01372c424b51ae5e9727ccf4235e3b14556dfeb010865e41a9473419ccda16559139aa469086b1fff9abfd337e87387fdec1c64 DIST openmpi-4.0.5.tar.bz2 9752045 BLAKE2B 9709dc8c251d4f2be14d0ab498c5d0d0e59f95db98fb16d9e84fe3d30af5a8e2f9636bbceaf7ae4086a3312bcd6299f0e9e1ca609d658930a1f5abe1018311e1 SHA512 b7a1a5ccfc0eaa0f0504ff770b550480f7ae6727fa891e3310d9340a0d844a2ceddf62c2e59efd047ab9416b24c829919bbccd29606ca0e0d7a0569dad800011 DIST openmpi-4.0.6.tar.bz2 9805015 BLAKE2B 2a476fc22a953bd8afb56153ca73e86e27a60ea1490bc1f2ac2a800d352876504e474d8cf8fc768e447ea9840413d7ae9eb7d852c14b0d751b90b86a6133b194 SHA512 4900a957756399464a74e7f685d5d0bf2b4672e274dc02f7de3e5ac07d9e890713d20ef424e0810368ace2315a2d3dea727bfeca980eb2d7cc99f12979dde22d +DIST openmpi-4.0.7.tar.bz2 9809794 BLAKE2B c8ecafa3d50c54ebb9c8853010628240a696b342b04d17df66c4dbbc199a6b65bf7d92a8c34867e86e36a8664d1e26b7d0b0fa16f28cc9c8fed5223a4c06ef81 SHA512 27c49a1598c565e7ab63d2ca5b5277aad36f9f863854199e86af0387ec6edce9a99e9a8bc8dad565d01a6ab4c9f61067603c07b30a165317cced4997507727a4 DIST openmpi-4.1.1.tar.bz2 10052770 BLAKE2B 2f853ca44703197469e5ccd42ecd81de72d39f265e0da9d847e6b2f7a7646241b76346c71969bf6a3d4605c28f02de6b587fd0330c753ad7dec8503af0784b69 SHA512 0d85ba45a40c0879f266e5286615e2cf94eb3570f0a705194525821d5c85d460cefc3a2da8207e6e84c479d3d0da656e2342cc2d6f88c4b4577ca22bbeacc89d +DIST openmpi-4.1.2.tar.bz2 10084596 BLAKE2B 2e6fc12b4564a302d2c364528d0f6bea8b23f9b1cd6059763b8d5de583d86aae2812c239b1d0bb40c83f3c7682c8e666ce1de3112e95de54848169cb5e2805e8 SHA512 1958f96434cddbe525b4511fcf8d0cf8bf1ff376e024466219bd3a2092900e318f45a4b1e1a8ef6b03e350f46a71777fc7db82a7df711f12bb9758150d209aad EBUILD openmpi-1.10.7.ebuild 6259 BLAKE2B 2d1121714a453904b55d0773b1b66328ae738970b516122503d9a7237851fc4a1af2d020966c981887c5ad575749cba83ff080f10191490d75dfe6eba8e65d49 SHA512 b9d936fd911d07f2c0c9dc94137bbce7be58322bffcf1d35cf3b260aed66f4052d378e29b659c0949f2c1920f667d3d134a5d766a0af17a4eee6075101738ebd EBUILD openmpi-1.4.5-r1.ebuild 2413 BLAKE2B e19baf3cecf5b23e1323faf8201d7c9c61f30cb4a3d1db78a6b7d1f801a6d0648c68fd47a8b3237e6534aa4096a392b7f0c57053528c64150f5728424e60e0d1 SHA512 fc1fff1385bc270d88d87b52e699e6d65c5b0e9c80ed1807417a7db5757848cd69c555a5221a0b0238b1bf4001174e458e71d851e657622aaf83c13391a311a1 EBUILD openmpi-1.7.5-r2.ebuild 4699 BLAKE2B 78e51295e74e29456e37f319af559c0b591d3eeb372165eb860964d2dc288aa90bb0de98061227f92360b1365ca160dd8ea32b98a60aee2799b460c12db61585 SHA512 964d4d9844bed55525a34cfd989bb158a5f8f87ef02739f8c0ee79e714359a0646bbeb2b3015856f09d9898ec50509d8d79296cb94f779ad4cfd39b76dd75edf @@ -25,7 +27,9 @@ EBUILD openmpi-4.0.2-r1.ebuild 5323 BLAKE2B 77ba576ec0494dcb9354152f2d943a1dea24 EBUILD openmpi-4.0.3-r1.ebuild 5323 BLAKE2B 77ba576ec0494dcb9354152f2d943a1dea241343fc297e60f4a07997d09d90cd94e09c7f09799313f5725d9f4c05e44d5470a2f20885d0ef35b17bc6690b348a SHA512 3724903c5d70076ff9626bf0f422405395dd2e31b9591b12a599cc748b57168dc42622181257fdbb0baf08774cd5e21897bd5aec5504f6a75bb3f07e1209d4da EBUILD openmpi-4.0.4-r1.ebuild 5323 BLAKE2B 77ba576ec0494dcb9354152f2d943a1dea241343fc297e60f4a07997d09d90cd94e09c7f09799313f5725d9f4c05e44d5470a2f20885d0ef35b17bc6690b348a SHA512 3724903c5d70076ff9626bf0f422405395dd2e31b9591b12a599cc748b57168dc42622181257fdbb0baf08774cd5e21897bd5aec5504f6a75bb3f07e1209d4da EBUILD openmpi-4.0.5-r2.ebuild 5381 BLAKE2B 563c2cc627514ea7230194ef3e301e7bcf1f32f7f82337c77909c4f0858d986e48e591a2b33f54b79c7231c75cd2c0741786e455a69447b407526dbee9697f24 SHA512 fe538a342237eea851165c5c2976e3d72bcfebad200be4d001e8582480c9eb6f0000dc18e61cbd02426c2294ab09bc1e248f48bc6a809208ffc8eab8c84ec5d3 -EBUILD openmpi-4.0.5-r3.ebuild 5495 BLAKE2B 6bc1dd2a8a22fb91d9440affa0e9ed6957a2f85e9b318726b0d60cf4e9af26aee3a3b456f5bf02891c5e4b131aa8b1abc11bb500e5dbed84b9f4da1c7319308d SHA512 88cd50baa7a1e2a82a17616470aeeaef973c35d7c3f4a2418984eddd7f4034e4c12e371316ce00e4b0581f3e53d392244411bb3f77a8c5dd8211e42ebfe4a39d +EBUILD openmpi-4.0.5-r3.ebuild 5493 BLAKE2B 5238d480ee0112658a52bcfa09e884a9b26c32b3c0ee1cf58b9a087238ce776218fe0e84074beafee87cccbd8f94d8e36f228b1cdce8b431b9611e5f5068b90e SHA512 f20c971e620c982bbad1c98a09e0839b3194ef04103d34d6346af8e02c2e76e656dde4e0cb2cbf6c3f31742ca761a4c4c0609eeb68229530862706b592badb95 EBUILD openmpi-4.0.6-r1.ebuild 5501 BLAKE2B 2fea55fdd5cad7b3761a1b0f5f22094bee988796a615e18002c0ac1d6045d0c87ce73d7f96f5d9cb6b01c091f2b946e7f58ba53689eb3b88a5068ae5ceebdb4d SHA512 1d7472a9c74f3d11560a54721e5e91d8a66fb7813ebf2002adcd8f479cca328e88a706ccaadc67433df4e981baabff9984e1877eff671e9dfa146f8cbb1359c1 +EBUILD openmpi-4.0.7.ebuild 5501 BLAKE2B 2fea55fdd5cad7b3761a1b0f5f22094bee988796a615e18002c0ac1d6045d0c87ce73d7f96f5d9cb6b01c091f2b946e7f58ba53689eb3b88a5068ae5ceebdb4d SHA512 1d7472a9c74f3d11560a54721e5e91d8a66fb7813ebf2002adcd8f479cca328e88a706ccaadc67433df4e981baabff9984e1877eff671e9dfa146f8cbb1359c1 EBUILD openmpi-4.1.1-r1.ebuild 5813 BLAKE2B c6e0c20cb05932f24f5f5aadabee0f6487d946ca1fa2896537d7b562f451af8de212e4530fdac7b31a7511b21565ee424e6a163491c744d9bae6781f059c39bc SHA512 647b04be36ba199de2202b5cce0e9555411e642e1eea7134ca1487c0a3e9159e619360f51b4793f375a6500601b3b7ff6105035903e7fc123b4036a9e0bc913d +EBUILD openmpi-4.1.2.ebuild 5813 BLAKE2B c6e0c20cb05932f24f5f5aadabee0f6487d946ca1fa2896537d7b562f451af8de212e4530fdac7b31a7511b21565ee424e6a163491c744d9bae6781f059c39bc SHA512 647b04be36ba199de2202b5cce0e9555411e642e1eea7134ca1487c0a3e9159e619360f51b4793f375a6500601b3b7ff6105035903e7fc123b4036a9e0bc913d MISC metadata.xml 961 BLAKE2B 83fe60a3b125736b98fb8fde2deef0231d8dab694f251a1ca929360a92558774707da4f8085dbfa3431c311aabacaf06cefb0c2969126c95cee4996485cad87f SHA512 970e915852eb254419c67ba00df53034761e31ef12c63b3672ffcd1006a00e6ede30ae09d5ccd8c52e2d5899301cdecf24a477a67c8df9ec319e129705e9cd9c diff --git a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild index f7ced4a1d4a6..6609fda95cfc 100644 --- a/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild +++ b/sys-cluster/openmpi/openmpi-4.0.5-r3.ebuild @@ -30,7 +30,7 @@ HOMEPAGE="https://www.open-mpi.org" SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux" +KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux" IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" diff --git a/sys-cluster/openmpi/openmpi-4.0.7.ebuild b/sys-cluster/openmpi/openmpi-4.0.7.ebuild new file mode 100644 index 000000000000..93df7d8495cc --- /dev/null +++ b/sys-cluster/openmpi/openmpi-4.0.7.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +FORTRAN_NEEDED=fortran + +inherit cuda flag-o-matic fortran-2 java-pkg-opt-2 toolchain-funcs multilib multilib-minimal + +MY_P=${P/-mpi} +S=${WORKDIR}/${MY_P} + +IUSE_OPENMPI_FABRICS=" + openmpi_fabrics_ofed + openmpi_fabrics_knem + openmpi_fabrics_psm" + +IUSE_OPENMPI_RM=" + openmpi_rm_pbs + openmpi_rm_slurm" + +IUSE_OPENMPI_OFED_FEATURES=" + openmpi_ofed_features_control-hdr-padding + openmpi_ofed_features_udcm + openmpi_ofed_features_rdmacm + openmpi_ofed_features_dynamic-sl" + +DESCRIPTION="A high-performance message passing library (MPI)" +HOMEPAGE="https://www.open-mpi.org" +SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" +IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio + ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" + +REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) + openmpi_rm_pbs? ( !openmpi_rm_slurm ) + openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )" + +CDEPEND=" + !sys-cluster/mpich + !sys-cluster/mpich2 + !sys-cluster/nullmpi + >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads] + dev-libs/libltdl:0[${MULTILIB_USEDEP}] + >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) + openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) + openmpi_fabrics_knem? ( sys-cluster/knem ) + openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) + openmpi_rm_pbs? ( sys-cluster/torque ) + openmpi_rm_slurm? ( sys-cluster/slurm ) + openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )" + +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8:* )" + +DEPEND="${CDEPEND} + java? ( >=virtual/jdk-1.8:* )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/mpi.h + /usr/include/openmpi/ompi/mpi/java/mpiJava.h + /usr/include/openmpi/mpiext/mpiext_cuda_c.h +) + +pkg_setup() { + fortran-2_pkg_setup + java-pkg-opt-2_pkg_setup + + elog + elog "OpenMPI has an overwhelming count of configuration options." + elog "Don't forget the EXTRA_ECONF environment variable can let you" + elog "specify configure options if you find them necessary." + elog +} + +src_prepare() { + default + + # Necessary for scalibility, see + # http://www.open-mpi.org/community/lists/users/2008/09/6514.php + echo 'oob_tcp_listen_mode = listen_thread' \ + >> opal/etc/openmpi-mca-params.conf || die +} + +multilib_src_configure() { + if use java; then + # We must always build with the right -source and -target + # flags. Passing flags to javac isn't explicitly supported here + # but we can cheat by overriding the configure test for javac. + export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" + fi + + local myconf=( + --enable-mpi-fortran=$(usex fortran all no) + --enable-orterun-prefix-by-default + --enable-pretty-print-stacktrace + + --sysconfdir="${EPREFIX}/etc/${PN}" + + --with-hwloc="${EPREFIX}/usr" + --with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" + --with-libltdl="${EPREFIX}/usr" + --with-libevent="${EPREFIX}/usr" + --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" + + $(use_enable cxx mpi-cxx) + $(use_enable heterogeneous) + $(use_enable ipv6) + $(use_enable libompitrace) + $(use_enable peruse) + $(use_enable romio io-romio) + + $(use_with cma) + + $(multilib_native_use_enable java mpi-java) + $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) + $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) + $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) + $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) + + $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) + $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) + $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) + $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) + $(multilib_native_use_with openmpi_rm_pbs tm) + $(multilib_native_use_with openmpi_rm_slurm slurm) + ) + + ECONF_SOURCE=${S} econf "${myconf[@]}" +} + +multilib_src_test() { + # Doesn't work with the default src_test as the dry run (-n) fails. + emake -j1 check +} + +multilib_src_install() { + default + + # fortran header cannot be wrapped (bug #540508), workaround part 1 + if multilib_is_native_abi && use fortran; then + mkdir "${T}"/fortran || die + mv "${ED}"/usr/include/mpif* "${T}"/fortran || die + else + # some fortran files get installed unconditionally + rm \ + "${ED}"/usr/include/mpif* \ + "${ED}"/usr/bin/mpif* \ + || die + fi +} + +multilib_src_install_all() { + # fortran header cannot be wrapped (bug #540508), workaround part 2 + if use fortran; then + mv "${T}"/fortran/mpif* "${ED}"/usr/include || die + fi + + # Remove la files, no static libs are installed and we have pkg-config + find "${ED}" -name '*.la' -delete || die + + if use java; then + local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar + java-pkg_dojar "${mpi_jar}" + # We don't want to install the jar file twice + # so let's clean after ourselves. + rm "${mpi_jar}" || die + fi + einstalldocs +} diff --git a/sys-cluster/openmpi/openmpi-4.1.2.ebuild b/sys-cluster/openmpi/openmpi-4.1.2.ebuild new file mode 100644 index 000000000000..6652c805f75a --- /dev/null +++ b/sys-cluster/openmpi/openmpi-4.1.2.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +FORTRAN_NEEDED=fortran + +inherit cuda fortran-2 java-pkg-opt-2 multilib-minimal + +MY_P=${P/-mpi} +S=${WORKDIR}/${MY_P} + +IUSE_OPENMPI_FABRICS=" + openmpi_fabrics_ofed + openmpi_fabrics_knem + openmpi_fabrics_psm" + +IUSE_OPENMPI_RM=" + openmpi_rm_pbs + openmpi_rm_slurm" + +IUSE_OPENMPI_OFED_FEATURES=" + openmpi_ofed_features_control-hdr-padding + openmpi_ofed_features_udcm + openmpi_ofed_features_rdmacm + openmpi_ofed_features_dynamic-sl" + +DESCRIPTION="A high-performance message passing library (MPI)" +HOMEPAGE="https://www.open-mpi.org" +SRC_URI="https://www.open-mpi.org/software/ompi/v$(ver_cut 1-2)/downloads/${MY_P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" +IUSE="cma cuda cxx fortran heterogeneous ipv6 java libompitrace peruse romio + ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}" + +REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs ) + openmpi_rm_pbs? ( !openmpi_rm_slurm ) + openmpi_fabrics_psm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_udcm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed ) + openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )" + +CDEPEND=" + !sys-cluster/mpich + !sys-cluster/mpich2 + !sys-cluster/nullmpi + >=dev-libs/libevent-2.0.22:=[${MULTILIB_USEDEP},threads] + dev-libs/libltdl:0[${MULTILIB_USEDEP}] + >=sys-apps/hwloc-2.0.2:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= ) + openmpi_fabrics_ofed? ( || ( sys-cluster/rdma-core sys-fabric/ofed:* ) ) + openmpi_fabrics_knem? ( sys-cluster/knem ) + openmpi_fabrics_psm? ( sys-fabric/infinipath-psm:* ) + openmpi_rm_pbs? ( sys-cluster/torque ) + openmpi_rm_slurm? ( sys-cluster/slurm ) + openmpi_ofed_features_rdmacm? ( || ( sys-cluster/rdma-core sys-fabric/librdmacm:* ) )" + +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8:* )" + +DEPEND="${CDEPEND} + java? ( >=virtual/jdk-1.8:* )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/mpi.h + /usr/include/openmpi/ompi/mpi/java/mpiJava.h + /usr/include/openmpi/mpiext/mpiext_cuda_c.h +) + +pkg_setup() { + fortran-2_pkg_setup + java-pkg-opt-2_pkg_setup + + elog + elog "OpenMPI has an overwhelming count of configuration options." + elog "Don't forget the EXTRA_ECONF environment variable can let you" + elog "specify configure options if you find them necessary." + elog +} + +src_prepare() { + default + + echo "void main() { return 0; }" > test/util/opal_path_nfs.c || die + + # Necessary for scalibility, see + # http://www.open-mpi.org/community/lists/users/2008/09/6514.php + echo 'oob_tcp_listen_mode = listen_thread' \ + >> opal/etc/openmpi-mca-params.conf || die +} + +multilib_src_configure() { + if use java; then + # We must always build with the right -source and -target + # flags. Passing flags to javac isn't explicitly supported here + # but we can cheat by overriding the configure test for javac. + export ac_cv_path_JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" + fi + + local myconf=( + --enable-mpi-fortran=$(usex fortran all no) + --enable-orterun-prefix-by-default + --enable-pretty-print-stacktrace + + --sysconfdir="${EPREFIX}/etc/${PN}" + + --with-hwloc="${EPREFIX}/usr" + --with-hwloc-libdir="${EPREFIX}/usr/$(get_libdir)" + --with-libltdl="${EPREFIX}/usr" + --with-libevent="${EPREFIX}/usr" + --with-libevent-libdir="${EPREFIX}/usr/$(get_libdir)" + + $(use_enable cxx mpi-cxx) + $(use_enable heterogeneous) + $(use_enable ipv6) + $(use_enable libompitrace) + $(use_enable peruse) + $(use_enable romio io-romio) + + $(use_with cma) + + $(multilib_native_use_enable java mpi-java) + $(multilib_native_use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) + $(multilib_native_use_enable openmpi_ofed_features_rdmacm openib-rdmacm) + $(multilib_native_use_enable openmpi_ofed_features_udcm openib-udcm) + $(multilib_native_use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) + + $(multilib_native_use_with cuda cuda "${EPREFIX}"/opt/cuda) + $(multilib_native_use_with openmpi_fabrics_ofed verbs "${EPREFIX}"/usr) + $(multilib_native_use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) + $(multilib_native_use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) + $(multilib_native_use_with openmpi_rm_pbs tm) + $(multilib_native_use_with openmpi_rm_slurm slurm) + ) + + CONFIG_SHELL="${BROOT}/bin/bash" ECONF_SOURCE=${S} econf "${myconf[@]}" +} + +multilib_src_compile() { + emake V=1 +} + +multilib_src_test() { + # -j1: doesn't work with the default src_test as the dry run (-n) fails. + # Explicit listing of test/* subdirs modulo util because of nfs test fails + # due to sandbox and couldn't find a sane way to skip it. + emake -j1 -C test asm class datatype dss event monitoring mpool spc support threads +} + +multilib_src_install() { + default + + # fortran header cannot be wrapped (bug #540508), workaround part 1 + if multilib_is_native_abi && use fortran; then + mkdir "${T}"/fortran || die + mv "${ED}"/usr/include/mpif* "${T}"/fortran || die + else + # some fortran files get installed unconditionally + rm \ + "${ED}"/usr/include/mpif* \ + "${ED}"/usr/bin/mpif* \ + || die + fi +} + +multilib_src_install_all() { + # fortran header cannot be wrapped (bug #540508), workaround part 2 + if use fortran; then + mv "${T}"/fortran/mpif* "${ED}"/usr/include || die + fi + + # Remove la files, no static libs are installed and we have pkg-config + find "${ED}" -name '*.la' -delete || die + + if use java; then + local mpi_jar="${ED}"/usr/$(get_libdir)/mpi.jar + java-pkg_dojar "${mpi_jar}" + # We don't want to install the jar file twice + # so let's clean after ourselves. + rm "${mpi_jar}" || die + fi + einstalldocs +} diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest index fee0ab31cfc3..de48b2170662 100644 --- a/sys-cluster/ploop/Manifest +++ b/sys-cluster/ploop/Manifest @@ -1,4 +1,5 @@ -AUX disable_create_run_dir.patch 632 BLAKE2B 9b4c817cbf77de4b33063f42d832f729542da24cbd9c8c495f5383562e1228322e3c41321f4c2f09b9745dfc56420c74cc94dc380a7780d01dbd71a1f5a04d99 SHA512 4ef81f24a21f200881f2ff94ba9d39f1b097362eb371623a62dc7d66c7e174e3e7a465be85856c7c5ca8a01d8fe725bd9d713f871af8cec3c25bc94811d7c415 +AUX disable_create_run_dir.patch 560 BLAKE2B 08be833a3afd51560f91337e750027fc13163244e3709399a7824a0afe432c86820cb97b703276e2a64968aeba2c63c44a4944fee080a4e4414928f72bc3da31 SHA512 69f2fe1214bc9fa3cae47bf55af94df83b21c1c19f04a60ddae7d7e261ef59a90ab1ed6dbed63271db2c97ae0b476c3bc69bbde656d85af3ef2c16f4ebb0a7e4 DIST ploop-1.14.1.tar.bz2 123962 BLAKE2B d4f4f102d2ec0714d79901bd3193f85514e232dc18ffcab254becb954cf794f3598fe7b0f65d0bbb85766bff5ded9d816900b40b81cb6046c31d8b6459c67618 SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484 +EBUILD ploop-1.14.1-r1.ebuild 1411 BLAKE2B d28e1988e5b0bd869b2fcd03e1786b92507aec984a5521454d8b6ccdf839982cb6f3c3f605efae1557db4a1ea493219be1b9de9408dd0a4f3322d7a5cdb708e4 SHA512 6c530ddcae0609b0b7e2943fd03461de73f9baaf53f7adf14132d2dc4b4abdad827909243058b69aca390c9d44a1e5b6db949e09cd891398c71a9086e1a8910d EBUILD ploop-1.14.1.ebuild 1465 BLAKE2B ca02d9dcb3a5b7fbf509ba511f2c707866d157451d9a29078bce451447281b4545d0eac65b317aeeb04afd78fcee34cefc9df11dee53df28469321eca57cce47 SHA512 ea81975710843518d76d4e60aad9fc4927b252dbb69173209c92678385f1ed5bbb7ea55ce2ba4ab4b543b4769540c0c8fea85a1650968c239e4c046d08c53464 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/sys-cluster/ploop/files/disable_create_run_dir.patch b/sys-cluster/ploop/files/disable_create_run_dir.patch index 726094903b51..597a6c1d160d 100644 --- a/sys-cluster/ploop/files/disable_create_run_dir.patch +++ b/sys-cluster/ploop/files/disable_create_run_dir.patch @@ -1,5 +1,5 @@ ---- lib/Makefile.old 2015-10-10 15:49:25.377235002 +0300 -+++ lib/Makefile 2015-10-10 15:49:50.021464544 +0300 +--- a/lib/Makefile ++++ b/lib/Makefile @@ -76,17 +76,13 @@ .depend: $(filter-out $(GENERATED),$(SOURCES)) -include .depend diff --git a/sys-cluster/ploop/ploop-1.14.1-r1.ebuild b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild new file mode 100644 index 000000000000..5133adf338ac --- /dev/null +++ b/sys-cluster/ploop/ploop-1.14.1-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit tmpfiles toolchain-funcs + +DESCRIPTION="openvz tool and a library to control ploop block devices" +HOMEPAGE="https://wiki.openvz.org/Download/ploop" +SRC_URI="https://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +BDEPEND="virtual/pkgconfig" +DEPEND="dev-libs/libxml2" +RDEPEND="${DEPEND} + sys-block/parted + sys-fs/e2fsprogs + sys-process/lsof + sys-apps/findutils" + +PATCHES=( + "${FILESDIR}"/disable_create_run_dir.patch +) + +DOCS=( tools/README ) + +src_prepare() { + default + + # Respect CFLAGS and CC, do not add debug by default + sed -i \ + -e 's|CFLAGS =|CFLAGS +=|' \ + -e '/CFLAGS/s/-g -O0 //' \ + -e '/CFLAGS/s/-O2//' \ + -e 's|CC=|CC?=|' \ + -e 's/-Werror//' \ + -e '/DEBUG=yes/d' \ + -e '/LOCKDIR/s/var/run/' \ + Makefile.inc || die 'sed on Makefile.inc failed' + # Avoid striping of binaries + sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed' + + # respect AR and RANLIB, bug #452092 + tc-export AR RANLIB + sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed' +} + +src_compile() { + emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '') +} + +src_install() { + default + rm "${ED}"/usr/$(get_libdir)/*.a || die +} + +pkg_postinst() { + tmpfiles_process ploop.conf +} diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest index 06d96700555c..807db420f9a2 100644 --- a/sys-cluster/rdma-core/Manifest +++ b/sys-cluster/rdma-core/Manifest @@ -1,13 +1,14 @@ AUX ibacm.init 211 BLAKE2B 4f3b2ffb7cbc7f42b14dad5c02bce698feaf079ff75a2f7a7c9d7d0165a92656e8622fa47ecefe310e4283e5b14e70a386aabcf0fcd85403d5c9f16ddf4e9c4f SHA512 fc99aafb0952e4a8d6cf740df58c623fc400f89f60c7e78d3af7fb9067aaf36dc976d82db2c76120fb91ed3340591d24b2df099b44dccec0c136b599e9f12d7d AUX iwpmd.init 211 BLAKE2B ce37edeceae812b999cbcd15b9c9cae55125de0d94ac6983e953117a265c444ab4f9b7a09053c4303c260f1df59cc916ff7f1a89ca6f937a42c2cace6a2a88b4 SHA512 e08d8521d74aa4e266e11833750682974bede45e2b7c42ee3d4ba7cee5695f6e7f5c3c5963b57186f6f669a752faf4c5f4c51f92065425ff6ce859be9affdb07 AUX optional_pandoc.patch 1611 BLAKE2B 5f6c4f8ebe1379cf733b4b1829f39bfc34ff2715cd3be172a609518560c97adbfeec15a648d3205a3016f24a0e99db4be6cb6602672046b96a01c998fd314b6f SHA512 b9c1be47aa530231d0becf6bd313d881262f5360985206371daf96377f657f4aa1b52227ae371e21154edcac48ccf6b1433f84b689cd373b02b844782654c2c2 -AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299ae6eedd402776c4ee3b4965c7df0b8b1816969a715351a1e659e4a26abc99808e93ef69f6c9 SHA512 14c1dac4581943855c362d7a37ef31a87be458123dd890bdcfb75c35b71b0a6e789a819c768ea352b3846af29ab5c3b1872cbe27a2e127b8fc8c93a835428190 +AUX srpd.init 541 BLAKE2B c5e0d37dbbbacc0a0a20a1c33acd11a495d18f1be076840ea83f941f59f84a1ed975eb73c85753fc53add473a32aeaf534078b965ab3116a4a2845906ca3500c SHA512 6c09facaaab24a98914d9a0403d99b1f95e916b695590413860f0a7ad95202bba71f646a1f19c3ff627bac5606c791747415dbfaa6b47e5248b40964186a4021 DIST rdma-core-30.0.tar.gz 1485452 BLAKE2B 8774a41eaba486007a4b695fc5196935102c172607136ca37d03fa626c5bb0b75df7b9cc6a6126219111b4ba828984ffbb235e9afee1e941852650a2b2412dc7 SHA512 4a0ec689e27de71f33e21df9813f78bec81b99c941da234d8d4050a3e1a1b157488d7a4d58d7f62472f32061a36dadad43d986238dcbaf24a29dded3827ec374 DIST rdma-core-31.0.tar.gz 1501133 BLAKE2B 5e67d68ab8eb4019ffb18e7d1995caa8e84a2136201c8649f64093a6c8b8c7b8255e997c12bfd38f33de5608e0fa58a35a1a45e144cf9a65bde671a9f087de1c SHA512 b453343d419ccdc7eb0ae7092dfc84cfcd39b0b64a3e4b3bae18b5078f8e9ce7b2c1c126c535372d4717bb5af3cf2ca26a70e271f00631c66077e619814865c0 DIST rdma-core-32.0.tar.gz 1525119 BLAKE2B 8f754c04be3f13a90a162fde09f96b26d66534aa7284c12e6c0765390f00412cf34052cc1c313f01df8b8bc49cad459a72350cea6e08316387cd6016fd7cb019 SHA512 fbc458e47801b8869fa0a6a045c2ecf10b9021f8fe115cedad8601a4672f116f393a353dcac238ad297935950a09be4a6faa45e373ea6248711d077a57737c16 DIST rdma-core-33.0.tar.gz 1549162 BLAKE2B 7b7c8711eaeb9e66159962bcf0f70644cbb4af96df70f3c9ee6e9d9c8c3e4de5d3248666a0b3fe490537f91cc18c5d09448c72b98c45585e0645594deedee071 SHA512 64ace358c6336519131aea858012e22791bf2ab95f06d655a87835361b5822f5ce0c29db8ddb83121a62f4606418d5fa11358e7ad84da4f93f6233fb3947e52c DIST rdma-core-34.0.tar.gz 1571236 BLAKE2B 1c6799ba742926ef99f8fa7a0e20d7b910e0f3157e5de4350f7068d7d6f4fa79b8fa6be631e9675517bd12b91083c5e92157a1c097691ead0888823702c3583a SHA512 33ce5fbf0d468a31f7ac0e513cf107e3d730f5db279368aa986536f70d684f40e7bacdf965d18b77922272b0420a6cd973c0b73371758107d8f7751be5851ee7 DIST rdma-core-36.0.tar.gz 1649117 BLAKE2B e3d58d8584f440cff437dedba1ccf34c2b62ecc63b5a039f71fc7666aed8e277ffbba2bbb4f8eda428f2f5f5890a5939163c6ebf6d420d3b3b0037a721d45e42 SHA512 89ad37c381ec7b5f18db01dbcbe65351b40fc1d0bc76e2088d663c6c560bf5f119841930ecf1042c997f5bf644683b906748c38d85f1eb561aadda060baa2368 +DIST rdma-core-38.0.tar.gz 1760189 BLAKE2B ab028ce9367353201748f19d05d4d02170920b155b7ebb3584043729422e377cfb4ae29ed442ce7f965faa2470fe558499e9b2e7da51f282fa65ab029d4bcaa9 SHA512 98b3e3d26675891d54652817851f172855443faf6950b5c17177f10f5b3b197778590ad0e9640ecceaba17cf4aceb276ddb145ab46c1f6af9d2f6954688c3239 EBUILD rdma-core-30.0-r2.ebuild 2602 BLAKE2B 8e5974940353bddc406142c15e3adfad07b4706d8196a194dd35ce9381c4e7b4e394de4f59d16f5ead5087a0db466d1c54ab17f55aff5ee759c645219636a34f SHA512 590d01af90cb6d5fff462a264e8d2688599ea190dc5f2f425189be316509d51a20c4035c7ac00dfc5e79d47a1e176ab914fe8f6ff0bafa618311cb3d58b3e985 EBUILD rdma-core-31.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1 EBUILD rdma-core-32.0-r1.ebuild 2610 BLAKE2B af8b426ce6be058696ba668464734e3577987370a0cf9bd33f047c3dc3d54e09e01cde49b75ae100ae555b03dc7fe79901010e5cdf2d5dc9b57e86915b9b4be6 SHA512 44478c203f8bb06c7762c034f44e419d29897cca9107f2d4a24e2191a519aad042564affd4ec79907c613f9e21558507dde06a4380eebb888d1e824d99bf919a @@ -16,5 +17,6 @@ EBUILD rdma-core-33.0-r1.ebuild 2609 BLAKE2B 77e5b645f78c21892a1bc732119bafc3146 EBUILD rdma-core-33.0.ebuild 2609 BLAKE2B d8f57482d3ae5100a0bb6a70974df3fb91fb74e8945e4723206609322eb6ce3fd7a3a3505c2f40e98f64db65172e99d81101c3176e824eb370ce9578d8dfb939 SHA512 d6fe683f174cc3fd271081e3a9efc3e8d88127962fabe5e55ab0d5f38403cebeb4cb6b211a1552d36632515086b07bed08b19c95b17b8fb632c25b76676b04c1 EBUILD rdma-core-34.0.ebuild 2616 BLAKE2B 5709e9896abb2f409880a3aab216c5a47f2f088ccecafddf996dc989c731aa3b0ab18983f56ffb26dafe432f4d533f4a417a959ef712500ffd41d6c4080753be SHA512 b0906628ae91f9a03a02680c5c801ce86babf68809a03fc8264004d6a059e026d9b9504b5b031f4626629a00d4892b60f8c2247c5c21ee0b45aa7af8d3a81458 EBUILD rdma-core-36.0.ebuild 2559 BLAKE2B 3244073460b6be9f4d0a91ed7cfb0cc7f31e392a752fe66680830188b4270644b91424b7a352d9bc1f1446810ee54ac20b1dfe118665e2cc2cd492546f4217ce SHA512 ee08008ebbd8cbc3ca429f64f034a5fed491b5d302304b8bba35738cc34040c1ebaf468bcc05a46a58edc86fed571b64676e0dc9a6d92bea625d10207c18062d -EBUILD rdma-core-9999.ebuild 2608 BLAKE2B 2693dc295b8f2c8f7217d4837341704dfeb3f20cb77756cd7c09d5d7ddea1af3113656842606afd1531f2164518f60125c05907e7430486ea379db4b642cab64 SHA512 f3c011c46112b4fbbaf492ebfccd02627878ae68e7645b52122fd8e0acf15bf578b5ee6ec5c75604143e2b298fc876e34e1b3977d0ecfc69607f588b0835eeb3 +EBUILD rdma-core-38.0.ebuild 2417 BLAKE2B 9d463d5d6ed3fad034f9f8c74c6cfad4301b4831e5d9da3cfe8bd0178b4f769d0f0e9f5b40270d7a87abe8cdfed0d02fa7a96172ac73646a1886cb38b19976d9 SHA512 b66f56a3cc17e876423ca35e0bcda2f3632b3f45e92a7ce7b14ff3556f740a601009dcc9f67a3eb9691e0941b4e166e879de9b87d47149085fa84b44ebbc44d6 +EBUILD rdma-core-9999.ebuild 2417 BLAKE2B 9d463d5d6ed3fad034f9f8c74c6cfad4301b4831e5d9da3cfe8bd0178b4f769d0f0e9f5b40270d7a87abe8cdfed0d02fa7a96172ac73646a1886cb38b19976d9 SHA512 b66f56a3cc17e876423ca35e0bcda2f3632b3f45e92a7ce7b14ff3556f740a601009dcc9f67a3eb9691e0941b4e166e879de9b87d47149085fa84b44ebbc44d6 MISC metadata.xml 560 BLAKE2B f76b4e81668b49b5bb5c3719c2bc2ae9e2d649d827193b60961864924fba1861865d3a55dd14d38f2d58fae0ce49bae8144946600233c63baf4b9a88b2422a06 SHA512 bde881700dedb23708d08b09b0e5317e49729323e8fd4acd2be90c74ddbc837adc228b7831920c8140b8162d494d02b0ccfb8244dfd545aca3cadde418370a6e diff --git a/sys-cluster/rdma-core/files/srpd.init b/sys-cluster/rdma-core/files/srpd.init index 07f5ec2d29a7..ac6db2ffad9b 100644 --- a/sys-cluster/rdma-core/files/srpd.init +++ b/sys-cluster/rdma-core/files/srpd.init @@ -7,7 +7,7 @@ pidfile="/run/${SVCNAME}.pid" start_stop_daemon_args="-b -m" rdma_config="/etc/infiniband/openib.conf" -[ -f ${rdma_config} ] && source ${rdma_config} +[ -f ${rdma_config} ] && . ${rdma_config} [ ${SRP_DEFAULT_TL_RETRY_COUNT} ] && command_args="-l ${SRP_DEFAULT_TL_RETRY_COUNT}" diff --git a/sys-cluster/rdma-core/rdma-core-38.0.ebuild b/sys-cluster/rdma-core/rdma-core-38.0.ebuild new file mode 100644 index 000000000000..f78ff20324b2 --- /dev/null +++ b/sys-cluster/rdma-core/rdma-core-38.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..10} ) + +inherit cmake python-single-r1 udev systemd + +DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem" +HOMEPAGE="https://github.com/linux-rdma/rdma-core" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core" +else + SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )" +SLOT="0" +IUSE="neigh python static-libs systemd valgrind" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +COMMON_DEPEND=" + virtual/libudev:= + neigh? ( dev-libs/libnl:3 ) + systemd? ( sys-apps/systemd:= ) + valgrind? ( dev-util/valgrind ) + python? ( ${PYTHON_DEPS} )" + +DEPEND="${COMMON_DEPEND} + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') + )" + +RDEPEND="${COMMON_DEPEND} + !sys-fabric/infiniband-diags + !sys-fabric/libibverbs + !sys-fabric/librdmacm + !sys-fabric/libibumad + !sys-fabric/ibacm + !sys-fabric/libibmad + !sys-fabric/srptools + !sys-fabric/infinipath-psm + !sys-fabric/libcxgb3 + !sys-fabric/libcxgb4 + !sys-fabric/libmthca + !sys-fabric/libmlx4 + !sys-fabric/libmlx5 + !sys-fabric/libocrdma + !sys-fabric/libnes" + +BDEPEND="virtual/pkgconfig" + +pkg_setup() { + use python && python-single-r1_pkg_setup + +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_RUNDIR=/run + -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib + -DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}""$(get_udevdir)"/rules.d + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" + -DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)" + -DENABLE_VALGRIND="$(usex valgrind)" + -DENABLE_RESOLVE_NEIGH="$(usex neigh)" + -DENABLE_STATIC="$(usex static-libs)" + -DNO_PYVERBS="$(usex python OFF ON)" + -DNO_MAN_PAGES=1 + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules + rm -r "${ED}"/etc/{udev,init.d} || die + + if use neigh; then + newinitd "${FILESDIR}"/ibacm.init ibacm + newinitd "${FILESDIR}"/iwpmd.init iwpmd + fi + + newinitd "${FILESDIR}"/srpd.init srpd + + use python && python_optimize +} diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild index 8d9538a1c0b0..f78ff20324b2 100644 --- a/sys-cluster/rdma-core/rdma-core-9999.ebuild +++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_8 ) +PYTHON_COMPAT=( python3_{6..10} ) inherit cmake python-single-r1 udev systemd @@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core" else SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )" @@ -33,7 +33,7 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} python? ( $(python_gen_cond_dep ' - dev-python/cython[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_MULTI_USEDEP}] ') )" @@ -56,8 +56,6 @@ RDEPEND="${COMMON_DEPEND} BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/optional_pandoc.patch ) - pkg_setup() { use python && python-single-r1_pkg_setup @@ -65,33 +63,27 @@ pkg_setup() { src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_SYSCONFDIR=/etc + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}"/etc -DCMAKE_INSTALL_RUNDIR=/run -DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib - -DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d + -DCMAKE_INSTALL_UDEV_RULESDIR="${EPREFIX}""$(get_udevdir)"/rules.d -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)" - -DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes - $(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes) -DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)" -DENABLE_VALGRIND="$(usex valgrind)" -DENABLE_RESOLVE_NEIGH="$(usex neigh)" -DENABLE_STATIC="$(usex static-libs)" + -DNO_PYVERBS="$(usex python OFF ON)" + -DNO_MAN_PAGES=1 ) - if use python; then - mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" ) - else - mycmakeargs+=( -DNO_PYVERBS=ON ) - fi - cmake_src_configure } src_install() { cmake_src_install - udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules - rm -r "${D}"/etc/{udev,init.d} || die + udev_dorules "${ED}"/etc/udev/rules.d/70-persistent-ipoib.rules + rm -r "${ED}"/etc/{udev,init.d} || die if use neigh; then newinitd "${FILESDIR}"/ibacm.init ibacm diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest index d3191145710f..aa2040201f2e 100644 --- a/sys-cluster/singularity/Manifest +++ b/sys-cluster/singularity/Manifest @@ -1,7 +1,3 @@ -DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c SHA512 b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272 -DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957 SHA512 ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5 -DIST singularity-3.8.4.tar.gz 7959412 BLAKE2B 17786ef9c5a7d3ba0a6494253b5ad5972e89882a5e31aa9da14e62fbc5e8b515e39b22a5832fddb3fbd9cec74caabcb49264541412bc33955643d708ff7a7dc2 SHA512 21170fcea6d49edd827b000b7885fd4bd4a35fc4367a68f1358f45f181fe6b09eae6336bb02007948c20841483c1b74831faca8408cd3f2982be780712967c55 -EBUILD singularity-3.8.0.ebuild 1900 BLAKE2B a24c10ad485b5359a304caf1c85dcd1529e41d50070f842b9d36f1ef79c76edd51ed44f8bceddeea729038eb299e1a917036fef34f036413255033e3e4c0d3ae SHA512 32764eddc65b36a265c7527852b4b1709dca3f1cc17ad38ea75950fd2972643f0f13238df1e481fe392762ef6755e83707b64037b36f73dd18a923ee0f28058c -EBUILD singularity-3.8.3.ebuild 1909 BLAKE2B 345f4286e94ab41b16beb32498f84b10e9c53b70a94dd59f3be44f0762785ddb514dcef6c688541a11d02fa36b01426029a3f6802f175fbb34e6e8cafa789a52 SHA512 21c185762d6aa45e4e15301b3c3bfff41fa4d5ec46f79e4f8647d9a79debfc6f6852603a7f64b1ef547dd927c4e8c72646a552a21483ac88e8a595c6f27fabb0 -EBUILD singularity-3.8.4.ebuild 1909 BLAKE2B 345f4286e94ab41b16beb32498f84b10e9c53b70a94dd59f3be44f0762785ddb514dcef6c688541a11d02fa36b01426029a3f6802f175fbb34e6e8cafa789a52 SHA512 21c185762d6aa45e4e15301b3c3bfff41fa4d5ec46f79e4f8647d9a79debfc6f6852603a7f64b1ef547dd927c4e8c72646a552a21483ac88e8a595c6f27fabb0 +DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a SHA512 857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f +EBUILD singularity-3.8.5.ebuild 1907 BLAKE2B 0ede79ac122f085ca7e3fa82138a92d8512761a524d42ceb776b9f69eeb619a28728540b174e5e9f24072f1d392318a8c2c4e793d105749fee1efdd6b9e3e498 SHA512 13857d276650eebc61aee6fb41722e2638ee07f501e643f6a0e7c0911c313da3697787ccf4dcd0f7f1d2bdfcfd76a88fbeb9a502fc293c0cc14fee3c9b218579 MISC metadata.xml 452 BLAKE2B 5b210e6e78898e3bd858298ec713422552846c5b89c28af42df7d3ccba7935abcacb0a0c190580016c24b311e9dab2804e46337a0ad9cc1de438ae100f1fc512 SHA512 17b00ea10ebd8b196a7c7f5e42d9ea693ae8dfa2749b65612f07b11ba88552223e6c1a5bfad774fdbf97fb399ac71a8dd0637c4f74344cf22cba76dfce4598bf diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild b/sys-cluster/singularity/singularity-3.8.0.ebuild deleted file mode 100644 index e0cda2b957ce..000000000000 --- a/sys-cluster/singularity/singularity-3.8.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info toolchain-funcs - -DESCRIPTION="Application containers for Linux" -HOMEPAGE="https://sylabs.io" -SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="examples +network +suid" - -# Do not complain about CFLAGS etc. since go projects do not use them. -QA_FLAGS_IGNORED='.*' - -COMMON="sys-libs/libseccomp" -BDEPEND="virtual/pkgconfig" -DEPEND="${COMMON} - >=dev-lang/go-1.13.0 - app-crypt/gpgme - dev-libs/openssl - sys-apps/util-linux - sys-fs/cryptsetup" -RDEPEND="${COMMON} - sys-fs/squashfs-tools" - -CONFIG_CHECK="~SQUASHFS" - -src_configure() { - local myconfargs=( - -c "$(tc-getBUILD_CC)" \ - -x "$(tc-getBUILD_CXX)" \ - -C "$(tc-getCC)" \ - -X "$(tc-getCXX)" \ - --prefix=/usr \ - --sysconfdir=/etc \ - --runstatedir=/run \ - --localstatedir=/var \ - $(usex network "" "--without-network") \ - $(usex suid "" "--without-suid") - ) - ./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig" -} - -src_compile() { - emake -C builddir -} - -src_install() { - emake DESTDIR="${ED}" -C builddir install - keepdir /var/singularity/mnt/session - - # As of version 3.5.3 this seems to be very much broken, affecting - # commands which have got nothing to do with singularity (example: - # completion on 'udisks mount -b /dev/' rejects all files from that - # directory other than 'autofs'). Moreover, this should go into - # $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc. - # Hopefully temporary, which is why we delete this at install time - # instead of patching build scripts not to generate bash-completion - # data in the first place. - rm -rf "${ED}"/etc/bash_completion.d || die - - dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md - if use examples; then - dodoc -r examples - fi -} diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild b/sys-cluster/singularity/singularity-3.8.3.ebuild deleted file mode 100644 index 1875b1b03824..000000000000 --- a/sys-cluster/singularity/singularity-3.8.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit linux-info toolchain-funcs - -DESCRIPTION="Application containers for Linux" -HOMEPAGE="https://sylabs.io" -SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="examples +network +suid" - -# Do not complain about CFLAGS etc. since go projects do not use them. -QA_FLAGS_IGNORED='.*' - -COMMON="sys-libs/libseccomp" -BDEPEND="virtual/pkgconfig" -DEPEND="${COMMON} - >=dev-lang/go-1.13.0 - app-crypt/gpgme - dev-libs/openssl - sys-apps/util-linux - sys-fs/cryptsetup" -RDEPEND="${COMMON} - sys-fs/squashfs-tools" - -CONFIG_CHECK="~SQUASHFS" - -src_configure() { - local myconfargs=( - -c "$(tc-getBUILD_CC)" \ - -x "$(tc-getBUILD_CXX)" \ - -C "$(tc-getCC)" \ - -X "$(tc-getCXX)" \ - --prefix=/usr \ - --sysconfdir=/etc \ - --runstatedir=/run \ - --localstatedir=/var \ - $(usex network "" "--without-network") \ - $(usex suid "" "--without-suid") - ) - ./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig" -} - -src_compile() { - emake -C builddir -} - -src_install() { - emake DESTDIR="${ED}" -C builddir install - keepdir /var/singularity/mnt/session - - # As of version 3.5.3 this seems to be very much broken, affecting - # commands which have got nothing to do with singularity (example: - # completion on 'udisks mount -b /dev/' rejects all files from that - # directory other than 'autofs'). Moreover, this should go into - # $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc. - # Hopefully temporary, which is why we delete this at install time - # instead of patching build scripts not to generate bash-completion - # data in the first place. - rm -rf "${ED}"/etc/bash_completion.d || die - - dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md - if use examples; then - dodoc -r examples - fi -} diff --git a/sys-cluster/singularity/singularity-3.8.4.ebuild b/sys-cluster/singularity/singularity-3.8.5.ebuild index 1875b1b03824..8e6b0570d888 100644 --- a/sys-cluster/singularity/singularity-3.8.4.ebuild +++ b/sys-cluster/singularity/singularity-3.8.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="examples +network +suid" # Do not complain about CFLAGS etc. since go projects do not use them. @@ -20,7 +20,7 @@ QA_FLAGS_IGNORED='.*' COMMON="sys-libs/libseccomp" BDEPEND="virtual/pkgconfig" DEPEND="${COMMON} - >=dev-lang/go-1.13.0 + >=dev-lang/go-1.16.0 app-crypt/gpgme dev-libs/openssl sys-apps/util-linux |