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

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

6 files changed, 37 insertions, 63 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/Manifest b/sys-cluster/pacemaker/Manifest
index c5d7f52c4d45..69aa7c1f08da 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pacemaker-1.0.8-asneeded.patch 1178 RMD160 5fb3bd8a4683619e40c9cf0776704bb6203b88a7 SHA1 bf21b8fbc82f5695089d229f8449201909d9e0ac SHA256 8fa45fe9c04e29e3d5d978e40438cfad87c5183f201783863211251797a1c409
-AUX pacemaker-1.0.8-installpaths.patch 644 RMD160 4054a78cc87345443b08386577bf150e0525af0f SHA1 4c11d4ecf3d51c9b9f067a5af9fcbb53184dc571 SHA256 f5a6c88c8673d1d324491dd4daa3ad53c9722fe6290043d409393251421f73ef
-DIST Pacemaker-1.0.9.1.tar.bz2 6624422 RMD160 a53d545f95fad36808ea650f90b32252ac7b535f SHA1 b95bf80f6b7b03238a54f877b53035c8c1c95d41 SHA256 55b30bf018720f28d92c22519cbb26ebedb5c511dbeedb7e2c2a2712034ebd92
-EBUILD pacemaker-1.0.9.1-r1.ebuild 1716 RMD160 01f015514e2268fb65fa5bbf8ec707c09f6964e2 SHA1 ea16fee4fcdc75f8392a58fcc4a377367e561295 SHA256 004de219aa2319460b13dcb802624e02836082f0c27f61b871b2890ccdfdb709
-MISC ChangeLog 1301 RMD160 afa8c238a48b01419ac57e47ea0afe1cd7295289 SHA1 557b2c68f3213ecbfb274529b6ce9ce2eb5d633e SHA256 24b66c278b1768ecd8654f3096f0271dbd6d67fe333c9aa04ff44be2b6925c51
+AUX pacemaker-1.0.10-asneeded.patch 750 RMD160 9aaf83ce34c8c3f35db805108d3446dd66a66e81 SHA1 58393bcef301cda18f4bc008f4edeba00ed90ffa SHA256 552e14bc626aafc7f290d5d5e2968679ee8b506bb200ef5f1bdb1dfd17db2b34
+AUX pacemaker-1.0.10-installpaths.patch 200 RMD160 d2b3bdae8d6f982b64af5f83375497df74fadbc0 SHA1 69a1b9a2c7415a0e0d10c982ecb64474da358fb3 SHA256 4b8d82244123f88491b7deecb99b2d36d6317ada5aa6c6339e95dbcdc73dbbee
+DIST Pacemaker-1.0.10.tar.bz2 6642704 RMD160 9eaac150c7e3e7f2e1c00303025aa8fe5bfb90c7 SHA1 5901533948f85a1adfe2264b2ac0dae14ad8c116 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9
+EBUILD pacemaker-1.0.10.ebuild 1714 RMD160 de9028768a15e425a2d28ee8b277542fd797a4a5 SHA1 ca308b7a6f3bb19f96f8fb9dd020264fc7c3166f SHA256 00cf65104127217c51821d36c0f9cad8dfb2e687318fbc3a8e5c89fc63474f3e
+MISC ChangeLog 1689 RMD160 372825afc5e6baf2b0ff1183c8eb899d445f1ac6 SHA1 3e595f8614ec163cab48ad03f959b643521af314 SHA256 5864d698408072f1e498d9785d2f112c44923628accb64c4723cab993d58845e
 MISC metadata.xml 797 RMD160 c99dc189163047b32ad1915b13e33cc01a407481 SHA1 c9a83889da12df16797e7436751e184440ef9537 SHA256 904067d2d16de829ccfc138dde85ea965db6d680b4cea293105542a5a8b9ca52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkyKjO0ACgkQIiMqcbOVdxQiMQQAjVlWvo/PYggUQQpG5hPpVDw9
-ku0Kbg50rkflxRpyWv5hTOjMHPGMqRulEATKK9Y95xg5QWAtAtXlCu1+r+VCzA80
-hPyg3dRIzNmY+CzwuLCtlfZ7KtfrvWBjEVLkxXk7GeQvYf5NNMFlE9tGAn5t7EOL
-/nUTP/06Sqy7j+1kys8=
-=XhMC
+iJwEAQECAAYFAkzpbmQACgkQIiMqcbOVdxRPqQP/RJFjftXMrJHyr0yVuBUfKr9q
+Qcwn18ByKKuczez1sAvHgUsXpcTOqfBhGdQGVSx+66KgPeij6+p2HCNS6GAqUIOc
+AsWn04qxJujSbldYd01fGVbpVt2w5bSFmpUSU054dpiMDWRngr0wgYen7z4KfTTu
+pcuw0ZT6dHU95MAUgxU=
+=Q7b3
 -----END PGP SIGNATURE-----
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}"