version bump fix #449876 and #420643

Package-Manager: portage-2.1.11.41/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

6 files changed, 183 insertions, 13 deletions

diff --git a/sys-cluster/resource-agents/ChangeLog b/sys-cluster/resource-agents/ChangeLog
index 55cc894ed004..e8d92a3016ad 100644
--- a/sys-cluster/resource-agents/ChangeLog
+++ b/sys-cluster/resource-agents/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/resource-agents
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/ChangeLog,v 1.15 2012/02/20 18:01:20 ultrabug Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/ChangeLog,v 1.16 2013/01/18 12:36:36 ultrabug Exp $
+
+*resource-agents-3.9.4 (18 Jan 2013)
+*resource-agents-1.0.4-r2 (18 Jan 2013)
+
+  18 Jan 2013; Ultrabug <ultrabug@gentoo.org> +files/3.9.4-configure.patch,
+  +resource-agents-1.0.4-r2.ebuild, +resource-agents-3.9.4.ebuild,
+  metadata.xml:
+  Version bump fix #420643 thx to Lorand Kelemen and Kazuyoshi, fix #449876
 
   20 Feb 2012; Ultrabug <ultrabug@gentoo.org> resource-agents-1.0.4-r1.ebuild:
   Fix libnet dependency, wrt #405055
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 25d54d721e99..29ed2292b656 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.0.3-docs.patch 1164 RMD160 b557476f4d8867ddb7bdf7aae786c7b8a414a6a7 SHA1 91cb5a505c069bfc42dfef966240286a7a66c761 SHA256 92f061cf7926e6d93ed993d94df1e360be3a4f88e54cdf0134d14d0d054b6350
-AUX 1.0.3-respect_cflags.patch 316 RMD160 18c50ad77c7192840a14aaa3a6487cca8d5f2028 SHA1 1d6f2a42c83f9439934811f0a0a4d3c168c411a9 SHA256 62cee339be61f5d1fd0cf0e335687633e19e38f84feb4ae2de52547269f9fce2
-AUX 1.0.4-dosymlinks.patch 1019 RMD160 53d4b58a0af4eaf19f0985adc2e57bc856f8d8cc SHA1 1108165813017257580bad4a5a420807ce1a5707 SHA256 44e96fda3bb7e18f16fb20ecae091080d43a2b151ebd2f6a6867620952d18a08
-DIST agents-1.0.4.tar.bz2 280486 RMD160 6fd5ff9035d38d7587316a79ae55776f40fa1373 SHA1 49521b227b88d88757708882b445dcad45d1d7de SHA256 32a4b17e3775191728ad2554491f594b852c8836f9aab100ba20998e85c8baa5
-EBUILD resource-agents-1.0.4-r1.ebuild 1616 RMD160 655f53e91b7b59762fddc8288b50bcf5b30d7485 SHA1 3e3dc43e5874e2d5eb2314a684809b8c4bb09308 SHA256 992a143ec28b03865a751c67d8282f87a89500c7cc0a2c1e6c953d849b7944f0
-MISC ChangeLog 2493 RMD160 f8e0f07b421d40a2aee3c765946cd0e3a92b7e10 SHA1 582e507d7d533693fe284c7616cb7333aa15dcbc SHA256 57c1f689b8a38af69e2b365e12f14131f6e4d00f845881d29da36788b85d0f48
-MISC metadata.xml 613 RMD160 8158778c17cf3fdf40d31dfceea71688ca74cf42 SHA1 66d0ef2208a0aa67350258136489ff1925eb64a6 SHA256 3fe9427063dace4f990bef1bffe462793c18c7ab1eee97fb3cc543ac22a416d0
+AUX 1.0.3-docs.patch 1164 SHA256 92f061cf7926e6d93ed993d94df1e360be3a4f88e54cdf0134d14d0d054b6350 SHA512 efec7f4c0cbc33e2c58835d3df1b85798f291cf8ddec44b207a71dfe615a67b2d150a8a222e07779fc3728ded50131a891a6e4207a723db966c3b16770ad97e3 WHIRLPOOL 0585e78fbc8b5b8aef07fc6861ab4d7e7cb95ac88a83d9508e5e2123af683df1172fd4003fe9236f2bbcfe58f2eb82699842bcd82365d1d825076b943eb7cf2f
+AUX 1.0.3-respect_cflags.patch 316 SHA256 62cee339be61f5d1fd0cf0e335687633e19e38f84feb4ae2de52547269f9fce2 SHA512 58955b08d0bee3e97a2069d3215e8a20f0c4908c13f387f099a09164b445577969e5a89069012463a67c7fa13d5d2624363b2e9bcf855cf7cfd7f67e4fee7ad7 WHIRLPOOL ee03de33b01007d110aa8b27b04a59d733d23744d47ec484435e2aad537505e44d62de805980063649828c4898287d651c3265a86b15b2dc2b543f8dde58930f
+AUX 1.0.4-dosymlinks.patch 1019 SHA256 44e96fda3bb7e18f16fb20ecae091080d43a2b151ebd2f6a6867620952d18a08 SHA512 da457cf7db34da9649a2c8f2eb3cf7ce7456886b6dd64c0876f69b626ddf22fa7c85b73f91ec94c2088592be225fc0d7f62b5d5a8d2d59a31d1f61b21d98d5c8 WHIRLPOOL 0b5973303163b1b6bb5c4bf527350ee5b5419248be3a16c1f55f02c80669bb0f2714c16a2e84436b01a68421df59b0013c4d282d6fd18989435ac2f7ad448ac5
+AUX 3.9.4-configure.patch 1052 SHA256 8e02d6ae231099bb35b2ea5daec0cc072560f4811f748ada2f35a9df3c63c032 SHA512 3d716f9ddd24fe7bf6080525a106bb84bd83f684890fef8e88ef2bdf6fcf38409a9b83b0800e6f040b2f38450c8a8a47eb076ee1facd4ec730fbdf08fb98390e WHIRLPOOL bc2688aad7aa3b382bf1cbf8aaa1f5ff02fa72ece27b6ae1112dc772e016abb84338f5f816a09ab156d12bc280d63f67187a871d38751aa3c6e77a8fbdd8649a
+DIST agents-1.0.4.tar.bz2 280486 SHA256 32a4b17e3775191728ad2554491f594b852c8836f9aab100ba20998e85c8baa5 SHA512 c00e2a32312c11445b5a262c7668f6e26f2ffd8b013fbacb7fba91cec2baf403aeff35725207865c87c94d8133c2c7e341e7ef91a5f3accfd362dd0b1632de67 WHIRLPOOL 455358c5814d1cc4fd1a225e056b7e5f8cfcfc786009120acd0751c6c712df00bbbf458b6bb1e4248f918288893f2b879947deff7a58d8574161e3aa251622c1
+DIST resource-agents-3.9.4.tar.gz 539167 SHA256 fb4756814e8f2e861421f051ebc3f148b4901fabcedf7ef908474afd3bf8bd27 SHA512 53e92c7adeaeb48830216c257755f106a41e308055fa922e70b82f8b814cad5aa7c944bc46f0f3cb879e4d93efa8e147fe64473795b84a955fc35e58efebc36d WHIRLPOOL ddc10dfd46a0ed530906428431bdd2c76d8a28bc20d3fbeb3faac9d63c6a70adea2563bb880275ac964372a6350acff9ae6edfacf9588d846da136e64b5b353f
+EBUILD resource-agents-1.0.4-r1.ebuild 1616 SHA256 992a143ec28b03865a751c67d8282f87a89500c7cc0a2c1e6c953d849b7944f0 SHA512 13524eccf385610903d0a499f62e1c8fcaad2d7d0d73cd969feedbf45d3fe55fc5bfc35a8b626f7961d0ef38b00a6813ef8a94122a2b07347fe10f9a89811ab0 WHIRLPOOL 5544126bf66cf6a6d5135fc5152533ebc344e0e5b1d134f2b4464ccb996578645816a1c9f289d6425e005ea9913b44587b79d3b792cbe58c655ef57db53bf2d4
+EBUILD resource-agents-1.0.4-r2.ebuild 1646 SHA256 8a3b21ccb962df408735afcb4898ccd174ca913fe49149107ff659fefdd8cf32 SHA512 9763186f2f122b3e5219b6102ac9a8ed436601bd966d358a0e35350603c41570c1fac1da69ac42355c5dfee074069cbe75b72317167e39e2747e7f4eaf300519 WHIRLPOOL b02bdc0f7a54772b980fced18673c84ec040a7f225322f99293b089239f0e7df0ad24dfc418034ec1bf2527488f228abbd3e631fa2581dbae10fe47b646f14a4
+EBUILD resource-agents-3.9.4.ebuild 1682 SHA256 67c3db3d5323292689aa45e7738c30545ff29b176927b7637151e5c816ade177 SHA512 a1a1317b2ff328ac3856149a4f23ee59a335c76ae2732f404916dd4fa5607d6301428cc4f87e805b943ca54f2665d34578b5452c94bad6d7b548545a81aee965 WHIRLPOOL 9e80d1aec22ec39e5dc55fa5460ff147111bdf9306a1f9d4905e0f8c64a3022f79e387abf52a911a136a9c2bc9dcfda2d16cec995b587e2978006a8e4e8572f3
+MISC ChangeLog 2807 SHA256 d72912df6cbb990a180abd923179d6c35abfbb68b0a7d717480fd940faa545fa SHA512 c4cd26938047428e20856df64a718f65d8f5749b8d6490a8b38fbf3c7b9f787e374e70500e165a791e98fe9557d90533f3a427cb9d8103a3c798daf5571c2c28 WHIRLPOOL b6cad2d8574442da788b4bffce2f9ce03991fdaadd86b28696726f8d2c8f310dee5e192152cd4a51716238934bef0fd4c624c3afbbe3581c196068e6464b07de
+MISC metadata.xml 700 SHA256 58ce6f7697bd6fb666347dd4a712c76e639e5297f8daed6bebe16854e680863f SHA512 d66d18baec9d7af45b504f52ffab5372c0395bd24a6d19f5c6f0f6dfb38f99be1d0f43aea8e819c40571f1800dc1924e5990b382987161aff82ef000a5a43a84 WHIRLPOOL b2806944446b8ebca7ab2b7a2012a772b70e041f403bfa7edc49e5a8fcd56ac0d4242dd9fb012bcc715cb17101503ecd5e039dd92051a7ae299a8210a4501cdf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9CinkACgkQKiQSS7ZY+hOMYAD9F5eMl0wk/u0GQCGFKux2DDVS
-17IPSdx7gsnKwkYmfaEBAJLcFNYhcGNm3yE8cZ7J68lcchBOi3Syq1vN4lxeif4g
-=LUOE
+iF4EAREIAAYFAlD5QdkACgkQKiQSS7ZY+hNs0QEAjR8oIEE933TNFjrUIKVaV4m1
+aTwknBf11Q17MOwQLiQBAKG9tmrNLgLZXI8382wqaw0qRmW788kOrSGgoUmB4l+I
+=fA8F
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/resource-agents/files/3.9.4-configure.patch b/sys-cluster/resource-agents/files/3.9.4-configure.patch
new file mode 100644
index 000000000000..bb2f7bec62a4
--- /dev/null
+++ b/sys-cluster/resource-agents/files/3.9.4-configure.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac	2013-01-18 13:14:54.492191322 +0100
++++ b/configure.ac	2013-01-18 13:17:17.559551891 +0100
+@@ -557,11 +557,13 @@
+ AC_DEFINE_UNQUOTED(POWEROFF_CMD, "$POWEROFF_CMD", path to the poweroff command)
+ AC_DEFINE_UNQUOTED(POWEROFF_OPTIONS, "$POWEROFF_OPTIONS", poweroff options)
+ 
+-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])
+-fi
++AC_ARG_ENABLE([doc],
++	AS_HELP_STRING([--enable-doc],[Build documentation]))
++
++AS_IF([test "x$enable_doc" = "xyes"], [
++	AC_PATH_PROGS(XSLTPROC, xsltproc)
++])
++AM_CONDITIONAL([BUILD_DOC], [test "x$enable_doc" = "xyes"] )
+ AC_SUBST(XSLTPROC)
+ 
+ AC_PATH_PROGS(POD2MAN, pod2man)
+@@ -732,8 +734,6 @@
+         CFLAGS="$CFLAGS -g"
+ 	enable_fatal_warnings=no
+ else
+-        CFLAGS="$CFLAGS -ggdb3"
+-
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+ 	# Also remove -Waggregate-return because we use one libnet
+ 	# call which returns a struct
diff --git a/sys-cluster/resource-agents/metadata.xml b/sys-cluster/resource-agents/metadata.xml
index fc14aaf4f652..ec40dd44fdd5 100644
--- a/sys-cluster/resource-agents/metadata.xml
+++ b/sys-cluster/resource-agents/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<use>
 		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
