diff options
Diffstat (limited to 'sys-cluster/pacemaker-gui')
| -rw-r--r-- | sys-cluster/pacemaker-gui/ChangeLog | 11 | ||||
| -rw-r--r-- | sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch | 50 | ||||
| -rw-r--r-- | sys-cluster/pacemaker-gui/metadata.xml | 1 | ||||
| -rw-r--r-- | sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild | 92 |
4 files changed, 153 insertions, 1 deletions
diff --git a/sys-cluster/pacemaker-gui/ChangeLog b/sys-cluster/pacemaker-gui/ChangeLog index bcce87937ab9..b81f9a52f07a 100644 --- a/sys-cluster/pacemaker-gui/ChangeLog +++ b/sys-cluster/pacemaker-gui/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-cluster/pacemaker-gui # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/ChangeLog,v 1.2 2011/10/12 12:38:45 ultrabug Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/ChangeLog,v 1.3 2011/12/27 14:11:56 ultrabug Exp $ + +*pacemaker-gui-2.1.0-r1 (27 Dec 2011) + + 27 Dec 2011; Ultrabug <ultrabug@gentoo.org> + +files/pacemaker-gui-2.0.0-noGTK.patch, +pacemaker-gui-2.1.0-r1.ebuild, + metadata.xml: + Make the compilation of the GTK client optional via the gtk USE flag, fix + #392201. EAPI4. Drop the useless init.d and change the log message + instructions thanks to Vladimir Varlamov. *pacemaker-gui-2.1.0 (12 Oct 2011) diff --git a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch b/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch new file mode 100644 index 000000000000..ead72605fcb8 --- /dev/null +++ b/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch @@ -0,0 +1,50 @@ +--- a/lib/mgmt/Makefile.am 2011-12-27 13:00:29.229415108 +0100 ++++ b/lib/mgmt/Makefile.am 2011-12-27 14:39:54.886062765 +0100 +@@ -24,15 +24,12 @@ + -I$(top_builddir) -I$(top_srcdir) + + halibdir = $(libdir)/@HB_PKG@ +-guilibdir = $(libdir)/heartbeat-gui + havarlibdir = $(localstatedir)/lib/@HB_PKG@ + COMMONLIBS = $(GLIBLIB) + MGMT_DIR = mgmt + mgmtdir = $(HA_VARLIBHBDIR)/$(MGMT_DIR) + apigid = @HA_APIGROUP@ + +-EXTRA_DIST = pymgmt.i +- + lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtclient.la libhbmgmtcommon.la + libhbmgmttls_la_SOURCES = mgmt_tls_lib.c + libhbmgmttls_la_LIBADD = $(COMMONLIBS) $(GNUTLSLIBS) +@@ -46,18 +43,4 @@ + libhbmgmtcommon_la_LIBADD = $(COMMONLIBS) $(top_builddir)/replace/libreplace.la + libhbmgmtcommon_la_CFLAGS = $(INCLUDES) + +-guilib_LTLIBRARIES = _pymgmt.la +-_pymgmt_la_SOURCES = pymgmt_wrap.c mgmt_client_lib.c mgmt_tls_lib.c mgmt_common_lib.c +-_pymgmt_la_CFLAGS = @PYTHON_INCLUDES@ -I$(top_builddir)/include -w +-_pymgmt_la_LDFLAGS = -module +-_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GNUTLSLIBS) +- +-guilib_DATA = pymgmt.py +- +-pymgmt_wrap.c pymgmt.py: pymgmt.i +- $(SWIG) -python $^ +- + install-exec-local: +- $(mkinstalldirs) $(DESTDIR)$(mgmtdir) +- -chgrp $(apigid) $(DESTDIR)/$(mgmtdir) +- chmod 770 $(DESTDIR)/$(mgmtdir) +--- a/Makefile.am 2011-12-27 13:00:29.239415185 +0100 ++++ b/Makefile.am 2011-12-27 14:36:22.964472730 +0100 +@@ -84,10 +84,6 @@ + ssh $(OBS_SERVER) -- "cd $(OBS_PREFIX)/server:ha-clustering:Factory/$(OBS_PROJECT); /usr/bin/osc commit -m \"New $(OBS_PROJECT) snapshot - $(shell $(HG) id)\"" + + install-exec-local: +- -mkdir -p $(DESTDIR)$(bindir) +- -cd $(DESTDIR)$(libdir)/heartbeat-gui && rm -f haclient.py && ln -s $(datadir)/heartbeat-gui/haclient.py . +- -cd $(DESTDIR)$(bindir) && rm -f crm_gui && ln -s $(datadir)/heartbeat-gui/haclient.py crm_gui +- -cd $(DESTDIR)$(bindir) && rm -f hb_gui && ln -s $(datadir)/heartbeat-gui/haclient.py hb_gui + + dist-clean-local: + rm -f autoconf automake autoheader diff --git a/sys-cluster/pacemaker-gui/metadata.xml b/sys-cluster/pacemaker-gui/metadata.xml index 423ae52b7d47..17fffa4bcbf3 100644 --- a/sys-cluster/pacemaker-gui/metadata.xml +++ b/sys-cluster/pacemaker-gui/metadata.xml @@ -5,5 +5,6 @@ <longdescription>Pacemaker python GUI and management daemon</longdescription> <use> <flag name="heartbeat">Enable support for heartbeat based <pkg>sys-cluster/pacemaker</pkg>.</flag> + <flag name="gtk">Enable the GTK+ based GUI client.</flag> </use> </pkgmetadata> diff --git a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild new file mode 100644 index 000000000000..351e3158c9c5 --- /dev/null +++ b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild,v 1.1 2011/12/27 14:11:56 ultrabug Exp $ + +EAPI=4 +PYTHON_DEPEND="2" +MY_P="pacemaker-mgmt-${PV}" + +inherit python base autotools + +DESCRIPTION="Pacemaker python GUI and management daemon" +HOMEPAGE="http://hg.clusterlabs.org/pacemaker/pygui/" +SRC_URI="http://hg.clusterlabs.org/pacemaker/pygui/archive/${MY_P}.tar.bz2" + +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="-gtk heartbeat nls snmp static-libs" + +CDEPEND=" + app-arch/bzip2 + dev-libs/glib:2 + dev-libs/libxslt + dev-libs/openssl + net-libs/gnutls + sys-apps/util-linux + sys-cluster/cluster-glue + >=sys-cluster/pacemaker-1.1 + heartbeat? ( sys-cluster/pacemaker[heartbeat] ) + gtk? ( + dev-python/pygtk + dev-python/pyxml + ) + sys-libs/ncurses + sys-libs/pam + sys-libs/zlib" +RDEPEND="${CDEPEND} + sys-devel/libtool" +DEPEND="${CDEPEND} + gtk? ( dev-lang/swig ) + dev-util/pkgconfig + nls? ( + dev-util/intltool + sys-devel/gettext + )" + +S="${WORKDIR}/Pacemaker-Python-GUI-${MY_P}/" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-gnutls.patch" + "${FILESDIR}/${PN}-2.0.0-doc.patch" +) + +pkg_setup() { + python_set_active_version 2 +} + +src_prepare() { + base_src_prepare + if ! use gtk; + then + sed -i -e 's/ client//g' mgmt/Makefile.am + epatch "${FILESDIR}/${PN}-2.0.0-noGTK.patch" + fi + eautoreconf +} + +src_configure() { + local myopts="" + use heartbeat || myopts="--with-ais-support" + econf $(use_with heartbeat heartbeat-support) \ + $(use_enable snmp) \ + $(use_enable nls) \ + $(use_enable static-libs static) \ + ${myopts} \ + --disable-fatal-warnings +} + +src_install() { + base_src_install + use static-libs || rm "${D}"/usr/$(get_libdir)/*.la + dodoc README doc/AUTHORS || die +} + +pkg_postinst() { + elog "IMPORTANT: To have the mgmtd daemon started with your cluster," + elog "you must add this directive in /etc/corosync/service.d/pacemaker :" + elog "" + elog "use_mgmtd: 1" + elog "" + elog "NB: To access the GUI, your user must be part of the 'haclient' group" +} |