Version bump, drop old, wtr #356629.

(Portage version: 2.1.10.59/cvs/Linux x86_64)

5 files changed, 21 insertions, 655 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index c1d2fba97303..7a903b8428dc 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.18 2012/05/16 10:44:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.19 2012/05/16 15:08:26 ultrabug Exp $
+
+*pacemaker-1.1.7 (16 May 2012)
+
+  16 May 2012; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.1.4-r4.ebuild,
+  -files/pacemaker-1.1.4-autotools-r2.patch, -pacemaker-1.1.5.ebuild,
+  -files/pacemaker-1.1.5-autotools.patch, +pacemaker-1.1.7.ebuild:
+  Version bump, drop old, wtr #356629.
 
   16 May 2012; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.1.6.1.ebuild:
   Fix building with glib-2.32, thanks to Marc Schiffbauer <mschiff@gentoo.org>
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
deleted file mode 100644
index a3aad6443319..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
+++ /dev/null
@@ -1,287 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1354,6 +1354,7 @@
- if
-     $PKGCONFIG --exists $SERVICELOG
- then
-+    PKG_CHECK_MODULES([SERVICELOG], [servicelog-1])
-     SERVICELOG_EXISTS="yes"
- fi
- AC_MSG_RESULT($SERVICELOG_EXISTS)
-@@ -1366,6 +1367,7 @@
- if
-     $PKGCONFIG --exists $OPENIPMI $SERVICELOG
- then
-+    PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix])
-     OPENIPMI_SERVICELOG_EXISTS="yes"
- fi
- AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
---- a/fencing/Makefile.am
-+++ b/fencing/Makefile.am
-@@ -36,21 +36,20 @@
- 
- stonith_test_SOURCES	= test.c
- 
--stonith_test_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
--			$(top_builddir)/lib/common/libcrmcommon.la	\
-+stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/common/libcrmcluster.la	\
--			$(top_builddir)/lib/fencing/libstonithd.la
-+			$(top_builddir)/lib/fencing/libstonithd.la	\
-+			$(CRYPTOLIB) $(CLUSTERLIBS)
- 
- stonith_admin_SOURCES	= admin.c
- 
--stonith_admin_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
--			$(top_builddir)/lib/common/libcrmcommon.la	\
-+stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/common/libcrmcluster.la	\
--			$(top_builddir)/lib/fencing/libstonithd.la
--
-+			$(top_builddir)/lib/fencing/libstonithd.la 	\
-+			$(CRYPTOLIB) $(CLUSTERLIBS)
- stonithd_SOURCES	= main.c commands.c remote.c
- 
--stonithd_LDADD		= $(CRYPTOLIB) $(CLUSTERLIBS)			\
--			$(top_builddir)/lib/common/libcrmcommon.la	\
-+stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/common/libcrmcluster.la	\
--			$(top_builddir)/lib/fencing/libstonithd.la
-+			$(top_builddir)/lib/fencing/libstonithd.la	\
-+			$(CRYPTOLIB) $(CLUSTERLIBS)
---- a/mcp/Makefile.am
-+++ b/mcp/Makefile.am
-@@ -34,7 +34,7 @@
- noinst_HEADERS		= 
- 
- pacemakerd_SOURCES	= pacemaker.c corosync.c
--pacemakerd_LDADD	= $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb
-+pacemakerd_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb
- 
- %.8:	%
- 	echo Creating $@
---- a/crmd/Makefile.am
-+++ b/crmd/Makefile.am
-@@ -41,14 +41,13 @@
- 		cib.c pengine.c tengine.c lrm.c 			\
- 		utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
- 
--crmd_LDADD	= $(CLUSTERLIBS) -llrm					\
--		$(top_builddir)/lib/fencing/libstonithd.la		\
-+crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
- 		$(top_builddir)/lib/transition/libtransitioner.la	\
- 		$(top_builddir)/lib/pengine/libpe_rules.la		\
- 		$(top_builddir)/lib/cib/libcib.la			\
- 		$(top_builddir)/lib/common/libcrmcluster.la		\
--		$(top_builddir)/lib/common/libcrmcommon.la
--
-+		$(top_builddir)/lib/common/libcrmcommon.la		\
-+		$(CLUSTERLIBS) -llrm
- if BUILD_XML_HELP
- man8_MANS =	crmd.8
- 
---- a/pengine/Makefile.am
-+++ b/pengine/Makefile.am
-@@ -73,14 +73,14 @@
- libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la
- 
- pengine_SOURCES	= main.c
--pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/cib/libcib.la
-+pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
- # libcib for get_object_root()
- #		$(top_builddir)/lib/hbclient/libhbclient.la
- 
- ptest_SOURCES	= ptest.c 
--ptest_LDADD	= $(COMMONLIBS)						\
--		$(top_builddir)/lib/cib/libcib.la			\
--		$(top_builddir)/lib/transition/libtransitioner.la
-+ptest_LDADD	= $(top_builddir)/lib/cib/libcib.la			\
-+		$(top_builddir)/lib/transition/libtransitioner.la	\
-+		$(COMMONLIBS)
- 
- install-exec-local:
- 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
---- a/lib/common/Makefile.am
-+++ b/lib/common/Makefile.am
-@@ -38,7 +38,7 @@
- endif
- 
- libcrmcluster_la_LDFLAGS = -version-info 1:0:0
--libcrmcluster_la_LIBADD  = $(CLUSTERLIBS) libcrmcommon.la
-+libcrmcluster_la_LIBADD  = libcrmcommon.la $(CLUSTERLIBS)
- libcrmcluster_la_DEPENDENCIES = libcrmcommon.la
- 
- # Can't use -Wcast-qual here because glib insists on pretending things are const  
-@@ -51,7 +51,8 @@
- 
- libcrmcommon_la_SOURCES	= ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
- 
--libcrmcommon_la_LDFLAGS	= -version-info 2:0:0  $(GNUTLSLIBS)
-+libcrmcommon_la_LDFLAGS	= -version-info 2:0:0
-+libcrmcommon_la_LIBADD  = $(GNUTLSLIBS)
- 
- clean-generic:
- 	rm -f *.log *.debug *.xml *~
---- a/lib/plugins/lrm/Makefile.am
-+++ b/lib/plugins/lrm/Makefile.am
-@@ -29,8 +29,8 @@
- plugin_LTLIBRARIES = stonith.la
- 
- stonith_la_SOURCES = raexecstonith.c
--stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \
--		     $(top_builddir)/lib/fencing/libstonithd.la -llrm
-+stonith_la_LDFLAGS = -export-dynamic -module -avoid-version
-+stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm
- 
- install-exec-local:
- 	$(mkinstalldirs) $(DESTDIR)$(lrmdir)
---- a/lib/fencing/Makefile.am
-+++ b/lib/fencing/Makefile.am
-@@ -25,8 +25,8 @@
- lib_LTLIBRARIES = libstonithd.la
- 
- libstonithd_la_SOURCES = st_client.c
--libstonithd_la_LDFLAGS = -version-info 1:0:0 				\
--			-lplumb -lstonith $(CLUSTERLIBS)		\
--			$(top_builddir)/lib/common/libcrmcommon.la
-+libstonithd_la_LDFLAGS = -version-info 1:0:0
-+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la 	\
-+			-lplumb -lstonith $(CLUSTERLIBS)
- 
- AM_CFLAGS = $(INCLUDES)
---- a/cib/Makefile.am
-+++ b/cib/Makefile.am
-@@ -47,8 +47,8 @@
- cib_SOURCES		= io.c messages.c notify.c	\
- 			callbacks.c main.c remote.c common.c
- 
--cib_LDADD		= $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)	\
--			$(top_builddir)/lib/common/libcrmcluster.la
-+cib_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
-+			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
- 
- cibmon_SOURCES		= cibmon.c
- cibmon_LDADD		= $(COMMONLIBS) 
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -62,8 +62,8 @@
- noinst_HEADERS		= 
- 
- crmadmin_SOURCES	= crmadmin.c
--crmadmin_LDADD		= $(COMMONLIBS) $(CLUSTERLIBS) \
--			$(top_builddir)/lib/pengine/libpe_status.la
-+crmadmin_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la \
-+			  $(COMMONLIBS) $(CLUSTERLIBS)
- 
- crm_uuid_SOURCES	= crm_uuid.c
- crm_uuid_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la
-@@ -75,45 +75,45 @@
- crm_shadow_LDADD	= $(COMMONLIBS) 
- 
- crm_node_SOURCES	= ccm_epoche.c
--crm_node_LDADD		= $(COMMONLIBS) $(CLUSTERLIBS) \
--			$(top_builddir)/lib/common/libcrmcluster.la
-+crm_node_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
-+			  $(COMMONLIBS) $(CLUSTERLIBS)
- 
- crm_simulate_SOURCES	= crm_inject.c
- crm_simulate_CFLAGS	= -I$(top_srcdir)/pengine
- 
--crm_simulate_LDADD	= $(COMMONLIBS)						\
--			$(top_builddir)/lib/pengine/libpe_status.la		\
-+crm_simulate_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la		\
- 			$(top_builddir)/pengine/libpengine.la 			\
- 			$(top_builddir)/lib/cib/libcib.la			\
--			$(top_builddir)/lib/transition/libtransitioner.la
-+			$(top_builddir)/lib/transition/libtransitioner.la	\
-+			$(COMMONLIBS)
- 
- crm_diff_SOURCES	= xml_diff.c
- crm_diff_LDADD		= $(COMMONLIBS)
- 
- crm_mon_SOURCES		= crm_mon.c
--crm_mon_LDADD		= $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
--			$(top_builddir)/lib/pengine/libpe_status.la
-+crm_mon_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la		\
-+			  $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm
- 
- # Arguments could be made that this should live in crm/pengine
- crm_verify_SOURCES	= crm_verify.c
--crm_verify_LDADD	= $(COMMONLIBS) \
--			$(top_builddir)/lib/pengine/libpe_status.la \
--			$(top_builddir)/pengine/libpengine.la
-+crm_verify_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la 	\
-+			$(top_builddir)/pengine/libpengine.la		\
-+			$(COMMONLIBS)
- 
- crm_attribute_SOURCES	= crm_attribute.c
- crm_attribute_LDADD	= $(COMMONLIBS)
- 
- crm_resource_SOURCES	= crm_resource.c
--crm_resource_LDADD	= $(COMMONLIBS) \
--			$(top_builddir)/lib/pengine/libpe_rules.la  \
-+crm_resource_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  \
- 			$(top_builddir)/lib/pengine/libpe_status.la \
--			$(top_builddir)/pengine/libpengine.la
-+			$(top_builddir)/pengine/libpengine.la \
-+			$(COMMONLIBS)
- 
- iso8601_SOURCES		= test.iso8601.c
- iso8601_LDADD		= $(COMMONLIBS) 
- 
- attrd_SOURCES		= attrd.c
--attrd_LDADD		= $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
-+attrd_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
- 
- #pingd_SOURCES		= pingd.c
- #pingd_LDADD		= $(COMMONLIBS)
-@@ -123,14 +123,14 @@
- 
- if BUILD_SERVICELOG
- notifyServicelogEvent_SOURCES	= notifyServicelogEvent.c
--notifyServicelogEvent_CFLAGS	= `pkg-config --cflags servicelog-1`
--notifyServicelogEvent_LDFLAGS	= `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
-+notifyServicelogEvent_CFLAGS	= $(SERVICELOG_CFLAGS)
-+notifyServicelogEvent_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
- endif
- 
- if BUILD_OPENIPMI_SERVICELOG
- ipmiservicelogd_SOURCES	= ipmiservicelogd.c
--ipmiservicelogd_CFLAGS	= `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1`
--ipmiservicelogd_LDFLAGS	= `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
-+ipmiservicelogd_CFLAGS	= $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS) 
-+ipmiservicelogd_LDFLAGS	= $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
- endif
- 
- %.8:	% crm_attribute
---- a/extra/Makefile.am
-+++ b/extra/Makefile.am
-@@ -20,5 +20,5 @@
- 
- SUBDIRS                 =  resources
- 
--mibdir = $(datadir)/snmp/mibs
-+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
- mib_DATA = PCMK-MIB.txt
---- a/lib/pengine/Makefile.am
-+++ b/lib/pengine/Makefile.am
-@@ -34,7 +34,7 @@
- 
- libpe_status_la_LDFLAGS	= -version-info 3:0:0
- libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
--libpe_status_la_LIBADD	= -llrm @CURSESLIBS@
-+libpe_status_la_LIBADD	= $(top_builddir)/lib/cib/libcib.la -llrm @CURSESLIBS@
- 
- clean-generic:
- 	rm -f *.log *.debug *~
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -18,7 +18,7 @@
- MAINTAINERCLEANFILES    = Makefile.in
- 
- ## Subdirectories...
--SUBDIRS	= common pengine transition cib fencing plugins
-+SUBDIRS	= common cib pengine transition fencing plugins
- DIST_SUBDIRS =  $(SUBDIRS) ais
- 
- if BUILD_CS_SUPPORT
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
deleted file mode 100644
index b4098eed2af4..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
+++ /dev/null
@@ -1,271 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1354,6 +1354,7 @@
- if
-     $PKGCONFIG --exists $SERVICELOG
- then
-+    PKG_CHECK_MODULES([SERVICELOG], [servicelog-1])
-     SERVICELOG_EXISTS="yes"
- fi
- AC_MSG_RESULT($SERVICELOG_EXISTS)
-@@ -1366,6 +1367,7 @@
- if
-     $PKGCONFIG --exists $OPENIPMI $SERVICELOG
- then
-+    PKG_CHECK_MODULES([OPENIPMI_SERVICELOG],[OpenIPMI OpenIPMIposix])
-     OPENIPMI_SERVICELOG_EXISTS="yes"
- fi
- AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
---- a/mcp/Makefile.am
-+++ b/mcp/Makefile.am
-@@ -34,7 +34,7 @@
- noinst_HEADERS		= 
- 
- pacemakerd_SOURCES	= pacemaker.c corosync.c
--pacemakerd_LDADD	= $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la -lcfg -lconfdb
-+pacemakerd_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) -lcfg -lconfdb
- 
- %.8:	%
- 	echo Creating $@
---- a/crmd/Makefile.am
-+++ b/crmd/Makefile.am
-@@ -41,14 +41,13 @@
- 		cib.c pengine.c tengine.c lrm.c 			\
- 		utils.c misc.c te_events.c te_actions.c te_utils.c te_callbacks.c
- 
--crmd_LDADD	= $(CLUSTERLIBS) -llrm					\
--		$(top_builddir)/lib/fencing/libstonithd.la		\
-+crmd_LDADD	= $(top_builddir)/lib/fencing/libstonithd.la		\
- 		$(top_builddir)/lib/transition/libtransitioner.la	\
- 		$(top_builddir)/lib/pengine/libpe_rules.la		\
- 		$(top_builddir)/lib/cib/libcib.la			\
- 		$(top_builddir)/lib/common/libcrmcluster.la		\
--		$(top_builddir)/lib/common/libcrmcommon.la
--
-+		$(top_builddir)/lib/common/libcrmcommon.la		\
-+		$(CLUSTERLIBS) -llrm
- if BUILD_XML_HELP
- man8_MANS =	crmd.8
- 
---- a/lib/common/Makefile.am
-+++ b/lib/common/Makefile.am
-@@ -38,7 +38,7 @@
- endif
- 
- libcrmcluster_la_LDFLAGS = -version-info 1:0:0
--libcrmcluster_la_LIBADD  = $(CLUSTERLIBS) libcrmcommon.la
-+libcrmcluster_la_LIBADD  = libcrmcommon.la $(CLUSTERLIBS)
- libcrmcluster_la_DEPENDENCIES = libcrmcommon.la
- 
- # Can't use -Wcast-qual here because glib insists on pretending things are const  
-@@ -51,7 +51,8 @@
- 
- libcrmcommon_la_SOURCES	= ipc.c utils.c xml.c iso8601.c iso8601_fields.c remote.c mainloop.c
- 
--libcrmcommon_la_LDFLAGS	= -version-info 2:0:0  $(GNUTLSLIBS)
-+libcrmcommon_la_LDFLAGS	= -version-info 2:0:0
-+libcrmcommon_la_LIBADD  = $(GNUTLSLIBS)
- 
- clean-generic:
- 	rm -f *.log *.debug *.xml *~
---- a/lib/plugins/lrm/Makefile.am
-+++ b/lib/plugins/lrm/Makefile.am
-@@ -29,8 +29,8 @@
- plugin_LTLIBRARIES = stonith.la
- 
- stonith_la_SOURCES = raexecstonith.c
--stonith_la_LDFLAGS = -lpils -export-dynamic -module -avoid-version \
--		     $(top_builddir)/lib/fencing/libstonithd.la -llrm
-+stonith_la_LDFLAGS = -export-dynamic -module -avoid-version
-+stonith_la_LIBADD = $(top_builddir)/lib/fencing/libstonithd.la -lpils -llrm
- 
- install-exec-local:
- 	$(mkinstalldirs) $(DESTDIR)$(lrmdir)
---- a/lib/fencing/Makefile.am
-+++ b/lib/fencing/Makefile.am
-@@ -25,8 +25,8 @@
- lib_LTLIBRARIES = libstonithd.la
- 
- libstonithd_la_SOURCES = st_client.c
--libstonithd_la_LDFLAGS = -version-info 1:0:0 				\
--			-lplumb -lstonith $(CLUSTERLIBS)		\
--			$(top_builddir)/lib/common/libcrmcommon.la
-+libstonithd_la_LDFLAGS = -version-info 1:0:0
-+libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la 	\
-+			-lplumb -lstonith $(CLUSTERLIBS)
- 
- AM_CFLAGS = $(INCLUDES)
---- a/cib/Makefile.am
-+++ b/cib/Makefile.am
-@@ -47,8 +47,8 @@
- cib_SOURCES		= io.c messages.c notify.c	\
- 			callbacks.c main.c remote.c common.c
- 
--cib_LDADD		= $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)	\
--			$(top_builddir)/lib/common/libcrmcluster.la
-+cib_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
-+			  $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
- 
- cibmon_SOURCES		= cibmon.c
- cibmon_LDADD		= $(COMMONLIBS) 
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -62,8 +62,8 @@
- noinst_HEADERS		= 
- 
- crmadmin_SOURCES	= crmadmin.c
--crmadmin_LDADD		= $(COMMONLIBS) $(CLUSTERLIBS) \
--			$(top_builddir)/lib/pengine/libpe_status.la
-+crmadmin_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la \
-+			  $(COMMONLIBS) $(CLUSTERLIBS)
- 
- crm_uuid_SOURCES	= crm_uuid.c
- crm_uuid_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la
-@@ -75,45 +75,45 @@
- crm_shadow_LDADD	= $(COMMONLIBS) 
- 
- crm_node_SOURCES	= ccm_epoche.c
--crm_node_LDADD		= $(COMMONLIBS) $(CLUSTERLIBS) \
--			$(top_builddir)/lib/common/libcrmcluster.la
-+crm_node_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la \
-+			  $(COMMONLIBS) $(CLUSTERLIBS)
- 
- crm_simulate_SOURCES	= crm_inject.c
- crm_simulate_CFLAGS	= -I$(top_srcdir)/pengine
- 
--crm_simulate_LDADD	= $(COMMONLIBS)						\
--			$(top_builddir)/lib/pengine/libpe_status.la		\
-+crm_simulate_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la		\
- 			$(top_builddir)/pengine/libpengine.la 			\
- 			$(top_builddir)/lib/cib/libcib.la			\
--			$(top_builddir)/lib/transition/libtransitioner.la
-+			$(top_builddir)/lib/transition/libtransitioner.la	\
-+			$(COMMONLIBS)
- 
- crm_diff_SOURCES	= xml_diff.c
- crm_diff_LDADD		= $(COMMONLIBS)
- 
- crm_mon_SOURCES		= crm_mon.c
--crm_mon_LDADD		= $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm \
--			$(top_builddir)/lib/pengine/libpe_status.la
-+crm_mon_LDADD		= $(top_builddir)/lib/pengine/libpe_status.la		\
-+			  $(COMMONLIBS) $(SNMPLIBS) $(ESMTPLIBS) -llrm
- 
- # Arguments could be made that this should live in crm/pengine
- crm_verify_SOURCES	= crm_verify.c
--crm_verify_LDADD	= $(COMMONLIBS) \
--			$(top_builddir)/lib/pengine/libpe_status.la \
--			$(top_builddir)/pengine/libpengine.la
-+crm_verify_LDADD	= $(top_builddir)/lib/pengine/libpe_status.la 	\
-+			$(top_builddir)/pengine/libpengine.la		\
-+			$(COMMONLIBS)
- 
- crm_attribute_SOURCES	= crm_attribute.c
- crm_attribute_LDADD	= $(COMMONLIBS)
- 
- crm_resource_SOURCES	= crm_resource.c
--crm_resource_LDADD	= $(COMMONLIBS) \
--			$(top_builddir)/lib/pengine/libpe_rules.la  \
-+crm_resource_LDADD	= $(top_builddir)/lib/pengine/libpe_rules.la  \
- 			$(top_builddir)/lib/pengine/libpe_status.la \
--			$(top_builddir)/pengine/libpengine.la
-+			$(top_builddir)/pengine/libpengine.la \
-+			$(COMMONLIBS)
- 
- iso8601_SOURCES		= test.iso8601.c
- iso8601_LDADD		= $(COMMONLIBS) 
- 
- attrd_SOURCES		= attrd.c
--attrd_LDADD		= $(COMMONLIBS) $(top_builddir)/lib/common/libcrmcluster.la
-+attrd_LDADD		= $(top_builddir)/lib/common/libcrmcluster.la $(COMMONLIBS)
- 
- #pingd_SOURCES		= pingd.c
- #pingd_LDADD		= $(COMMONLIBS)
-@@ -123,14 +123,14 @@
- 
- if BUILD_SERVICELOG
- notifyServicelogEvent_SOURCES	= notifyServicelogEvent.c
--notifyServicelogEvent_CFLAGS	= `pkg-config --cflags servicelog-1`
--notifyServicelogEvent_LDFLAGS	= `pkg-config --libs servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
-+notifyServicelogEvent_CFLAGS	= $(SERVICELOG_CFLAGS)
-+notifyServicelogEvent_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la $(SERVICELOG_LIBS)
- endif
- 
- if BUILD_OPENIPMI_SERVICELOG
- ipmiservicelogd_SOURCES	= ipmiservicelogd.c
--ipmiservicelogd_CFLAGS	= `pkg-config --cflags OpenIPMI OpenIPMIposix servicelog-1`
--ipmiservicelogd_LDFLAGS	= `pkg-config --libs OpenIPMI OpenIPMIposix servicelog-1` $(top_builddir)/lib/common/libcrmcommon.la
-+ipmiservicelogd_CFLAGS	= $(OPENIPMI_SERVICELOG_CFLAGS) $(SERVICELOG_CFLAGS) 
-+ipmiservicelogd_LDFLAGS	= $(top_builddir)/lib/common/libcrmcommon.la $(OPENIPMI_SERVICELOG_LIBS) $(SERVICELOG_LIBS)
- endif
- 
- %.8:	% crm_attribute
---- a/extra/Makefile.am
-+++ b/extra/Makefile.am
-@@ -20,5 +20,5 @@
- 
- SUBDIRS                 =  resources
- 
--mibdir = $(datadir)/snmp/mibs
-+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
- mib_DATA = PCMK-MIB.txt
---- a/fencing/Makefile.am	2011-02-25 09:58:45.621572915 +0100
-+++ b/fencing/Makefile.am	2011-02-25 10:00:39.024820006 +0100
-@@ -42,23 +42,23 @@
- 
- stonith_test_SOURCES	= test.c
- 
--stonith_test_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
--			$(top_builddir)/lib/common/libcrmcommon.la	\
-+stonith_test_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/common/libcrmcluster.la	\
--			$(top_builddir)/lib/fencing/libstonithd.la
-+			$(top_builddir)/lib/fencing/libstonithd.la	\
-+			$(CRYPTOLIB) $(CLUSTERLIBS)
- 
- stonith_admin_SOURCES	= admin.c
- 
--stonith_admin_LDADD	= $(CRYPTOLIB) $(CLUSTERLIBS)			\
-+stonith_admin_LDADD	= $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/cib/libcib.la		\
- 			$(top_builddir)/lib/pengine/libpe_status.la	\
--			$(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/common/libcrmcluster.la	\
--			$(top_builddir)/lib/fencing/libstonithd.la
-+			$(top_builddir)/lib/fencing/libstonithd.la	\
-+			$(CRYPTOLIB) $(CLUSTERLIBS)
- 
- stonithd_SOURCES	= main.c commands.c remote.c
- 
--stonithd_LDADD		= $(CRYPTOLIB) $(CLUSTERLIBS)			\
--			$(top_builddir)/lib/common/libcrmcommon.la	\
-+stonithd_LDADD		= $(top_builddir)/lib/common/libcrmcommon.la	\
- 			$(top_builddir)/lib/common/libcrmcluster.la	\
--			$(top_builddir)/lib/fencing/libstonithd.la
-+			$(top_builddir)/lib/fencing/libstonithd.la	\
-+			$(CRYPTOLIB) $(CLUSTERLIBS)
---- a/pengine/Makefile.am
-+++ b/pengine/Makefile.am
-@@ -71,16 +71,17 @@
- libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c \
- 			native.c group.c clone.c master.c graph.c
--libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la
-+libpengine_la_LIBADD    = $(top_builddir)/lib/pengine/libpe_status.la \
-+	$(top_builddir)/lib/cib/libcib.la
- 
- pengine_SOURCES	= main.c
--pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/cib/libcib.la
-+pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
- # libcib for get_object_root()
- #		$(top_builddir)/lib/hbclient/libhbclient.la
- 
- ptest_SOURCES	= ptest.c 
--ptest_LDADD	= $(COMMONLIBS)						\
--		$(top_builddir)/lib/cib/libcib.la			\
--		$(top_builddir)/lib/transition/libtransitioner.la
-+ptest_LDADD	= $(top_builddir)/lib/cib/libcib.la			\
-+		$(top_builddir)/lib/transition/libtransitioner.la	\
-+		$(COMMONLIBS)
- 
- install-exec-local:
- 	$(mkinstalldirs) $(DESTDIR)/$(PE_STATE_DIR)
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.4-r4.ebuild
deleted file mode 100644
index 74b8a5556c9b..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.4-r4.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/pacemaker-1.1.4-r4.ebuild,v 1.2 2011/10/18 18:40:04 xarthisius Exp $
-
-EAPI="2"
-
-MY_PN="Pacemaker"
-MY_P="${MY_PN}-${PV}"
-PYTHON_DEPEND="2"
-inherit autotools base eutils flag-o-matic multilib python
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="heartbeat smtp snmp static-libs"
-
-RDEPEND="
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/resource-agents
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-autotools-r2.patch"
-)
-
-S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-	use heartbeat || myopts="--with-ais"
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		--with-cs-quorum \
-		--without-cman \
-		$(use_with smtp esmtp) \
-		$(use_with heartbeat) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	base_src_install
-	newinitd "${FILESDIR}/pacemaker.initd" pacemaker || die
-	insinto /etc/corosync/service.d
-	newins "${FILESDIR}/pacemaker.service" pacemaker || die
-}
-
-pkg_postinst() {
-	elog "This version of Pacemaker uses the new MCP feature"
-	elog "and the v1 plugin for CoroSync. Read [1] for more info."
-	elog
-	elog "To start the Pacemaker Cluster Manager, run:"
-	elog "/etc/init.d/pacemaker start"
-	elog
-	elog "[1] http://theclusterguy.clusterlabs.org/post/907043024/introducing-the-pacemaker-master-control-process-for"
-	elog
-	elog "Note: sys-cluster/openais is no longer a hard dependency of ${P},"
-	elog "so you may need to install it yourself to suit your needs."
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
index ff13f47aa083..8504ec5aeb4f 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild
@@ -1,29 +1,32 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.4 2011/10/18 18:40:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.7.ebuild,v 1.1 2012/05/16 15:08:26 ultrabug Exp $
 
-EAPI=3
+EAPI=4
 
 inherit autotools base python
 
 MY_PN=Pacemaker
 MY_P=${MY_PN}-${PV}
+MY_TREE="b5b0a7b"
 PYTHON_DEPEND="2"
 
 DESCRIPTION="Pacemaker CRM"
 HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
+SRC_URI="https://github.com/ClusterLabs/${PN}/tarball/${MY_P} -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="acl heartbeat smtp snmp static-libs"
+REQUIRED_USE="cman? ( !heartbeat )"
+IUSE="acl cman heartbeat smtp snmp static-libs"
 
 DEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
 	sys-cluster/resource-agents
+	cman? ( sys-cluster/cman )
 	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
 	!heartbeat? ( sys-cluster/corosync )
 	smtp? ( net-libs/libesmtp )
@@ -31,11 +34,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-autotools.patch"
-)
-
-S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
+S="${WORKDIR}/ClusterLabs-${PN}-${MY_TREE}"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -45,6 +44,8 @@ pkg_setup() {
 src_prepare() {
 	base_src_prepare
 	sed -i -e "/ggdb3/d" configure.ac || die
+	sed -e "s:<glib/ghash.h>:<glib.h>:" \
+		-i lib/ais/plugin.c || die
 	eautoreconf
 }
 
@@ -56,9 +57,9 @@ src_configure() {
 		--localstatedir=/var \
 		--disable-dependency-tracking \
 		--disable-fatal-warnings \
-		--with-cs-quorum \
-		--without-cman \
 		$(use_with acl) \
+		$(use_with cman cs-quorum) \
+		$(use_with cman cman) \
 		$(use_with heartbeat) \
 		$(use_with smtp esmtp) \
 		$(use_with snmp) \