Bump corosync-2 series for testing

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

4 files changed, 34 insertions, 65 deletions

diff --git a/sys-cluster/corosync/ChangeLog b/sys-cluster/corosync/ChangeLog
index b76570a439eb..19535cce35f7 100644
--- a/sys-cluster/corosync/ChangeLog
+++ b/sys-cluster/corosync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/corosync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.23 2012/07/11 08:30:55 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.24 2012/10/29 13:41:52 ultrabug Exp $
+
+*corosync-2.1.0 (29 Oct 2012)
+
+  29 Oct 2012; Ultrabug <ultrabug@gentoo.org> -corosync-2.0.0.ebuild,
+  files/corosync-2.0.0-docs.patch, -files/corosync-2.0.0-rpath.patch,
+  +corosync-2.1.0.ebuild:
+  Bump corosync-2 series for testing, drop the old one
 
 *corosync-1.4.3-r1 (11 Jul 2012)
 
diff --git a/sys-cluster/corosync/corosync-2.0.0.ebuild b/sys-cluster/corosync/corosync-2.1.0.ebuild
index 2cc94852e3e7..e9811d3a7e66 100644
--- a/sys-cluster/corosync/corosync-2.0.0.ebuild
+++ b/sys-cluster/corosync/corosync-2.1.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.0.0.ebuild,v 1.1 2012/05/16 12:39:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.1.0.ebuild,v 1.1 2012/10/29 13:41:52 ultrabug Exp $
 
 EAPI=4
 
 inherit autotools base
 
+MY_TREE="1706129"
+
 DESCRIPTION="OSI Certified implementation of a complete cluster engine"
 HOMEPAGE="http://www.corosync.org/"
-SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
+SRC_URI="https://github.com/corosync/corosync/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
@@ -32,13 +34,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( sys-apps/groff )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.0-docs.patch"
-	"${FILESDIR}/${PN}-2.0.0-rpath.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-2.0.0-docs.patch" )
 
 DOCS=( README.recovery SECURITY TODO AUTHORS )
 
