Fix glib-2.32 compilation, bug #412653 by Jeroen Roovers. Drop old.

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 27 insertions, 100 deletions

diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog
index e5e843b597b1..bcb78ee2bcea 100644
--- a/sys-cluster/cluster-glue/ChangeLog
+++ b/sys-cluster/cluster-glue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cluster-glue
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.22 2012/02/24 15:22:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.23 2012/04/20 20:03:48 pacho Exp $
+
+  20 Apr 2012; Pacho Ramos <pacho@gentoo.org> +files/1.0.9-glib-2.32.patch,
+  -cluster-glue-1.0.7-r2.ebuild, cluster-glue-1.0.9.ebuild:
+  Fix glib-2.32 compilation, bug #412653 by Jeroen Roovers. Drop old.
 
   24 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   cluster-glue-1.0.9.ebuild:
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index f2c42259a522..ac731b4a7ef4 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 1.0.5-docs.patch 1329 RMD160 e3617a9ce4b9ca562328d81b4563bb2ab82324c4 SHA1 08c689eebdee966512721328277ea7f828a6702e SHA256 27d854f18b0830b9f2ac0161a244a06edc04da0fa4661d81dc171e07e3efa24b
 AUX 1.0.5-respect_cflags.patch 287 RMD160 b61f719213f4d11fd43d9b6444201d26048de468 SHA1 e0a41227a9f463d5f431d64c240746a3587dcdd7 SHA256 be7f2c9cbfc8201118abbdb2aeb1cf6d9aca2c586ae7a6d55963ee3143d9f71e
 AUX 1.0.7-fix_configure.patch 379 RMD160 bf4963e3925995e2811fa74b120c4cad575f3c74 SHA1 66fc09252eae94bf4c017b304de2b309de81c0b9 SHA256 f786933d5b8e7593240bc6a174984943700a37d71594f7b9c1dc322778ceb571
+AUX 1.0.9-glib-2.32.patch 473 RMD160 42cc681524c87bd7bbb549444e01687ebfe9f5c8 SHA1 0e3748402d4b4bbf67af05f4a376946eb3921ded SHA256 cfd3b30840c7930e684ae09f9b8cc8f6a35edbfea135cdb7de9653a0a7069f18
 AUX heartbeat-logd.init 953 RMD160 7319d87e690f2309c9b76a9cd52f96c0754b5362 SHA1 cd324adbc95b65bf42eafed4a3aa6a9709395719 SHA256 c174d2767c7cee63d77436c8e533aba7d6856af398c82881c7ba3758eba38e7b
-DIST glue-1.0.7.tar.bz2 444765 RMD160 b3e0cbfc98815d2f4adf9c6f64276b2f5b7df494 SHA1 f02ab98686a3a89879e96d1e3846033bb96daf2d SHA256 dcb2500d049476142204491113ff8eeeda210ca26530aa982ff3896bb65a84c7
 DIST glue-1.0.9.tar.bz2 461579 RMD160 6ed16d09359e63c8bb5f0da20e8e13871cdf71f5 SHA1 6e38c0ef140ca394017cde8bac597b2496546d5d SHA256 c5c3e7672913798887e0127e387dcc9a4adff8ceac6ff6cec06d8eacd5ca26fa
-EBUILD cluster-glue-1.0.7-r2.ebuild 2176 RMD160 155c072279047785854a75b09f003e0368c016e8 SHA1 cd3c1232089b3ae347fb525d7766e45973f61b8c SHA256 a41a9a16f6bb27a528201cf4c84077e6182a476ac1a011be193cbf10a6265b4c
-EBUILD cluster-glue-1.0.9.ebuild 2392 RMD160 6ac3975da65ae8195ef7ffbd95ac17cf5a41ce49 SHA1 e405063222c77c85444f12387a66fcda5259abd4 SHA256 8c8d529dc982ec008caa0ca931a57b83065f418dbef5631c304d6cc542c498dd
-MISC ChangeLog 3729 RMD160 9f5ad16cba80bb678e8d2dc9cb43a320d5e31479 SHA1 da1570a32cc5b7d436213e68e932936e353c42eb SHA256 9628b8571712eba50b1519fc6a70e717e7122487d2659304ad2a2358dab56f54
+EBUILD cluster-glue-1.0.9.ebuild 2424 RMD160 7d1fbbe019f9cc4f244af4994496d8aaf466ff9a SHA1 97e0ec434e9e7435b1a87e105f0858be8e70d75c SHA256 961206cbf7b4e56012d14454675341889ba8ecfb58d3b95cbe0e45901f235ead
+MISC ChangeLog 3931 RMD160 cfa2d4d623fd5bf0cb0d5bb0af25a1e82e8c6bbd SHA1 b2393455ac2004116785d504c61c4806e008f7bf SHA256 349c5ecc1f102a824981c00908e78e95906bc8e40042f120650a75c7a571f957
 MISC metadata.xml 483 RMD160 30f3680d6aa967fb12723593a77caf3b1f746243 SHA1 0c87d9114eca4a6f0c60ff281f107a540e95c9a1 SHA256 544de4cd75ae97b51a6eacb384430b18089ac14b0f78bfd8e2f157abeb75266e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk9HqyMACgkQuUQtlDBCeQJv7ACfYPv3lYE4peDYaczmxC0goyJn
-wZgAni8rmgARHAiOokYgJHavXSLUhVIG
-=LhUl
+iEYEARECAAYFAk+RwSoACgkQCaWpQKGI+9QgRgCgh6KCJf+K75yTZOzEe7lzZ/1L
+OnMAn2k7y/n4EtcqiGN6G2zM1RVN5M8H
+=DnHt
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.7-r2.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.7-r2.ebuild
deleted file mode 100644
index 432a93282afd..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.7-r2.ebuild,v 1.4 2011/02/21 08:33:44 jer Exp $
-
-EAPI="2"
-
-MY_P="${P/cluster-}"
-inherit autotools multilib eutils base
-
-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
-	libnet? ( <net-libs/libnet-1.1.5 )
-	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
-}
-
-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.9.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.9.ebuild
index 8b01ebb79e9c..e1aec2bfbd16 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.9.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.9.ebuild,v 1.6 2012/02/24 15:22:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.9.ebuild,v 1.7 2012/04/20 20:03:48 pacho Exp $
 
 EAPI=4
 
@@ -36,6 +36,7 @@ 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() {
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
new file mode 100644
index 000000000000..a2dff8341bfd
--- /dev/null
+++ b/sys-cluster/cluster-glue/files/1.0.9-glib-2.32.patch
@@ -0,0 +1,13 @@
+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];