Version bump, drop large-cluster from IUSE.

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

3 files changed, 113 insertions, 23 deletions

diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog
index e78fde5fe7bf..d407bf01d047 100644
--- a/sys-cluster/cluster-glue/ChangeLog
+++ b/sys-cluster/cluster-glue/ChangeLog
@@ -1,6 +1,11 @@
 # 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.24 2012/05/16 10:37:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.25 2012/07/23 08:04:02 ultrabug Exp $
+
+*cluster-glue-1.0.10 (23 Jul 2012)
+
+  23 Jul 2012; Ultrabug <ultrabug@gentoo.org> +cluster-glue-1.0.10.ebuild:
+  Version bump, drop large-cluster from IUSE (fixed by upstream bug #2633).
 
 *cluster-glue-1.0.9-r1 (16 May 2012)
 
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index bd621cd90a29..b1f356ad51e6 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,29 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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.9.tar.bz2 461579 RMD160 6ed16d09359e63c8bb5f0da20e8e13871cdf71f5 SHA1 6e38c0ef140ca394017cde8bac597b2496546d5d SHA256 c5c3e7672913798887e0127e387dcc9a4adff8ceac6ff6cec06d8eacd5ca26fa
-EBUILD cluster-glue-1.0.9-r1.ebuild 2432 RMD160 aced1b55dc1b7b1b77a5ca77c225dbe04ed82bc4 SHA1 b2e2c520a3cf89f29dd9d163aff7e4201ffaa7d7 SHA256 84b2333ff93ea078b82f5297cb31bb600e3ec9c04798bb3be979ad6b43102ceb
-MISC ChangeLog 4154 RMD160 27736c563591b211414258d1fe0cbf2f1321dd95 SHA1 f39c2de7a1402ed74594ab7512f3ba71b0f3cd42 SHA256 2e1d943e50f77dd31ca84ff48c0975ca17724ecf587501355e5995d0726f5123
-MISC metadata.xml 483 RMD160 30f3680d6aa967fb12723593a77caf3b1f746243 SHA1 0c87d9114eca4a6f0c60ff281f107a540e95c9a1 SHA256 544de4cd75ae97b51a6eacb384430b18089ac14b0f78bfd8e2f157abeb75266e
+AUX 1.0.5-docs.patch 1329 SHA256 27d854f18b0830b9f2ac0161a244a06edc04da0fa4661d81dc171e07e3efa24b SHA512 f1ec25ff47c31e05adc2b20118fb003fa304b64bf7969f3f7df3dbd997729720bd2f0a64df92f616c40cab8a8e464d7f60b1a76223ad7d8484e19163e1e72a05 WHIRLPOOL 57072f552ca18e15b44deda77e4809096aed7dd81937081208939e52a8ba8d51ce8c6d29db3bc59e2c729246c2642760e391e7ebc7e0d40b9f817d7575f87109
+AUX 1.0.5-respect_cflags.patch 287 SHA256 be7f2c9cbfc8201118abbdb2aeb1cf6d9aca2c586ae7a6d55963ee3143d9f71e SHA512 7c49a54477d02a0bafa9b9d1aa4029a872fa31b4355b78e215a7eade130ccc240921d563d3ddeb7b5f61650f2da79cc628f79e90fdaf0e4f771dc339be223d7a WHIRLPOOL a81854ccddf4a2d1e0be1eca40eba1a6d7451c44f88f28ca2f8b7d51f31ab4077113f9ff3f216271663eccb2671cf592640fda5f06d99b49eed065e6ef40aee8
+AUX 1.0.7-fix_configure.patch 379 SHA256 f786933d5b8e7593240bc6a174984943700a37d71594f7b9c1dc322778ceb571 SHA512 5e09852918860f041e03a33b6fc907bc7d53ffd88abb3a3fbcd9bdb303cf17db0b4b8aab9dcdc5b6bfa52bf4d17b492b8f85bc7a137a52e4a03ec324b13caca1 WHIRLPOOL ec891546e510bd44f0c4290587950288259b4f970d326171c8309675361e3e94f07c8c7d57ad8ad3ff0cb73efc44f712bd9cf297ef50f991d1ec1fa5316579fb
+AUX 1.0.9-glib-2.32.patch 473 SHA256 cfd3b30840c7930e684ae09f9b8cc8f6a35edbfea135cdb7de9653a0a7069f18 SHA512 a9c0fe16d9cb2906e88b1d390e8df30671d61c279b0ea5aa8eca2051f27f52aa97fbaa7eacb27b9dd30c6bf0fabcaf9f95fc8363534e3350b5343fed9fb23a59 WHIRLPOOL 5cd551b8e98672164c092e2d0c80f47558515755011a9f0123dfa3a6f2859e198a258cca4f61e1be31474940c1e91721c9e7a68d59219af101b2967b02d60624
+AUX heartbeat-logd.init 953 SHA256 c174d2767c7cee63d77436c8e533aba7d6856af398c82881c7ba3758eba38e7b SHA512 df2371f745084985663043acf79ecb5d88838a170de6d5801e651e93c842551bc90cb024841b494efaafc3e24bff7898248165911feca1969cae0cf8b354e55e WHIRLPOOL 73cba45ab401affaac74fbb1323096fdefaef95bc437ccda299e81a30698bafb2f4bc6424bc332b68407e2c03082a969009908030b16bd26695fe2e75a910147
+DIST glue-1.0.10.tar.bz2 463675 SHA256 c79225097153820aa449c130ec4b4a64755e699e84dde2a698f2689c3f78a2bc SHA512 79c5c9c0a5b721d09aa134e436c476fe5b1f2dcbba3605ab89dcb3770d50ec001b8200e7beb305e8fad526eee192c9f9385458b5b90bda2d94554393ee37a991 WHIRLPOOL 7f884c5fc11ab11130f3c12badf6a0d597aaac8480bcca575717e390c90d318447fa22bf0578273ccdcfc038527143680cc1a2846fcbd333264967a0b17eddc1
+DIST glue-1.0.9.tar.bz2 461579 SHA256 c5c3e7672913798887e0127e387dcc9a4adff8ceac6ff6cec06d8eacd5ca26fa
+EBUILD cluster-glue-1.0.10.ebuild 2256 SHA256 d8313284c3a1da489a09d7f2e73fe216e583db750ec4eb675919d4e65c807b5d SHA512 7bff096f6cbc7a1cc9481ae9e4e5d722ed450844efe43d341cad6a6a3b8fd6c3e4c6c268ddae02a0149823b544cffb0a583c4d84430346e87394796144462abd WHIRLPOOL 7bed9952813a238bbaa238b3cc03b11d5c1d992f0852b133736be997a3db56702104f76149636abebd0273422f234eaec4b7efca9ee98d7babdb90ba57ad2990
+EBUILD cluster-glue-1.0.9-r1.ebuild 2432 SHA256 84b2333ff93ea078b82f5297cb31bb600e3ec9c04798bb3be979ad6b43102ceb SHA512 8aadbc92c799f60639e35c76c8dfd4c3ade322553cd7bd65eb6a5cbab5042b2f235819b7df64a8d224a643877521f71c30f3f3de42115464e8a3d16e0399910c WHIRLPOOL 55fbb8a1f37ce81ecd1654307f5d32ce0279ef3baf702d516756f1608ca6203e0f2191a03ec45b3b7bf46eb4a11fc3cdad0e283774ed2f44c5871d85c43d6791
+MISC ChangeLog 4340 SHA256 39c1d1189c63b03561fbaa20c9e82d632f76db25bb0d74b1b9ec9958b9f4eebb SHA512 934516447a785ecffd5cf43459d0b85d5d3bfddfe726775a747372ee3efe5de0ba8c50021933b9a86829e3ef16a2f12734b31d47fd3f29fe199a03a1172e8d05 WHIRLPOOL 7876a59382c866a716e090cc7d44bd7e897c15cba1cc81ce34fbb2b084e4670e8e3d8ebb1dd2756cb4c2c452ff37c3ea4233ffc8fcc01dc69c61e9f84ff7fdc9
+MISC metadata.xml 483 SHA256 544de4cd75ae97b51a6eacb384430b18089ac14b0f78bfd8e2f157abeb75266e SHA512 8bec7e01779aa115cb7cbbfe6dd3874b58e04176f55664a29adbd9cff1702e65c9ab57df8afc77408b3ca0de7788072f3a90f321c73890443f48ecc9003a22a0 WHIRLPOOL 16123c3265290dedd5971e005dcb76d1a2ef4c96e7c5598c3c81f4b910bed22d9c506237b89142398ec19af89dc167c00d55df3f4d8cc90d7134445d04f3a5c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPs4OIAAoJEF0huFKJUZL5ppEP/0o9ClYaNwm3SBgxnmo/nNyT
-thse/E/WgyTb2k+qSednX9D8miC9H0KdETqOjxQxwNetbev0yCrbjR7mef9eaRrY
-QLMFhrNRHPLSSHUUrJGuhtlWu092x5dHw5hpNy4+BgeFI/EKN2IYD6h/vSTmSv19
-To/GwjsExVzq6OG7LD3pNL8KpnQXeHzILNMk4likn7ZwVe8qMwp4nXuins86NXJ2
-leUOJ+qh4moSTSPvJ4HcC2DMaXW8cGQw1ysC4Edzll1B40/lmS+e4xMFdrYnYaaU
-qph0fgW8Oav7ohAAr5tXo6vD3TV6mbWsO+MXPXoBhK8TQOsFcF6itqVrpkbwtc75
-2RlEd0zwT9UGq6tuLYeHu96TFXzIDQ2GrNb/Xw21ZxCQDrqyrr2SUn1y6o9c55Jm
-c9eHl6zeHlTP8+AE0DdZagS15Ldb3bKaF51kkVWJvpcrM2cKQbmn50CpPgeZxe4o
-+iOqNZK4emp/jsMkLvwJH/sjG3ojwpQAx8C4H3pt91SAgVfqRo/KOGpkYmIe8ueJ
-E9H3lbUmkFyP5VDhRr7IWSKd4DlqAM99OGmg1Paly0l3o9HFa+AUgJPycLdzKIgy
-AnHjKIG5gRemd/e2waviWQE+rCad70Fy18WaizznWiFAWs02c9/7ime17BK7mjrK
-UFiSs3yVy40ed7r2MRZn
-=aqux
+iF4EAREIAAYFAlANBXwACgkQKiQSS7ZY+hPpaAEA0UdIjJlociR2Ft849tHLqzxL
+YSRfgl4QSFPwK6F9vdwBAIhWSO32O0ib15d2dLsgaRIaPrPC6yESh/H6Nga39mEH
+=32y4
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
new file mode 100644
index 000000000000..af5900f90c5c
--- /dev/null
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
@@ -0,0 +1,93 @@
+# 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.10.ebuild,v 1.1 2012/07/23 08:04:02 ultrabug Exp $
+
+EAPI=4
+
+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
+	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
+}