+S="${WORKDIR}/${PN}-${PN}-${MY_TREE}"
+
 src_prepare() {
 	base_src_prepare
 	eautoreconf
@@ -54,14 +55,10 @@ src_configure() {
 		$(use_enable infiniband rdma)
 }
 
-src_compile() {
-	# Fix parallel compilation problem with libcmap
-	MAKEOPTS="-j1" base_src_compile
-}
-
 src_install() {
 	default
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	rm "${D}"/etc/init.d/corosync-notifyd || die
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotate ${PN}
diff --git a/sys-cluster/corosync/files/corosync-2.0.0-docs.patch b/sys-cluster/corosync/files/corosync-2.0.0-docs.patch
index 68de1f1b546d..66eacb821e5e 100644
--- a/sys-cluster/corosync/files/corosync-2.0.0-docs.patch
+++ b/sys-cluster/corosync/files/corosync-2.0.0-docs.patch
@@ -1,19 +1,17 @@
-Make docs optional
-
---- configure.ac
-+++ configure.ac
-@@ -432,7 +432,7 @@
- fi
+--- a/configure.ac	2012-10-29 14:34:48.200093085 +0100
++++ b/configure.ac	2012-10-29 14:37:05.997077034 +0100
+@@ -591,7 +591,7 @@
+ INCLUDE_DIRS="$INCLUDE_DIRS -I\$(top_builddir)/include/corosync -I\$(top_srcdir)/include/corosync"
  
  # final build of *FLAGS
--CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS $OS_CFLAGS \
-+CFLAGS="$ENV_CFLAGS $OS_CFLAGS \
- 	$COVERAGE_CFLAGS $EXTRA_WARNINGS $WERROR_CFLAGS $NSS_CFLAGS"
- CPPFLAGS="$ENV_CPPFLAGS $ANSI_CPPFLAGS $OS_CPPFLAGS"
- LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
-@@ -458,7 +458,10 @@
- AC_SUBST([DARWIN_OPTS])
- AC_SUBST([SOLARIS_OPTS])
+-CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $SEC_FLAGS $OPT_CFLAGS $GDB_FLAGS \
++CFLAGS="$ENV_CFLAGS $lt_prog_compiler_pic $OS_CFLAGS \
+ 	$COVERAGE_CFLAGS $EXTRA_WARNINGS \
+ 	$WERROR_CFLAGS $NSS_CFLAGS $LIBQB_CFLAGS \
+ 	$SNMP_INCLUDES"
+@@ -616,7 +616,10 @@
+ AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
+ AC_SUBST([NSS_LDFLAGS])
  
 -AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
 +AC_ARG_ENABLE([doc],
@@ -23,14 +21,14 @@ Make docs optional
  
  AC_SUBST([LINT_FLAGS])
  
---- Makefile.am
-+++ Makefile.am
-@@ -46,8 +46,6 @@
- 			  config.guess config.sub missing install-sh \
- 			  autoheader automake autoconf test_lense.sh
+--- a/Makefile.am	2012-10-29 14:34:48.200093085 +0100
++++ b/Makefile.am	2012-10-29 14:37:16.236853385 +0100
+@@ -48,8 +48,6 @@
+ 			  autoheader automake autoconf test_lense.sh \
+ 			  autoscan.log configure.scan ltmain.sh
  
 -dist_doc_DATA		= LICENSE INSTALL README.recovery SECURITY TODO AUTHORS
 -
  SUBDIRS			= include common_lib lib exec tools test cts pkgconfig \
- 			  man init conf
+ 			  man init conf qdevices
  
diff --git a/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch b/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch
deleted file mode 100644
index 4cca805066d8..000000000000
--- a/sys-cluster/corosync/files/corosync-2.0.0-rpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -49,7 +49,7 @@
- 
- EXTRA_DIST		= $(bin_SCRIPTS) corosync-xmlproc.sh corosync-notifyd.sysconfig.example
- 
--COMMON_OPTS		= -L../lib -L../common_lib -Wl,-rpath,../common_lib
-+COMMON_OPTS		= -L../lib -L../common_lib
- 
- corosync_cmapctl_LDFLAGS= $(COMMON_OPTS)
- corosync_cmapctl_LDADD	= -lcorosync_common -lcmap $(LIBQB_LIBS)
-@@ -57,10 +57,10 @@
- corosync_fplay_LDADD	= $(LIBQB_LIBS)
- 
- corosync_cfgtool_LDFLAGS= $(COMMON_OPTS)
--corosync_cfgtool_LDADD	= -lcfg $(LIBQB_LIBS)
-+corosync_cfgtool_LDADD	= -lcfg -lcorosync_common $(LIBQB_LIBS)
- 
- corosync_cpgtool_LDFLAGS= $(COMMON_OPTS)
--corosync_cpgtool_LDADD	= -lcfg -lcpg $(LIBQB_LIBS)
-+corosync_cpgtool_LDADD	= -lcfg -lcpg -lcorosync_common $(LIBQB_LIBS)
- 
- corosync_quorumtool_LDFLAGS = $(COMMON_OPTS)
- corosync_quorumtool_LDADD   = -lcmap -lcfg -lquorum -lcorosync_common \
-@@ -68,7 +68,7 @@
- 
- corosync_notifyd_CPPFLAGS = $(DBUS_CFLAGS)
- corosync_notifyd_LDFLAGS  = $(COMMON_OPTS)
--corosync_notifyd_LDADD    = -lcfg -lcmap \
-+corosync_notifyd_LDADD    = -lcfg -lcmap -lcorosync_common \
- 			    $(LIBQB_LIBS) $(DBUS_LIBS) $(SNMPLIBS) \
- 			    -lquorum
-