gentoo resync : 25.11.2020

11 files changed, 315 insertions, 37 deletions

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 7310e3994869..b8541222980b 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,8 +1,17 @@
+AUX pacemaker-1.1.24-python-fixes.patch 1097 BLAKE2B 0ae19b7c6110262728369f5368a80d2d80e1d2566cc7480a9419302c2e49d98d07df2d7222028076f517a7158ea8af6ea95e9c47b06881ee5140272203b3650a SHA512 d31f8a7ab06a6b0649bf5395bd722503ec58164f87db137cda7125e95cda4337cc754fce509d50706e9159e45b61e2593c2fd9cd132bd7e4467a077855308af5
+AUX pacemaker-1.1.24-qa-warnings.patch 492 BLAKE2B 9ff485f9d2af09d2ce736b4b8312a9ff9d799ad49db433c2353252fdfc6dc85d85fdf300127d35f2ce815770ff60ce0b8ac7536993841f8e0a962a685a00789c SHA512 736f13ddbe0013ad15c62acc469e97fb30eb12b9782e0c60338c5d8cfa87174e9c8e2b3b9d326b9228135709830749e4481a77bd088ca83027ba4472867147b3
+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.19.tar.gz 5369381 BLAKE2B 9134f014b4da61c01bb2533ad33201400335d9e722e064f5e838df851777cfd17115430bd4623b08b97330bfe98340091f06a98c06dd125761053e79f0375dd2 SHA512 c41403441a3ba7a4fb81b6c3e84d7eff5ee951e1040918597ea8462284c83dc6f572607d4903b1238c55757f1eca78132878a172da4e3b5db2dbfe0831c34548
-EBUILD pacemaker-1.1.16.ebuild 1635 BLAKE2B 0eb20751ed13d23cc766c2e68296c711a0d9ebfc2993adc5f9c54e86557aca1ecc5f32e86d08011dee1959c9285803abe64ef2816f44f6c10b112b4584a19edb SHA512 cdcbf1e0170a616a09a00b878767dc02976b01f6eddc8f5b1440fe3c26406c679493c9579c95088f203036904f04f84f6ce3fe21a1c516370573ee060d808fe0
-EBUILD pacemaker-1.1.19-r1.ebuild 1648 BLAKE2B de91e5a4d40719f74d0503a91c1666c516026e8ee99385102f17d20e395f16ef10b9890f8cbe2a6b51c49cc1e20146c31de039510ccc9cb282c9dce9a5a63949 SHA512 e02adc3fb6e1186264ed91170d3b97b1e974f2b344cd972ce8406de9592bb45312040b970a7a707074cc0988c6f6c2147837db7ec9f77fa294676cf6d8c2325c
-EBUILD pacemaker-1.1.19.ebuild 1637 BLAKE2B bec518f49dedf193882e42fde6c24f5a6787884739807460c15dd6e71a1ef1967262ab8384ef9902e13e432826a8ca63e97c4eff711d4cbd242f595f5a236361 SHA512 998e69df883392f99074155de857063e55fa5ecaa617665d8c01d393b3295b5b3c4152467879628791464547c1b3fd551843a010f52f699acf59b6a153d191dd
-MISC metadata.xml 889 BLAKE2B 9b52f88582de605852765e0956640e713e68584066410f472beecccbf69db5a8b7226aaf4ce12851b45fd6945d0cde5cd7e524a873599bf35d4e3cf03a6dd8a5 SHA512 dbfaa3e72fbe361e1648a0a1dfd3e0f153489d005f052fc4ddd1468480d53c84a49bb18c0cfc16ac3f2f409f2ff673ec554faae562452420b898167b8650654f
+DIST Pacemaker-1.1.24-rc1.tar.gz 5766749 BLAKE2B 7928fc40ba6c88983f394edb19116f8843c0e51c5dbbde503b10962fc178ab712470f3de91d93f69de4e18395aa9af04edf79c0c35372a3d3cc3d4d1ef6aa262 SHA512 188e3960408b9529f502e3bff28de39b7d7393140af3b14fe9220b52f59b3bcca85d9f00d07f9d210b3a5dd8a618d2aea23f65c6f484a8e31510da9d759ceeb8
+DIST Pacemaker-2.0.4.tar.gz 5134516 BLAKE2B 8fa9a648d9d3971a579852833cba2bbf2d45d2d02870bf314813389fe6d49bb2109f9436224d8e0abe8449660b319a37ea9aa2b28250f14874608bcba6e4472d SHA512 fbff3b5ab05ad52d469304d5bc7fca518df2f491a1176a24735cd1a9b46f7ff90dc5aeae65e5e29feb86e8a210e69e528261138847d6f8773933fb557e71133d
+DIST Pacemaker-2.0.5-rc3.tar.gz 5433648 BLAKE2B f564ff0d7c33897bb58886194e169d2071823c43b27bb5e359a3a3a9a471cb8a9c22f86e93ed99d7eedcebfc530494a35fbd0b523287d3111dea0f507cf5b76b SHA512 adf558d80d93ee7944b8e9eb5d07304e374ee61a4d81159daa9c6a9108ee77294e109766c21ed6f6eef2847ebc67d98925b8c63ff49bba958058bb7ef68d0f07
+EBUILD pacemaker-1.1.16.ebuild 1458 BLAKE2B 3b9456e15527b474b5d6865012040046e4fa23f20c6294b4728a9482cba65fb154af4aabd3b288529c9a64ce0e8e9cc3bafea5a540850672f96f476bb14994de SHA512 506adfebe1059b3f03def9d08da0235aa482ebbceb77a778e78f6519a07f0d25d45efc00faa1546835a5d67d9b2f9bfe02909640c59c4dcee045bbf1407d761d
+EBUILD pacemaker-1.1.19-r1.ebuild 1493 BLAKE2B eab0b238de42ed3cf3debbe9337ee66cf3b521aa2536d877850c47f488090f97d6896b7fa97f915b248b5e75a1398111da5622e9ccdc5c65cea1944e323fb035 SHA512 79eb96bdfbec00370087849f1c18995ad1e9e50136eae2fb69c6f1cef70349ef4af49a12d7cab7f220a5532c6c8a0d1c5afd1c4ff1f103e9379e7ca073c3130d
+EBUILD pacemaker-1.1.19.ebuild 1460 BLAKE2B f06004d23b50a994c9b1f9efa838e53c48b36817d299976c5d805d2b40da37b410718c0de5ad57cbe443e409049495485fb3e9cbef01bbc647f4f5446df2dfa8 SHA512 ce1a47cedacfb54a9af73698bb8ddbd4a210fcacdf896857b0af5d3119673d13ad87e51935f04a2f7cc1b7a5fd181532a92148aeb2b69c98961f3360f5db575a
+EBUILD pacemaker-1.1.24_rc1.ebuild 1678 BLAKE2B c9158e44b70924415e4e9269486e2674415f2f468e395024385fd9ac6400cd053846c372ee1d0036db0c72236d6281c7d6b6453e01626e4997ec109228bd35e9 SHA512 3b3ab7724c93575163415ada7c72234254f9aaabec43b4647fbe5d2ac4da2ad391fd435be2ded2c2e0d723681070401552c170785ee4b0a60ffa2a7a392b4680
+EBUILD pacemaker-2.0.4.ebuild 1580 BLAKE2B 9a117486e36def204f3973ac5bdfc3ce1135c04e1c92edd538facd9fbf40a57b861c567f0f8f04757cf3ba8ea090e6da73baa352d36f025544fc20bc443bb921 SHA512 9905ff45eb621149fbaaa1e307cb2d3617e1487c7a427af8d57347436694d28ffaef408e858dfd95bd582588370d3997b7d17d1649cef9ecffb36b2d44f937e9
+EBUILD pacemaker-2.0.5_rc3.ebuild 1580 BLAKE2B 9a117486e36def204f3973ac5bdfc3ce1135c04e1c92edd538facd9fbf40a57b861c567f0f8f04757cf3ba8ea090e6da73baa352d36f025544fc20bc443bb921 SHA512 9905ff45eb621149fbaaa1e307cb2d3617e1487c7a427af8d57347436694d28ffaef408e858dfd95bd582588370d3997b7d17d1649cef9ecffb36b2d44f937e9
+MISC metadata.xml 808 BLAKE2B a4da9e3271b4b28e903675dafd9d7f89e04ba1f326a849bb61b74f9ee7a3d21acf32b64826752b5881e40a292e850242eb87d722a41caa2d6c5106fe7162a3d9 SHA512 a86d59e889206951e38efc0fb3ace9f54662abfc56edbf04e66f266e4d29c97bda968df5b16bc54150a5be24ccbb7f3ff3d04f8d527f12bc067fac02255b5119
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
new file mode 100644
index 000000000000..2428a399d5f0
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.24-python-fixes.patch
@@ -0,0 +1,26 @@
+diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py
+--- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/remote.py	2020-10-30 18:35:13.000000000 +0100
++++ pacemaker-Pacemaker-1.1.24-rc1/cts/remote.py	2020-11-10 22:47:21.600435423 +0100
+@@ -125,7 +125,7 @@
+     '''
+ 
+     def __init__(self, rsh, silent=False):
+-        self.async = []
++        self.hasync = []
+         self.rsh = rsh
+         self.silent = silent
+         self.logger = LogFactory()
+diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py
+--- pacemaker-Pacemaker-1.1.24-rc1.orig/cts/watcher.py	2020-10-30 18:35:13.000000000 +0100
++++ pacemaker-Pacemaker-1.1.24-rc1/cts/watcher.py	2020-11-10 22:46:08.287258247 +0100
+@@ -140,8 +140,8 @@
+         self.logger.debug(message)
+ 
+     def harvest(self, delegate=None):
+-        async = self.harvest_async(delegate)
+-        async.join()
++        hasync = self.harvest_async(delegate)
++        hasync.join()
+ 
+     def harvest_async(self, delegate=None):
+         self.log("Not implemented")
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
new file mode 100644
index 000000000000..37346d6a396a
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.24-qa-warnings.patch
@@ -0,0 +1,12 @@
+diff -ur pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac pacemaker-Pacemaker-1.1.24-rc1/configure.ac
+--- pacemaker-Pacemaker-1.1.24-rc1.orig/configure.ac	2020-10-30 18:35:13.000000000 +0100
++++ pacemaker-Pacemaker-1.1.24-rc1/configure.ac	2020-11-10 23:21:04.728714112 +0100
+@@ -2198,7 +2198,7 @@
+ 
+ dnl Put the above variables to use
+ LIBTOOL="${LIBTOOL} --tag=CC \$(QUIET_LIBTOOL_OPTS)"
+-MAKE="${MAKE} \$(QUIET_MAKE_OPTS)"
++MAKE="${MAKE} ${QUIET_MAKE_OPTS}"
+ 
+ AC_SUBST(CC)
+ AC_SUBST(MAKE)
diff --git a/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch b/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch
new file mode 100644
index 000000000000..33cf74d73260
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-2.0.4-qa-warnings.patch
@@ -0,0 +1,16 @@
+diff -Naur pacemaker-Pacemaker-2.0.4.orig/extra/resources/pingd pacemaker-Pacemaker-2.0.4/extra/resources/pingd
+--- pacemaker-Pacemaker-2.0.4.orig/extra/resources/pingd	2020-07-13 22:30:01.503255159 +0200
++++ pacemaker-Pacemaker-2.0.4/extra/resources/pingd	2020-07-13 22:33:27.434714056 +0200
+@@ -25,8 +25,10 @@
+ : ${OCF_RESKEY_interval:="1"}
+ : ${OCF_RESKEY_CRM_meta_interval:=0}
+ 
+-ocf_log err "This agent (ocf:pacemaker:pingd) is deprecated, does not work, and"
+-ocf_log err "will be removed in a future release (use ocf:pacemaker:ping instead)"
++if [ "$__OCF_ACTION" != "meta-data" ]; then
++    ocf_log err "This agent (ocf:pacemaker:pingd) is deprecated, does not work, and"
++    ocf_log err "will be removed in a future release (use ocf:pacemaker:ping instead)"
++fi
+ 
+ case "$__OCF_ACTION" in
+     start|monitor)
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index 4548b53178e8..dcb0f854efe2 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -12,7 +12,6 @@
 		capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
 	</longdescription>
 	<use>
-		<flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
 		<flag name="smtp">Enable SMTP support via <pkg>net-libs/libesmtp</pkg></flag>
 	</use>
 	<upstream>
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
index f6bef07a1217..ef21da20c787 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild
@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+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
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
 	snmp? ( net-analyzer/net-snmp )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
 		$(use_with acl) \
 		--without-cs-quorum \
 		--without-cman \
-		$(use_with heartbeat) \
+		--without-heartbeat \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
 		$(use_enable static-libs static) \
-		${myopts}
+		--with-ais
 }
 
 src_install() {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
index c20405e8e1b0..7790d983ce70 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild
@@ -16,17 +16,16 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp"
+IUSE="acl smtp snmp"
 
 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
 
-	heartbeat?	( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat?	( sys-cluster/corosync )
 	smtp?		( net-libs/libesmtp )
 	snmp?		( net-analyzer/net-snmp )
 "
@@ -52,17 +51,12 @@ src_configure() {
 		--without-cs-quorum
 		--without-cman
 		$(use_with acl)
-		$(use_with heartbeat)
+		--without-heartbeat
 		$(use_with smtp esmtp)
 		$(use_with snmp)
+		--with-ais
 	)
 
-	if use heartbeat ; then
-		myconf+=( --without-corosync )
-	else
-		myconf+=( --with-ais )
-	fi
-
 	econf "${myconf[@]}"
 }
 
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
index 0c8299ce0378..d1e44f3de6f8 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild
@@ -16,16 +16,15 @@ SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+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
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
 	snmp? ( net-analyzer/net-snmp )
 "
@@ -43,12 +42,6 @@ src_prepare() {
 }
 
 src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
@@ -56,11 +49,11 @@ src_configure() {
 		$(use_with acl) \
 		--without-cs-quorum \
 		--without-cman \
-		$(use_with heartbeat) \
+		--without-heartbeat \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \
 		$(use_enable static-libs static) \
-		${myopts}
+		--with-ais
 }
 
 src_install() {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild
new file mode 100644
index 000000000000..2b957bb10d39
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-1.1.24_rc1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+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"
+
+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}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.24-python-fixes.patch
+	"${FILESDIR}"/${PN}-1.1.24-qa-warnings.patch
+)
+
+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
+	local myconf=(
+		--localstatedir=/var
+		--disable-fatal-warnings
+		--disable-static
+		--without-cs-quorum
+		--without-cman
+		$(use_with acl)
+		--without-heartbeat
+		$(use_with smtp esmtp)
+		$(use_with snmp)
+		--with-ais
+	)
+
+	econf "${myconf[@]}"
+}
+
+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
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+	python_optimize
+}
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild
new file mode 100644
index 000000000000..0d030893990e
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+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"
+
+DEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-cluster/cluster-glue-1.0.12-r1
+	>=sys-cluster/libqb-2.0.0:=
+	sys-cluster/resource-agents
+	sys-cluster/corosync
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ -ggdb//g" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	local myconf=(
+		--with-ocfdir=/usr/$(get_libdir)/ocf
+		--localstatedir=/var
+		--disable-fatal-warnings
+		--disable-static
+		--without-cs-quorum
+		--without-cman
+		--without-heartbeat
+		--with-corosync
+		--with-ais
+		$(use_with acl)
+		$(use_with smtp esmtp)
+		$(use_with snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+	rm -rf "${D}/var/run" "${D}/etc/init.d"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+	keepdir /var/log/pacemaker/bundles
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
new file mode 100644
index 000000000000..0d030893990e
--- /dev/null
+++ b/sys-cluster/pacemaker/pacemaker-2.0.5_rc3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+MY_PN="${PN^}"
+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"
+
+DEPEND="${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-cluster/cluster-glue-1.0.12-r1
+	>=sys-cluster/libqb-2.0.0:=
+	sys-cluster/resource-agents
+	sys-cluster/corosync
+	smtp? ( net-libs/libesmtp )
+	snmp? ( net-analyzer/net-snmp )
+"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-qa-warnings.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ -ggdb//g" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	local myconf=(
+		--with-ocfdir=/usr/$(get_libdir)/ocf
+		--localstatedir=/var
+		--disable-fatal-warnings
+		--disable-static
+		--without-cs-quorum
+		--without-cman
+		--without-heartbeat
+		--with-corosync
+		--with-ais
+		$(use_with acl)
+		$(use_with smtp esmtp)
+		$(use_with snmp)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	python_optimize
+	rm -rf "${D}/var/run" "${D}/etc/init.d"
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	keepdir /var/lib/pacemaker/{blackbox,cib,cores,pengine}
+	keepdir /var/log/pacemaker/bundles
+
+	find "${D}" -name '*.la' -delete || die
+}