fix #392201. EAPI4. Drop the useless init.d and change the log message instructions.

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

5 files changed, 160 insertions, 6 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/Manifest b/sys-cluster/pacemaker-gui/Manifest
index 538fb5cf3457..dfb49a0c4eb6 100644
--- a/sys-cluster/pacemaker-gui/Manifest
+++ b/sys-cluster/pacemaker-gui/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX mgmtd.init 916 RMD160 13fd7d9156606999dab89e32b9076bbe58a89c92 SHA1 fc02139019311561d30a8b002a83cec7efc97a2a SHA256 02110dc3e1b5ed1e87b53091d83a03312c49fa70e08f09122eee8e623f0691fc
 AUX pacemaker-gui-2.0.0-doc.patch 427 RMD160 9db55433397f25884e255cf19c0062fd24a19b2d SHA1 148f8cde46ff165fe76f1dfd8a56a05fbd284ff9 SHA256 8aa4602f9ceb3e426293f0f660b3e54dd1cd651f776319a4bc65f5b91186ed56
 AUX pacemaker-gui-2.0.0-gnutls.patch 1554 RMD160 474d03b50b3dc09b2495dd7c70962e0bdfe02802 SHA1 f6d810037195b5c72fcd2b677d4b2749b2c0fccf SHA256 aadc022cfdd5f04660fb4051a80b4921baa36761ae4c72ac5ecbeccf811f8677
+AUX pacemaker-gui-2.0.0-noGTK.patch 2048 RMD160 4c1411aec3b8eb35bca5853adb785cf9fa0f74ac SHA1 0a489e0370dbb38a620a7b4a324ef261b6ecf8fa SHA256 496f69e62e233c81c94be293e3080ff39af2cf9b091322615eaf68fee3b3fd44
 DIST pacemaker-mgmt-2.1.0.tar.bz2 338626 RMD160 37c684c851dcca94ec6b537fbabfd9a8dc82a97b SHA1 f2cbe1e8cde137d94e5b269c837351799176abe7 SHA256 767bcb3740aeedce269d761cbc306afbc5496ee07c15d077f9124d392bdd9a92
+EBUILD pacemaker-gui-2.1.0-r1.ebuild 2098 RMD160 95f3bf9e488a712bba2a621c19373779f8e79d29 SHA1 c4e5a6284788d219af49bc2ebba92cdbaf9cfcda SHA256 d42eb158fb94725b96cd77023a03bf0bc9e8fd2697b286d5132751c69016a65e
 EBUILD pacemaker-gui-2.1.0.ebuild 1869 RMD160 c2a445ff91a259eabc9fe15886d371954035a36c SHA1 2c005d07b2659986b648b11af21e7eeee9709abb SHA256 b0989309c7a6b6681dd7985eeb09b95833b325da3f960e60a2ca915713da2cf0
-MISC ChangeLog 640 RMD160 ebc83992a8d308a74a770192610d7114af16b5e4 SHA1 c6efea6b5e90e417a04094e5a64a7c876c521d4e SHA256 f369dd9f31edfa135fd2c53511e9c8ba4548e9d508d0233c53bc687fa71b32ab
-MISC metadata.xml 367 RMD160 94761c030409dc9be7e326ddb2cd1eef8821c970 SHA1 6e0ac88a92e37d5dcfbed1e404d0c92f8e53b5da SHA256 c39a57c48956a8eca1af4dc901a33b4a18ea8cb4328e4bb918f127313abd76dc
+MISC ChangeLog 1005 RMD160 e79e4e5b838b33db1f388900d8986f04f412c3b9 SHA1 ee0c27d09de31d82cc4e7b45b4acbfda219ad196 SHA256 996b04d3380cb7c15963dee1a9c991699db97500326de2a4dc64f803f7b7356c
+MISC metadata.xml 429 RMD160 c126cc91a46cfd827462d113d91c435001d5d2da SHA1 28b0326810a51c20e4e701070243b355453bdee3 SHA256 aa528f0fc82c129c23cc4339f3701b0265388d40a3e8f907f4fdddd452d829e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6Vil4ACgkQKiQSS7ZY+hO/BgD9Er5rls6u+8TQsKxXKcMD3dkK
-Z6wYI355BjHb3fLhZcQA/RIkTGMxnGvnHCs7yvVMPkUZXq1nn6icTH9plMaCcDBd
-=duBR
+iF4EAREIAAYFAk750jUACgkQKiQSS7ZY+hM/CAEAx9mfUCF9byrPJETTv2GeeL4J
+YWSw8nNmXLczLTXZ4l4A/3DeFvJvxwXkevfi5UMMnaG4GVs6XRN5bQhSICUvezSa
+=6ztG
 -----END PGP SIGNATURE-----
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"
+}