From: Ultrabug <ultrabug@gentoo.org>
Date: Tue, 25 Apr 2017 09:50:53 +0000 (+0200)
Subject: sys-cluster/cluster-glue: old ebuilds cleanup and eapi compliance bump
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b2b4557714b798712c26c7fb14cf7fed68245223;p=gentoo.git

sys-cluster/cluster-glue: old ebuilds cleanup and eapi compliance bump

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 91f5dbc1c4e9..da64821ed33a 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,4 +1,2 @@
-DIST glue-1.0.10.tar.bz2 463675 SHA256 c79225097153820aa449c130ec4b4a64755e699e84dde2a698f2689c3f78a2bc SHA512 79c5c9c0a5b721d09aa134e436c476fe5b1f2dcbba3605ab89dcb3770d50ec001b8200e7beb305e8fad526eee192c9f9385458b5b90bda2d94554393ee37a991 WHIRLPOOL 7f884c5fc11ab11130f3c12badf6a0d597aaac8480bcca575717e390c90d318447fa22bf0578273ccdcfc038527143680cc1a2846fcbd333264967a0b17eddc1
 DIST glue-1.0.11.tar.bz2 466057 SHA256 dbee64df379e565a0983c08d0d5510b04f8abf4bb496368734c02926735bd91c SHA512 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 WHIRLPOOL 562afc17eb8aab4a97fdf27ca85e771ccaee6bb767682ef2a56a8f0037197c813f58cbf98641b7f327c1137d0c408db2373d4c618eeb0cb0fefb2cee9e735868
 DIST glue-1.0.12.tar.bz2 451569 SHA256 feba102fa1e24b6be2005089ebe362b82d6567af60005cf371679b1b44ec503f SHA512 d5d2f6c426d2bed0d39269338fedfffe840a90ff56b05dff395243d0d8b803593bf35bbce5f7dce376120cd7ddef78400914cb7515b5451c287a1e9e74233122 WHIRLPOOL dc0db40874691d27463480e06a6f98e3b14f9566caf88667b7ed965c325e39a033b905ca16ad74d988eccc3c99559a33d43bdfdb2f70c1f1d82ac41f1661d274
-DIST glue-1.0.9.tar.bz2 461579 SHA256 c5c3e7672913798887e0127e387dcc9a4adff8ceac6ff6cec06d8eacd5ca26fa SHA512 6cafa9dfcbd71e2ab1a7187a31fd88881e552f5cc5e79e073c83840328c589e3e2beb32f7707a5bf540e16353c49c07795836a84265f48617dcf0203f7e8e7cf WHIRLPOOL b02e37d1b6ad0eaf6dc30795e6a58c88fab158932ab71d8b6cd810dcf672ec4c2e0151062a55e50f874224538d8b474c84b772d324e82a0149fc9b3b88f6d8bb
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
deleted file mode 100644
index c1ac97aab2c8..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P="${P/cluster-}"
-inherit autotools multilib eutils base user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="doc libnet static-libs"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libaio
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.0.5-docs.patch"
-	"${FILESDIR}/1.0.5-respect_cflags.patch"
-	"${FILESDIR}/1.0.7-fix_configure.patch"
-)
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	base_src_install
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-# 	newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
index 02c1372177ca..a8286bdae265 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 MY_P="${P/cluster-}"
-inherit autotools multilib eutils base user
+inherit autotools eutils multilib user
 
 DESCRIPTION="Library pack for Heartbeat / Pacemaker"
 HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
