gentoo resync : 25.11.2020

5 files changed, 108 insertions, 5 deletions

diff --git a/sys-cluster/corosync/Manifest b/sys-cluster/corosync/Manifest
index 019035170fe2..b5b6d802fe8e 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -2,7 +2,9 @@ AUX corosync-2.3.4-docs.patch 842 BLAKE2B 363e26872497c2724ba54dee2e6458e5b101bb
 AUX corosync.initd 668 BLAKE2B 52a838b1cc64103a69a3f67573b0b752ec9eef434c9fd2183478d32a6dfda825e96e41333e16f0aa7431937323ad3d5329c04037baec83717624a884d2480bcb SHA512 a514ac91e4b691c7e7e65a45dbb49c1da408690012d750ff3e4cb1c45e629df070019382f9b7c1dbcf8342b1edc15b296433d1f589334effde843434005f0969
 AUX corosync.logrotate 93 BLAKE2B cc8f22c668dfde3fe4dac13fb295be81ff1ca13c8081557f87570952117109b68c7101045990dfd8aea5f56c8a8078d12383f8cb040b098591678c8294dd52bc SHA512 3c65eb01a33a6fa51befa8ce466cc8a35a06a19816b77610b83c18f9372dccdbd33354fc8568e63fe165f2c2aa598b6a5d15615939f12e3385b4c3e1b91a6ec3
 DIST corosync-2.3.5.tar.gz 428253 BLAKE2B be9fc2b27b60357acee6dee013bc95c08045c114acafc62eaa82a1821f07ff76b8821b9d06f31246b9978f8aef46e3a9e1a2d61ca74465bc74d4140c0ad0d0fa SHA512 212a95d8a68a2941f27c9ec22750a88598744d6fd4db6b46abe0b4cdfa988d3906f760bdf67c403d8c6d0a04da64f29ec744fb68ca51c7269ba58e306553cee9
-DIST corosync-2.4.2.tar.gz 547204 BLAKE2B 1b440e84b25263ea866bd66f9837a3bdbbc790d26a38d10a033d67bb0ba48dd58d6b515879dd0ece75ffe78c8a150c1e5ab8d0eb312e701abdc36eb5cb4dc520 SHA512 45a4d2570d5d096e6f42070f701fdb2aaed26812b6a75f73ea415cf409b33343f8bc090b4fcf851ab971ca4b17925f239c31a3d9eafe4841dfbeb56537b2c78c
-EBUILD corosync-2.3.5.ebuild 1734 BLAKE2B 6357e43ade6d4dd035eb9b8221b0c057a594f8eceb11ea0a5f7245416188e5eab47309f94d5c35a1c3a34a2f89c5d49f55d00626ad4d5b700cbeaa6536f6f90e SHA512 877e3f6103294a8b74cad41f9c044ef18e70e91956c49bf63d0ea80744274b2acc91ac095c43469d3b17c31deef3f3a235b3c237d4884471246f4b592bb71c50
-EBUILD corosync-2.4.2.ebuild 1702 BLAKE2B dbf853cd542094bb4edd03a50c76895d83ae886cefb67115790a408f6e565d4d46e8a9a377e239bf233905cf6ff7771cb372ab5173d90a5ee158fa696fba890e SHA512 a012365a627b1813af9b109460b37c8a3a6d3e34ee533253524dd48b54f370c43dea425ae475ac681d387bdf5271020c6d3645e196f9984b1bd5137b2d31c91a
-MISC metadata.xml 447 BLAKE2B 660930ff9e96851aa0272fafb5547be824e424f9d866e58a13699608eda86c9c45533218d6c1647028bb1c8e5bb6e738087b8ad8f7ddbe7ae94a2ea9eb47ec47 SHA512 9897d127e1d47ee58213ea00d4ebdb536e2316c13633331194ac118ec5a2e782e515a6f1ccb01cd7eafae34bfb032fc2c9ea61a549b9da34bc3e96a988457d03
+DIST corosync-2.4.5.tar.gz 587015 BLAKE2B f1ef6b0a0f34e23a4ab5a5e9a6f21ba1886fb6cebec7d9440f6e189acb095cd825049dfceb174b490be1b6d85195ae4b99230ea44a31e427db9020257e8fc428 SHA512 e8476c006df8fd0c5291a8b0099c4756f884d41c7e9c13573c34458f63cd057d49d6fa0c1d5344d5fc44341186817ddee66997d51937339e6d70dcada0c402ee
+DIST corosync-3.1.0.tar.gz 447073 BLAKE2B 1a0d5b744ac5cba1d67fed6d58a159d8dfc63615aa6fbe5051b20f6e41da589871b6d0b59937db0ac31b4186e4f051378e48308ffc3e0743a5372e494485b3c7 SHA512 05be0d417f3ebbba993b92074f261dea3d951e20d2054817b9017eb04a8a017c9c3f3d0119dafd689944accb690beaafc9f11c1e67f53d978918ea49e51a5e6f
+EBUILD corosync-2.3.5.ebuild 1735 BLAKE2B 765b8975199936351fbf79d3b185bdd4f8acfb85136476699a4ee5e7a63829e9bfaa66477541f1af1a4c9dcbc8e0579da958baf0ef9ba72f42fb534e32886ff0 SHA512 4811829e99eea8738d8ce9647919137d90910fbed382409ddf21f285e961a5e45ded341d1acee98c80e346e5a13fd6eca231877b393a7d2a47509d091af2c955
+EBUILD corosync-2.4.5.ebuild 1702 BLAKE2B dbf853cd542094bb4edd03a50c76895d83ae886cefb67115790a408f6e565d4d46e8a9a377e239bf233905cf6ff7771cb372ab5173d90a5ee158fa696fba890e SHA512 a012365a627b1813af9b109460b37c8a3a6d3e34ee533253524dd48b54f370c43dea425ae475ac681d387bdf5271020c6d3645e196f9984b1bd5137b2d31c91a
+EBUILD corosync-3.1.0.ebuild 2545 BLAKE2B 0b03da2f70e6c6151c3d7c399be6f0754cf9e626c139f601c8271f061b545b126dd35daabc9716820008261f735db0144207e3a187bbe5e7e48db7998c636be3 SHA512 175d460ca94d22fdc9fa8e45c4633fcb2e44cec6325de818bce61e73ac24021224dc673db9442ed1a252ad95bee436fb7dccaf010f83f34468ea1b311f99250f
+MISC metadata.xml 568 BLAKE2B b37326b0f2809f7e67a1537b9a0a9126b7f6801559007fab15a2b90fa8bd094a907414eb6b384ebce9cfd32ff6dfa8e00e73b637a5629c5e56dad6217872a58e SHA512 1f37d14000dac9555b731071cef48a008a775893f200488b2acc55e5c90f789223202da8fb3f7a016db05e84b2c75b311baa5dc2a95f8f73a2ea9194c1d6a2ff
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 3485dedb6bb1..e40a5ddb5edb 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://build.clusterlabs.org/corosync/releases/${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="doc infiniband static-libs systemd xml"
 
 # TODO: support those new configure flags
