* [gentoo-commits] proj/sci:master commit in: sys-cluster/heartbeat/files/, sys-cluster/heartbeat/
@ 2011-02-11 11:05 Alexys Jacob
0 siblings, 0 replies; only message in thread
From: Alexys Jacob @ 2011-02-11 11:05 UTC (permalink / raw
To: gentoo-commits
commit: 90e56fd6d7179e606238f99315ff54cbf078a8e6
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 11:04:52 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 11:04:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=90e56fd6
sys-cluster/heartbeat moved to main tree
---
sys-cluster/heartbeat/files/3.0.4-docs.patch | 57 -----------
.../heartbeat/files/3.0.4-fix_configure.patch | 99 --------------------
.../heartbeat/files/3.0.4-python_tests.patch | 29 ------
sys-cluster/heartbeat/files/heartbeat-init | 91 ------------------
sys-cluster/heartbeat/heartbeat-3.0.4.ebuild | 82 ----------------
5 files changed, 0 insertions(+), 358 deletions(-)
diff --git a/sys-cluster/heartbeat/files/3.0.4-docs.patch b/sys-cluster/heartbeat/files/3.0.4-docs.patch
deleted file mode 100644
index 3fdcfbd..0000000
--- a/sys-cluster/heartbeat/files/3.0.4-docs.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -505,8 +505,15 @@
- AC_PATH_PROGS(TEST, test)
- AC_PATH_PROGS(PKGCONFIG, pkg-config)
-
--dnl xsltproc is required for building the man pages
--AC_PATH_PROGS(XSLTPROC, xsltproc)
-+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)
-+
-
- dnl ************************************************************************
- dnl Check whether non-root user can chown.
---- doc/Makefile.am
-+++ doc/Makefile.am
-@@ -33,11 +33,12 @@
-
- doc_DATA = $(OTHER_DOCS)
-
-+if BUILD_DOC
- man_MANS = heartbeat.8 apphbd.8 cl_status.1 \
- hb_standby.1 hb_takeover.1 hb_addnode.1 hb_delnode.1 \
- ha.cf.5 authkeys.5
-
--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,6 +48,12 @@
- XSLTPROC_HTML_OPTIONS ?= $(XSLTPROC_OPTIONS)
- XSLTPROC_FO_OPTIONS ?= $(XSLTPROC_OPTIONS)
-
-+%.5 %.8 %.1: %.xml
-+ $(XSLTPROC) \
-+ $(XSLTPROC_MANPAGES_OPTIONS) \
-+ $(MANPAGES_STYLESHEET) $<
-+endif
-+
- EXTRA_DIST = $(txtfiles) $(htmlfiles) $(man_MANS) $(OTHER_DOCS)
-
- ChangeLog: $(SPECSRC)
-@@ -56,7 +63,3 @@
- .html.txt:
- if [ "X$(HTML2TXT)" = "X" ]; then echo "Lynx or w3m or user-defined HTML2TXT required to convert $< to $@" >$@ ; else $(HTML2TXT) -dump $< >$@ ; fi
-
--%.5 %.8 %.1: %.xml
-- $(XSLTPROC) \
-- $(XSLTPROC_MANPAGES_OPTIONS) \
-- $(MANPAGES_STYLESHEET) $<
diff --git a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch b/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
deleted file mode 100644
index 03db0cc..0000000
--- a/sys-cluster/heartbeat/files/3.0.4-fix_configure.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- work/Heartbeat-3-0-STABLE-3.0.4/configure.in 2010-12-09 21:09:47.000000000 +0100
-+++ work2/Heartbeat-3-0-STABLE-3.0.4/configure.in 2010-12-28 17:37:45.080773140 +0100
-@@ -243,9 +243,9 @@
- mandir=`var "$mandir" "$exec_prefix/man"`
- dnl docdir is available in autoconf 2.60+, for older versions preseed
- dnl with the same value that 2.60+ uses
--docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
--libdir=`var "$libdir" "$exec_prefix/lib"`
--libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
-+dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-+dnl libdir=`var "$libdir" "$exec_prefix/lib"`
-+dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
- noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
-
-
-@@ -284,59 +284,11 @@
- LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
- LibCdir=`dirname $LIBC`
- dirlist=`echo $LibCdir | tr '/' ' '`
-- LibDirSuffix=unknown
-- for dir in $dirlist
-- do
-- case $dir in
-- *lib*) LibDirSuffix=$dir; break;;
-- *);;
-- esac
-- done
-- case $LibDirSuffix in
-- unknown) LibDirSuffix=`basename $LibCdir`;;
-- esac
- OutFileType=`file $tmpOutfile`
- rm -f $tmpCfile $tmpOutfile
- else
- AC_MSG_ERROR([Cannot Compile trivial C program])
- fi
--#
--# The code above doesn't work right everywhere
--# (like Fedora and OpenBSD)
--#
--case ${LibDirSuffix} in
-- *lib*) : Cool;;
-- *) : Sigh...
-- case $OutFileType in
-- *64-bit*)
-- case $host_os in
-- openbsd*) LibDirSuffix=lib;;
-- *) LibDirSuffix=lib64;;
-- esac;;
-- *32-bit*) LibDirSuffix=lib;;
-- *) LibDirSuffix=lib;;
-- esac;;
--esac
--#
--# This may not yet be quite right for PPC where the default
--# is to produce 32-bit binaries, even though the OS is 64-bit
--# or for that matter for system Z, But, it's a lot better than
--# it used to be.
--#
--AC_MSG_RESULT($LibDirSuffix)
--
--case $libdir in
-- */*${LibDirSuffix}) : Cool ;;
-- *) : Uh Oh...
-- libdir=`dirname $libdir`/$LibDirSuffix
-- AC_MSG_WARN([Overriding libdir to: $libdir]);;
--esac
--case $libexecdir in
-- */$LibDirSuffix) : Cool ;;
-- *) : Uh Oh...
-- libexecdir=`dirname $libexecdir`/$LibDirSuffix
-- AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
--esac
-
- for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
- includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
-@@ -386,7 +338,6 @@
- fi
-
- AC_CHECK_HEADERS(heartbeat/glue_config.h)
--GLUE_HEADER=none
- if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
- GLUE_HEADER=heartbeat/glue_config.h
- else
-@@ -453,15 +404,6 @@
-
- dnl We use this in the RPM specfile...
- AC_SUBST(ac_configure_args)
--cleaned_configure_args=""
--for j in ${ac_configure_args}
--do
-- case $j in
-- *--libdir=*|*--libexecdir=*) ;;
-- *) cleaned_configure_args="$cleaned_configure_args $j";;
-- esac
--done
--AC_SUBST(cleaned_configure_args)
-
- dnl *************************************************************************
- PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
diff --git a/sys-cluster/heartbeat/files/3.0.4-python_tests.patch b/sys-cluster/heartbeat/files/3.0.4-python_tests.patch
deleted file mode 100644
index a91c7ec..0000000
--- a/sys-cluster/heartbeat/files/3.0.4-python_tests.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- cts/Makefile.am
-+++ cts/Makefile.am
-@@ -21,7 +21,7 @@
-
- ctsdir = @HA_NOARCHDATAHBDIR@/cts
-
--cts_PYTHON = \
-+cts_SCRIPTS = \
- CM_fs.py \
- CM_hb.py \
- CM_LinuxHAv2.py \
-@@ -32,14 +32,12 @@
- extracttests.py \
- getpeinputs.sh \
- OCFIPraTest.py \
-- CIB.py
-+ CIB.py \
-+ CTSproxy.py \
-+ LSBDummy
-
- cts_DATA = README
-
--cts_SCRIPTS = \
-- CTSproxy.py \
-- getpeinputs.sh \
-- LSBDummy
-
- all-local: $(cts_PYTHON)
-
diff --git a/sys-cluster/heartbeat/files/heartbeat-init b/sys-cluster/heartbeat/files/heartbeat-init
deleted file mode 100644
index 5a81a21..0000000
--- a/sys-cluster/heartbeat/files/heartbeat-init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/files/heartbeat-init,v 1.7 2007/03/01 00:48:11 xmerlin Exp $
-
-HA_DIR=/etc/ha.d
-. $HA_DIR/shellfuncs
-
-depend() {
- use logger
- need net
-}
-
-opts="start stop status reload restart"
-
-CheckBool() {
- case `echo "$1" | tr A-Z a-z` in
- y|yes|enable|on|true|1) true;;
- *) false;;
- esac
-}
-
-# Run pre-startup script if it exists
-RunStartStop() {
- [ -f $HA_DIR/resource.d/startstop ] && $HA_DIR/resource.d/startstop "$@"
-}
-
-start() {
- ebegin "Starting heartbeat"
-
- . $HA_DIR/shellfuncs
-
- # start the log subsystem
- CheckBool "`ha_parameter use_logd`" && \
- ( /usr/lib/heartbeat/ha_logd -s &>/dev/null || \
- /usr/lib/heartbeat/ha_logd -d -c /etc/ha.d/ha_logd.cf)
-
- RunStartStop pre-start
-
- CheckBool "`ha_parameter crm`" || \
- /usr/lib/heartbeat/ResourceManager verifyallidle
-
- /usr/lib/heartbeat/heartbeat &>/dev/null
- ret=$?
-
- RunStartStop post-start
-
- eend ${ret}
-}
-
-stop() {
- ebegin "Stopping heartbeat"
-
- RunStartStop pre-stop
-
- /usr/lib/heartbeat/heartbeat -k &>/dev/null
- ret=$?
-
- RunStartStop post-stop ${ret}
-
- # stop log subsystem
- CheckBool "`ha_parameter use_logd`" && \
- ( /usr/lib/heartbeat/ha_logd -s &>/dev/null && \
- /usr/lib/heartbeat/ha_logd -k &>/dev/null )
-
- eend ${ret}
-}
-
-status() {
- /usr/lib/heartbeat/heartbeat -s
-}
-
-reload() {
- ebegin "Reloading heartbeat"
- /usr/lib/heartbeat/heartbeat -r &>/dev/null
- eend $?
-}
-
-restart() {
- . $HA_DIR/shellfuncs
-
- sleeptime=$(( `ha_parameter deadtime` + 10 ))
-
- svc_stop
-
- ebegin " waiting ${sleeptime}s to allow resource takeover to complete"
- sleep ${sleeptime}
- eend 0
-
- svc_start
-}
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.4.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.4.ebuild
deleted file mode 100644
index e2e8b2b..0000000
--- a/sys-cluster/heartbeat/heartbeat-3.0.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-3.0.3-r2.ebuild,v 1.1 2010/10/06 09:25:37 xarthisius Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-inherit python autotools multilib eutils base
-
-DESCRIPTION="Heartbeat high availability cluster manager"
-HOMEPAGE="http://www.linux-ha.org/wiki/Heartbeat"
-SRC_URI="http://hg.linux-ha.org/${PN}-STABLE_3_0/archive/STABLE-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipmi snmp static-libs"
-
-RDEPEND="sys-cluster/cluster-glue
- dev-libs/glib:2
- virtual/ssh
- net-libs/gnutls
- ipmi? ( sys-libs/openipmi )
- snmp? ( net-analyzer/net-snmp )
- "
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- dev-lang/swig"
-
-PDEPEND="sys-cluster/resource-agents"
-
-S=${WORKDIR}/Heartbeat-3-0-STABLE-${PV}
-
-PATCHES=(
- "${FILESDIR}/${PV}-fix_configure.patch"
- "${FILESDIR}/${PV}-docs.patch"
- "${FILESDIR}/${PV}-python_tests.patch"
-)
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- base_src_prepare
- eautoreconf
-
- cp "${FILESDIR}"/heartbeat-init "${T}" || die
- sed -i \
- -e "/ResourceManager/ s/lib/share/" \
- -e "s:lib:$(get_libdir):g" \
- "${T}"/heartbeat-init || die
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- --disable-fatal-warnings \
- $(use_enable static-libs static) \
- $(use_enable doc) \
- --disable-tipc \
- $(use_enable ipmi ipmilan) \
- --enable-dopd \
- --libdir=/usr/$(get_libdir) \
- --localstatedir=/var \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable snmp)
-}
-
-src_install() {
- base_src_install
-
- newinitd "${T}/heartbeat-init" heartbeat || die
-
- # fix collisions
- rm -rf "${D}"/usr/include/heartbeat/{compress,ha_msg}.h
-
- if use doc ; then
- dodoc README doc/*.txt doc/AUTHORS || die
- fi
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-11 11:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-11 11:05 [gentoo-commits] proj/sci:master commit in: sys-cluster/heartbeat/files/, sys-cluster/heartbeat/ Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox