gentoo resync : 25.01.2018

6 files changed, 0 insertions, 290 deletions

diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index e8ec56687db5..626a11b091d0 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,13 +1,6 @@
-AUX pacemaker-1.1.10-tinfo.patch 767 BLAKE2B 42ecf4c9fe707c2047efcf4bf8178633c8f8232a8791693af902f101a83d7b979b09de01df207fc86af74162f786cacae437d83c79f96468bd09d1c0eba00ba3 SHA512 2418cb275d69e5a589ed5e7aba707719c23bbdae83f2700b4fdabe9df03bf6f6922ef7db6f09b0c06d6d66e8cd661eed37f9c905a5781f865842517a3bd56358
-AUX pacemaker-1.1.12-glib.patch 1634 BLAKE2B be601a1da62d1d35c8d5b0e153e16099265edbfb7968ff2385ba6e66087270973de505ad0f13cffed59723777d6207efc73a0ec0f878990072a6ac2f8f4422c7 SHA512 11d95e0b85c61b845d9465d1d5dd6ebf2b33a3cba40a89a085fbe4c16eabbc9262546a62fbcdcaab22071de2bbb3967e041527965b61d8bf9a978904128cba0b
-AUX pacemaker-1.1.12-stonith.patch 690 BLAKE2B 7297941ea6aea753547c2e5ee06387051dfafa844a39d6ab0e8a8111dd895d9f5eb8a54d5a8d93af11fb56918817f8e848568aec9e5e47518cf7163ca85d060b SHA512 168811591d18aea99d260c53d4e8307a8c65e0b756f50cd939d05c37697e1c2d0018d3422065add6d126ca23e4fc2371cf8d9f24e68bac2bab74d438112d80d1
 AUX pacemaker.initd 862 BLAKE2B 4da4af65887be567aa77fff2b3647b64fa86a9862a2269db1c27ab429759ac597f6eb5fcbadefc22ec64d0eb5983b3d7301c1867d056ef8332f241d967aae3c0 SHA512 9578a47ea9271a5b8b5939dc32ff49736504c2e6318f3e9f906b554b1b11a334c01cae8900e946318cdffd3cf9611d748013bdcc63b3ae68919709ebb12e7e7c
 AUX pacemaker.service 105 BLAKE2B 2b77b0c81427ab418bb5af372fb4938a7c630a9bb1e4128ed7335d9d1d11b5fbaf657e9ccabd6a7d4b1a120a00d7e46678f8a7a635b0dee7a2aa60559e78d50c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b
 AUX ping 10389 BLAKE2B 7291fd63b478dd73b90f2303b4ccd4f3ecd2f561de2aad3e55ba9368af231902a81788f712b149b7be3f5d7f28f86f5dcc86fae8dcc1c4429651d6d71b96a15c SHA512 832cd68dab0844b9cee1d1b1453314d42497bc497e97a5cbb78aafbd43b696aa97786b71d1b4d175c1aa8c5f7f240432f1fd4421d16a40ceecdc008d911c0288
-DIST Pacemaker-1.1.12.tar.gz 10459675 BLAKE2B 31fe62a4a21523653e232812cb61b636adf2e5965f3d863a39f6d511950e892be126d954f0dd338bfd26a07eee2966a09ccf8d166c9c8bc1fd2ba73898a25ba8 SHA512 cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1
-DIST Pacemaker-1.1.14.tar.gz 4729808 BLAKE2B 90e5fcbfcb88c65b590367c2e99f848f3fa585353308df41684c8a7a039782b3ac507cbf347faf3b68d2f866763df1b713ac8d1ce34579b6b80708277eec0e89 SHA512 81927061bcc0a0b88c472f87a2cbdb26b88a2443b06112cd8c8d58d8491da4e9ae03997108c9d40aa408e80e2998bdc0ac03691f1732d2629c4cef0adcc4b7fa
 DIST Pacemaker-1.1.16.tar.gz 4897772 BLAKE2B a6ea8b3e5f6ef776a67d8895a0361945c5bcd98ecd861c0fd8d8b3c474a6f14c816e1f36da1dccd429ab8d92c53a9dd071796968d5080d6a900518df200fafbd SHA512 967c860fab7b9e73dd8643e6d09083a2a1298a77d71c3b138187803c89153bee7219da13e6b94b20f2881b53ba7fc1c8584a43ff058a265e76708fd5dbccf534
