From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- sys-cluster/Manifest.gz | Bin 14202 -> 14206 bytes sys-cluster/ceph/Manifest | 11 +- sys-cluster/ceph/ceph-12.2.12-r1.ebuild | 317 ------------------ sys-cluster/ceph/ceph-12.2.12-r2.ebuild | 317 ++++++++++++++++++ sys-cluster/ceph/ceph-13.2.5-r3.ebuild | 339 ------------------- sys-cluster/ceph/ceph-13.2.5-r4.ebuild | 339 +++++++++++++++++++ sys-cluster/ceph/ceph-14.2.0-r5.ebuild | 344 -------------------- sys-cluster/ceph/ceph-14.2.1.ebuild | 362 +++++++++++++++++++++ .../files/ceph-14.2.0-boost-1.70-sonames.patch | 321 ++++++++++++++++++ .../ceph/files/ceph-14.2.0-boost-1.70.patch | 120 +++++++ sys-cluster/ceph/files/ceph.initd-r12 | 115 +++++++ sys-cluster/minikube/Manifest | 2 + sys-cluster/minikube/minikube-1.0.1.ebuild | 50 +++ sys-cluster/neutron/Manifest | 6 +- sys-cluster/neutron/neutron-13.0.2-r1.ebuild | 231 ------------- sys-cluster/neutron/neutron-13.0.3.ebuild | 2 +- sys-cluster/sanlock/Manifest | 2 +- sys-cluster/sanlock/sanlock-3.6.0.ebuild | 2 +- 18 files changed, 1637 insertions(+), 1243 deletions(-) delete mode 100644 sys-cluster/ceph/ceph-12.2.12-r1.ebuild create mode 100644 sys-cluster/ceph/ceph-12.2.12-r2.ebuild delete mode 100644 sys-cluster/ceph/ceph-13.2.5-r3.ebuild create mode 100644 sys-cluster/ceph/ceph-13.2.5-r4.ebuild delete mode 100644 sys-cluster/ceph/ceph-14.2.0-r5.ebuild create mode 100644 sys-cluster/ceph/ceph-14.2.1.ebuild create mode 100644 sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch create mode 100644 sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch create mode 100644 sys-cluster/ceph/files/ceph.initd-r12 create mode 100644 sys-cluster/minikube/minikube-1.0.1.ebuild delete mode 100644 sys-cluster/neutron/neutron-13.0.2-r1.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz index 7114e7c4a818..a2c569414a18 100644 Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 49b24289e95d..7dfb489fbc0a 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -19,6 +19,8 @@ AUX ceph-13.2.0-mgr-python-version.patch 675 BLAKE2B 2458bd067f9947189b65c439df5 AUX ceph-13.2.0-no-virtualenvs.patch 4466 BLAKE2B 9f5176b7d3ee3b3602341864af8eb2494cfcc2268492d7ecf9f43576963de913c9be52259dd16c2a3ad6440eeb33604ce609fc11e7e36236a37c02b84ad81890 SHA512 7b9ab0a7e22784f66253f873dd76bb3e76cfff4781632ed51d39beefacdd1a7f4d90441aff9fd93987837fadaa847906bba32eb18c86f8a8fe31205246cbfd8d AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f49408496360fa24a433e9d6f3568749a6dfb415cbd17bfb950b9500f182c5141eab402686001f95e1611e60accdac7111ceca14f03b1ff8b4345c087f SHA512 ea069b75b786c22166c609b127b512802cc5c6e9512d792d7b7b34d276f5b86d57c8c35cfc7b5c855a59c0ba87ba1aabe2ca26da72b26bff46b6ba8410ddb27e AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d +AUX ceph-14.2.0-boost-1.70-sonames.patch 13703 BLAKE2B a619a07217895ae34a84c145930d9b477cc557d5088d1fb915f0427556330a24cb4385e953facf7cb2dcf99c1245bd25d2ebe25db56dec40648ad065bce7e873 SHA512 69f82d5f10b1237c17428b11e746422fcd0e1be735500032892d834361e636a23135cb7e6f537cbd808b74378325c24132a88f256abcce40ec1bdfe212b7648c +AUX ceph-14.2.0-boost-1.70.patch 5556 BLAKE2B 7610a48c30fe5cf8462f498501a36c17c33289967e7d50456d6b8e6c467db89b768f73bb6e69ecd4c6dec0432d4fbb47af339f02eb510ba69770b9b122b41dbf SHA512 71ee1d583f71b2c52fee40e5105d1ff1d4b676230eac7c19f42754316c3958808304155a48992f8766eded52d3e28007b631680dca8b4672153fa44b8eccbbb8 AUX ceph-14.2.0-boost-sonames.patch 14155 BLAKE2B 766a3e40c8a4d94d1cc52a511f0d440178c199cb37b1d06a792fe627df4f01793d8555005054604397d02d9e366521b10788f6e56381a6d967814370e4298844 SHA512 91184e32d3ef28a43bc8e0d53b4f359c5b2177250b39bbcc7921e38d044ba54610713826bc64450a0b2232450f68e724d23757cc5c6d39e50855060e86890ed2 AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94 AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d @@ -34,6 +36,7 @@ AUX ceph-osd_at.service.conf 115 BLAKE2B d234b9bd718585baf43f229f583e211607aab02 AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c856efab51e64f36ae5435bec761bd85f7b42bfe78ebc28c267ba80ee0b4123b960ffaf35b749ff25 SHA512 ea3e7b668f6fcdf7f1884968a33d06c86448426a83cb132f927c32d83e28adaf8789489e7e817d4349479e3647577ef40190fc75fa88553aac1c7b4f515184c9 AUX ceph.confd-r5 619 BLAKE2B 6d495b970c7ff14972845e46aafc55d227c45817f5f8a9a1cad2e242398cc49f2c53896affe1373433db4175c426f1148242588207c7dee60f28a8c3ee543e5f SHA512 288560fee187c496402d46e3fa17fe99c4d3f2c0bbb389a5a91384a1015939f2389a81398045f0d1c978c4da5a1400e97126b98374185424bc5501d0b821ad5c AUX ceph.initd-r11 3070 BLAKE2B b8e875705720c323377dcedb2fddd76d199eb6430761a75d0da3b26a5a25295e33382ccc88843a894d81a7b07d76ec38faa9a292e67ec6102985d8002ecb3337 SHA512 e3b310a7f99b9226a80bbb9e0b4ed43b3bbe5b69e72f5c0dec5d2f9a7d5f5fc274b1f8e847183d92f27dd283511db8cf5428803bbc833708ce25a38a9da59a63 +AUX ceph.initd-r12 3088 BLAKE2B 371ee28604bef04766b3b13687feb56e076cf4ef23797bdf469db8b85454624ab005304c798c0945bcd4c5c0478ad7d724ccd33074afef39ab939464969e32b1 SHA512 4eeb1d589cd010b39405d1664f077a79d6a8bb8d9693b32390546e14a240f98ba6e4d6281940f482f57e8364339c68b1b02219c0f837f65a738686b00ac9498c AUX ceph.initd-r9 2435 BLAKE2B 2e1246f9d409bbe4d2895e9747490ddd108ef22c2060e151944ad2bda1e7ae13d61330cf9f33ec4900eb4fd4a26ff454dd081869901d21bff8309bf8db6d7533 SHA512 c7f0dd45bbada67e93b2e1acdafdb0ccd1de107d9d582b6b83889c5e0f91e524ea1324ab21e96d4c56d6016be6fed718a7791695c95c68813c6b9d6d3dc2a384 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b @@ -45,10 +48,10 @@ DIST ceph-12.2.11.tar.gz 79009034 BLAKE2B d8b1c188fe39603e90511eb436100ba14c0a9c 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-14.2.0.tar.gz 118882504 BLAKE2B e650d99dceb11c7b035480c8cdd9f63ee4a5f81ffea27988e180a2956433e3e4b34e496a73bf5992c428eff859311c623b92a6f006eb694ebf928d8204dc9b06 SHA512 c86a335714fd5678988133ec0e60cb10cd948250a133c073d1ed055c5bba232fa6f1e102dd7fcb0c70b37a07c9c2d1220d4a1713720e4dcab9659152ee577480 +DIST ceph-14.2.1.tar.gz 117111511 BLAKE2B c00181223c6e02e7fe696ed4226f1751eca48e799f8b5377a06621eb3300f81b58dc20f325b455df04fcbd0c28b981fae1cfc778a8d69414247ddd206d0c6175 SHA512 fccde341344c721fbfc7f7cb73db4f65933d7fcacc9495398b55b37d1e208f0bad0cd78a4da08a3b5e26cca3175e7707f7dfb76fae5aa094f58afaed8603c866 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f -EBUILD ceph-12.2.12-r1.ebuild 8390 BLAKE2B 7cbb4f10b7deb154c6ad7a4e1796faedaa6a35d567f931d58a412329dfe5084c573112b46c20a1b7394d1c732cfc7e16a9638746f2b390f323ac95976f410160 SHA512 80001c80c09a9dc021e47d02f225778be34d1f5b1d218809bace78c9046f4c7ce1fcc78cf4e4618d905870a469020086484b19768e84a859cf867ab2fe0cd9ca +EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1 -EBUILD ceph-13.2.5-r3.ebuild 8988 BLAKE2B 7eeef2b9ebdc34167657126d2ef86e1ed204fcdd5ac8af2c004607f291106dd38e486e17a2d1044e7d4adfa9c6067dfa556504d54eb8b75c03f4fbd2820b6586 SHA512 ba79137aefa69c7320ba88f8a3409b752033aa89c8424863e8b21cf6d0c0079440daee98a338ce01314ce4969a5b7a3f074f7c006a2235aee856d7ad29ae9371 -EBUILD ceph-14.2.0-r5.ebuild 9111 BLAKE2B 9d2f2c126e5f715e83cfde6801875b7cbe29e8cef634ba5c1a89022ad7d3d325a499e4733034e0eb7ee301800062612c019c4ec3429358a029db7757257fb75e SHA512 2666e7e54405a3e7f2dc4b97fc9d41268d2dea87802d1dc32ae25fcf8daf5082f74b32fb4f22355a9ac4d1c1e303af877cd3fd07c2cd2723652fe52d8ee5a8f7 +EBUILD ceph-13.2.5-r4.ebuild 8988 BLAKE2B 9498ed92a31d2939154b76181b1fc0810c7332c6a4a5b49aa84d88d3f3cc0979db901a497f0e12039920f99093eaee5e291f677c2313629a665b44bf84eb8f4c SHA512 e477d9d147585a89c59386907457701104ee322392de98caaf3f88128d20de56b3d03fb017917f2d68e4c58e64e91596012ce7bdef7ef86622b7c7ebdae16030 +EBUILD ceph-14.2.1.ebuild 10034 BLAKE2B b179d248d3b80566cdd061463beea542ec7013646c429cb179620f09db0c485f6e6cb6192df0c37c398f167d57e6fcbd7e0d51df543abd32ddf72a932a9b0283 SHA512 be69c25fac899365a3fb5074233fc8e6561e5f1c35a2cd21a712cc218c5aef7ff220eeecbcf1c2412fec67aca4bd147a5d35077930adf5f9a41011935eb6b905 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250 diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild deleted file mode 100644 index 783210078a84..000000000000 --- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild +++ /dev/null @@ -1,317 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,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 ~arm64 ~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-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/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 - !/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 - 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-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" - - 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-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild new file mode 100644 index 000000000000..5c5c01140856 --- /dev/null +++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild @@ -0,0 +1,317 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,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 ~arm64 ~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-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/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 + !/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 + 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 '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" + + 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.5-r3.ebuild b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild deleted file mode 100644 index d6e08fe9ba96..000000000000 --- a/sys-cluster/ceph/ceph-13.2.5-r3.ebuild +++ /dev/null @@ -1,339 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,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 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(-)] - !/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-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 '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.5-r4.ebuild b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild new file mode 100644 index 000000000000..de0b1ea8ca75 --- /dev/null +++ b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,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 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(-)] + !/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.0-r5.ebuild b/sys-cluster/ceph/ceph-14.2.0-r5.ebuild deleted file mode 100644 index 52a0a5582aba..000000000000 --- a/sys-cluster/ceph/ceph-14.2.0-r5.ebuild +++ /dev/null @@ -1,344 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,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 ~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 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.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 ) - 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(-)] - !/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 install - popd >/dev/null || die -} - -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-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 '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/{mount.*,ceph-volume{,-systemd}} || 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.1.ebuild b/sys-cluster/ceph/ceph-14.2.1.ebuild new file mode 100644 index 000000000000..6cab06ebd9c3 --- /dev/null +++ b/sys-cluster/ceph/ceph-14.2.1.ebuild @@ -0,0 +1,362 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,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 ~x86" +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(-)] + !/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 +} + +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 + sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ + "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" + + 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/files/ceph-14.2.0-boost-1.70-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch new file mode 100644 index 000000000000..6d7120037424 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch @@ -0,0 +1,321 @@ +diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake +index bfab4ca436..90ed0cbb17 100644 +--- a/cmake/modules/FindBoost.cmake ++++ b/cmake/modules/FindBoost.cmake +@@ -1181,10 +1181,10 @@ endif() + # on all platforms to keep end user code free from platform dependent + # code. Also provide convenience targets to disable autolinking and + # enable dynamic linking. +-if(NOT TARGET Boost::diagnostic_definitions) +- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) +- add_library(Boost::disable_autolinking INTERFACE IMPORTED) +- add_library(Boost::dynamic_linking INTERFACE IMPORTED) ++if(NOT TARGET boost_diagnostic_definitions) ++ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) ++ add_library(boost_disable_autolinking INTERFACE IMPORTED) ++ add_library(boost_dynamic_linking INTERFACE IMPORTED) + endif() + if(WIN32) + # In windows, automatic linking is performed, so you do not have +@@ -1205,11 +1205,11 @@ if(WIN32) + # code to emit a #pragma message each time a library is selected + # for linking. + set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") +- set_target_properties(Boost::diagnostic_definitions PROPERTIES ++ set_target_properties(boost_diagnostic_definitions PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") +- set_target_properties(Boost::disable_autolinking PROPERTIES ++ set_target_properties(boost_disable_autolinking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") +- set_target_properties(Boost::dynamic_linking PROPERTIES ++ set_target_properties(boost_dynamic_linking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") + endif() + +@@ -2018,52 +2018,52 @@ if(Boost_FOUND) + endif() + + foreach(COMPONENT ${Boost_FIND_COMPONENTS}) +- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) ++ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + if(Boost_${UPPERCOMPONENT}_FOUND) + if(Boost_USE_STATIC_LIBS) +- add_library(Boost::${COMPONENT} STATIC IMPORTED) ++ add_library(boost_${COMPONENT} STATIC IMPORTED) + else() + # Even if Boost_USE_STATIC_LIBS is OFF, we might have static + # libraries as a result. +- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) ++ add_library(boost_${COMPONENT} UNKNOWN IMPORTED) + endif() + if(Boost_INCLUDE_DIRS) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" + IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") +- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY ++ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") +- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY ++ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" + IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") + endif() + if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) + unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) + foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) +- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) ++ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep}) + endforeach() + if(COMPONENT STREQUAL "thread") + list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) + endif() +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") + endif() + if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}") + endif() + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1b1f19d464..21c222280f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -353,12 +353,12 @@ set(ceph_common_objs + set(ceph_common_deps + json_spirit erasure_code arch crc32 + ${LIB_RESOLV} +- Boost::thread +- Boost::system +- Boost::random +- Boost::program_options +- Boost::date_time +- Boost::iostreams ++ boost_thread ++ boost_system ++ boost_random ++ boost_program_options ++ boost_date_time ++ boost_iostreams + ${BLKID_LIBRARIES} + ${Backtrace_LIBRARIES} + ${BLKIN_LIBRARIES} +@@ -518,7 +518,7 @@ if (WITH_CEPHFS) + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common +- Boost::thread) ++ boost_thread) + install(TARGETS ceph-mds DESTINATION bin) + endif() + +diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt +index d7b58521d4..e1533af33f 100644 +--- a/src/crimson/CMakeLists.txt ++++ b/src/crimson/CMakeLists.txt +@@ -106,8 +106,8 @@ target_link_libraries(crimson-common + PRIVATE + crc32 + crimson::cflags +- Boost::iostreams +- Boost::random ++ boost_iostreams ++ boost_random + ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) + + set(crimson_auth_srcs +diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt +index 252fb3e5e3..213482da16 100644 +--- a/src/mgr/CMakeLists.txt ++++ b/src/mgr/CMakeLists.txt +@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") + target_link_libraries(ceph-mgr + osdc client heap_profiler + global-static ceph-common +- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} ++ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} + ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) + set_target_properties(ceph-mgr PROPERTIES + POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) +diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt +index e9d3804c5f..5c6eb58de1 100644 +--- a/src/rbd_replay/CMakeLists.txt ++++ b/src/rbd_replay/CMakeLists.txt +@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) + global + babeltrace + babeltrace-ctf +- Boost::date_time ++ boost_date_time + ) + install(TARGETS rbd-replay-prep DESTINATION bin) + endif(HAVE_BABELTRACE) +diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt +index ccc4f74cfe..854aa6e5e9 100644 +--- a/src/rgw/CMakeLists.txt ++++ b/src/rgw/CMakeLists.txt +@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL) + endif() + + if(WITH_BOOST_CONTEXT) +- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) ++ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) + endif() + + set(rgw_libs rgw_a) +@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) + target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) + endif() + if(WITH_BOOST_CONTEXT) +- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) ++ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) + endif() + + if(WITH_TESTS) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 20a64fd41b..a8bb323614 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -158,7 +158,7 @@ add_executable(ceph_omapbench + ) + target_link_libraries(ceph_omapbench + librados +- Boost::program_options ++ boost_program_options + global + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} +diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt +index 71fb77cda9..aff8fb6565 100644 +--- a/src/test/common/CMakeLists.txt ++++ b/src/test/common/CMakeLists.txt +@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) + + add_executable(unittest_async_completion test_async_completion.cc) + add_ceph_unittest(unittest_async_completion) +-target_link_libraries(unittest_async_completion Boost::system) ++target_link_libraries(unittest_async_completion boost_system) + + add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) + add_ceph_unittest(unittest_async_shared_mutex) +-target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) ++target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) +diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt +index 721f6c3675..1cd9635c77 100644 +--- a/src/test/erasure-code/CMakeLists.txt ++++ b/src/test/erasure-code/CMakeLists.txt +@@ -2,15 +2,15 @@ + add_executable(ceph_erasure_code_benchmark + ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc + ceph_erasure_code_benchmark.cc) +-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + install(TARGETS ceph_erasure_code_benchmark + DESTINATION bin) + + add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) +-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + + add_executable(ceph_erasure_code ceph_erasure_code.cc) +-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + install(TARGETS ceph_erasure_code + DESTINATION bin) + +diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt +index 4fc53d2406..e6304394f8 100644 +--- a/src/test/librados/CMakeLists.txt ++++ b/src/test/librados/CMakeLists.txt +@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) + target_link_libraries(ceph_test_rados_api_asio global + librados ${UNITTEST_LIBS}) + if(WITH_BOOST_CONTEXT) +- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) ++ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) + endif() + + add_executable(ceph_test_rados_api_list +@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp + tier_cxx.cc + $) + target_link_libraries(ceph_test_rados_api_tier_pp +- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) ++ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) + + add_executable(ceph_test_rados_api_snapshots + snapshots.cc) +diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt +index 2bf6723c40..e99b8afa11 100644 +--- a/src/test/librbd/CMakeLists.txt ++++ b/src/test/librbd/CMakeLists.txt +@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE + radostest + radostest-cxx + librados +- Boost::thread ++ boost_thread + GMock::GMock + GTest::GTest) + +diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt +index 9b2c6b6321..80e4cb7829 100644 +--- a/src/test/rgw/CMakeLists.txt ++++ b/src/test/rgw/CMakeLists.txt +@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) + target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock) + if(WITH_BOOST_CONTEXT) + target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) +- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) ++ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) + endif() + + if(WITH_RADOSGW_AMQP_ENDPOINT) +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index d31f3d2408..6945018b11 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -35,20 +35,20 @@ install(PROGRAMS + endif(WITH_TESTS) + + add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) +-target_link_libraries(ceph-osdomap-tool os global Boost::program_options) ++target_link_libraries(ceph-osdomap-tool os global boost_program_options) + install(TARGETS ceph-osdomap-tool DESTINATION bin) + + add_executable(ceph-monstore-tool + ceph_monstore_tool.cc + ../mgr/mgr_commands.cc) +-target_link_libraries(ceph-monstore-tool os global Boost::program_options) ++target_link_libraries(ceph-monstore-tool os global boost_program_options) + install(TARGETS ceph-monstore-tool DESTINATION bin) + + add_executable(ceph-objectstore-tool + ceph_objectstore_tool.cc + rebuild_mondb.cc + RadosDump.cc) +-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) + if(WITH_FUSE) + target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) + endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch new file mode 100644 index 000000000000..ce2ee92b3d8e --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch @@ -0,0 +1,120 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f97f96b5bf..f5e5d06d35 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -657,13 +657,13 @@ if(WITH_SYSTEM_BOOST) + if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE) + set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}") + endif() +- find_package(Boost 1.67 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) ++ find_package(Boost 1.70 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + else() + set(BOOST_J 1 CACHE STRING + "max jobs for Boost build") # override w/-DBOOST_J= + set(Boost_USE_STATIC_LIBS ON) + include(BuildBoost) +- build_boost(1.67 ++ build_boost(1.70 + COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS}) + endif() + include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS}) +diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake +index f46cc0d485..4254508570 100644 +--- a/cmake/modules/BuildBoost.cmake ++++ b/cmake/modules/BuildBoost.cmake +@@ -137,14 +137,14 @@ function(do_build_boost version) + check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version}) + set(source_dir + SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost") +- elseif(version VERSION_GREATER 1.67) ++ elseif(version VERSION_GREATER 1.70) + message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}") + else() + message(STATUS "boost will be downloaded...") + # NOTE: If you change this version number make sure the package is available + # at the three URLs below (may involve uploading to download.ceph.com) +- set(boost_version 1.67.0) +- set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba) ++ set(boost_version 1.70.0) ++ set(boost_sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778) + string(REPLACE "." "_" boost_version_underscore ${boost_version} ) + set(boost_url + https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2) +diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc +index e4be074ec7..4af3695dc1 100644 +--- a/src/rgw/rgw_asio_frontend.cc ++++ b/src/rgw/rgw_asio_frontend.cc +@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO { + using SharedMutex = ceph::async::SharedMutex; + + template +-void handle_connection(RGWProcessEnv& env, Stream& stream, ++void handle_connection(boost::asio::io_context& context, ++ RGWProcessEnv& env, Stream& stream, + boost::beast::flat_buffer& buffer, bool is_ssl, + SharedMutex& pause_mutex, + rgw::dmclock::Scheduler *scheduler, +@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream, + rgw::io::add_conlen_controlling( + &real_client)))); + RGWRestfulIO client(cct, &real_client_io); +- auto y = optional_yield{socket.get_io_context(), yield}; ++ auto y = optional_yield{context, yield}; + process_request(env.store, env.rest, &req, env.uri_prefix, + *env.auth_registry, &client, env.olog, y, scheduler); + } +@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) + return; + } + buffer.consume(bytes); +- handle_connection(env, stream, buffer, true, pause_mutex, ++ handle_connection(context, env, stream, buffer, true, pause_mutex, + scheduler.get(), ec, yield); + if (!ec) { + // ssl shutdown (ignoring errors) +@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) + auto c = connections.add(conn); + boost::beast::flat_buffer buffer; + boost::system::error_code ec; +- handle_connection(env, s, buffer, false, pause_mutex, ++ handle_connection(context, env, s, buffer, false, pause_mutex, + scheduler.get(), ec, yield); + s.shutdown(tcp::socket::shutdown_both, ec); + }); +diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h +index 70487a5253..1d454acd2e 100644 +--- a/src/rgw/rgw_dmclock_async_scheduler.h ++++ b/src/rgw/rgw_dmclock_async_scheduler.h +@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { + using Completion = async::Completion>; + + using Clock = ceph::coarse_real_clock; ++#if BOOST_VERSION < 107000 + using Timer = boost::asio::basic_waitable_timer; ++#else ++ using Timer = boost::asio::basic_waitable_timer, executor_type>; ++#endif + Timer timer; //< timer for the next scheduled request + + CephContext *const cct; +diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h +index d99a6ff68d..213fc238d2 100644 +--- a/src/rgw/rgw_reshard.h ++++ b/src/rgw/rgw_reshard.h +@@ -183,7 +183,14 @@ class RGWReshardWait { + ceph::condition_variable cond; + + struct Waiter : boost::intrusive::list_base_hook<> { +- boost::asio::basic_waitable_timer timer; ++#if BOOST_VERSION < 107000 ++ using Timer = boost::asio::basic_waitable_timer; ++#else ++ using Executor = boost::asio::io_context::executor_type; ++ using Timer = boost::asio::basic_waitable_timer, Executor>; ++#endif ++ Timer timer; + explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} + }; + boost::intrusive::list waiters; diff --git a/sys-cluster/ceph/files/ceph.initd-r12 b/sys-cluster/ceph/files/ceph.initd-r12 new file mode 100644 index 000000000000..4a90e3c3f984 --- /dev/null +++ b/sys-cluster/ceph/files/ceph.initd-r12 @@ -0,0 +1,115 @@ +#!/sbin/openrc-run + +# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc +_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}" +if [ -r "${_CONFD_FILE}" ]; then + . "${_CONFD_FILE}" || exit 1 +fi + +: "${ceph_conf:=/etc/ceph/ceph.conf}" +daemon_type="${RC_SVCNAME#ceph-}" +daemon_type="${daemon_type%%.*}" +daemon_id="${RC_SVCNAME#ceph-*.}" +daemon_id="${daemon_id:-0}" +: "${rundir:=/run/ceph}" +: "${user:=ceph}" +: "${group:=ceph}" +: "${rc_ulimit:=-n 1048576 -u 1048576}" + +pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid" +daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid" + +command="/usr/bin/${RC_SVCNAME%%.*}" +command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}" +extra_commands="${extra_commands} reload" +command_args_foreground="--foreground" + +retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}" +start_stop_daemon_args="--user ${user} --group ${group}" +supervise_daemon_args="--user ${user} --group ${group}" + +: "${supervisor:=supervise-daemon}" +: "${stdout:=/var/log/ceph/ceph}" +: "${stderr:=/var/log/ceph/ceph}" +: "${respawn_delay:=10}" +: "${respawn_max:=5}" +: "${respawn_period:=1800}" + +: "${osd_respawn_delay:=15}" +: "{osd_respawn_max:=10}" + +: "{radosgw_respawn_max:=5}" +: "${radosgw_respawn_period:=30}" + +depend() { + use dns logger + after net ntpd ntp-client chronyd + before netmount +} + +is_type_valid() { + case ${daemon_type} in + mon|mds|osd|mgr|radosgw) return 0;; + *) return 1;; + esac +} + +start_pre() { + local log_dir + export CEPH_CONF="${ceph_conf}" + + checkpath -d -q -o "${user}:${group}" "${rundir}" + + if ! is_type_valid ;then + eerror "Please give valid Ceph Server Type: mds, mon, osd" + return 1 + + elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then + eerror "${daemon_type}.${daemon_id} is still running, refusing to start" + return 1 + fi + + if [ -n "${bluestore_osd_fsid}" ]; then + einfo "Mounting Bluestore" + ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd + fi + + if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then + command_args="${command_args} --name client.${daemon_id}" + fi + + local arg_name arg_val repl_arg_name + for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do + eval arg_val="\${${daemon_type}_${arg_name}}" + + if [ -z "${arg_val}" ]; then + eval arg_val="\${${arg_name}}" + else + eval "${arg_name}=\"${arg_val}\"" + fi + + if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then + local log_file log_postfix + log_postfix=".${daemon_id}-${arg_name}.log" + log_file="${arg_val}" + + if [ "${log_file}" != /dev/null ]; then + log_file="${log_file}${log_postfix}" + + log_dir="$(dirname "${log_file}")" + checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}" + fi + + repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)" + supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}" + fi + done +} + +reload() { + ebegin "Reloading Ceph ${daemon_type}.${daemon_id}" + start-stop-daemon --signal 1 "${start_stop_daemon_args}" + eend ${?} +} + +# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest index b677785e5986..d79802b6930d 100644 --- a/sys-cluster/minikube/Manifest +++ b/sys-cluster/minikube/Manifest @@ -1,7 +1,9 @@ DIST minikube-0.33.1.tar.gz 9434081 BLAKE2B a29c3293f67e33fa0f5ece632db1a852a3bbd6f2c522699e59148a41277bf819c20d5d27034c71f89df2a5d7895c2dbf3166c11661e98be38267fbd5b2c25ab5 SHA512 c4a266c2d68264155ebc6dcbd3788ed77678c86310be469e595cd6f1d89677082cd8445e9dd456ec7d7433922fd0e7d4315614c2a62640ce9efc7adceb0e7cb8 DIST minikube-0.34.1.tar.gz 11048222 BLAKE2B 7451d310079f58c5a81383b3801faa153aeca9be6a93dd553d4220e203ce5ad06c2c5b1d0a7601bd76c9f05881c99ceabd959d1b290daa9c0ffce8b2f59c4e69 SHA512 004e403be9300b93a734eabe0fadf01fbfb7f13e04564df08924a6681109b1c155979728561aadce94265920ff3706785390d7ee9000a5072789127185d2a1d4 DIST minikube-1.0.0.tar.gz 11078450 BLAKE2B 4773ab9afd769e479674f4ce2ddf50220c1fc8b48a93b15541940db1805118e601d538bc93eb64f6978a6cdf7f9ea7e4300b947a3f819247f04dacd4c81f2a93 SHA512 9cf064192adad21270ea0c86dae2085482f0763d538210e4b35478277edf6b20ac9d212119f79eaa7ad8679dbeb7c1e2d0a4a0efeb3d6033f858e5dd7c296df5 +DIST minikube-1.0.1.tar.gz 11206771 BLAKE2B 3aae096cd0998405ae30e1db699fd51330e82c13ebbf05283e5ead25918bfdd52c352fb8385caf7ef74b45fb94f63ddf2fa64c96cba79be59703cf0579e79e39 SHA512 41855aec3b159ddc8f6e89b9a8a63179edf21d3078040ccda56994aab8ce7b57f6a989d63b8b75c92698f2bbec8c128980b7f2268c793157f67f245625e07780 EBUILD minikube-0.33.1.ebuild 1618 BLAKE2B 5620e6b79ef6c614f2a95ec2ef865bd5ef9231c96dc65826a368beed1c394915127049eb469ec56173507f4bbeeaa592660d55f07e673953980feeb14708b11b SHA512 bc5fbdc8dea3180ca54d0d387faad6dfec924d7800651c13d78dcd292a95d4aef920531cf54a1ff59739ecedce82f45f9a1a87cacfe13165c7fd11972c162da3 EBUILD minikube-0.34.1.ebuild 1618 BLAKE2B 5620e6b79ef6c614f2a95ec2ef865bd5ef9231c96dc65826a368beed1c394915127049eb469ec56173507f4bbeeaa592660d55f07e673953980feeb14708b11b SHA512 bc5fbdc8dea3180ca54d0d387faad6dfec924d7800651c13d78dcd292a95d4aef920531cf54a1ff59739ecedce82f45f9a1a87cacfe13165c7fd11972c162da3 EBUILD minikube-1.0.0.ebuild 1618 BLAKE2B 9065eb65010b5804f0a2e976fd42239bb5dfd0f80c2087b71938d12afefff71cc2ee3fdc01e339f55e6d848c9a57d41550197b00c78651c6ea2a2fce1a48621f SHA512 cb1fc1030f67221a28896374cc43ce733b95314ab72610e223124c8520968c4cf725bc879be7ab09e5e71b05aac218f53654716f691af28b56c165dacf8df1c0 +EBUILD minikube-1.0.1.ebuild 1618 BLAKE2B 9065eb65010b5804f0a2e976fd42239bb5dfd0f80c2087b71938d12afefff71cc2ee3fdc01e339f55e6d848c9a57d41550197b00c78651c6ea2a2fce1a48621f SHA512 cb1fc1030f67221a28896374cc43ce733b95314ab72610e223124c8520968c4cf725bc879be7ab09e5e71b05aac218f53654716f691af28b56c165dacf8df1c0 MISC metadata.xml 394 BLAKE2B ca9fbc7af4a84d99a6d22c00cb28c09747675dc66ef21a43b3011bdccd129df698cacad0375f4ef360de2874d1cf6282834c6b901cd86c6c4dd213f67f006f45 SHA512 0690f97963d432904a0f002273d73ac4d998cde1d2f2fafddc2eeb5d841970b634c58ffa534fd5982a8166a40159164422771baa000566561b4f428ebe818bd8 diff --git a/sys-cluster/minikube/minikube-1.0.1.ebuild b/sys-cluster/minikube/minikube-1.0.1.ebuild new file mode 100644 index 000000000000..b49a012ebec2 --- /dev/null +++ b/sys-cluster/minikube/minikube-1.0.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) + +inherit python-any-r1 golang-build golang-vcs-snapshot + +EGO_PN="k8s.io/minikube" +ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64" + +DESCRIPTION="Single Node Kubernetes Cluster" +HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io" +SRC_URI="${ARCHIVE_URI}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="hardened libvirt" + +DEPEND="dev-go/go-bindata + ${PYTHON_DEPS} + libvirt? ( app-emulation/libvirt[qemu] )" +RDEPEND=">=sys-cluster/kubectl-1.14.0" + +RESTRICT="test" + +src_prepare() { + default + sed -i -e 's/ -s -w/ -w/' -e 's#.*GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' -e 's#$(GOPATH)/bin/go-bindata#/usr/bin/go-bindata#g' src/${EGO_PN}/Makefile || die + sed -i -e "s/get_commit(), get_tree_state(), get_version()/get_commit(), 'gitTreeState=clean', get_version()/" src/${EGO_PN}/hack/get_k8s_version.py || die +} + +src_compile() { + export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" + LDFLAGS="" GOFLAGS="-v" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN} $(usex libvirt "out/docker-machine-driver-kvm2" "") out/minikube-linux-amd64 +} + +src_install() { + pushd src/${EGO_PN} || die + newbin out/minikube-linux-amd64 minikube + use libvirt && dobin out/docker-machine-driver-kvm2 + dodoc -r docs CHANGELOG.md README.md + popd || die +} + +pkg_postinst() { + elog "You may want to install the following optional dependency:" + elog " app-emulation/virtualbox or app-emulation/virtualbox-bin" +} diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest index 4acc3904a9c4..ab24b9264d38 100644 --- a/sys-cluster/neutron/Manifest +++ b/sys-cluster/neutron/Manifest @@ -6,21 +6,17 @@ AUX neutron-openvswitch-agent.confd 142 BLAKE2B 32c521f734854608173a41625bc037ee AUX neutron-server.confd 70 BLAKE2B 88309872ce864e4dfa9072c1472bd6f1e8116f71106ff7e055f6386563ef1077b41f538a72e183ae00e700262d2bcf82434077f0b7e5753389077be3f276b178 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0 AUX neutron.initd 530 BLAKE2B 48900bdde5770a0b0db90490d6ae8541dafc96e3fa2aa1c8d75eab5f547be35fa5adb792db8960f71a98bbeb71d56b29e5f5166a47735ebe85804019aa4e1f11 SHA512 c9c7386ae8d97205859f02edb0c7d601059af78def3f232f87e676131c5e6fcdb6e880ccee5b1b15397b1dffe83446421145c90ed448f5e9d55994efd1629f92 AUX neutron.sudoersd 117 BLAKE2B 30e903fd3d681b779ad7e4758b56bfd78df6165ae030f0a5017dccd1873570db450efd3e7b232f77d6d2e3fcb81cb64d9d44901802310ebe2d88f882d334acda SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 -DIST neutron-13.0.2.tar.gz 10596419 BLAKE2B 5d18c5ada86c2676ecab1c0121834c04e5c12d2c81a42ddb9554d0bdc2b7d472b5941b7290dc701c22b21b69442d04a44768c9423ff5d317b51d8cd37aa076bf SHA512 4fb343039a6f6a6930d9770b02d58be732c57910e36739c8364bf8027a7ed55dafc40201ef8c349278310afc2ab6ee80fea562af94896e38891c35eaeb1faced DIST neutron-13.0.3.tar.gz 10599028 BLAKE2B 1eb3bcbf9986531d24d06de6dcf71707fb6599bf20d85814af42ce9feb24059a94592c2741fbcd71fad78ff829f93f811dbbe63aa2cdb3931b7499b5de2bcc2e SHA512 1c229256733bb1ea03ae3296607a7ee6c9004c03a6c57fdb9c13f006bbb337b39a57c4690e3a59a7d9e313d0f450c4b81f2100a64a14e5e5c81a188a8116e1e9 DIST neutron-14.0.1.tar.gz 10711126 BLAKE2B 43bf5ffeb46249207b8ab55cc01812e12ac719b680a867cbd374fdad50df2443eb44df16e97fff9845467284ac3dbaa3e0e1886703a868c7f26087d8e4e27a1a SHA512 9181d1a63550e205114f33e5626ff66f306d424505fb42cf21bcc8673e80b8e36b8a0bf33d3f2ec90343868a7e2e1f6b221831df64d1bec8e84a1d956da69392 -DIST neutron-configs-13.0.2.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c DIST neutron-configs-13.0.3.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c DIST neutron-configs-14.0.1.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b DIST neutron-configs-2018.2.9999.tar.gz 26109 BLAKE2B 5de3b90dcb6f8c86ce659b3ab439a79dd920aaf57b66a1e1b29f1b0d0fd433b222335a634dca01ce2b0e07acc3011ff6bf25983071dc0ff00e78ac847ee3fdd6 SHA512 498f41ffec6c14597e9785da9a36c2d906138215b34017aa93f56d051078682279bcce05288d2534ff7ab8208b8251c9f721256488f6850173210e41bc6dd51c DIST neutron-configs-2019.1.9999.tar.gz 22973 BLAKE2B f454ccc2569ec1e586d88b410d3acbe557f25894c5f4d06558aa242f3d14971b791eca0d827f22400ef02db9899fdb2a501b1b745a531c0f6577318a28c58278 SHA512 dce4a1fd8880d9ffbde9014dffdbb67f69a798a834f9cc6ac6ccd34d520c21b468b16093b3c54fbb472ded501305775b0b31da3c62a860cf19c4486a30c1da2b -DIST neutron-ml2-plugins-13.0.2.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f DIST neutron-ml2-plugins-13.0.3.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f DIST neutron-ml2-plugins-14.0.1.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2 DIST neutron-ml2-plugins-2018.2.9999.tar.gz 7068 BLAKE2B fa27bd84c1d67bd36c7c7e47b6e8f98dd100e09c7a3bfa7aec615ed24e3dadf240f8ef44874c868ff92f79452afbf4a21fba46b1b9aec191bad53a62767b1861 SHA512 add4697c78c592dfe5ebadd3b0cf9b9c2a2c33bd05130a8e1422abf7456d8a0cc926a0d46f6b49ceee87017304d7c9c3486c975086e46f178e3bc142844f836f DIST neutron-ml2-plugins-2019.1.9999.tar.gz 8642 BLAKE2B 71d945504f3e2185bffddb94956f019fa38bdd4a8782e936de2b8753e2a934374b6f0ed11ea0cdc9d454a80544b2e225e70ff987acbb971d756ae940cf4d7d16 SHA512 399e3f0cd8daaaf18e36d47aa105cf71d70e3ed5f707093e2292e480e3a0868818ee0ee68ca7a8eeb8e28cec51721e2508ed75815f04a415eb42dfe56708fce2 -EBUILD neutron-13.0.2-r1.ebuild 8373 BLAKE2B 1cec37720970b276e892e7e826ecab17e5d063d0cb5703df568aeb4ad8d97881d52dbc088554eddcda03f83309d4615e83949813bc9aca866cd1768bda090167 SHA512 1788a996f6525d0a7b9d1e1a9a2c4e8b14938afc8ebf32e598828c5de6af0bd7d20eb28429328c86cd6cee13289eea84f6b5047a3c7d1b6419c3c47401cdf794 -EBUILD neutron-13.0.3.ebuild 8375 BLAKE2B a5d845ecaf73ef4a2d3c861a21be54ae454fbf3c5cae4fc66ebbcf694b083650369de0f1247120b363d9cabb14b2d3056fe65ba43dee9489b7a05f04862b53c4 SHA512 ff750f4164295bfaf82693a4f11416669b8da4c28e339497327be5b81485dc634025297dc5685fa0fc494f2c44c94d7a2b8b3117ae38ce173fe9df1383b9eb61 +EBUILD neutron-13.0.3.ebuild 8373 BLAKE2B a8fe7ffaed5896881e6f48bfe605927f6785dc4722a6a110e8bd9c441f2dc8e33aab524b15b1aad2e40d9025a7ad273868ca6f0b7eeee462a33490d79eb3e50f SHA512 24abe3297c803492b6aa2fa7809dc2e6583a509eb16f52fbb6b2c86f46cc3297998f6d3c9fd136e644159479f679639a821dfb20f09d8bf133e5031c36ea54ed EBUILD neutron-14.0.1.ebuild 8416 BLAKE2B ecda613ac4b1bb9a39e263bddf90b5a8f93b33bb141c3571c07a37c912fe33a53a9e24f53197b944964a086be7daf511c554d22676294c51ceb4af69b856287e SHA512 5a18c0566b6df54700b861fd7330a558c22069407c05bfa8a6947408729878c6682d0798abf0b4775c9c3b3c80db17ad4a64a264ec0a8e7347a728434780f0f8 EBUILD neutron-2018.2.9999.ebuild 8375 BLAKE2B d88b9e1112d96c762185f2e376ae00e58457fdf22a1b869ca9610ba2d4bc4439aa58f571d7518653becda1e91eaa616cc6698c33802ea96da6e0955603d04979 SHA512 51bcb6827e7bcbb943de8978dd6ac8403b9f6ff9cadafee53ab641c1837df9c8dd051123e288366913a41de1c567aad7a6b8857df83cc54bd5036695d8083fde EBUILD neutron-2019.1.9999.ebuild 8416 BLAKE2B ecda613ac4b1bb9a39e263bddf90b5a8f93b33bb141c3571c07a37c912fe33a53a9e24f53197b944964a086be7daf511c554d22676294c51ceb4af69b856287e SHA512 5a18c0566b6df54700b861fd7330a558c22069407c05bfa8a6947408729878c6682d0798abf0b4775c9c3b3c80db17ad4a64a264ec0a8e7347a728434780f0f8 diff --git a/sys-cluster/neutron/neutron-13.0.2-r1.ebuild b/sys-cluster/neutron/neutron-13.0.2-r1.ebuild deleted file mode 100644 index 22f5e34848b2..000000000000 --- a/sys-cluster/neutron/neutron-13.0.2-r1.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{5,6} ) -# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439 - -inherit distutils-r1 linux-info user - -DESCRIPTION="A virtual network service for Openstack" -HOMEPAGE="https://launchpad.net/neutron" -if [[ ${PV} == *9999 ]];then - inherit git-r3 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz" - EGIT_REPO_URI="https://github.com/openstack/neutron.git" - EGIT_BRANCH="stable/rocky" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz - https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres" -REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) ) - compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server - || ( openvswitch linuxbridge ) )" - -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/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}] - >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] - >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] - >=dev-python/pecan-1.1.1[${PYTHON_USEDEP}] - !~dev-python/pecan-1.2.0[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] - >=dev-python/jinja-2.10[${PYTHON_USEDEP}] - >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}] - >=dev-python/neutron-lib-1.18.0[${PYTHON_USEDEP}] - >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}] - >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}] - >=dev-python/ryu-4.24[${PYTHON_USEDEP}] - compute-only? ( - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.2.0[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.0[${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] - ) - >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}] - >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}] - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.23.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-1.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-utils-3.33.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}] - >=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}] - >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/pyroute2-0.4.21[${PYTHON_USEDEP}] - >=dev-python/weakrefmethod-1.0.2[$(python_gen_usedep 'python2_7')] - >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] - >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}] - >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}] - dev-python/pyudev[${PYTHON_USEDEP}] - sys-apps/iproute2 - net-misc/iputils[arping] - net-misc/bridge-utils - net-firewall/ipset - net-firewall/iptables - net-firewall/ebtables - net-firewall/conntrack-tools - haproxy? ( net-proxy/haproxy ) - openvswitch? ( net-misc/openvswitch ) - ipv6? ( - net-misc/radvd - >=net-misc/dibbler-1.0.1 - ) - dhcp? ( net-dns/dnsmasq[dhcp-tools] )" - -#PATCHES=( -#) - -pkg_pretend() { - linux-info_pkg_setup - CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \ - IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \ - NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES" - 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 -} - -pkg_setup() { - enewgroup neutron - enewuser neutron -1 -1 /var/lib/neutron neutron -} - -pkg_config() { - fperms 0700 /var/log/neutron - fowners neutron:neutron /var/log neutron -} - -src_prepare() { - sed -i '/^hacking/d' test-requirements.txt || die - # it's /bin/ip not /sbin/ip - sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die - distutils-r1_python_prepare_all -} - -python_install_all() { - distutils-r1_python_install_all - if use server; then - newinitd "${FILESDIR}/neutron.initd" "neutron-server" - newconfd "${FILESDIR}/neutron-server.confd" "neutron-server" - dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini - fi - if use dhcp; then - newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent" - newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent" - fi - if use l3; then - newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent" - newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent" - fi - if use metadata; then - newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent" - newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent" - fi - if use openvswitch; then - newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent" - newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup" - newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup" - fi - if use linuxbridge; then - newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent" - newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent" - fi - diropts -m 755 -o neutron -g neutron - dodir /var/log/neutron /var/lib/neutron - keepdir /etc/neutron - insinto /etc/neutron - insopts -m 0640 -o neutron -g neutron - - doins etc/* - # stupid renames - insinto /etc/neutron - doins -r "etc/neutron/plugins" - insopts -m 0640 -o root -g root - doins "etc/rootwrap.conf" - doins -r "etc/neutron/rootwrap.d" - - #add sudoers definitions for user neutron - insinto /etc/sudoers.d/ - insopts -m 0440 -o root -g root - newins "${FILESDIR}/neutron.sudoersd" neutron - - # add generated configs - cd "${D}/etc/neutron" || die - unpack "neutron-configs-${PV}.tar.gz" - cd "${D}/etc/neutron/plugins/ml2" || die - unpack "neutron-ml2-plugins-${PV}.tar.gz" - - # correcting perms - fowners neutron:neutron -R "/etc/neutron" - fperms o-rwx -R "/etc/neutron/" - - #remove superfluous stuff - rm -R "${D}/usr/etc/" -} - -python_install() { - distutils-r1_python_install - # copy migration conf file (not coppied on install via setup.py script) - insopts -m 0644 - insinto "/$(python_get_sitedir)/neutron/db/migration/alembic_migrations/" - doins -r "neutron/db/migration/alembic_migrations/versions" -} - -pkg_postinst() { - elog - elog "neutron-server's conf.d file may need updating to include additional ini files" - elog "We currently assume the ml2 plugin will be used but do not make assumptions" - elog "on if you will use openvswitch or linuxbridge (or something else)" - elog - elog "Other conf.d files may need updating too, but should be good for the default use case" - elog -} diff --git a/sys-cluster/neutron/neutron-13.0.3.ebuild b/sys-cluster/neutron/neutron-13.0.3.ebuild index 7b0f728c6c0a..7379b294ab07 100644 --- a/sys-cluster/neutron/neutron-13.0.3.ebuild +++ b/sys-cluster/neutron/neutron-13.0.3.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/configs.tar.gz -> neutron-configs-${PV}.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/rocky/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz 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/sanlock/Manifest b/sys-cluster/sanlock/Manifest index a0d0da860762..e2eb81e4ac63 100644 --- a/sys-cluster/sanlock/Manifest +++ b/sys-cluster/sanlock/Manifest @@ -3,5 +3,5 @@ AUX wdmd.initd 261 BLAKE2B 65b393f2f084896d3c17aa0345f9930badeec7a3ee4cc7e47bd0a DIST sanlock-3.4.0.tar.xz 157016 BLAKE2B 9d588214d260b88cfa3978e831bcd8086ae80aafc1a04b616274da141140a22c2765083632f29402cdae67cdbbdfcefdaff1539e5d45485c6f271e3ee7f6471a SHA512 8a10faaa5b9ce9f0506ca16620ad482804c9ca860b84a60a6f0b525a256059229a202163d366a57fb59169c0f4f822ced570b42562e412747f6f716509341f19 DIST sanlock-3.6.0.tar.gz 221666 BLAKE2B 7fe95bd6813c13b76993b343a5ad605c7ba642583987ffa5fef583f34c053ee62b0f9e5979f5b5cb9e4fcde53268ae3debc5ec36b04f6651cc4cb902dff52df9 SHA512 59eb2a6f12e95d54886fdf6d56fd9a6814dd20fe11f39664f2bb82a56326fee48c9465ae30e6d04f970c8f1b0d9c2e22b90d21ab1f657c6d6b61ff9f02332443 EBUILD sanlock-3.4.0-r1.ebuild 2101 BLAKE2B d3ebdf34348baef440e9593dcf1aba3aede634d2651290dd5000dc5b36a9a5da21894dc8fa3c0d39ae24612e4ede6545d6a4cfc1917eb4c9050726a223cdaa6d SHA512 51452c62da78326f90eb5eefdd3349ad744477f7963e797b645be0e9979b8a8dd676980b7bafc0350002c0353881a46ac842d40784fe165c60187ed73add7fde -EBUILD sanlock-3.6.0.ebuild 2076 BLAKE2B 27823e97ecb977dd25ca11308d380c0f9dbb46fbaa0b51a64cc6b3f302ff2616a9e9ed2cadaf4ca045b84a84baf740e81d658ec6162098e8b4f7bb5ffd643441 SHA512 afe77c486aa54ac2ea6c40f1e1f12f748e0f5b20fc68f14e847669bc42206587f08a6e3e60290736e90b28e6be627fa2b3cfaf02ef2fbf95c28fb89b83e271e1 +EBUILD sanlock-3.6.0.ebuild 2074 BLAKE2B d43f459cb51c10389465070e4c0fe2827f5d8716542eb5f90bc80ed96ff3c86e04d394689539c3fe6c90f6048ec69b72d21ec33873f4f12528b9335809e21d70 SHA512 dbef36ba1273e2c4c60f50871b0ae8d6fc30e3736be7172f334e1215de5746e540108a4c5550b896bcb2ff76369d3c313968660c333ad92de0b3dccaea1904da MISC metadata.xml 368 BLAKE2B a15a411ea20eb7649f299e38704b394344194d7526f9bc92b27c0a26760d7dba05b1e5d483ff5f9ce73a6d1cd527a18ac905344a614c8dc31a0c1180b2be07e7 SHA512 2cc3ec3c99cfff2e0c576ab6c7b0a39460af875ba826ce0cf3c5a1a4f0f3def6170753c8d42af2fc7a139ad7f2135e309c3165bde83b4e7574292768c96e8086 diff --git a/sys-cluster/sanlock/sanlock-3.6.0.ebuild b/sys-cluster/sanlock/sanlock-3.6.0.ebuild index 4a32bb16ec06..cd4eb3c76341 100644 --- a/sys-cluster/sanlock/sanlock-3.6.0.ebuild +++ b/sys-cluster/sanlock/sanlock-3.6.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz" LICENSE="LGPL-2+ GPL-2 GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86" IUSE="python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -- cgit v1.2.3