diff options
Diffstat (limited to 'sys-cluster')
47 files changed, 373 insertions, 2305 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz Binary files differindex bb1b5d6d9e9d..44ac9d525c01 100644 --- a/sys-cluster/Manifest.gz +++ b/sys-cluster/Manifest.gz diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index b418864445f1..59b69bde3155 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -52,19 +52,8 @@ AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c5 AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a -DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c4d9531f1a4ca52e78449462aacd274b80f8d0549918979fcb1ca4632ae0eaade1ae311a730fbe6657be044fc35 SHA512 14f46cc6f38d7d894cc657a040b428309632e5c163109a8a4a79a346ba2901a37d79966a0bc09148810c22b89375d9a4cb3b23f16364685b094c518bfafe9bef DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc -DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac -DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8 -DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c -DIST ceph-14.2.4.tar.gz 116371380 BLAKE2B 2d2c78ec32a0749df16e9c527d2fd087a75daeb2ef26ac5f6aa641989eab62fa276eb320b873740e9eee3fd4f369da152c53c2389b1def1b6a45906ccc1bd1f1 SHA512 dc60321ed4dcaccacca711ab70c35011b5dfc6b8369016fb413a9976199ed4ba22c7dc87ba1ebaf1118513dee1a0c263c99ab137f27fc03c55e8a0625a3bdcc0 DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1 -EBUILD ceph-12.2.11.ebuild 8018 BLAKE2B 764348a298dc6079256001577e725caa80286c2c5d1202d39a3b951042ae6030e8d2bfaacf705c04027e5f4581370e68e9a419cf8f50a2047c2a3e2b387b8bd0 SHA512 884e9f7ef71a5b03eb28fa54133780902edf8579e9da685dab0f0746f68a100fa4dc4b39332e7400c65e2572471864eb5b2909e5dac8493a21ec69cb55549a8e -EBUILD ceph-12.2.12-r2.ebuild 8383 BLAKE2B 7813766d3f0fbe8f535ae40b77a57448e3229707f56c4e73e7b651135406306a7ffdef524e421c7c7fe3da59b061f3280b0ae6fb84fb7bc54f969219d0ac2579 SHA512 39e142f44de2eeeef492d347af4df81783f0f9e7d6b7bcf0860c23d5a78f44fca1cb727e2fba133df224d9a7481513bce42d8c853e5ba31728d61ce98e9370ec -EBUILD ceph-12.2.8-r1.ebuild 7879 BLAKE2B dd1c1d6076b4f64d68caf782cccb4abde3b97a2863b08701e2ef48333d9c68d9004011fd0c3098041218a43ff70ffae0f6ef51ed85e7d92f20e2973405294a9c SHA512 956e2ddb86fc7086c6db84e3c0d579cbab02b9972939ab1c131022f86a1874987a121d25ac06891b116622cad73de6a12988af5bc7c4932e930e634ca00ea4d9 -EBUILD ceph-13.2.5-r4.ebuild 9000 BLAKE2B 08a3da20abf27f537dbbb119497685f57afefe8057972d5dd56fbe409879fb31fba030509392ac74dfdbbd249eafae681b3b2a538663310d3b59ad78ea46e62f SHA512 c09871edccd098948209c5a16a837a394dd47f6437cc650078b710d43a660647abb69daca48e30c0dcff17b1a6bdcb7340d5d118100002c4bf14fd4fe9b238de -EBUILD ceph-13.2.6.ebuild 9126 BLAKE2B 4f9fac1da8ac01de8b7e924a554cbe097431cda09ad673e5728114eef63a3e448299624f670dac28a1ef0a364fc7204b20c95e1be8102724b0516fa2944def75 SHA512 be7bf2179c2b262fa9429a9e6673fe00f0424132221befb203661e2a265dbb7ec211bcc6c37b5fd351086657abcb8343be62c6c7abca3fc8fc94360364547474 -EBUILD ceph-14.2.4-r1.ebuild 10014 BLAKE2B b522e05a235dbafdc5a1838b726721c7d45ea59613f75a4abaaea168bf9aeed04b5bb979dadc4cd8bb5bd3447613cbc890b9d8c77314f5bc15985ff570965f55 SHA512 7964d35a804e3dc4875636259d84bdb2649dc9cbde24988fb459e8e1f6f5ff30ec549223365b3782ad00bc92d5db6ce78a451579b87dd944b55ddb062eaf7b00 -EBUILD ceph-14.2.4-r2.ebuild 9973 BLAKE2B a28e3087abb05692843c3265e7dc3c9456bcc77bef0d95b221b9e7b385b0c07981c05be7c3976b0330bffd2a45d90c9a6c11d51f86dde22c172f084a0106e33e SHA512 b1eec19f0b596260f60d538d322857e55842cac59e5e031b71eadedd59d705b89f58097033abf315b3eb7371a6f0d444ec94a05f4e9de3d77162154bc1e80278 -EBUILD ceph-14.2.7.ebuild 10268 BLAKE2B e8045c9cfacb231f8b0cb0c856578f97c27c98d2b0948ab25f9a0784bd37ff478971c6da27fb8ad92b08ab8500f5a640eefc8202e5454bcab1ab869bdec4a451 SHA512 c3b5a18f543e84e7deefd65a88c8ba4584df6a9971b648873bee274f9d03b256a369a1daeb3b246133f4f26208f50fbe24237fc9c56b2daac8daf276197732fc +EBUILD ceph-12.2.12-r2.ebuild 8446 BLAKE2B aed1bab233d20c77e385b49bc0f8fa7cbdd9a806f0e5e856e1000cccb09557bfc394ef2e97fbeb8fa5b995dd119dcd4b3e79751c6b5da00798b1267af392412e SHA512 50e031732540249f824e9b14a8286c600bff8a361e5047ad0b67c87ec940c1feaf0a2f7d5f40ab529dbfa91b15915b4adf372a6d3257025d6457c64cc152d1d1 +EBUILD ceph-14.2.7.ebuild 10267 BLAKE2B e64a6096a7e021d3a6f1ae0e8564132d76d38f3ef195510a2b0606602792929d2b62c31e16ae12b8c35b0b2dca793d40dc0d4a4e3dc517fa8edb21bf9ff88b42 SHA512 2cc3f8116ca7b57914f0b3b2cde51fbf0df5f90ca9c649db50ed370d6cda8f840cdb1d67f38454d765f1fcc2d96bab0ed5a7766601556a7931b8c8c3a8d988f2 MISC metadata.xml 1662 BLAKE2B 0d2b5697ff30ba38b9fff57fc08c0339d481e852a1ec54561214594d6fa6ddc6aa1bcd9adabe24bd1da39da9b9b66ff9cca1c30cae5a0d3b4259cb80673638e3 SHA512 95d94f98a016a1c04ed65cbb2710b07984bc2db428c4e54fed3ab35eda6c5e4db6f7a4d273772cffbbe6ad331a8257247cc359e1814bd418eeb4f0952858c945 diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild deleted file mode 100644 index 552bea72df52..000000000000 --- a/sys-cluster/ceph/ceph-12.2.11.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ - python-r1 udev user readme.gentoo-r1 systemd - -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 ~x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl" -IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs(-)?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - <dev-libs/crypto++-7.0:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - nss? ( dev-libs/nss:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - xfs? ( sys-fs/xfsprogs:=[static-libs?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - ssl? ( <dev-libs/openssl-1.1:0=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - <dev-libs/openssl-1.1:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - system-boost? ( - =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - app-arch/cpio - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - test? ( - dev-python/tox[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - )" -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/e2fsprogs - sys-fs/cryptsetup - sys-fs/lvm2 - !<sys-apps/openrc-0.26.3 - dev-python/cherrypy[${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/requests[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - $(python_gen_useflags 'python2*') - ${PYTHON_REQUIRED_USE} - ?? ( ssl nss ) - ?? ( jemalloc tcmalloc ) - " - -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI="no" - -STRIP_MASK="/usr/lib*/rados-classes/*" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" - "${FILESDIR}/ceph-12.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch" - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" - "${FILESDIR}/ceph-12.2.4-cflags.patch" - "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" - "${FILESDIR}/ceph-12.2.5-no-werror.patch" - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" - "${FILESDIR}/ceph-12.2.11-fix-min-call.patch" -) - -check-reqs_export_vars() { - if use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="460M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup 'python2*' - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - cmake-utils_src_prepare - - if use system-boost; then - eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" - fi - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t - - #rm -rf "${UNBUNDLE_LIBS[@]}" -} - -ceph_src_configure() { - local flag - local mycmakeargs=( - -DWITH_BABELTRACE=$(usex babeltrace) - -DWITH_CEPHFS=$(usex cephfs) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_MGR=$(usex mgr) - -DWITH_NSS=$(usex nss) - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '') - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - ceph_src_configure -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - - ceph_src_configure - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - 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-utils_src_make all - - # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" 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="${D}" emake install - popd >/dev/null || die -} - -src_install() { - cmake-utils_src_install - python_foreach_impl python_install - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r11" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - 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 - - readme.gentoo_create_doc - - python_setup 'python2*' - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild index b2a3dc2cc6ed..5ce8a64ecb1d 100644 --- a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild @@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_6 ) DISTUTILS_OPTIONAL=1 inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ - python-r1 udev user readme.gentoo-r1 systemd + python-r1 udev readme.gentoo-r1 systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -14,7 +14,8 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + # currently broken (bug #708294) + #KEYWORDS="~amd64 ~arm64 ~x86" fi DESCRIPTION="Ceph distributed filesystem" @@ -33,6 +34,8 @@ IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" #>=dev-libs/jerasure-2.0.0-r1 #>=dev-libs/gf-complete-2.0.0 COMMON_DEPEND=" + acct-group/ceph + acct-user/ceph virtual/libudev:= app-arch/bzip2:=[static-libs?] app-arch/lz4:=[static-libs?] diff --git a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild deleted file mode 100644 index bf467d18c840..000000000000 --- a/sys-cluster/ceph/ceph-12.2.8-r1.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ - python-r1 udev user readme.gentoo-r1 systemd - -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 x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl" -IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs(-)?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - <dev-libs/crypto++-7.0:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - nss? ( dev-libs/nss:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - ssl? ( dev-libs/openssl:0=[static-libs?] ) - xfs? ( sys-fs/xfsprogs:=[static-libs?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - dev-libs/openssl:0=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - system-boost? ( - =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - app-arch/cpio - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - test? ( - dev-python/tox[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - )" -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2 - !<sys-apps/openrc-0.26.3 - dev-python/cherrypy[${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/requests[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - $(python_gen_useflags 'python2*') - ${PYTHON_REQUIRED_USE} - ?? ( ssl nss ) - ?? ( jemalloc tcmalloc ) - " - -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI="no" - -STRIP_MASK="/usr/lib*/rados-classes/*" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" - "${FILESDIR}/ceph-12.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch" - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" - "${FILESDIR}/ceph-12.2.4-cflags.patch" - "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" - "${FILESDIR}/ceph-12.2.5-no-werror.patch" -) - -check-reqs_export_vars() { - if use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="460M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup 'python2*' - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - cmake-utils_src_prepare - - if use system-boost; then - eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch" - fi - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t - - #rm -rf "${UNBUNDLE_LIBS[@]}" -} - -ceph_src_configure() { - local flag - local mycmakeargs=( - -DWITH_BABELTRACE=$(usex babeltrace) - -DWITH_CEPHFS=$(usex cephfs) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_MGR=$(usex mgr) - -DWITH_NSS=$(usex nss) - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '') - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${CMAKE_BUILD_DIR:-${S}}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - ceph_src_configure -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - - ceph_src_configure - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - 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-utils_src_make all - - # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" 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="${D}" emake install - popd >/dev/null || die -} - -src_install() { - cmake-utils_src_install - python_foreach_impl python_install - - prune_libtool_files --all - - exeinto /usr/$(get_libdir)/ceph - newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r4" ${PN} - - 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 - - readme.gentoo_create_doc - - python_setup 'python2*' - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-13.2.5-r4.ebuild b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild deleted file mode 100644 index 70b81415dfa1..000000000000 --- a/sys-cluster/ceph/ceph-13.2.5-r4.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ - python-r1 udev user readme.gentoo-r1 systemd bash-completion-r1 - -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 ~x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr" -IUSE+=" numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc" -IUSE+=" test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs(-)?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - numa? ( sys-process/numactl:=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) - xfs? ( sys-fs/xfsprogs:=[static-libs?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) - ) - system-boost? ( - >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - app-arch/cpio - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - )" -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2[-device-mapper-only(-)] - !<sys-apps/openrc-0.26.3 - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/cherrypy[${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/requests[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( $(python_gen_useflags 'python3*') ) - ?? ( jemalloc tcmalloc ) - " - -# the tests need root access -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI="no" - -# ninja does not work at all -CMAKE_MAKEFILE_GENERATOR="emake" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" - "${FILESDIR}/ceph-12.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" - "${FILESDIR}/ceph-13.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" - "${FILESDIR}/ceph-13.2.0-mgr-python-version.patch" - "${FILESDIR}/ceph-13.2.0-no-virtualenvs.patch" - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" - "${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch" - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" - "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" -) - -check-reqs_export_vars() { - if use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="460M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup 'python3*' - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - cmake-utils_src_prepare - - if use system-boost; then - eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch" - fi - - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - src/bash_completion/CMakeLists.txt || die - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die - - #rm -rf "${UNBUNDLE_LIBS[@]}" -} - -ceph_src_configure() { - local flag - local mycmakeargs=( - -DWITH_BABELTRACE=$(usex babeltrace) - -DWITH_CEPHFS=$(usex cephfs) - -DWITH_DPDK=$(usex dpdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=NO - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DWITH_TBB=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -Wno-dev - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:--${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - ceph_src_configure -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - ceph_src_configure - - rm -r "${BUILD_DIR}/lib/cython_modules" || die - - 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-utils_src_make VERBOSE=1 all - - # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" 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 install - popd >/dev/null || die -} - -src_install() { - cmake-utils_src_install - python_foreach_impl python_install - - find "${D}" -name '*.la' -delete || die - - exeinto /usr/$(get_libdir)/ceph - newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - 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 - - readme.gentoo_create_doc - - python_setup 'python3*' - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" - - local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) - dostrip -x "${rados_classes[@]#${D}}" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-13.2.6.ebuild b/sys-cluster/ceph/ceph-13.2.6.ebuild deleted file mode 100644 index 895df81e7d8f..000000000000 --- a/sys-cluster/ceph/ceph-13.2.6.ebuild +++ /dev/null @@ -1,341 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ - python-r1 udev user readme.gentoo-r1 systemd bash-completion-r1 - -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 ~x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs dpdk fuse jemalloc ldap libressl lttng +mgr" -IUSE+=" numa +radosgw +ssl static-libs +system-boost systemd +tcmalloc" -IUSE+=" test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -# unbundling code commented out pending bugs 584056 and 584058 -#>=dev-libs/jerasure-2.0.0-r1 -#>=dev-libs/gf-complete-2.0.0 -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs(-)?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - numa? ( sys-process/numactl:=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) - xfs? ( sys-fs/xfsprogs:=[static-libs?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) - ) - system-boost? ( - >=dev-libs/boost-1.67:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - app-arch/cpio - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - )" -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2[-device-mapper-only(-)] - !<sys-apps/openrc-0.26.3 - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/cherrypy[${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/requests[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( $(python_gen_useflags 'python3*') ) - ?? ( jemalloc tcmalloc ) - " - -# the tests need root access -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI="no" - -# ninja does not work at all -CMAKE_MAKEFILE_GENERATOR="emake" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -PATCHES=( - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch" - "${FILESDIR}/ceph-12.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch" - "${FILESDIR}/ceph-13.2.0-cflags.patch" - "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch" - "${FILESDIR}/ceph-13.2.0-mgr-python-version.patch" - "${FILESDIR}/ceph-13.2.6-no-virtualenvs.patch" - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" - "${FILESDIR}/ceph-13.2.5-no-automagic-deps.patch" - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" - "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" - "${FILESDIR}/ceph-13.2.6-dpdk-alignment.patch" -) - -check-reqs_export_vars() { - if use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="460M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup 'python3*' - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - cmake-utils_src_prepare - - if use system-boost; then - eapply "${FILESDIR}/ceph-13.2.0-boost-sonames.patch" - fi - - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - src/bash_completion/CMakeLists.txt || die - - # remove tests that need root access - rm src/test/cli/ceph-authtool/cap*.t || die - - #rm -rf "${UNBUNDLE_LIBS[@]}" -} - -ceph_src_configure() { - local flag - local mycmakeargs=( - -DWITH_BABELTRACE=$(usex babeltrace) - -DWITH_CEPHFS=$(usex cephfs) - -DWITH_DPDK=$(usex dpdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=NO - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DWITH_TBB=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -Wno-dev - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:--${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - ceph_src_configure -} - -python_compile() { - local CMAKE_USE_DIR="${S}" - ceph_src_configure - - rm -rf "${BUILD_DIR}/lib/cython_modules" || die - - 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-utils_src_make VERBOSE=1 all - - # we have to do this here to prevent from building everything multiple times - BUILD_DIR="${CMAKE_BUILD_DIR}" 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 install - popd >/dev/null || die -} - -src_install() { - cmake-utils_src_install - python_foreach_impl python_install - - find "${D}" -name '*.la' -delete || die - - exeinto /usr/$(get_libdir)/ceph - newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - 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 - - readme.gentoo_create_doc - - python_setup 'python3*' - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed" - - local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) - dostrip -x "${rados_classes[@]#${D}}" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild b/sys-cluster/ceph/ceph-14.2.4-r1.ebuild deleted file mode 100644 index d65902987c2b..000000000000 --- a/sys-cluster/ceph/ceph-14.2.4-r1.ebuild +++ /dev/null @@ -1,361 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ - multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ - systemd - -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" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" -IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" -IUSE+=" systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs(-)?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/ncurses:0=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - kerberos? ( virtual/krb5 ) - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) - xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) - ) - system-boost? ( - || ( - ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - ) - " -BDEPEND=" app-arch/cpio - >=dev-util/cmake-3.5.0 - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - " -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2[-device-mapper-only(-)] - !<sys-apps/openrc-0.26.3 - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/cherrypy[${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/requests[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( $(python_gen_useflags 'python3*') ) - ?? ( jemalloc tcmalloc ) - rabbitmq? ( radosgw ) - " - -# the tests need root access -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# false positives unless all USE flags are on -CMAKE_WARN_UNUSED_CLI="no" - -UNBUNDLE_LIBS=( - src/erasure-code/jerasure/jerasure - src/erasure-code/jerasure/gf-complete -) - -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-13.2.0-cflags.patch" - "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch" - "${FILESDIR}/ceph-14.2.0-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-link-crc32-statically.patch" - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" - "${FILESDIR}/ceph-14.2.3-boost-1.70.patch" - "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" - "${FILESDIR}/ceph-14.2.4-python-executable.patch" - "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch" -) - -# dpdk and ninja don't get along -CMAKE_MAKEFILE_GENERATOR="emake" - -check-reqs_export_vars() { - if use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="460M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -user_setup() { - enewgroup ceph ${CEPH_GID} - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup 'python3*' - check-reqs_export_vars - check-reqs_pkg_setup - user_setup -} - -src_prepare() { - cmake-utils_src_prepare - - if use system-boost; then - eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch" - - has_version '>=dev-libs/boost-1.70.0' || \ - eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch" - fi - - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - src/bash_completion/CMakeLists.txt || die - - # 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_CEPHFS=$(usex cephfs) - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) - -DWITH_DPDK=$(usex dpdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_GRAFANA=$(usex grafana) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=NO - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DWITH_TBB=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - #-Wno-dev - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ - || die "failed to remove cmake cache" - - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - 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-utils_src_make 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-utils_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/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - 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 - - readme.gentoo_create_doc - - python_setup 'python3*' - - # 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 -} diff --git a/sys-cluster/ceph/ceph-14.2.4-r2.ebuild b/sys-cluster/ceph/ceph-14.2.4-r2.ebuild deleted file mode 100644 index 3208d2f2deb7..000000000000 --- a/sys-cluster/ceph/ceph-14.2.4-r2.ebuild +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -CMAKE_MAKEFILE_GENERATOR=emake - -DISTUTILS_OPTIONAL=1 - -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ - multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \ - systemd - -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" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" -IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" -IUSE+=" systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -COMMON_DEPEND=" - acct-group/ceph - acct-user/ceph - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs(-)?] - app-arch/zstd:=[static-libs?] - app-shells/bash:0 - app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= - sys-apps/coreutils - sys-apps/grep - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-apps/sed - sys-apps/util-linux - sys-libs/ncurses:0=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - kerberos? ( virtual/krb5 ) - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) - xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) - ) - system-boost? ( - || ( - ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - ) - " -BDEPEND=" - app-arch/cpio - >=dev-util/cmake-3.5.0 - dev-util/gperf - dev-util/valgrind - sys-apps/coreutils - sys-apps/findutils - sys-apps/grep - sys-apps/sed - sys-apps/which - sys-devel/bc - virtual/pkgconfig - " -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2[-device-mapper-only(-)] - sys-fs/lsscsi - virtual/awk - !<sys-apps/openrc-0.26.3 - dev-python/bcrypt[${PYTHON_USEDEP}] - dev-python/cherrypy[${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/requests[${PYTHON_USEDEP}] - dev-python/werkzeug[${PYTHON_USEDEP}] - " -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( $(python_gen_useflags 'python3*') ) - ?? ( jemalloc tcmalloc ) - rabbitmq? ( radosgw ) - " - -# the tests need root access -RESTRICT="test? ( userpriv )" - -# distribution tarball does not include everything needed for tests -RESTRICT+=" test" - -# 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-13.2.0-cflags.patch" - "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch" - "${FILESDIR}/ceph-14.2.0-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-link-crc32-statically.patch" - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" - "${FILESDIR}/ceph-14.2.3-boost-1.70.patch" - "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" - "${FILESDIR}/ceph-14.2.4-python-executable.patch" - "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch" -) - -check-reqs_export_vars() { - if use amd64; then - CHECKREQS_DISK_BUILD="12G" - CHECKREQS_DISK_USR="460M" - else - CHECKREQS_DISK_BUILD="1400M" - CHECKREQS_DISK_USR="450M" - fi - - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR -} - -pkg_pretend() { - check-reqs_export_vars - check-reqs_pkg_pretend -} - -pkg_setup() { - python_setup 'python3*' - check-reqs_export_vars - check-reqs_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - if use system-boost; then - eapply "${FILESDIR}/ceph-14.2.3-boost-sonames.patch" - - has_version '>=dev-libs/boost-1.70.0' || \ - eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch" - fi - - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ - src/bash_completion/CMakeLists.txt || die - - # 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_CEPHFS=$(usex cephfs) - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) - -DWITH_DPDK=$(usex dpdk) - -DWITH_FUSE=$(usex fuse) - -DWITH_LTTNG=$(usex lttng) - -DWITH_GSSAPI=$(usex kerberos) - -DWITH_GRAFANA=$(usex grafana) - -DWITH_MGR=$(usex mgr) - -DWITH_MGR_DASHBOARD_FRONTEND=NO - -DWITH_NUMA=$(usex numa) - -DWITH_OPENLDAP=$(usex ldap) - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) - -DWITH_RADOSGW=$(usex radosgw) - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) - -DWITH_SSL=$(usex ssl) - -DWITH_SYSTEMD=$(usex systemd) - -DWITH_TESTS=$(usex test) - -DWITH_XFS=$(usex xfs) - -DWITH_ZFS=$(usex zfs) - -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") - -DWITH_SYSTEM_BOOST=$(usex system-boost) - -DBOOST_J=$(makeopts_jobs) - -DWITH_RDMA=no - -DWITH_TBB=no - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) - -DEPYTHON_VERSION="${EPYTHON#python}" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - #-Wno-dev - ) - if use amd64 || use x86; then - for flag in ${CPU_FLAGS_X86[@]}; do - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") - done - fi - - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ - || die "failed to remove cmake cache" - - cmake-utils_src_configure - - # bug #630232 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ - "${BUILD_DIR:-${S}}"/include/acconfig.h \ - || die "sed failed" -} - -src_configure() { - 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-utils_src_make 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-utils_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" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - 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 - - readme.gentoo_create_doc - - python_setup 'python3*' - - # 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 -} diff --git a/sys-cluster/ceph/ceph-14.2.7.ebuild b/sys-cluster/ceph/ceph-14.2.7.ebuild index a1ec2d75760f..971298be9bf5 100644 --- a/sys-cluster/ceph/ceph-14.2.7.ebuild +++ b/sys-cluster/ceph/ceph-14.2.7.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc64" + KEYWORDS="amd64 ~arm64 ~ppc64" fi DESCRIPTION="Ceph distributed filesystem" diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index bfe29300a4e7..472c6d9547ce 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -4,8 +4,8 @@ AUX charliecloud-0.9.10-fix-hardcoded-gcc.patch 708 BLAKE2B 78b73bf527f7d9be0aa9 DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61 DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f -EBUILD charliecloud-0.10.ebuild 1512 BLAKE2B 786ab44a7afdecfd9ed124bf15d464336090bf2550e40fae5446591f5fc205f77f35ee6515c21cebbf9750438472267a32e7036f726a54930ab8b40fb5e12990 SHA512 32209c6cd04145740ea14f21a902b5fd2ae0d685e9b9e01defbf10f11e61dcdd2537fc6c13a79302d39668208793f8dfe8b7f0091cd4922f6d38855bfcbfabd1 -EBUILD charliecloud-0.9.10.ebuild 1507 BLAKE2B 9a6d834c063198c140d30d7f39f28f429ca8720dbb882bc5fb920e7bda1c90c7469f73164335bd9f44bfa38be89507e4a9bf5a4f0c4a05b4efd3ae205515539f SHA512 dbf662098d89e8019e6bfff2876a49cd453cfbac484d192b0f1f33ea571f54e7b8404e85d959a8b4aa5e7c50a5a296bc03065a6a43c55ef9055c447406a2502d +EBUILD charliecloud-0.10-r1.ebuild 1559 BLAKE2B e33fd6a6dcd8bf6823e9d79a005050c56ff40f4d86a63805997f15c0b2620fea00b726a9734f7c2d6ccc97132b3f83990a6cb5a3d5e16090f51ac8c4e7ba4a35 SHA512 c04634bbaa51798f5d969657608f11008af026781d6eddd1350bd98415dc38d5dadb4aff252fdfdbc3073b72a29e46209c2792675414749649ce8befd2ead13d +EBUILD charliecloud-0.9.10.ebuild 1554 BLAKE2B a5255254ef542ed3ac8d2233af32dffb2be2cf75578891ca66ecac4283657bb453d7fbbd50914f93399d996cafe6694f4efab855bf5a151f5db0225cded66e7d SHA512 a44da8749ee859b459a211d92838d8e5886eeb58e8927d44c9014d0c15a24d20d2531c0a994ecf9513ef509cafb1d8086e5ab556f8549c46731534d4bd28d674 EBUILD charliecloud-0.9.6.ebuild 1502 BLAKE2B b7dee3131b106eaa6ef4ec023339efcf33b24d9e684e0f3b0b9e246676f4868394e6a4a7e23cb66296c355de32cee0cc2425c8ca7241a3743787849bfdf80f4b SHA512 ad33df1b66ffab1b882b5799c89df2f03a3458c0bfc5e172eed3da9f37490db535c447ba9e4b177bdb747b43e3b042b9f88fac5021d7a1356bd70f32d1d18344 -EBUILD charliecloud-9999.ebuild 1379 BLAKE2B f020986c8158d6575b0431027aad64626306048d1df6373facd3177a71a6da7dd96a852fcd45e8c63d68c2e13bde38f3f1a853c03f07ef30cea20b5ba1002f72 SHA512 d2a449c6317b29ecb98733bbddfec19f54ea46971fa6df16d9129f12bdadf0cb858da1766ab5f2fd7ebe4a73b80693f7c168a5d26fb78ff787444749f1df620d +EBUILD charliecloud-9999.ebuild 1426 BLAKE2B 15d6b088b608f19fea30aec3ae1e81f6c26a7da0e36c2dba234754fcfc8c51a19b90d6e33c27b249984f2217a965ed9699816b2c5356ea8341ce805eedd20835 SHA512 ffddb1be0a052eddc178cf50c587c1f966e18ff88d78089702f5e7f996e481e482f3612517cf0c4f8fc15116f20b73e4cdb72f2e47e8b1804f5cba1f57fe3d48 MISC metadata.xml 782 BLAKE2B 8eb3cbbd39486b78ffaf3b932804536d900cbbded17dc41437bece7f47f6edbe8fe76d99b695f220c7477356e93ffad16a137a902a026ded8ab5098b7a44ade6 SHA512 775f7de9e4f296a5d13bf66df50b935866d4ca87b2d13678ba03ee5ee72f2740d17c9c2ba69e221efef7ca4038129d7704f1e13c738227e87cd7b869cd7d63db diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild index 8705c0ed4ae3..b1560f0ec968 100644 --- a/sys-cluster/charliecloud/charliecloud-0.10.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild @@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS} pv? ( sys-apps/pv ) squashfuse? ( sys-fs/squashfuse ) " -DEPEND="doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] +DEPEND=" + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') net-misc/rsync )" diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild index d86e0f7345fe..042093fc1081 100644 --- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild @@ -33,9 +33,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} pv? ( sys-apps/pv ) " -DEPEND="doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] +DEPEND=" + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') net-misc/rsync )" diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index 4b1d34753150..c838d73e90e9 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -34,9 +34,12 @@ RDEPEND="${PYTHON_DEPS} pv? ( sys-apps/pv ) squashfuse? ( sys-fs/squashfuse ) " -DEPEND="doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] +DEPEND=" + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_MULTI_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] + ') net-misc/rsync )" diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index b465cabe7d33..aaa228389a41 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -1,11 +1,8 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 -DIST cinder-15.0.0.tar.gz 5515047 BLAKE2B c7b62dc424bda2a86b9369f283fae4d891f55922228dc2c05206cee67bb7553b75b98e86f8d90035d0566baddad28a76aa4ca454fb4e003eaff346d2bb49a699 SHA512 f80705782976ec778681ef65f5da79ee2028a8dccbe9a14150b3577354882beedbde73f562b40ec395427e23766688299e07bf173476627c579bc812eec065fa DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f -DIST cinder.conf.sample-15.0.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a -EBUILD cinder-15.0.0.ebuild 7778 BLAKE2B 5019af30bc8b195694bb1c3d0a85f1636466ffe680daf3464097feb8dd4a95b34f0bd02d81543c185942c5f35ced18a71c530de69e413b5f3b780c7758203439 SHA512 a9589470aa830ec490ec66cc69156fbf3a6f6a383736ada769c524b3b5fb413d2a3f337d19ef9d7e3412a4e1dc58bbbd96c61d7c8d24a92de087ebd156507d02 -EBUILD cinder-15.0.1.ebuild 7780 BLAKE2B 1468810068a386b70a3622e39c65e1161034d5a80a024b74c913d9cbf9657073abe86122f53112ec0af97ca70278788ca4639c7209002cd1a1e41daddba03c91 SHA512 856bfa4fd74f451a7ed0b9a4ad2cf163b1c1b2bc8435c9b9fe549b8cbe68d51984ebc66856b03e4cd827f19f57aeec5607df6f6cd7f8f81870984e189b42ea8e +EBUILD cinder-15.0.1.ebuild 7778 BLAKE2B 5019af30bc8b195694bb1c3d0a85f1636466ffe680daf3464097feb8dd4a95b34f0bd02d81543c185942c5f35ced18a71c530de69e413b5f3b780c7758203439 SHA512 a9589470aa830ec490ec66cc69156fbf3a6f6a383736ada769c524b3b5fb413d2a3f337d19ef9d7e3412a4e1dc58bbbd96c61d7c8d24a92de087ebd156507d02 EBUILD cinder-2019.2.9999.ebuild 7731 BLAKE2B 390a9626e7df1d9195ad89d6ceea5406393ec7e0c2f730bde0b4463a0b09ab44e9f82c086535552c8e1064091a58f7b61cef52836bb90d4b29292fea9b5756d7 SHA512 2a0edb351aa45f6a0668b211d42b4aabc854cccc03a73b13b19ebe2580fc6251cf295373128a5df2e5cee41572d2db70ea1716c156d78262bb64e533248b8f9d MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9 diff --git a/sys-cluster/cinder/cinder-15.0.0.ebuild b/sys-cluster/cinder/cinder-15.0.0.ebuild deleted file mode 100644 index 023a076b4f1c..000000000000 --- a/sys-cluster/cinder/cinder-15.0.0.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 eutils linux-info user - -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" -HOMEPAGE="https://launchpad.net/cinder" - -if [[ ${PV} == *9999 ]];then - inherit git-r3 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}" - EGIT_REPO_URI="https://github.com/openstack/cinder.git" - EGIT_BRANCH="stable/train" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" - -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] - !~dev-python/pbr-2.1.0" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND} - app-admin/sudo" - -RDEPEND=" - ${CDEPEND} - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] - virtual/python-ipaddress[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] - >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - <dev-python/prettytable-0.8[${PYTHON_USEDEP}] - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] - >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] - >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] - !~dev-python/requests-2.20.0[${PYTHON_USEDEP}] - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] - >=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - sqlite? ( - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}] - ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] - !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] - ) - >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] - ~dev-python/suds-0.6[${PYTHON_USEDEP}] - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] - >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] - >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] - iscsi? ( - tgt? ( sys-block/tgt ) - sys-block/open-iscsi - ) - lvm? ( sys-fs/lvm2 ) - memcached? ( net-misc/memcached ) - app-emulation/qemu - sys-fs/sysfsutils" -# qemu is needed for image conversion - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="" - if use tcp; then - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " - fi - if use rdma; then - CONFIG_CHECK_MODULES+="INFINIBAND_ISER " - fi - if use infiniband; then - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" - fi - if linux_config_exists; then - for module in ${CONFIG_CHECK_MODULES}; do - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" - done - fi -} - -pkg_setup() { - enewgroup cinder - enewuser cinder -1 -1 /var/lib/cinder cinder -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - # only used for docs - sed -i '/^sphinx-feature-classification/d' requirements.txt || die - distutils-r1_python_prepare_all -} - -python_test() { - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /etc/cinder - dodir /etc/cinder/rootwrap.d - - for svc in api scheduler volume; do - newinitd "${FILESDIR}/cinder.initd" cinder-${svc} - done - - insinto /etc/cinder - insopts -m0640 -o cinder -g cinder - doins "etc/cinder/api-httpd.conf" - doins "etc/cinder/logging_sample.conf" - doins "etc/cinder/rootwrap.conf" - doins "etc/cinder/api-paste.ini" - doins "etc/cinder/resource_filters.json" - newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample" - insinto /etc/cinder/rootwrap.d - doins "etc/cinder/rootwrap.d/volume.filters" - - dodir /var/log/cinder - fowners cinder:cinder /var/log/cinder - - #add sudoers definitions for user nova - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/cinder.sudoersd" cinder - # stupid python - rm -r "${ED}"/usr/etc -} - -pkg_postinst() { - if use iscsi ; then - elog "Cinder needs tgtd to be installed and running to work with iscsi" - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" - fi -} diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild index 380941c5f784..023a076b4f1c 100644 --- a/sys-cluster/cinder/cinder-15.0.1.ebuild +++ b/sys-cluster/cinder/cinder-15.0.1.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then else SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="Apache-2.0" diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 732bfb87454a..a3d45e1a5b2a 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -8,10 +8,10 @@ DIST galera-25.3.28.tar.gz 3390722 BLAKE2B 4e399b0f00c7303c11622c3807bc8a7b9b3b5 DIST galera-26.4.2.tar.gz 3499538 BLAKE2B 4531b246da119528192ce85364a344f56aeb83b05b6de0a87fed5cb34f7e23497b9576e4014899c58af23d045501989ccdb51a25ee27b4e32aeb5d1be1054115 SHA512 6c500dbcdc9156421c628c842a00985b3e7c440ad2facbd893f98c846426bf0607ca28152fef99a587146cefb376883ef083d498562d96fcedecf4935a3d466f DIST galera-26.4.3.tar.gz 3507925 BLAKE2B fb15724dd1477cbabffe6d76e6fee0425a86d335289a61e8b3fbb51b5dd84f8a6259d3ce1cf808fb5b2f2299c2b9f28988a87d0dc67667a02a53e12ba911d976 SHA512 857c6b1965871a5801d3cd7396fec8259e0b72a397b5fb92e63f374531fdb03dbecd5d5ebfdf2f0dc388d87c0ae25b357d02581c8d5889803d04c0a2f2583b52 DIST galera-3-25.3.25.tar.gz 3373347 BLAKE2B 892c5824d88d7ceb0db16f72d9fad9ac7074435a6cacf3fea1599af0be811cc1a0b476d0a15353d0cf854a201ca5e60808392a41125c780bd97b844a4fd55216 SHA512 bc9f02c796c7289034f5b285a8f6a0e668c78302546b47c70cbe3927467993baae8835cf54978fb5276251a6d04a84d6952eaee4e6c7c5fd488543fd53d07b03 -EBUILD galera-25.3.25.ebuild 1917 BLAKE2B a79f4254ba6fa85f555c32516c4cbec40cf38dca8cf13185ff466c4c957ac9495810a772ca4f72d38b73fa54c7734166eb56ba8abeaa62caae633c674a5dfdf0 SHA512 cb716fd80c6990d243aa60d3bab6db7e6a11e8da16c55be063e159e401b98d13a3ec348f13852ba23a4063ec1320c3f9a6846c60753a805c9b40cf21ddaa1149 -EBUILD galera-25.3.26.ebuild 1936 BLAKE2B 05e4b45bfb16388643d411874850d4ac55dbf7ce55e260eee06aef13d764a955342cb5266a34ed9f341170affaf49d7b72319efc8fb651c6546b5eea1605fa9b SHA512 07412b9dfdaeb17dff32c3292bb67d79a86befc325b8c782bdd6748bec0ae43f1a181624d03d245bc824241aa6ae56174970b4a4e16354b647f199587db17ce1 -EBUILD galera-25.3.28-r1.ebuild 1791 BLAKE2B 2f7995bc41249985feb8d7615c2a445995573c3e319f39df3ca73adeae6215547a8c1a452ad7ab4b1261b9f13f16a06c7331c137210dcdca57c0700f83f19114 SHA512 3bee479b7b683259e18a4c90a7b928b0117e780905218b0a5e0becb2a26f49cfb7074fb37260468111b86c58a09befd44479d1b8ff4c98fbaa8a182e21493a71 -EBUILD galera-25.3.28.ebuild 1936 BLAKE2B 2429f091fd2148dc1ddab4ebbea33716a5587b2e5fbe1db7f3e468445f58e5b4e18d8c4681ebd69309c5465799f156b0b0ab4515738eb4dcf681abe90664a370 SHA512 dabe8571df02ac88647ec2339235414642338dd63e083d879abb5f7f9ba54530b9ef8d38a737f82ce5a2be74b5c08c000f8ead68a4729362a3151beae15ee24e -EBUILD galera-26.4.2.ebuild 1890 BLAKE2B 64797d6bef6c10c7caa64378751ce0c8c5e95729a796d6d180edccafb82902a781b2da6c855c8e5839b72773bf5f713d8fdced4d312ad489ce60f828fe0ca909 SHA512 3f5be0efb37f17f592a315274eef85a9dd3328b6473834a39a39575e7ad029ef75671a748b954ce0943d31498fb88bf4a0edaf42f5df4b3371bd3a44e044da99 -EBUILD galera-26.4.3.ebuild 1794 BLAKE2B de91252646af1c30448a7a82712aec4f3638c76d99a6a90eb8bc3436c7ae7f3bdb1989d209647168e3404800d91f226bf9887496c7accfc6cc59c62eff124fd3 SHA512 9f9624415793179aebc61bea4e7697f6ccb90f23e37be85eebbdfbd1acef6f86cafcfd90ec84e3bf75a76c296859720d181c02607c8fd67cd9cb1635490f4bcb +EBUILD galera-25.3.25.ebuild 1911 BLAKE2B 044f49f0ddca4082656e49b16ae7205cf9764283f4e125f65d8dcd1ee6625a24c2d4de952900305827588a90ea395abc07b2a00ce0eac29d8b14991fc3ae1f19 SHA512 5ed799b7485d49ca76e0d3b1d0dfc18bb3bf23d94cc5b729cb7311b5353b691b8c9e1445fa86dbf548453681619322cb380b0c9cafc5ca0f51f2bf37281395ee +EBUILD galera-25.3.26.ebuild 1932 BLAKE2B 7b8ba8da617cb4c0ef8d74d72f15769eaaa674fbc0da07f81268b8c67155fea1cabd8d8666bd55e2b5c5a7e70b63e06480011f9164977ede0d2cc26409abf8cf SHA512 9c595718ba6e8813cb16e3cc758c8d8f64d4f088ebf36c2ff78b5815a1be5555198f5225cbae2a11b3c4a8d21d95d6a4b24da0705635ca5a9119148a9f16090f +EBUILD galera-25.3.28-r1.ebuild 1786 BLAKE2B a064ec5c6e173f43e54535ee88c7732b1459b68a3e3dcf47dc3034e1988b3bbbe3d568dfb1dfd01026ba98e42341bb0ff9bf785a2adad8428840669ca2bd9353 SHA512 132d907d22de6a25cfcd84a12371cb8c79748dba5ee17335b18c89aeb6a481029209eab6ecf00d8a7952d6b4a64d602a5f8bdb7911fadddea0c7684b5716b568 +EBUILD galera-25.3.28.ebuild 1932 BLAKE2B 429c0365de384c20d4004f555f3b18230c9272631cbd77e964cd07666362806b5faed1a5e26cabcc4627893f1a6daa2910a8f150fa2fcd9fe8987325a2dae11d SHA512 7509ef4e83f1e2f5c39366d66583082c83bcccc2f0218f94e4f6745e9080193850d82ca60882727f694196eade5370ef827db0c20e387a3890c0c649748a3fe4 +EBUILD galera-26.4.2.ebuild 1886 BLAKE2B 0a118cbbc699ae1023eb65283ac6c7c76c954c465c67fe49d0069e1362571639ef2c6c5de524627fa6a17d0d2bbc8967abd27cec5a4d6bc62c323ee0dfe2b73e SHA512 9b3ef59bce28519e85c505c65899064eeba3cc0f7ef8bb00f5c4062487fe907278c32805169ef53088d0b777f3c287d2cd2fa5a5c540272f784483fe2768eb61 +EBUILD galera-26.4.3.ebuild 1790 BLAKE2B 455e88d86919e56823b52eb750072b45919efa1a7e274db4313d162e2ff9c54265268c002317d7f23eb0a937559cb100a0b2776a99a685eea5fcee76414eddba SHA512 82751b9c0c2270bbd2557efe9be0924ac3dcde05ccc32d1645e5f8430effa36bb8754309d51a1cead442d0f08ba911b9933c87747f2e57d6ee0d7b58c668c686 MISC metadata.xml 462 BLAKE2B 1b0826bcb2bd93caa5f017b3c530d3bea18daac9f457dc79d6436d21f41b8c33d2979469df870cbc68428ba0110d17013bf9cd82f4f46d9be43bf996f7815e0c SHA512 b99987e53ae976905d3e493b09cbe35161f90b8ebfc88c4a9616b8722b0a0005c2427d509e15fdd7bbb30977266188452b3b6ec7479a943bce3a5922410246e2 diff --git a/sys-cluster/galera/galera-25.3.25.ebuild b/sys-cluster/galera/galera-25.3.25.ebuild index c1c8faac6bed..09aa81a6ffac 100644 --- a/sys-cluster/galera/galera-25.3.25.ebuild +++ b/sys-cluster/galera/galera-25.3.25.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) MY_P="${PN}-3-${PV}" diff --git a/sys-cluster/galera/galera-25.3.26.ebuild b/sys-cluster/galera/galera-25.3.26.ebuild index b5ffbd5c1026..e8c4120483bf 100644 --- a/sys-cluster/galera/galera-25.3.26.ebuild +++ b/sys-cluster/galera/galera-25.3.26.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) MY_P="${PN}-3-${PV}" diff --git a/sys-cluster/galera/galera-25.3.28-r1.ebuild b/sys-cluster/galera/galera-25.3.28-r1.ebuild index 068b38353f16..f3c043e52404 100644 --- a/sys-cluster/galera/galera-25.3.28-r1.ebuild +++ b/sys-cluster/galera/galera-25.3.28-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic @@ -14,7 +14,7 @@ LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86" IUSE="cpu_flags_x86_sse4_2 garbd test" RESTRICT="!test? ( test )" diff --git a/sys-cluster/galera/galera-25.3.28.ebuild b/sys-cluster/galera/galera-25.3.28.ebuild index ba57a09fea77..ef4d202bc320 100644 --- a/sys-cluster/galera/galera-25.3.28.ebuild +++ b/sys-cluster/galera/galera-25.3.28.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) MY_P="${PN}-3-${PV}" diff --git a/sys-cluster/galera/galera-26.4.2.ebuild b/sys-cluster/galera/galera-26.4.2.ebuild index d523af7c34e9..459781b25ea6 100644 --- a/sys-cluster/galera/galera-26.4.2.ebuild +++ b/sys-cluster/galera/galera-26.4.2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit python-any-r1 scons-utils toolchain-funcs user flag-o-matic diff --git a/sys-cluster/galera/galera-26.4.3.ebuild b/sys-cluster/galera/galera-26.4.3.ebuild index c5f610e33cc1..403fe64247e4 100644 --- a/sys-cluster/galera/galera-26.4.3.ebuild +++ b/sys-cluster/galera/galera-26.4.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) inherit python-any-r1 scons-utils toolchain-funcs flag-o-matic diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 843b4db9bc1f..3dd106b561ba 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -3,6 +3,7 @@ AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae66574 AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db AUX glusterfs-4.1.0-silent_rules.patch 500 BLAKE2B bd6812be1059f04bcb34e9408b6ef24f6bd0992cc432ff22da9f21970e11dd5394e1421a6967cae6c026207dcf1d7ae591afaa06e4a25a62c0e79f7f679cd22e SHA512 1cbdfd9f04a917387f0b3299f3ab04074c34e5a4911642ccf4274f1270a97acbf0e27f89c89ce6a1cd2e26238761f956cd1dfa3033d763ead32b0d0fd92a0798 AUX glusterfs-6.7-fix-rebalance-crash.patch 5861 BLAKE2B caaf103b10d18e4540ab1e516f5ee06aeeb418e12a570d9f4df7c1952302a2035b8ead11fee17d2d797e5872e977ebd8c124aa8bdda26e28a23e8a4173338222 SHA512 149bc10d47424bc40e55cb4053ab251adf88f890a6e4e2e03cddbb23fe411b9d1621fe183b8e09acd36d7945827f85eefcc83c58b01d27f988d6e88bdb1bcafd +AUX glusterfs-6.7-fix-seek.patch 1247 BLAKE2B 77ede2514e3afcca12a0d2fef7d24ed66924ffe9ff804bbd48b56a04f27268b8b09471368afaececf9c6c7a304889c5f5271207442ff134d0ad215b46ac2ddf7 SHA512 839eb1d2bb87cae9adbfcc1f81c6187697e0b9c69fcd4c6aea9182c45fef09e3fe3ed3be210c8321a4530f4b9a6a140429ca2437bf5daf8357518ac1732f8434 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 @@ -13,7 +14,7 @@ DIST glusterfs-6.7.tar.gz 7565257 BLAKE2B bb38383cad0cbf890b89dd75f7b260d21b381a DIST glusterfs-7.2.tar.gz 7630773 BLAKE2B abceafd06ca8f5de1c84708a1a3ec4453c5d536d8811b773fa6f5dd02d6e3d450c329bc4d0fa32d970ff57e82a1fe3aa48ec9c3a7d3d5ca5817a91e8930b1b6e SHA512 fd1059222c4d30fa5c4011083c3c53af44433180ae124c884a774628051d31d95386bef71d4d25ed2b0c5dd8d9a6936601e8e37d963b34d291cb88ea45e31ff2 EBUILD glusterfs-4.1.8.ebuild 6785 BLAKE2B 1daf6faa219ec1c64fe661f068aadd6d7735c029f2692cba1f4ce84abe40a7f2defa29bcdbe84f962fc59b805124c5d252be2909afb946e086bc52a3137d347d SHA512 d0a7aaec14523e68ed676ef461bd59ff73de94e40f197a64d9a24b71a98949915327b7732637a57b6138e8171b402d851969732fda9039a255ac9696aa554976 EBUILD glusterfs-6.5.ebuild 6223 BLAKE2B a708adff12d8467555d22e8652bfc30ad538a00b9ff0bbb3e0379ec9eaee1dc41d6b00432ab63ad0e4fea9c181ec8fd17a6d7013c82410ca7f31b484a171f4cc SHA512 2c2a011e1e96e07a057f04e16a0296f93ffce38aa25c87312682f3f605c66ed3a9fb7c528c86eb11163249ebeb7080acc03eef7c151aa85f587b1a29e67acbb2 -EBUILD glusterfs-6.7.ebuild 6343 BLAKE2B 96c3f8481e64de65ed72e8c0f7efcd16af5df450246ee0ae4d32afb6d82dee2f3ada4e0770793042df65a2fc692deaa4b568d9a0b9e88ab4e43acc97f1cbd64b SHA512 e9c5c53b5aa9f033ba563b9475de2600ff0baa06029ff9e2bc51932952b3dd5b4bb2e7116766e86b7d5262b8f3d3b9a8193a608a502cd6d4b6295062fa4d91be -EBUILD glusterfs-7.2.ebuild 6225 BLAKE2B 9d5b56203bafea2898e70663c1cd58c36f9ce3d1d775303e9f98634af153bdab042605967c7fd99ed7e2403c3b80d413411af3fa4c79e28fd523a63d9ee0f2c9 SHA512 ceecd841ec42ecca2ce9985a302538edd2a4fad13993336f0477f985a54e13f5d6b4a9a89788dc19186d13af7be8034ddee9ffb069cc8ef9c2fa1d0c95dbccb9 +EBUILD glusterfs-6.7-r1.ebuild 6484 BLAKE2B 8fe0924b0de96f68c70becf17ee2ffeb094f3e00d14ebcb527efc45aa251f59961a255de9039e502480af601e71acc110ebb173ef3a403197b99ab1a0ad0b2e1 SHA512 c20d29404d857d0bd12e822e374c5b29adede828098ac0bd692f70fda52d51d172edf054e437bcf52a5bff2b2d77ac2218c1b66518693ba622ed9b740811099c +EBUILD glusterfs-7.2-r1.ebuild 6366 BLAKE2B f2b859dd7fc0c3f278943918b8e75d31a42045b03cc1f09aa104799371f727254ffc9e3c6831005f5f4b1cef1de3e25fc3dbedb6019f3b3cddf69f297f9fd4c5 SHA512 4cac260a0b364dfe051dceb9acfac86b84e24aef5a28c63c9b53fcda233e2dd158a185f48c3bcbcb3033ac109727eea0c9cc70b36c8f20a28f1594aa57133e8f EBUILD glusterfs-9999.ebuild 6789 BLAKE2B a803818430d7faca876f1db48f7082fba1560a9fc539303a1ec7b8154ba0b43716a76f415ac11fde898780afac2469d7b73c28115a6b2a832c1cea8486874ff0 SHA512 3355f1533d7a3a8e8b9ad437c077172a0285e2d0911fdcdf8efab75ab65785671699a26d744ed62cd4f1487678353fe7ccfda55496bd72f209a542dd6a60b0ae MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043 diff --git a/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch new file mode 100644 index 000000000000..07d1ecef0376 --- /dev/null +++ b/sys-cluster/glusterfs/files/glusterfs-6.7-fix-seek.patch @@ -0,0 +1,45 @@ +diff --git a/xlators/performance/open-behind/src/open-behind.c b/xlators/performance/open-behind/src/open-behind.c +index 70a144abb5..95e00dbd79 100644 +--- a/xlators/performance/open-behind/src/open-behind.c ++++ b/xlators/performance/open-behind/src/open-behind.c +@@ -708,6 +708,32 @@ ob_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) + return 0; + } + ++int ++ob_seek(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, ++ gf_seek_what_t what, dict_t *xdata) ++{ ++ call_stub_t *stub = NULL; ++ fd_t *wind_fd = NULL; ++ ++ wind_fd = ob_get_wind_fd(this, fd, NULL); ++ ++ stub = fop_seek_stub(frame, default_seek_resume, wind_fd, offset, what, ++ xdata); ++ ++ fd_unref(wind_fd); ++ ++ if (!stub) ++ goto err; ++ ++ open_and_resume(this, wind_fd, stub); ++ ++ return 0; ++err: ++ STACK_UNWIND_STRICT(fstat, frame, -1, ENOMEM, 0, 0); ++ ++ return 0; ++} ++ + int + ob_flush(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) + { +@@ -1256,6 +1282,7 @@ struct xlator_fops fops = { + .flush = ob_flush, + .fsync = ob_fsync, + .fstat = ob_fstat, ++ .seek = ob_seek, + .ftruncate = ob_ftruncate, + .fsetxattr = ob_fsetxattr, + .setxattr = ob_setxattr, diff --git a/sys-cluster/glusterfs/glusterfs-6.7.ebuild b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild index 9bb5a61620be..d36a647109cf 100644 --- a/sys-cluster/glusterfs/glusterfs-6.7.ebuild +++ b/sys-cluster/glusterfs/glusterfs-6.7-r1.ebuild @@ -83,6 +83,10 @@ src_prepare() { # https://bugzilla.redhat.com/show_bug.cgi?id=1786983 eapply "${FILESDIR}/glusterfs-6.7-fix-rebalance-crash.patch" + # https://bugs.gentoo.org/705536 + # https://bugzilla.redhat.com/show_bug.cgi?id=1793990 + eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch" + # build rpc-transport and xlators only once as shared libs find rpc/rpc-transport xlators -name Makefile.am | xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die diff --git a/sys-cluster/glusterfs/glusterfs-7.2.ebuild b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild index 27be5d5543a4..d122e64c2265 100644 --- a/sys-cluster/glusterfs/glusterfs-7.2.ebuild +++ b/sys-cluster/glusterfs/glusterfs-7.2-r1.ebuild @@ -80,6 +80,10 @@ pkg_setup() { src_prepare() { default + # https://bugs.gentoo.org/705536 + # https://bugzilla.redhat.com/show_bug.cgi?id=1793990 + eapply "${FILESDIR}/glusterfs-6.7-fix-seek.patch" + # build rpc-transport and xlators only once as shared libs find rpc/rpc-transport xlators -name Makefile.am | xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index 0b437887097d..61e4a9bc6839 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,4 +1,4 @@ DIST hpx_1.2.1.tar.gz 3919474 BLAKE2B 5f62f97a047c1b931068b671855bc9d7b8ff03d7f26793ee58445fb4c567d68c6c24c87844c7a6463901d784e11afe475120a41038e783a67cc75ede508473c5 SHA512 057724de1ef252e941a776174fa594a855255b5600461725a4da6e9002b1424a1e59be3f8a40673bb3db5a8aabd3c7b38abbb78042490befe247dd73c921b87c -EBUILD hpx-1.2.1.ebuild 1831 BLAKE2B 395c62c2cab7bc309ec4cc6ce05090d80b74a8db7f7095d4ccff500baa72cc81cfcc2725ca6f9a1d4e0b34f2693dae72785d3b92d95530d709e19e8f860669a6 SHA512 72f74a38132344cc847c1058225bbf6d1c7fabf96f493bbd762a8994b7efaf45ded1ba0756049f36b467c1ed68e2ac8018df4e416b68d19365d10b9c5526b873 -EBUILD hpx-9999.ebuild 1831 BLAKE2B 395c62c2cab7bc309ec4cc6ce05090d80b74a8db7f7095d4ccff500baa72cc81cfcc2725ca6f9a1d4e0b34f2693dae72785d3b92d95530d709e19e8f860669a6 SHA512 72f74a38132344cc847c1058225bbf6d1c7fabf96f493bbd762a8994b7efaf45ded1ba0756049f36b467c1ed68e2ac8018df4e416b68d19365d10b9c5526b873 +EBUILD hpx-1.2.1.ebuild 1825 BLAKE2B e457a6e33e0aa9a5101a29435d696672489d3ffe2ea4378d74a9b767c34fcd801c2f63646fae744fafd7cbcdc92ce076eb11df2a79013007d40d707a24edfb5e SHA512 d52f213519a7a9282e83e819e58ed2df0331527b1f4339d3e79e124126a4a19d657387c01468508c08a1c38d3c7af2651166507105921aad1079db7da2f40dd9 +EBUILD hpx-9999.ebuild 1825 BLAKE2B e457a6e33e0aa9a5101a29435d696672489d3ffe2ea4378d74a9b767c34fcd801c2f63646fae744fafd7cbcdc92ce076eb11df2a79013007d40d707a24edfb5e SHA512 d52f213519a7a9282e83e819e58ed2df0331527b1f4339d3e79e124126a4a19d657387c01468508c08a1c38d3c7af2651166507105921aad1079db7da2f40dd9 MISC metadata.xml 964 BLAKE2B 0f71483979af41ebf24ccf4a7b547048aaa6198d638b04963303cdbe0b3b7b86a66ff13dadaac501fcbb3c7992e3bdebffebcfbd3d82bad0fe5890e89d581b9f SHA512 2c80ae2fd03aebaa25fa19592b6f84cd343cc6c2733dde34023800805987ae91024d36b2c3246c449acdb0be18154648bc571328bb8acb8f561afc149666bf8e diff --git a/sys-cluster/hpx/hpx-1.2.1.ebuild b/sys-cluster/hpx/hpx-1.2.1.ebuild index 40cfca820e39..d075974e0bd9 100644 --- a/sys-cluster/hpx/hpx-1.2.1.ebuild +++ b/sys-cluster/hpx/hpx-1.2.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) if [[ ${PV} == 9999 ]] ; then inherit git-r3 diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 40cfca820e39..d075974e0bd9 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) if [[ ${PV} == 9999 ]] ; then inherit git-r3 diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest index c6ee7e674df4..6cc1add96d91 100644 --- a/sys-cluster/minikube/Manifest +++ b/sys-cluster/minikube/Manifest @@ -93,7 +93,7 @@ DIST github.com-ulikunitz-xz-v0.5.5.tar.gz 477164 BLAKE2B 505d5dfa38cc36ce9a9ec7 DIST minikube-1.0.1.tar.gz 11206771 BLAKE2B 3aae096cd0998405ae30e1db699fd51330e82c13ebbf05283e5ead25918bfdd52c352fb8385caf7ef74b45fb94f63ddf2fa64c96cba79be59703cf0579e79e39 SHA512 41855aec3b159ddc8f6e89b9a8a63179edf21d3078040ccda56994aab8ce7b57f6a989d63b8b75c92698f2bbec8c128980b7f2268c793157f67f245625e07780 DIST minikube-1.6.1.tar.gz 78447692 BLAKE2B 16ee3d0f9dfc90f20723ae9ef33a36cbfa02de0f00d973f34c2e39872d6b954d5909c1aa534bb690b00ace0bdd4207986f022c796dfff20f776d12a13796bc96 SHA512 00da5047404abd631e08046a9e285d8009465b3cfa18c4e238bd5a6549714fb21f19864fcb68973e9a317f03a270158b90c36c0601316605edf2ecf93175b12e DIST minikube-1.6.2.tar.gz 78450821 BLAKE2B 05efb671bebf197fa4942c578585583476c2550dd3f3dc7804bdd836f5b2cb38864ab39d267d968ace2b816220e7d45b40b7367782e8c1eb4755679c91a8f3d6 SHA512 40af184878e812defecf48308c1ce3a702415985e5e7dfde37d61fe3413bee5e986ecf4a873aa66f11faae733f8afa8c64e3b0122f4e75b7153764fdcc771c48 -EBUILD minikube-1.0.1.ebuild 1806 BLAKE2B e6df223c56458f5d4a56777f3d8e604a5e1a7cc7a61bd7ef149d66a0a47f8644a3b736ab3c13c7e7593c22ed1f074bc15eb4c805ee07b1157be0a8d97e89d3db SHA512 210843add77079f009580428c137a9a2526c53a7a58be7c3513c8e0013b3e9509cd8e458d2514b1a6881961e2858b92cacda9f2cd034499a9b80754a5c3fe7c0 -EBUILD minikube-1.6.1.ebuild 6943 BLAKE2B 86d852e91895ccb837205323d7f09f77ed4df7be69b168d09dc1010e1b97f15786e46a890376cf41cefa82c5b2f4b5080580eccca6cbf637cef59acad2df7fb1 SHA512 01714d1a53363b267d18349f16a916f655d87f478b945a6865953e1ca8ea829496d0d27268051b192cded712854c8f8cf659e0582cbeb0bd938641f7e6538f8e -EBUILD minikube-1.6.2.ebuild 6943 BLAKE2B 7783f828650aea01b0e7fb841b23d82d409e4ee1a8494becb2ec2ccd54802450995643c71d2e39733fe2e6cc9a1f4389f54cbbd04af52f258c5ba0310733a027 SHA512 015d6a7ce9777ec6c510fb644358aa759c0aa859d513c5d8eeb8ce1b61b61f36f905fe4dec72c699a8ea1fa5bb7c85e0add11ab43851505ed722e22b0dde5fed +EBUILD minikube-1.0.1.ebuild 1800 BLAKE2B dc9a2a90340070569e63d3f35e8b4950e9c21ce1f552d3d0a1db487eb8b24abbcd65b9977eb447a6ab1a40510069db789dbaa3ba0fa853c30ddbef7bc3c28a03 SHA512 079f2ef3a816c2ef3f29704aa762086ca78570387245baaf48cd6eb0726b86fddaefd6a7857e338c126e24e149b7b6151cb0394c7bca796a7fcc52f5090ee374 +EBUILD minikube-1.6.1.ebuild 6937 BLAKE2B 681004882d53d2a7e5bf0a7b84c2a88485f40a25d9263438a0460d7e99093f24587518b4ebf01837f0af37008c331f9413a9c656b879be8c16563a0733fae6f0 SHA512 9438048cdff7053cae3dc859bc0cef6416107150ce0090cc9f0f7b209396cc6d4be2d9749e262184b55ad1417d4bf3be92bacc666c89aed7e38e192390c20ade +EBUILD minikube-1.6.2.ebuild 6937 BLAKE2B 3a3ee5544c89a637410c2935a1c6e6cb70ef9663d83907b6f5a0e70984b25e8f5c9a0fd9e38eafaec14c6aedbfae84cd6925750a8fba9742e9c52d91e3111ec4 SHA512 afa9d5ce4241119654f62541737d1fbbc82fe2c3fca9a6f40f656e2587f0f0ea4ec637c3fc58144e9e8f61d1edf419e6be17b5509202d4e18ca3e307e4844100 MISC metadata.xml 393 BLAKE2B 6c1d7e4c6ebff826d2a8eb0bf7a81fdd0c67279084e95aea0188e9b7e0f8ff869fc983f50c318cf17c42fdb482388e0989c655c8e65f18b462da0343dd57bf24 SHA512 9af4b86772936bd3299be9ff2e62a72dcad3481b39d4644b3774bfbdec6617d47dd1697205e1b3fa0a3944c38464584f42b8b2d6c7f1086b340d6a917f4d280f diff --git a/sys-cluster/minikube/minikube-1.0.1.ebuild b/sys-cluster/minikube/minikube-1.0.1.ebuild index c0cfc1eabe7b..65951f69c4e1 100644 --- a/sys-cluster/minikube/minikube-1.0.1.ebuild +++ b/sys-cluster/minikube/minikube-1.0.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_6} ) +PYTHON_COMPAT=( python3_6 ) inherit python-any-r1 golang-build golang-vcs-snapshot diff --git a/sys-cluster/minikube/minikube-1.6.1.ebuild b/sys-cluster/minikube/minikube-1.6.1.ebuild index 7acc960aa259..9ce970f58fe3 100644 --- a/sys-cluster/minikube/minikube-1.6.1.ebuild +++ b/sys-cluster/minikube/minikube-1.6.1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 go-module diff --git a/sys-cluster/minikube/minikube-1.6.2.ebuild b/sys-cluster/minikube/minikube-1.6.2.ebuild index bb5af846aa7d..941d63fa9a29 100644 --- a/sys-cluster/minikube/minikube-1.6.2.ebuild +++ b/sys-cluster/minikube/minikube-1.6.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit python-any-r1 go-module diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest index eeb8881053d7..cfe18419bec7 100644 --- a/sys-cluster/nova/Manifest +++ b/sys-cluster/nova/Manifest @@ -4,8 +4,11 @@ AUX nova.initd 745 BLAKE2B 3242a38313147eaffc096752b35cbed34e16f1133cb482515086a AUX openstack-scsi-disk.rules 134 BLAKE2B c1e3e150d93ab51b4da48caf2a0f83513fe63b5dde1e449a9c4c4dbfad65589b6326c799958736da86390142a914acbf9acf5b78bb1042e2c156eaf01cec8250 SHA512 6c3734d0b9ce9de887e15b1ddd5f5486dd1d0a55f463f9824ef067d3fe64a93d08ad2ef2b9d288f0dd42d570a5061e7a06976f7223df44b98bd321b73f9d036b AUX scsi-openscsi-link.sh 2777 BLAKE2B 84c14df2b1c49fe6210a4abf4387229aaa4fcd0c956b374b719285a20d8309f1bb58d51061084f34d284624d279bc64d53a629ec57702314c23e9b129c4a16b4 SHA512 3e7f6fc872f27b6a4d6c991346bd8eafcbc8f2b74439f1c77e93362e57fa1010ff002813cf21bf12d0550bfc165f79c70430862cd4ed5aaa15056777baf34409 DIST nova-20.0.1.tar.gz 11587774 BLAKE2B 62f7b6d4ab83533e4462f16978a2f95ceca3d6594029f87dbb170f3abc19917a4449ec95b007adae16c2e290649a560404d12e738a83bc8ad4bbbc1a4554d074 SHA512 3c83a1061696bb6e830e1e518ceea5e5b6405673373df674926b8c01955ea71714bf484906db3dc556209fb895c052003b54477d6a2791df0905244abbf9abe0 +DIST nova-20.1.0.tar.gz 11600925 BLAKE2B ad601ad07cd34df8fee75713f6040048129d6f45c00745903b334a281b555e78d1e8479d5d130e0ff7c1191e2ae18fc38405b2dfa4ec2800747bbb84602d9987 SHA512 b10e8d96846c9e8605cd4ae2dbcd1c4955979e91aa97b29a4411d00c5d5772264d46a9d62cce369d7db6da0641b86a3bf10dd37128e863b4565a5de19d30bdde DIST nova.conf.sample-20.0.1 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38 +DIST nova.conf.sample-20.1.0 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38 DIST nova.conf.sample-2019.2.9999 220110 BLAKE2B af98687c895ee091cc2e8d668eb50b52cc94618081f8a50b544faebed29b2b3a5dfa38309da70dcc6d0083792605b810081b50c15a6c960947e0c782f25717ab SHA512 cc6cce95943b06d60dfc1f85b87d527662eeb57388dca4a6037078b517302b86fd7f752c6e9e43c59c10be83ac5955f21c08284bbc946ffe2171f5bfa6edff38 EBUILD nova-20.0.1.ebuild 7833 BLAKE2B 97055ab422300946032a79791afbdf250e9f1e9834aa145596a9a275eb5585064bfd17c1ed8a91243af458eb58479cbcf2283e651abc437f9060803e9181065a SHA512 e42571920ebeedd3e82ab82b1922fcf6a28a64974f77da9047c324bd6af0070118b0fb13c68cb9a07d86ad12521c2c81b617af46ba113eb4031c4a2c9d140439 +EBUILD nova-20.1.0.ebuild 7807 BLAKE2B 189334991c04a5f7bb7306d98a320482338998d9ac60ffb4f593bc78bcd3a9047c125c2c3b021c8d3755813c9e489e0d5d46985c1109698d59f961a2ce5d8025 SHA512 b30fe7c3ee7d064f63768d3bd4dbcb5915a204caf517b1e942bffb96915daebf7ee58a1578f3e1c94dbd27bfe10e3922b1e524bca6c725626eac088e62710c4f EBUILD nova-2019.2.9999.ebuild 7807 BLAKE2B 189334991c04a5f7bb7306d98a320482338998d9ac60ffb4f593bc78bcd3a9047c125c2c3b021c8d3755813c9e489e0d5d46985c1109698d59f961a2ce5d8025 SHA512 b30fe7c3ee7d064f63768d3bd4dbcb5915a204caf517b1e942bffb96915daebf7ee58a1578f3e1c94dbd27bfe10e3922b1e524bca6c725626eac088e62710c4f MISC metadata.xml 1172 BLAKE2B aa85fe6bed1e40717884d721c2633c5f6d380914c69cb8a4a4c31b3e4c779db52b90fdaa5ee63b66ad9bc6694f666dd37dceeffb8de4676014ef3bb688476ef7 SHA512 bb506fa680b064c3d6a48710cac11efedc9e8a340603e234bf5c4c48aaab773e4527d7a8fc66ae36ec894230a1d02a5be995e521d222914f652e03b6f72642e4 diff --git a/sys-cluster/nova/nova-20.1.0.ebuild b/sys-cluster/nova/nova-20.1.0.ebuild new file mode 100644 index 000000000000..fb95e0d2d711 --- /dev/null +++ b/sys-cluster/nova/nova-20.1.0.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +inherit distutils-r1 eutils linux-info multilib + +DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python" +HOMEPAGE="https://launchpad.net/nova" + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV}" + EGIT_REPO_URI="https://github.com/openstack/nova.git" + EGIT_BRANCH="stable/train" +else + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/train/nova.conf.sample -> nova.conf.sample-${PV} + https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite" +REQUIRED_USE=" + !compute-only? ( || ( mysql postgres sqlite ) ) + compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )" + +CDEPEND=" + >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] + !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]" +DEPEND=" + ${CDEPEND} + app-admin/sudo" + +RDEPEND=" + ${CDEPEND} + compute-only? ( + >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] + ) + sqlite? ( + >=dev-python/sqlalchemy-1.2.19[sqlite,${PYTHON_USEDEP}] + ) + mysql? ( + >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] + !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] + ) + postgres? ( + >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.2.19[${PYTHON_USEDEP}] + ) + >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] + >=dev-python/eventlet-0.20.0[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] + >=dev-python/jinja-2.10[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}] + >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}] + !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] + >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.7[${PYTHON_USEDEP}] + >=dev-python/webob-1.8.2[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}] + !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] + >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] + >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] + <dev-python/prettytable-0.8[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] + >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] + >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] + >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] + !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] + virtual/python-enum34[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] + >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}] + !~dev-python/python-cinderclient-4.0.0[${PYTHON_USEDEP}] + >=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}] + >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}] + >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] + >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] + >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] + >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.21.0[${PYTHON_USEDEP}] + >=dev-python/oslo-upgradecheck-0.1.1[${PYTHON_USEDEP}] + !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}] + >=dev-python/oslo-db-4.44.0[${PYTHON_USEDEP}] + >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-7.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}] + >=dev-python/oslo-privsep-1.33.2[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] + >=dev-python/oslo-service-1.40.1[${PYTHON_USEDEP}] + >=dev-python/rfc3986-1.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] + >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] + >=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}] + >=dev-python/os-brick-2.6.1[${PYTHON_USEDEP}] + >=dev-python/os-resource-classes-0.4.0[${PYTHON_USEDEP}] + >=dev-python/os-traits-0.16.0[${PYTHON_USEDEP}] + >=dev-python/os-vif-1.14.0[${PYTHON_USEDEP}] + >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] + >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] + >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}] + >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}] + >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] + >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] + >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}] + >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}] + >=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}] + >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}] + >=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}] + >=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}] + dev-python/libvirt-python[${PYTHON_USEDEP}] + app-emulation/libvirt[iscsi?] + app-emulation/spice-html5 + novncproxy? ( www-apps/novnc ) + sys-apps/iproute2 + openvswitch? ( net-misc/openvswitch ) + rabbitmq? ( net-misc/rabbitmq-server ) + memcached? ( + net-misc/memcached + >=dev-python/python-memcached-1.58 + ) + sys-fs/sysfsutils + sys-fs/multipath-tools + net-misc/bridge-utils + compute? ( + app-cdr/cdrtools + sys-fs/dosfstools + app-emulation/qemu + ) + iscsi? ( + sys-fs/lsscsi + >=sys-block/open-iscsi-2.0.873-r1 + ) + acct-user/nova + acct-group/nova" + +#PATCHES=( +#) + +pkg_setup() { + linux-info_pkg_setup + CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ + IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \ + NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \ + ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT" + if linux_config_exists; then + for module in ${CONFIG_CHECK_MODULES}; do + linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel" + done + fi +} + +python_prepare_all() { + sed -i '/^hacking/d' test-requirements.txt || die + distutils-r1_python_prepare_all +} + +python_install_all() { + distutils-r1_python_install_all + + if use !compute-only; then + for svc in api conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do + newinitd "${FILESDIR}/nova.initd" "nova-${svc}" + done + fi + use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute" + use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy" + + diropts -m 0750 -o nova -g qemu + dodir /var/log/nova /var/lib/nova/instances + diropts -m 0750 -o nova -g nova + + insinto /etc/nova + insopts -m 0640 -o nova -g nova + newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" + doins "${FILESDIR}/nova-compute.conf" + doins "${S}/etc/nova/"* + # rootwrap filters + insopts -m 0644 + insinto /etc/nova/rootwrap.d + doins "etc/nova/rootwrap.d/api-metadata.filters" + doins "etc/nova/rootwrap.d/compute.filters" + doins "etc/nova/rootwrap.d/network.filters" + + # add sudoers definitions for user nova + insinto /etc/sudoers.d/ + insopts -m 0600 -o root -g root + doins "${FILESDIR}/nova-sudoers" + + if use iscsi ; then + # Install udev rules for handle iscsi disk with right links under /dev + udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules + + insinto /etc/nova/ + doins "${FILESDIR}/scsi-openscsi-link.sh" + fi + rm -r "${ED}/usr/etc" +} + +pkg_postinst() { + if use iscsi ; then + elog "iscsid needs to be running if you want cinder to connect" + fi +} diff --git a/sys-cluster/openstack-meta/Manifest b/sys-cluster/openstack-meta/Manifest index cb7c8acc06f3..d660084acf1f 100644 --- a/sys-cluster/openstack-meta/Manifest +++ b/sys-cluster/openstack-meta/Manifest @@ -1,3 +1,3 @@ -EBUILD openstack-meta-2019.2.1.ebuild 725 BLAKE2B a74b8acf7d39580f70ce0cae631ce0dce3d961cf6678a4422c75a7687a027ce89eb3e7f5f0610a92d55df0893702b7b728c6e9e0e24f4100bc4c3f0a9e9bec2a SHA512 7da633d6f527d312798df5726c1934b888bb5740311de645bb668093dd39d3830eb023477210a12381f24c4a93fc61d5fd3b12dd8fc9b81a4311f3b31021a479 +EBUILD openstack-meta-2019.2.2.ebuild 725 BLAKE2B 008d57246099fb3c7c9dd3fe75d17ca8c6b7292d5215d732d0f41983b1ddce3ff07778c78bf131f6a7db840b0331b65def740af30661e5a499f5123edc11c81a SHA512 c3ee9e79ba4c1e6a9523531bb13dc0303e57d46beaa57cd8faa48efa1c143ffa51c64eab15f34b4216de311957473fbcd792073f14087e614fc950a0fdec5097 EBUILD openstack-meta-2019.2.9999.ebuild 720 BLAKE2B 7b98e630cdf78a504a088f7cbef581ddb23cbd266058a4af622370c8deb5d58bc3d8a6fc65b77a4350ead39b3c120146b26edb23abac2cfb74b2b14a07dd313d SHA512 5d80cc2745055cc52c9b8d9ceb0c7d540e4295135ab8e4fc4af2b0c8cda1ea4e09f35d01634bb8ded59b880321f70cdf73397a741bda21999fa20bb1b4be3ef6 MISC metadata.xml 931 BLAKE2B 23cfe01ee67c4203f65ae6fe48c75c039948576ee98ce29e319ad7821e1bf7afe2f80dcb88994893a270d7902d37663159223639843f9b026a09c9f7a004d770 SHA512 5a37fd37399ecf64a4b655a117b2ed0bc118a08b281bf71d84cb5f2e0057f67322dd177c2e2572200bff90cef14bfe1d0323f8e3b84d6b8120d859f4c0d4576f diff --git a/sys-cluster/openstack-meta/openstack-meta-2019.2.1.ebuild b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild index ecc8723d0aed..135d73ac37cc 100644 --- a/sys-cluster/openstack-meta/openstack-meta-2019.2.1.ebuild +++ b/sys-cluster/openstack-meta/openstack-meta-2019.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ RDEPEND=" swift? ( ~sys-cluster/swift-2.23.1 ) neutron? ( ~sys-cluster/neutron-15.0.0 ) glance? ( ~app-admin/glance-19.0.0 ) - cinder? ( ~sys-cluster/cinder-15.0.0 ) + cinder? ( ~sys-cluster/cinder-15.0.1 ) nova? ( ~sys-cluster/nova-20.0.1 ) heat? ( ~sys-cluster/heat-13.0.0 ) placement? ( ~sys-cluster/placement-2.0.0 ) diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest index ef0428e1a47b..2f4dedb97483 100644 --- a/sys-cluster/rdma-core/Manifest +++ b/sys-cluster/rdma-core/Manifest @@ -5,8 +5,8 @@ AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299a DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742 DIST rdma-core-27.0.tar.gz 1445552 BLAKE2B a038653865f8d37b6599a54ca7fef97b2ac131b3a11ce8696b5c1ec558e85332e950f8d5104f250b23a186224735b2a338fc03f875979bff342ad26ebb5b74b2 SHA512 8a299f4d3fe6ea98d8fc8d8135295e55c8bbf5d0d5f2e5fd362a5eb96d86f5aa84263736ab80a3c0eb104c7fc5fb5d43a2077cc6a1fed3d346af89597a4ddee2 -EBUILD rdma-core-26.0.ebuild 2439 BLAKE2B 9b35dcbe991f1cdebedb601838ebf081d872b1b5d286e9a698a024e6909d44f937b88f110d7190b828a6da7fe7e75840d866c853fc3cc537153d02131529b9d3 SHA512 53ec17e9cb20f5da20c388254cc4924f5202f05a2db3feeb3128d16e1c4b058c25fe31ccc7133eae99bc9535d556e73b6ba890d7e8c47b8ae7ec602dea9b4004 -EBUILD rdma-core-26.1.ebuild 2441 BLAKE2B 31bd2434748e44555bd6d23bedc43a040ad3836616293d030b4d230e6ff6933b165f2b4ba59a84bdda3adda30cf5635085388c5843fbacd431706bbcee91d4d7 SHA512 dab20965e12df6dcc67c8969b6bfd22af1527d0fdcdeae650aadf2d2543fe77a13da245ea6702d58c5ab6aa5a42b75395f22067f8d9768d2728b532c9bbac544 -EBUILD rdma-core-27.0.ebuild 2447 BLAKE2B 0490574c27ee112fc977277ff0a254df1a221d54371110f57502e4a19d37c4da9ffe47fd17507a91799b9e358c0dcd3db95c8f23fb588bc49fcb55a833e1939b SHA512 497f15ea57b8d06c478853e866d870d88713ee57be4d84ad2364179eee3ac1a4a13f03be616a6c051ec9c8978761adcb399cc9b27ffd73c750cc846085b0abe2 -EBUILD rdma-core-9999.ebuild 2399 BLAKE2B 9bde6f6608aa17a27ec8c11f9fd5c18219a20be28b4a166b53f2c79be36b9d86bd4dce218e200b941f92377f58a525987248df2bb9b37f77847f5074dff403b7 SHA512 84a79dc6e623e549f9031eade6b4ca08de1bfe6e60de8e432a21001f7fe15f3e76a2aab3fe7ca9634c948250347700df34eb66769362155bcbad10eb5d9352fe +EBUILD rdma-core-26.0-r1.ebuild 2513 BLAKE2B 519c57cb9eb2e8ddbd666668c50e186b106eeff016f8be36ee3f15afadcc7851f65f16684355d4deee14ec66ef0770391fcd3f202423b6a6dc926c26c40afbcc SHA512 f81a43e2b04de7479b61fb626a1dc701ae21bf6c14af586574950965195d8541c09e663a678b5a28a3db658c57da2dc010e7071dcae2e32b465b140a18b3a7fb +EBUILD rdma-core-26.1.ebuild 2514 BLAKE2B d63803233031ebe7765c685e24a28751f1e83433b49ad7dd6a167d97c007d4076fa3ba01015404ac24897997ce21ada5e634aad920911e9e3e0ee8f74c8517e6 SHA512 3b31ab7ec3630268d4f072046404ab129c3b5539054343d29361d56bdd493b01a04f05701f4bb7f6362787e6144f0dfbf43a6105426ab10b02aa3ed944922801 +EBUILD rdma-core-27.0-r1.ebuild 2538 BLAKE2B 9e36cbb2a9422d89000623f21b5089c422b4ec08709414038bee1158002f27e053d7d6bc7b582642e1af56bcae9260742ba50faaf3f42f05e10d3afda7d36c41 SHA512 910b9558c81b6ae579eb34eb5c6eac66ba82a2fbbf56ec3689fa3082f506235e6afd5956add2eaf543f8003e6380397b62277559a9026fc39a338262ca0d2ba9 +EBUILD rdma-core-9999.ebuild 2472 BLAKE2B d1883898cc9fe6f89ce89377ec7f4141c60b7c945d7152c2c59548e396a5f771a4a2b75028886fc2131d51288005ca07de08e347c235d5bb4b75398f9b9b7d92 SHA512 2768d543d83416c519c7305af1ad66c9c7370d090a249fd5d9a5c79cb3245bd5c1824279f1cf8c7ecb26fabaf618adf96d1bcac1a243fb9c3c788d618fa2a8e7 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb diff --git a/sys-cluster/rdma-core/rdma-core-26.0.ebuild b/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild index c2a9e0a05f59..39c6e4a73b19 100644 --- a/sys-cluster/rdma-core/rdma-core-26.0.ebuild +++ b/sys-cluster/rdma-core/rdma-core-26.0-r1.ebuild @@ -31,7 +31,11 @@ COMMON_DEPEND=" python? ( ${PYTHON_DEPS} )" DEPEND="${COMMON_DEPEND} - python? ( dev-python/cython[${PYTHON_USEDEP}] )" + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') + )" RDEPEND="${COMMON_DEPEND} !sys-fabric/infiniband-diags @@ -92,4 +96,7 @@ src_install() { newinitd "${FILESDIR}"/ibacm.init ibacm newinitd "${FILESDIR}"/iwpmd.init iwpmd newinitd "${FILESDIR}"/srpd.init srpd + + use python && python_optimize + } diff --git a/sys-cluster/rdma-core/rdma-core-26.1.ebuild b/sys-cluster/rdma-core/rdma-core-26.1.ebuild index e879e9b2b999..39537f768f10 100644 --- a/sys-cluster/rdma-core/rdma-core-26.1.ebuild +++ b/sys-cluster/rdma-core/rdma-core-26.1.ebuild @@ -31,7 +31,11 @@ COMMON_DEPEND=" python? ( ${PYTHON_DEPS} )" DEPEND="${COMMON_DEPEND} - python? ( dev-python/cython[${PYTHON_USEDEP}] )" + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') + )" RDEPEND="${COMMON_DEPEND} !sys-fabric/infiniband-diags @@ -92,4 +96,6 @@ src_install() { newinitd "${FILESDIR}"/ibacm.init ibacm newinitd "${FILESDIR}"/iwpmd.init iwpmd newinitd "${FILESDIR}"/srpd.init srpd + + use python && python_optimize } diff --git a/sys-cluster/rdma-core/rdma-core-27.0.ebuild b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild index cc1079c577a3..9313f938a56d 100644 --- a/sys-cluster/rdma-core/rdma-core-27.0.ebuild +++ b/sys-cluster/rdma-core/rdma-core-27.0-r1.ebuild @@ -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="~amd64 ~hppa ~x86" + KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" fi LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )" @@ -31,7 +31,11 @@ COMMON_DEPEND=" python? ( ${PYTHON_DEPS} )" DEPEND="${COMMON_DEPEND} - python? ( dev-python/cython[${PYTHON_USEDEP}] )" + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') + )" RDEPEND="${COMMON_DEPEND} !sys-fabric/infiniband-diags @@ -92,4 +96,6 @@ src_install() { newinitd "${FILESDIR}"/ibacm.init ibacm newinitd "${FILESDIR}"/iwpmd.init iwpmd 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 a4b748ab4b1d..a8c381b38698 100644 --- a/sys-cluster/rdma-core/rdma-core-9999.ebuild +++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild @@ -31,7 +31,11 @@ COMMON_DEPEND=" python? ( ${PYTHON_DEPS} )" DEPEND="${COMMON_DEPEND} - python? ( dev-python/cython[${PYTHON_USEDEP}] )" + python? ( + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_MULTI_USEDEP}] + ') + )" RDEPEND="${COMMON_DEPEND} !!sys-fabric/infiniband-diags @@ -90,4 +94,6 @@ src_install() { newinitd "${FILESDIR}"/ibacm.init ibacm newinitd "${FILESDIR}"/iwpmd.init iwpmd newinitd "${FILESDIR}"/srpd.init srpd + + use python && python_optimize } diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest index f318ccf94978..33700296143d 100644 --- a/sys-cluster/swift/Manifest +++ b/sys-cluster/swift/Manifest @@ -7,6 +7,6 @@ DIST swift-2.23.1.tar.gz 3044545 BLAKE2B b3b06aefa7c58b718f7d9c1c1b9bc92f442b832 DIST swift-2.24.0.tar.gz 3177018 BLAKE2B f465f0e8f58cc097b5b1fdbe5c9736ee3e2247d13d8ae1beeb7e736dd1246e7d8820cb7241afb67e651ad85c269a48d9dbeda3479dadd773bfc1fe3278731afe SHA512 f8e3b0fec06776e095067b2c12f782a9a787c814cea8039ec32930c562be5c74b4b2bf4cb9dad3481953e5163bd051fe32f3074be7776fd1af0be94982d113b6 EBUILD swift-2.22.0.ebuild 3854 BLAKE2B 92ade52d11d331d9f08ed9ff7f017453c2c4bbb68edf13a7e3a4f61ec2b1817bd0ef18fe680cb7862224da8b3a1405242499a21489dd2fd1f9e066eaf384525b SHA512 573572d4dab5a4be49bd4638221e757804454571a246b2333ceac48b105e1a099b07d62c7b01885980a435146cdc2a61635bd04f05b0b38295b05af1f3378054 EBUILD swift-2.23.1.ebuild 3855 BLAKE2B a72c67caf9cb6cab55e24ed942e708ed6f4b08aa4806178c6421e76896c9afc5e4ba963bc88b0e2d46e233f710eff368d12715ab79ca8c064f61eb1cff002b96 SHA512 ab4c4ae34bd94e42b008c671c3d4df017fd45b06108b5ef82e693ae0bac9269a9c27d9304025260128adf86cd798c078ffa80515e51a0e7c97a899f19bac1ccd -EBUILD swift-2.24.0.ebuild 3834 BLAKE2B 4ea629a582861a48ed0917ce5aabc1e9eec54ae2995f61a66db9ffa6ead669aa3324940f36575c3db23b26cdbeac09f560b41b22ea7c0310c56c9d8369fcc841 SHA512 afbaae9466aea1f342efc0940bf621ae5d0210c27b6f1df41e2c874685083267ee4380d2b1a0e8ea42e51e413ee29c14ef2b2dc075e2001b08e4fba672d43155 -EBUILD swift-2019.2.9999.ebuild 3834 BLAKE2B 4ea629a582861a48ed0917ce5aabc1e9eec54ae2995f61a66db9ffa6ead669aa3324940f36575c3db23b26cdbeac09f560b41b22ea7c0310c56c9d8369fcc841 SHA512 afbaae9466aea1f342efc0940bf621ae5d0210c27b6f1df41e2c874685083267ee4380d2b1a0e8ea42e51e413ee29c14ef2b2dc075e2001b08e4fba672d43155 +EBUILD swift-2.24.0.ebuild 3837 BLAKE2B 2fd42f1864db9312f8c66e9379ead2560295dfc87ea5d6d98db37d3c38a128621b6d0ceba8f1415bd0b3cc277cc4be25dbae3613684f9e0628a208ae329b8687 SHA512 5b580e2377d322971b24a19cd02c331ed6d0b53afc5f016f4fb1ced11fa327e7c6f9ca62aea376149de3c46ed6d190f6d07324059b8ce724ca77a24f2fd9f8e7 +EBUILD swift-2019.2.9999.ebuild 3837 BLAKE2B 2fd42f1864db9312f8c66e9379ead2560295dfc87ea5d6d98db37d3c38a128621b6d0ceba8f1415bd0b3cc277cc4be25dbae3613684f9e0628a208ae329b8687 SHA512 5b580e2377d322971b24a19cd02c331ed6d0b53afc5f016f4fb1ced11fa327e7c6f9ca62aea376149de3c46ed6d190f6d07324059b8ce724ca77a24f2fd9f8e7 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c diff --git a/sys-cluster/swift/swift-2.24.0.ebuild b/sys-cluster/swift/swift-2.24.0.ebuild index f9125af321f6..66211332bf21 100644 --- a/sys-cluster/swift/swift-2.24.0.ebuild +++ b/sys-cluster/swift/swift-2.24.0.ebuild @@ -85,7 +85,7 @@ python_install_all() { newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" newins "etc/proxy-server.conf-sample" "proxy-server.conf" if use memcached; then - sed -i '/depend/a\nneed memcached' "${D}/etc/init.d/swift-proxy" + sed -i '/depend/a\ need memcached' "${D}/etc/init.d/swift-proxy" fi fi if use account; then diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild index f9125af321f6..66211332bf21 100644 --- a/sys-cluster/swift/swift-2019.2.9999.ebuild +++ b/sys-cluster/swift/swift-2019.2.9999.ebuild @@ -85,7 +85,7 @@ python_install_all() { newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy" newins "etc/proxy-server.conf-sample" "proxy-server.conf" if use memcached; then - sed -i '/depend/a\nneed memcached' "${D}/etc/init.d/swift-proxy" + sed -i '/depend/a\ need memcached' "${D}/etc/init.d/swift-proxy" fi fi if use account; then |