-EBUILD pacemaker-1.1.12-r2.ebuild 2357 BLAKE2B a4423891a7a40e11578db80f717e77d7f7757f3037657f8747ffa91ad6dc91be59c3727f7e08cb7e6f26164be1b6bfc20816127527a8db151f0cb67828bad261 SHA512 2d1eceed9491e95b2e87b37056ea8b63c1a0fc491ed88a91d4e80a0c79144714392887547f5491ec2c43c9eed272a217fc847097bd5e4dbc6517f8d5b34924f4
-EBUILD pacemaker-1.1.14.ebuild 2197 BLAKE2B 4f9f4f33b4718460a75561b73cf6c85290ae3dcb4fbb65fc2c7c5191aee95ac1f07429518b6dabcace1deeb41a415c42df0c0593bac650fb193e2ae1dfa9b20e SHA512 e39e2084d9a409df027cf3fa9f506e8b5076ac93c6217219d29e19d1b69585ce42094e4873ed8249366abb1b330dd13565a1b0363f5993946fa197ca908ff13c
 EBUILD pacemaker-1.1.16.ebuild 1800 BLAKE2B ecde13f0404966b2839eb47848a37760cfaad76878f6859967484c4e42e49527f7f1861538004aa2d7b651247671996cd0b61732421cc881434bf3d4a4550cab SHA512 549a2dc99b5d0df356c55bbd873cf96f3643e7b64984b3fa4687f0cafd5345cd57ce69ae5932a78687bbfa9b4bb861e032d311c0a5461397752dc78eb21e71bb
 MISC metadata.xml 960 BLAKE2B a5d656c25a4a0663c4c9e9d01d69e5a84232d724f54ee895aa38a8d53e61f460b890df34d787536770ee64130799dc447dfb8dd2b32b984c933c71b38396c08a SHA512 1bec04a003d61dfcaffad2fa9ca2bcbf5504f35103c544749a9af251a32fe52c0b92cf4e0099eeffef63535b55d4393616093c13e7bee7e02170f57eca98e563
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
deleted file mode 100644
index 1dba440c9e79..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.10-tinfo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac	2014-12-12 14:13:07.262413254 +0100
-+++ b/configure.ac	2014-12-12 14:13:14.922480835 +0100
-@@ -885,14 +885,16 @@
- CURSESLIBS=''
- if test "$ac_cv_header_ncurses_h" = "yes"; then
-   AC_CHECK_LIB(ncurses, printw,
--    [CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-+    [AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-   )
-+  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
- fi
- 
- if test "$ac_cv_header_ncurses_ncurses_h" = "yes"; then
-   AC_CHECK_LIB(ncurses, printw,
--    [CURSESLIBS='-lncurses'; AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-+    [AC_DEFINE(HAVE_LIBNCURSES,1, have ncurses library)]
-   )
-+  CURSESLIBS=`$PKGCONFIG --libs ncurses`;
- fi
- 
- dnl Only look for non-n-library if there was no n-library.
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch
deleted file mode 100644
index 8233f98a17e8..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 568e41db929a34106c8c2ff7c48716ab5c13ef49 Mon Sep 17 00:00:00 2001
-From: Andrew Beekhof <andrew@beekhof.net>
-Date: Mon, 13 Oct 2014 13:30:58 +1100
-Subject: [PATCH] Fix: lrmd: Prevent glib assert triggered by timers being
- removed from mainloop more than once
-
----
- lib/services/services.c       | 3 +++
- lib/services/services_linux.c | 1 +
- 2 files changed, 4 insertions(+)
-
---- a/lib/services/services.c
-+++ b/lib/services/services.c
-@@ -313,6 +313,7 @@ services_action_free(svc_action_t * op)
- 
-     if (op->opaque->repeat_timer) {
-         g_source_remove(op->opaque->repeat_timer);
-+        op->opaque->repeat_timer = 0;
-     }
-     if (op->opaque->stderr_gsource) {
-         mainloop_del_fd(op->opaque->stderr_gsource);
-@@ -425,6 +426,7 @@ services_action_kick(const char *name, c
-     } else {
-         if (op->opaque->repeat_timer) {
-             g_source_remove(op->opaque->repeat_timer);
-+            op->opaque->repeat_timer = 0;
-         }
-         recurring_action_timer(op);
-         return TRUE;
-@@ -459,6 +461,7 @@ handle_duplicate_recurring(svc_action_t
-         if (dup->pid != 0) {
-             if (op->opaque->repeat_timer) {
-                 g_source_remove(op->opaque->repeat_timer);
-+                op->opaque->repeat_timer = 0;
-             }
-             recurring_action_timer(dup);
-         }
---- a/lib/services/services_linux.c
-+++ b/lib/services/services_linux.c
-@@ -226,6 +226,7 @@ recurring_action_timer(gpointer data)
-     op->stdout_data = NULL;
-     free(op->stderr_data);
-     op->stderr_data = NULL;
-+    op->opaque->repeat_timer = 0;
- 
-     services_action_async(op, NULL);
-     return FALSE;
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch
deleted file mode 100644
index 31c729559f35..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-stonith.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix: stonith-ng: Reset mainloop source IDs after removing them
-
-Origin: upstream, commit: 0326f05c9e26f39a394fa30830e31a76306f49c7
-Author: Andrew Beekhof <andrew@beekhof.net>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1412962
-Last-Update: 2015-01-20
-
---- a/lib/fencing/st_client.c
-+++ b/lib/fencing/st_client.c
-@@ -663,9 +663,11 @@ stonith_action_async_done(mainloop_child
- 
-     if (action->timer_sigterm > 0) {
-         g_source_remove(action->timer_sigterm);
-+        action->timer_sigterm = 0;
-     }
-     if (action->timer_sigkill > 0) {
-         g_source_remove(action->timer_sigkill);
-+        action->timer_sigkill = 0;
-     }
- 
-     if (action->last_timeout_signo) {
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
deleted file mode 100644
index fc65ae9855a1..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-WANT_AUTOMAKE="1.12"
-
-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"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}"/pacemaker-1.1.10-tinfo.patch
-	"${FILESDIR}"/pacemaker-1.1.12-glib.patch
-	"${FILESDIR}"/pacemaker-1.1.12-stonith.patch
-)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# bug #490908
-	cp "${FILESDIR}/ping" extra/resources/ping || die
-
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
-	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
-	eautoreconf
-
-	python_fix_shebang .
-}
-
-src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
-	# appends lib to localstatedir automatically
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog " "
-	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
-	elog " "
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
deleted file mode 100644
index 492f531c7022..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-WANT_AUTOMAKE="1.12"
-
-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"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="${PYTHON_DEPS}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	default
-	epatch_user
-
-	# bug #490908
-	cp "${FILESDIR}/ping" extra/resources/ping || die
-
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
-	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
-	eautoreconf
-
-	python_fix_shebang .
-}
-
-src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
-	# appends lib to localstatedir automatically
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	default
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog " "
-	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
-	elog " "
-}