gentoo resync : 08.01.2021

4 files changed, 5 insertions, 74 deletions

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 6606cf5e0dbd..dbea52fcf14a 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -3,10 +3,8 @@ AUX pacemaker-1.1.24-qa-warnings.patch 492 BLAKE2B 9ff485f9d2af09d2ce736b4b8312a
 AUX pacemaker-2.0.4-qa-warnings.patch 819 BLAKE2B 5de3717c80c6aa0d81b66c2b16e0b15a272f2a67549ef22288f4feddd34ca498dd797744a94ebe5a7b05cf515a3f42f78e0281dfc805724a7aed957d966f58f8 SHA512 fad606290261b996dc5ed9c29388c245e1247d9816ef843360e36fac4360de0c95eda17ec3e254e7cb67921ab60263ae2acda46874c6d722f13b2e025a98ac94
 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
-DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
 DIST Pacemaker-1.1.24.tar.gz 5765945 BLAKE2B cdbba75b640adf6962d00a13a12045bf5d1e34dbdaf34d53797e8fea4fff9368dd3d771fe2d7f70813bb3cfab87a7daca3af56f4f5b343fb3ac3aec649f32316 SHA512 6eb5996ae135970cb7a04b81ad43d060e898566d0addd70da61085d47da6d7dc752e8e9df580e18c295c8b373bab6b4574ddb3a34cb7a1e29b2ed768a4f916bd
 DIST Pacemaker-2.0.5.tar.gz 5434850 BLAKE2B 4e3d24746978fe0785dd9c415cc3779a2bd06f78d8bcd3353cdab8c93b192db8a017d404f6d5e27852369e8db2dc1ee4a2c4c7806ebb1aad5381d1c5b5a681dc SHA512 5fd3614f0284297babb66ea2dc567583315052fcf77f49107c52161e8e8c164ae3169d98528fdc1316d8eabaacc98ed24e9c6e6c90b3286f2f012a4ee874bbba
-EBUILD pacemaker-1.1.16.ebuild 1458 BLAKE2B 3b9456e15527b474b5d6865012040046e4fa23f20c6294b4728a9482cba65fb154af4aabd3b288529c9a64ce0e8e9cc3bafea5a540850672f96f476bb14994de SHA512 506adfebe1059b3f03def9d08da0235aa482ebbceb77a778e78f6519a07f0d25d45efc00faa1546835a5d67d9b2f9bfe02909640c59c4dcee045bbf1407d761d
-EBUILD pacemaker-1.1.24.ebuild 1677 BLAKE2B 9dcf551d16623e503c614938cb4cb8d8a5bb22b620f23314d728ecd27295455bb0266e471de542d872af061c5f63b3c7351abdf52fcacc424bf71a7ac3c7264d SHA512 dcebf30038e00493b20608ca860f11114a759f3317fd84f276b4bd9bee999b62b4186ae23596208c9fd42597914c6cc28e76df45165a02fa003e78d59187e421
-EBUILD pacemaker-2.0.5.ebuild 1580 BLAKE2B 9a117486e36def204f3973ac5bdfc3ce1135c04e1c92edd538facd9fbf40a57b861c567f0f8f04757cf3ba8ea090e6da73baa352d36f025544fc20bc443bb921 SHA512 9905ff45eb621149fbaaa1e307cb2d3617e1487c7a427af8d57347436694d28ffaef408e858dfd95bd582588370d3997b7d17d1649cef9ecffb36b2d44f937e9
+EBUILD pacemaker-1.1.24.ebuild 1676 BLAKE2B 0b7f2a6990b045a34acd2b6da92e6a8532a0a01fa791d5f899d7d93e2421801119f6c7db14cd56830ec05ae9d8a948c83cce078b1d1a3a8830b17fe3be42a718 SHA512 b590cf37c9d293b519c1b2dd6afc4c64c6d26fd1b12919fd33668e7093f7cae5a78d969c00555933fc9765fc725917c6150522275a933905244250f0388897cc
+EBUILD pacemaker-2.0.5.ebuild 1579 BLAKE2B c475bdae2a1a82ec6382e28d4c993dc1a031bb416eef031705af06b333f5472823dac7016046b2ee595aa7a2c66f6e657a51b84cdb353620f95aa3940b3178e3 SHA512 07ac65f5f3c0dd5683d48e0691b262280bc95c23bebd540524f2b70d4c29b68f7462bb9953a3a4c19469854516d5bb3b293d8d73b47e5a109b50be38acfd4397
 MISC metadata.xml 808 BLAKE2B a4da9e3271b4b28e903675dafd9d7f89e04ba1f326a849bb61b74f9ee7a3d21acf32b64826752b5881e40a292e850242eb87d722a41caa2d6c5106fe7162a3d9 SHA512 a86d59e889206951e38efc0fb3ace9f54662abfc56edbf04e66f266e4d29c97bda968df5b16bc54150a5be24ccbb7f3ff3d04f8d527f12bc067fac02255b5119
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
deleted file mode 100644
index ef21da20c787..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="acl smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/corosync
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	eautoreconf
-	python_fix_shebang .
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		--without-cs-quorum \
-		--without-cman \
-		--without-heartbeat \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		--with-ais
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN}
-	fi
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
index 4f09fb9802b1..a9bd70e669fd 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.24.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
index 0d030893990e..0eed3c3478aa 100644
--- a/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="acl smtp snmp"
 
 DEPEND="${PYTHON_DEPS}