version bump, drop useless and fixed versions.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

7 files changed, 22 insertions, 235 deletions

diff --git a/sys-cluster/pacemaker-gui/ChangeLog b/sys-cluster/pacemaker-gui/ChangeLog
index 65fa6bd45900..5448817dd981 100644
--- a/sys-cluster/pacemaker-gui/ChangeLog
+++ b/sys-cluster/pacemaker-gui/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-cluster/pacemaker-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/ChangeLog,v 1.4 2012/02/05 02:01:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/ChangeLog,v 1.5 2012/03/08 10:35:39 ultrabug Exp $
+
+*pacemaker-gui-2.1.1 (08 Mar 2012)
+
+  08 Mar 2012; Ultrabug <ultrabug@gentoo.org>
+  -files/pacemaker-gui-2.0.0-doc.patch,
+  -files/pacemaker-gui-2.0.0-gnutls.patch,
+  -files/pacemaker-gui-2.0.0-noGTK.patch, -pacemaker-gui-2.1.0.ebuild,
+  -pacemaker-gui-2.1.0-r1.ebuild, +pacemaker-gui-2.1.1.ebuild,
+  +files/pacemaker-gui-2.1.1-doc.patch, -files/mgmtd.init:
+  Version bump, drop old init script based version, drop non upstream GTK
+  handling.
 
   05 Feb 2012; Mike Gilbert <floppym@gentoo.org> pacemaker-gui-2.1.0-r1.ebuild:
   Inherit multilib.
diff --git a/sys-cluster/pacemaker-gui/files/mgmtd.init b/sys-cluster/pacemaker-gui/files/mgmtd.init
deleted file mode 100644
index a5548139d0c7..000000000000
--- a/sys-cluster/pacemaker-gui/files/mgmtd.init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# 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/files/mgmtd.init,v 1.1 2011/02/21 14:46:15 ultrabug Exp $
-
-PIDFILE="/var/run/pcmk-mgmtd.pid"
-BINARY="/usr/lib/heartbeat/mgmtd"
-
-# Adjust on the installed stack
-if [ -f /etc/init.d/corosync ]; then
-   DEPEND="pacemaker"
-   export HA_cluster_type="openais"
-else
-    DEPEND="heartbeat"
-    export HA_cluster_type="heartbeat"
-fi
-
-depend() {
-   need $DEPEND
-}
-
-start() {
-   ebegin "Starting Pacemaker Management daemon"
-   start-stop-daemon --start --pidfile "${PIDFILE}" -m -x ${BINARY} -b -- -v
-   eend $?
-}
-
-stop() {
-   ebegin "Stopping Pacemaker Management daemon"
-   start-stop-daemon --stop --pidfile "${PIDFILE}"
-   eend $?
-}
-
-restart() {
-   ebegin "Restarting Pacemaker Management daemon"
-   svc_stop
-   svc_start
-   eend $?
-}
diff --git a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-gnutls.patch b/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-gnutls.patch
deleted file mode 100644
index 5b6cb46b3b97..000000000000
--- a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-gnutls.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.in	2010-06-28 17:52:56.949797667 +0000
-+++ configure.in	2010-06-28 17:54:51.839826869 +0000
-@@ -1490,8 +1490,6 @@
-    LCRSODIR="$libdir"
- fi
- 
--PKG_FEATURES="$PKG_FEATURES$STACKS"
--
- AC_MSG_CHECKING(for supported stacks)
- if test x"$STACKS" = x; then
-    AC_MSG_FAILURE(You must choose at least one cluster stack to support)
-@@ -1973,7 +1971,9 @@
- 	GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
- 	AC_MSG_RESULT($GNUTLSLIBS)
- else
--	AC_CHECK_LIB(gnutls, gnutls_init)
-+	PKG_CHECK_MODULES(GNUTLS, [gnutls])
-+	GNUTLSHEAD=$GNUTLS_CFLAGS
-+	GNUTLSLIBS=$GNUTLS_LIBS
- fi
- AC_SUBST(GNUTLSHEAD)
- AC_SUBST(GNUTLSLIBS)
-
---- lib/mgmt/Makefile.am	2010-03-26 11:05:47.000000000 +0000
-+++ lib/mgmt/Makefile.am	2010-06-28 17:56:38.339798756 +0000
-@@ -35,8 +35,7 @@
- 
- lib_LTLIBRARIES = libhbmgmttls.la libhbmgmtclient.la libhbmgmtcommon.la
- libhbmgmttls_la_SOURCES = mgmt_tls_lib.c
--libhbmgmttls_la_LIBADD  = $(COMMONLIBS)
--libhbmgmttls_la_LDFLAGS = $(GNUTLSLIBS)
-+libhbmgmttls_la_LIBADD  = $(COMMONLIBS) $(GNUTLSLIBS)
- libhbmgmttls_la_CFLAGS = $(INCLUDES) $(GNUTLSHEAD)
- 
- libhbmgmtclient_la_SOURCES = mgmt_client_lib.c
-@@ -50,8 +49,8 @@
- 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 $(GNUTLSLIBS)
--_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la
-+_pymgmt_la_LDFLAGS = -module 
-+_pymgmt_la_LIBADD = $(top_builddir)/replace/libreplace.la $(GNUTLSLIBS)
- 
- guilib_DATA = pymgmt.py
- 
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
deleted file mode 100644
index ead72605fcb8..000000000000
--- a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-noGTK.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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/files/pacemaker-gui-2.0.0-doc.patch b/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.1.1-doc.patch
index 3d35d4741611..8e89cc177516 100644
--- a/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.0.0-doc.patch
+++ b/sys-cluster/pacemaker-gui/files/pacemaker-gui-2.1.1-doc.patch
@@ -4,8 +4,8 @@
  SNMP_SUBAGENT_DIR = snmp_subagent
  endif
  
--SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR) doc po
-+SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR) po
+-SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR) doc
++SUBDIRS	= $(LIBLTDL_DIR) replace include lib mgmt $(CIM_PROVIDER_DIR) $(TSA_PLUGIN_DIR) $(SNMP_SUBAGENT_DIR)
  
  tgz:
  	rm -f $(TARFILE)
diff --git a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0.ebuild b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0.ebuild
deleted file mode 100644
index 011d761eefe8..000000000000
--- a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.ebuild,v 1.1 2011/10/12 12:38:45 ultrabug Exp $
-
-EAPI=3
-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="heartbeat nls snmp static-libs"
-
-CDEPEND="
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-libs/openssl
-	dev-python/pygtk
-	dev-python/pyxml
-	net-libs/gnutls
-	sys-apps/util-linux
-	sys-cluster/cluster-glue
-	>=sys-cluster/pacemaker-1.1
-	heartbeat? ( sys-cluster/pacemaker[heartbeat] )
-	sys-libs/ncurses
-	sys-libs/pam
-	sys-libs/zlib"
-RDEPEND="${CDEPEND}
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	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
-	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
-	newinitd "${FILESDIR}"/mgmtd.init pcmk-mgmtd
-	dodoc README doc/AUTHORS || die
-}
-
-pkg_postinst() {
-	elog "IMPORTANT: To login in the GUI, your user"
-	elog "must be part of the 'haclient' group."
-	elog " "
-	elog "To start the management daemon, run:"
-	elog "/etc/init.d/pcmk-mgmtd start"
-}
diff --git a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.1.ebuild
index a68ef4eebb9f..d5d74d3ed093 100644
--- a/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.0-r1.ebuild
+++ b/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2012 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.2 2012/02/05 02:01:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker-gui/pacemaker-gui-2.1.1.ebuild,v 1.1 2012/03/08 10:35:39 ultrabug Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
 MY_P="pacemaker-mgmt-${PV}"
+MY_TREE="e4db9d3"
 
-inherit python base autotools multilib
+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"
+SRC_URI="https://github.com/gao-yan/pacemaker-mgmt/tarball/${MY_P} -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
@@ -29,7 +30,6 @@ CDEPEND="
 	heartbeat? ( sys-cluster/pacemaker[heartbeat] )
 	gtk? (
 		dev-python/pygtk
-		dev-python/pyxml
 		)
 	sys-libs/ncurses
 	sys-libs/pam
@@ -44,11 +44,10 @@ DEPEND="${CDEPEND}
 		sys-devel/gettext
 	)"
 
-S="${WORKDIR}/Pacemaker-Python-GUI-${MY_P}/"
+S="${WORKDIR}/gao-yan-pacemaker-mgmt-${MY_TREE}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-gnutls.patch"
-	"${FILESDIR}/${PN}-2.0.0-doc.patch"
+	"${FILESDIR}/${PN}-2.1.1-doc.patch"
 )
 
 pkg_setup() {
@@ -57,11 +56,6 @@ pkg_setup() {
 
 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
 }
 
@@ -71,6 +65,7 @@ src_configure() {
 	econf $(use_with heartbeat heartbeat-support) \
 		$(use_enable snmp) \
 		$(use_enable nls) \
+		$(use_enable gtk mgmt-client) \
 		$(use_enable static-libs static) \
 		${myopts} \
 		--disable-fatal-warnings
@@ -78,7 +73,7 @@ src_configure() {
 
 src_install() {
 	base_src_install
-	use static-libs || rm "${D}"/usr/$(get_libdir)/*.la
+	use static-libs || find "${D}"/usr/$(get_libdir)/ -name "*.la" -delete
 	dodoc README doc/AUTHORS || die
 }