@@ -33,17 +33,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/1.0.5-respect_cflags.patch"
-)
-
 pkg_setup() {
 	enewgroup haclient
 	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
 }
 
 src_prepare() {
-	base_src_prepare
+	default
+	sed -e '/ -ggdb3/d' -i configure.ac || die
 	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
 		-i doc/Makefile.am || die
 	eautoreconf
@@ -68,7 +65,7 @@ src_configure() {
 }
 
 src_install() {
-	base_src_install
+	default
 
 	dodir /var/lib/heartbeat/cores
 	dodir /var/lib/heartbeat/lrm
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index 08450183febb..188c2e16164f 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 MY_P="${P/cluster-}"
-inherit autotools multilib eutils base user
+inherit autotools eutils multilib user
 
 DESCRIPTION="Library pack for Heartbeat / Pacemaker"
 HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
@@ -34,17 +34,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/1.0.12-respect_cflags.patch"
-)
-
 pkg_setup() {
 	enewgroup haclient
 	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
 }
 
 src_prepare() {
-	base_src_prepare
+	default
+	sed -e '/ -ggdb/d' -i configure.ac || die
 	sed -e "s@http://docbook.sourceforge.net/release/xsl/current@/usr/share/sgml/docbook/xsl-stylesheets/@g" \
 		-i doc/Makefile.am || die
 	eautoreconf
@@ -69,7 +66,7 @@ src_configure() {
 }
 
 src_install() {
-	base_src_install
+	default
 
 	dodir /var/lib/heartbeat/cores
 	dodir /var/lib/heartbeat/lrm
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild
deleted file mode 100644
index 8a1b0c3d2428..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P="${P/cluster-}"
-inherit autotools multilib eutils base user
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="doc large-cluster libnet static-libs"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/glib:2
-	libnet? ( net-libs/libnet:1.1 )
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-glue--${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.0.5-docs.patch"
-	"${FILESDIR}/1.0.5-respect_cflags.patch"
-	"${FILESDIR}/1.0.7-fix_configure.patch"
-	"${FILESDIR}/1.0.9-glib-2.32.patch"
-)
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	if use large-cluster
-	then
-		sed -i -e 's@256\*1024@1024\*1024@g' -e 's@2048\*1024@8192\*1024@g' "${S}"/include/clplumbing/ipc.h || die
-	fi
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable libnet) \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	base_src_install
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-	newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
-	rm "${D}"/etc/init.d/logd
-
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/files/1.0.12-respect_cflags.patch b/sys-cluster/cluster-glue/files/1.0.12-respect_cflags.patch
deleted file mode 100644
index 52a879574ccb..000000000000
--- a/sys-cluster/cluster-glue/files/1.0.12-respect_cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2014-07-23 10:37:39.052887243 +0200
-+++ b/configure.ac	2014-07-23 10:37:53.541464249 +0200
-@@ -1226,8 +1226,6 @@
-         CFLAGS="$CFLAGS -g"
- 	enable_fatal_warnings=no
- else
--        CFLAGS="$CFLAGS -ggdb"
--
- 	# We had to eliminate -Wnested-externs because of libtool changes
-         EXTRA_FLAGS="-fgnu89-inline
- 		-fstack-protector-all
diff --git a/sys-cluster/cluster-glue/files/1.0.5-docs.patch b/sys-cluster/cluster-glue/files/1.0.5-docs.patch
deleted file mode 100644
index 424c529623f0..000000000000
--- a/sys-cluster/cluster-glue/files/1.0.5-docs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- doc/Makefile.am
-+++ doc/Makefile.am
-@@ -29,11 +29,10 @@
- 
- if BUILD_DOC
- man_MANS		+= hb_report.8 ha_logd.8 ha_logger.1 stonith.8 meatclient.8
--endif
- 
- EXTRA_DIST		= $(man_MANS)
- 
--STYLESHEET_PREFIX 	?= http://docbook.sourceforge.net/release/xsl/current
-+STYLESHEET_PREFIX 	?= /usr/share/sgml/docbook/xsl-stylesheets/
- MANPAGES_STYLESHEET 	?= $(STYLESHEET_PREFIX)/manpages/docbook.xsl
- HTML_STYLESHEET 	?= $(STYLESHEET_PREFIX)/xhtml/docbook.xsl
- FO_STYLESHEET 		?= $(STYLESHEET_PREFIX)/fo/docbook.xsl
-@@ -47,3 +46,4 @@
- 	$(XSLTPROC) \
- 	$(XSLTPROC_MANPAGES_OPTIONS) \
- 	$(MANPAGES_STYLESHEET) $<
-+endif
---- configure.ac
-+++ configure.ac
-@@ -492,11 +492,13 @@
- AC_PATH_PROGS(PKGCONFIG, pkg-config)
- AC_PATH_PROGS(XML2CONFIG, xml2-config)
- 
--AC_PATH_PROGS(XSLTPROC, xsltproc)
--AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" )
--if test "x$XSLTPROC" = "x"; then
--   AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages])
-+AC_ARG_ENABLE([doc],
-+ [  --enable-doc 	build documentation, [default=no]],
-+ [enable_doc=$withval], [enable_doc=no])
-+if test "x$enable_doc" != "xno"; then
-+	AC_PATH_PROGS(XSLTPROC, xsltproc)
- fi
-+AM_CONDITIONAL(BUILD_DOC, test "x$enable_doc" != "xno" )
- 
- AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
- AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)
diff --git a/sys-cluster/cluster-glue/files/1.0.5-respect_cflags.patch b/sys-cluster/cluster-glue/files/1.0.5-respect_cflags.patch
deleted file mode 100644
index f89432fc7eed..000000000000
--- a/sys-cluster/cluster-glue/files/1.0.5-respect_cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -1149,8 +1149,6 @@
-         CFLAGS="$CFLAGS -g"
- 	enable_fatal_warnings=no
- else
--        CFLAGS="$CFLAGS -ggdb3 -O0"
--
- 	# We had to eliminate -Wnested-externs because of libtool changes
-         EXTRA_FLAGS="-fgnu89-inline
- 		-fstack-protector-all
diff --git a/sys-cluster/cluster-glue/files/1.0.7-fix_configure.patch b/sys-cluster/cluster-glue/files/1.0.7-fix_configure.patch
deleted file mode 100644
index fff85b003322..000000000000
--- a/sys-cluster/cluster-glue/files/1.0.7-fix_configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix enable/disable of libnet
-
---- a/configure.ac	2010-12-06 18:17:03.000000000 +0100
-+++ b/configure.ac	2011-01-11 13:22:16.271977100 +0100
-@@ -928,7 +928,7 @@
- 
- AC_ARG_ENABLE([libnet],
-  [  --enable-libnet 	Use libnet for ARP based funcationality, [default=try]], 
-- [enable_libnet=$withval], [enable_libnet=try])
-+ [], [enable_libnet=try])
- 
- libnet=""
- libnet_version="none"
diff --git a/sys-cluster/cluster-glue/files/1.0.9-glib-2.32.patch b/sys-cluster/cluster-glue/files/1.0.9-glib-2.32.patch
deleted file mode 100644
index a2dff8341bfd..000000000000
--- a/sys-cluster/cluster-glue/files/1.0.9-glib-2.32.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Reusable-Cluster-Components-glue--glue-1.0.9/include/clplumbing/cl_uuid.h
-===================================================================
---- Reusable-Cluster-Components-glue--glue-1.0.9.orig/include/clplumbing/cl_uuid.h
-+++ Reusable-Cluster-Components-glue--glue-1.0.9/include/clplumbing/cl_uuid.h
-@@ -16,7 +16,7 @@
- 
- #ifndef _CL_UUID_H_
- #define _CL_UUID_H_
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- typedef struct cl_uuid_s{	
- 	unsigned char	uuid[16];
diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index 86982c891dc7..c8788d4ba459 100644
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -8,6 +8,5 @@
 	<longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
 	<use>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
-		<flag name="large-cluster">Extend messages length limits for resource heavy clusters</flag>
 	</use>
 </pkgmetadata>