+		<flag name="rgmanager">Install resources for <pkg>sys-cluster/rgmanager</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-cluster/resource-agents/resource-agents-1.0.4-r2.ebuild b/sys-cluster/resource-agents/resource-agents-1.0.4-r2.ebuild
new file mode 100644
index 000000000000..e3b1c6af3e7b
--- /dev/null
+++ b/sys-cluster/resource-agents/resource-agents-1.0.4-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-1.0.4-r2.ebuild,v 1.1 2013/01/18 12:36:36 ultrabug Exp $
+
+EAPI="2"
+
+MY_P="${P/resource-}"
+inherit autotools multilib eutils base
+
+DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
+SRC_URI="http://hg.linux-ha.org/agents/archive/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc libnet"
+
+DEPEND="sys-apps/iproute2
+	sys-cluster/cluster-glue
+	!<sys-cluster/heartbeat-3.0
+	libnet? ( net-libs/libnet:1.1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/Cluster-Resource-Agents-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/1.0.3-docs.patch"
+	"${FILESDIR}/1.0.3-respect_cflags.patch"
+	"${FILESDIR}/1.0.4-dosymlinks.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		$(use_enable doc) \
+		$(use_enable libnet)
+}
+
+src_install() {
+	base_src_install
+	rm -rf "${D}"/etc/init.d/ldirectord || die
+	rm -rf "${D}"/var/ || die
+}
+
+pkg_postinst() {
+	elog "To use Resource Agents installed in /usr/$(get_libdir)/ocf/resource.d"
+	elog "you have to emerge required runtime dependencies manually."
+	elog ""
+	elog "Description and dependencies of all Agents can be found on"
+	elog "http://www.linux-ha.org/wiki/Resource_Agents"
+	elog "or in the documentation of this package."
+}
diff --git a/sys-cluster/resource-agents/resource-agents-3.9.4.ebuild b/sys-cluster/resource-agents/resource-agents-3.9.4.ebuild
new file mode 100644
index 000000000000..039dd08e485c
--- /dev/null
+++ b/sys-cluster/resource-agents/resource-agents-3.9.4.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-3.9.4.ebuild,v 1.1 2013/01/18 12:36:36 ultrabug Exp $
+
+EAPI="5"
+
+MY_P="${P/resource-}"
+inherit autotools base eutils multilib
+
+DESCRIPTION="Resources pack for Heartbeat / Pacemaker"
+HOMEPAGE="http://www.linux-ha.org/wiki/Resource_Agents"
+SRC_URI="https://github.com/ClusterLabs/resource-agents/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc libnet rgmanager"
+
+RDEPEND="sys-apps/iproute2
+	sys-cluster/cluster-glue
+	!<sys-cluster/heartbeat-3.0
+	libnet? ( net-libs/libnet:1.1 )"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-libs/libxslt
+		app-text/docbook-xsl-stylesheets
+	)"
+
+PATCHES=(
+	"${FILESDIR}/3.9.4-configure.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-fatal-warnings \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		--libdir=/usr/$(get_libdir) \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
+		$(use_enable doc) \
+		$(use_enable libnet)
+}
+
+src_install() {
+	base_src_install
+	rm -rf "${D}"/etc/init.d/ || die
+	rm -rf "${D}"/var/run || die
+	use rgmanager || rm -rf "${D}"/usr/share/cluster/ "${D}"/var/
+}
+
+pkg_postinst() {
+	elog "To use Resource Agents installed in /usr/$(get_libdir)/ocf/resource.d"
+	elog "you have to emerge required runtime dependencies manually."
+	elog ""
+	elog "Description and dependencies of all Agents can be found on"
+	elog "http://www.linux-ha.org/wiki/Resource_Agents"
+	elog "or in the documentation of this package."
+}