diff --git a/sys-cluster/corosync/corosync-2.4.2.ebuild b/sys-cluster/corosync/corosync-2.4.5.ebuild
index a5382c7f7f8e..a5382c7f7f8e 100644
--- a/sys-cluster/corosync/corosync-2.4.2.ebuild
+++ b/sys-cluster/corosync/corosync-2.4.5.ebuild
diff --git a/sys-cluster/corosync/corosync-3.1.0.ebuild b/sys-cluster/corosync/corosync-3.1.0.ebuild
new file mode 100644
index 000000000000..0c6e68cf61c7
--- /dev/null
+++ b/sys-cluster/corosync/corosync-3.1.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info autotools
+
+DESCRIPTION="OSI Certified implementation of a complete cluster engine"
+HOMEPAGE="http://www.corosync.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas dbus doc snmp systemd watchdog xml"
+
+RDEPEND="dev-libs/nss
+	>=sys-cluster/libqb-2.0.0:=
+	sys-cluster/kronosnet:=
+	augeas? ( app-admin/augeas )
+	dbus? ( sys-apps/dbus )
+	snmp? ( net-analyzer/net-snmp )
+	systemd? ( sys-apps/systemd:= )
+	watchdog? ( sys-kernel/linux-headers )
+	"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/groff )"
+
+DOCS=( README.recovery AUTHORS )
+
+pkg_setup() {
+	if use watchdog; then
+		# verify that CONFIG_WATCHDOG is enabled in the kernel or
+		# warn otherwise
+		linux-info_pkg_setup
+		elog "Checking for suitable kernel configuration options..."
+		if linux_config_exists; then
+			if ! linux_chkconfig_present WATCHDOG; then
+				ewarn "CONFIG_WATCHDOG: is not set when it should be."
+				elog "Please check to make sure these options are set correctly."
+			fi
+		else
+				ewarn "Could not check, if CONFIG_WATCHDOG is enabled in your kernel."
+				elog "Please check to make sure these options are set correctly."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i 's/$SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS/$OS_CFLAGS/' configure.ac || die 'sed failed'
+
+	if ! use doc; then
+		sed -i 's/BUILD_HTML_DOCS, test/BUILD_HTML_DOCS, false/' configure.ac || die 'sed failed'
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	# FIXME: install just shared libs --disable-static does not work
+	econf_opts=(
+		--disable-static \
+		--localstatedir=/var \
+		$(use_enable augeas) \
+		$(use_enable dbus) \
+		$(use_enable snmp) \
+		$(use_enable systemd) \
+		$(use_enable watchdog) \
+		$(use_enable xml xmlconf)
+	)
+	use doc && econf_opts+=( --enable-doc )
+	econf "${econf_opts[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	keepdir /var/lib/corosync /var/log/cluster
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		elog "Default token timeout was changed from 1 seconds to 3 seconds."
+		elog "If you need to keep the old timeout, add 'token: 1000' to the"
+		elog "totem {} section of your corosync.conf"
+	fi
+}
diff --git a/sys-cluster/corosync/metadata.xml b/sys-cluster/corosync/metadata.xml
index 9f947509ce3a..827c977ca3db 100644
--- a/sys-cluster/corosync/metadata.xml
+++ b/sys-cluster/corosync/metadata.xml
@@ -12,4 +12,8 @@
 	<upstream>
 		<remote-id type="github">corosync/corosync</remote-id>
 	</upstream>
+	<use>
+		<flag name="augeas">Enable augeas support</flag>
+		<flag name="watchdog">Enable watchdog support</flag>
+	</use>
 </pkgmetadata>