diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2013-01-18 12:36:36 +0000 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2013-01-18 12:36:36 +0000 |
commit | 3040dba20c7e7e5907803f003b58a8d514ff1ab0 (patch) | |
tree | 4851428106b567ee097f380d2715b86234ea2b46 /sys-cluster/resource-agents | |
parent | Version Bump and cleanup of old versions (diff) | |
download | gentoo-2-3040dba20c7e7e5907803f003b58a8d514ff1ab0.tar.gz gentoo-2-3040dba20c7e7e5907803f003b58a8d514ff1ab0.tar.bz2 gentoo-2-3040dba20c7e7e5907803f003b58a8d514ff1ab0.zip |
version bump fix #449876 and #420643
(Portage version: 2.1.11.41/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster/resource-agents')
-rw-r--r-- | sys-cluster/resource-agents/ChangeLog | 12 | ||||
-rw-r--r-- | sys-cluster/resource-agents/files/3.9.4-configure.patch | 30 | ||||
-rw-r--r-- | sys-cluster/resource-agents/metadata.xml | 1 | ||||
-rw-r--r-- | sys-cluster/resource-agents/resource-agents-1.0.4-r2.ebuild | 63 | ||||
-rw-r--r-- | sys-cluster/resource-agents/resource-agents-3.9.4.ebuild | 64 |
5 files changed, 168 insertions, 2 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/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." +} |