Version bump. Thanks to Ultrabug <ultrabug@ultrabug.net>. Drop old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

5 files changed, 27 insertions, 53 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 9f756375e489..5d62b37453ff 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.6 2010/08/12 08:38:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.7 2010/11/21 19:09:15 xarthisius Exp $
+
+*pacemaker-1.0.10 (21 Nov 2010)
+
+  21 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/pacemaker-1.0.8-asneeded.patch,
+  -files/pacemaker-1.0.8-installpaths.patch, -pacemaker-1.0.9.1-r1.ebuild,
+  +pacemaker-1.0.10.ebuild, +files/pacemaker-1.0.10-asneeded.patch,
+  +files/pacemaker-1.0.10-installpaths.patch:
+  Version bump. Thanks to Ultrabug <ultrabug@ultrabug.net>. Drop old.
 
 *pacemaker-1.0.9.1-r1 (12 Aug 2010)
 
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.8-asneeded.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch
index 996f6bff2fcd..ac2655049380 100644
--- a/sys-cluster/pacemaker/files/pacemaker-1.0.8-asneeded.patch
+++ b/sys-cluster/pacemaker/files/pacemaker-1.0.10-asneeded.patch
@@ -3,30 +3,20 @@
 @@ -23,7 +23,7 @@
  MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure DRF/config-h.in \
                          DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
- 
+
 -SUBDIRS	= debian $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc
 +SUBDIRS	= $(LIBLTDL_DIR) replace include lib pengine cib crmd fencing tools shell xml cts extra doc
- 
+
  doc_DATA = AUTHORS COPYING COPYING.LIB
- 
---- pengine/Makefile.am
-+++ pengine/Makefile.am
-@@ -58,6 +58,7 @@
- # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
- 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
- 
- pengine_SOURCES	= main.c
- pengine_LDADD	= $(COMMONLIBS)	$(top_builddir)/lib/cib/libcib.la
+
 --- lib/pengine/Makefile.am
 +++ lib/pengine/Makefile.am
 @@ -34,7 +34,7 @@
- 
+
  libpe_status_la_LDFLAGS	= -version-info 2:0:0
  libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
 -libpe_status_la_LIBADD	= -llrm
 +libpe_status_la_LIBADD	= -llrm @CURSESLIBS@
- 
+
  clean-generic:
  	rm -f *.log *.debug *~
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch
new file mode 100644
index 000000000000..5187b7967ea9
--- /dev/null
+++ b/sys-cluster/pacemaker/files/pacemaker-1.0.10-installpaths.patch
@@ -0,0 +1,9 @@
+--- extra/Makefile.am
++++ extra/Makefile.am
+@@ -20,5 +20,5 @@
+
+ SUBDIRS                 =  resources
+
+-mibdir = $(datadir)/snmp/mibs
++mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
+ mib_DATA = PCMK-MIB.txt
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.0.8-installpaths.patch b/sys-cluster/pacemaker/files/pacemaker-1.0.8-installpaths.patch
deleted file mode 100644
index 005790c0f542..000000000000
--- a/sys-cluster/pacemaker/files/pacemaker-1.0.8-installpaths.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- cts/Makefile.am
-+++ cts/Makefile.am
-@@ -25,7 +25,7 @@
- 
- ctsdir		= $(datadir)/$(PACKAGE)/tests/cts
- 
--cts_PYTHON	=	CTSvars.py		\
-+cts_SCRIPTS	=	CTSvars.py		\
- 			CM_lha.py		\
- 			CM_ais.py		\
- 			CTS.py			\
-@@ -35,10 +35,9 @@
- 			CTSscenarios.py		\
- 			extracttests.py		\
- 			OCFIPraTest.py		\
--			CIB.py
-+			CIB.py			\
-+			cluster_test		\
-+			LSBDummy
- 
- cts_DATA	=	README cts.supp
- 
--cts_SCRIPTS	=				\
--			cluster_test		\
--			LSBDummy
---- extra/Makefile.am
-+++ extra/Makefile.am
-@@ -20,5 +20,5 @@
- 
- SUBDIRS                 =  resources
- 
--mibdir = $(datadir)/snmp/mibs
-+mibdir = $(datadir)/$(PACKAGE)/snmp/mibs
- mib_DATA = PCMK-MIB.txt
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.9.1-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
index 6182fb63a9e4..03f0e08c7ce5 100644
--- a/sys-cluster/pacemaker/pacemaker-1.0.9.1-r1.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.9.1-r1.ebuild,v 1.1 2010/08/12 08:38:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.1 2010/11/21 19:09:15 xarthisius Exp $
 
 EAPI="2"
 
@@ -31,8 +31,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.8-asneeded.patch"
-	"${FILESDIR}/${PN}-1.0.8-installpaths.patch"
+	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
+	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-1-0-${MY_P}"