5 files changed, 170 insertions, 1 deletions
diff --git a/sys-cluster/corosync/ChangeLog b/sys-cluster/corosync/ChangeLog
index 36f24402e09a..9082dce3a781 100644
--- a/sys-cluster/corosync/ChangeLog
+++ b/sys-cluster/corosync/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/corosync
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.1 2010/03/23 21:51:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.2 2010/06/26 16:25:18 xarthisius Exp $
+
+*corosync-1.2.5 (26 Jun 2010)
+
+  26 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +corosync-1.2.5.ebuild, +files/corosync-docs.patch,
+  +files/corosync-ldflags.patch:
+  Version bump. Moved from scarabeus' overlay. Fixing several QA issues
 
 *corosync-1.2.0 (23 Mar 2010)
 
diff --git a/sys-cluster/corosync/corosync-1.2.5.ebuild b/sys-cluster/corosync/corosync-1.2.5.ebuild
new file mode 100644
index 000000000000..abe596576f44
--- /dev/null
+++ b/sys-cluster/corosync/corosync-1.2.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-1.2.5.ebuild,v 1.1 2010/06/26 16:25:18 xarthisius Exp $
+
+EAPI="3"
+
+inherit base autotools
+
+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"
+
+LICENSE="BSD-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc infiniband ssl"
+
+RDEPEND="!sys-cluster/heartbeat
+	ssl? ( dev-libs/nss )
+	infiniband? (
+		sys-infiniband/libibverbs
+		sys-infiniband/librdmacm
+	)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( sys-apps/groff )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-ldflags.patch"
+	"${FILESDIR}/${PN}-docs.patch"
+)
+
+DOCS=( "README.recovery" "README.devmap" "SECURITY" "TODO" "AUTHORS" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	# FIXME: install both static and shared libs
+	econf \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable doc) \
+		$(use_enable ssl nss) \
+		$(use_enable infiniband rdma)
+}
+
+src_install() {
+	base_src_install
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+
+	keepdir /var/lib/corosync
+}
diff --git a/sys-cluster/corosync/files/corosync-docs.patch b/sys-cluster/corosync/files/corosync-docs.patch
new file mode 100644
index 000000000000..198db980ae44
--- /dev/null
+++ b/sys-cluster/corosync/files/corosync-docs.patch
@@ -0,0 +1,37 @@
+Make docs optional
+
+--- configure.ac
++++ configure.ac
+@@ -432,7 +432,7 @@
+ fi
+ 
+ # 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])
+ 
+-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
++AC_ARG_ENABLE([doc],
++  AS_HELP_STRING([--enable-doc],[Build html documentation])
++)
++AM_CONDITIONAL(BUILD_HTML_DOCS, [test -n "${GROFF}" && test "x$enable_doc" = "xyes"] )
+ 
+ AC_SUBST([LINT_FLAGS])
+ 
+--- Makefile.am
++++ Makefile.am
+@@ -41,9 +41,6 @@
+ 			  config.guess config.sub missing install-sh \
+ 			  autoheader automake autoconf
+ 
+-dist_doc_DATA		= LICENSE INSTALL README.devmap \
+-			  README.recovery SECURITY TODO AUTHORS
+-
+ corosysconfdir		= ${COROSYSCONFDIR}
+
+ corosysconf_DATA        = conf/corosync.conf.example
diff --git a/sys-cluster/corosync/files/corosync-ldflags.patch b/sys-cluster/corosync/files/corosync-ldflags.patch
new file mode 100644
index 000000000000..487fed0bf7f0
--- /dev/null
+++ b/sys-cluster/corosync/files/corosync-ldflags.patch
@@ -0,0 +1,68 @@
+Respect LDFLAGS
+
+--- exec/Makefile.am
++++ exec/Makefile.am
+@@ -81,7 +81,7 @@
+ 
+ if BUILD_DARWIN
+ %.lcrso: %.o
+-	$(CC) $(CFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/exec -llogsys -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
+ 
+ libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
+ 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread
+@@ -122,7 +122,7 @@
+ else
+ 
+ %.lcrso: %.o
+-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+ 
+ libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
+ 	$(CC) -shared -o $@ \
+--- lcr/Makefile.am
++++ lcr/Makefile.am
+@@ -52,24 +52,24 @@
+ if BUILD_DARWIN
+ 
+ %.lcrso: %.o
+-	$(CC) $(CFLAGS) -bundle -bundle_loader ./test $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -bundle -bundle_loader ./test $^ -o $@
+ else
+ 
+ if BUILD_SOLARIS
+ 
+ %.lcrso: %.o
+-	$(CC) $(CFLAGS) -shared $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ -o $@
+ else
+ 
+ %.lcrso: %.o
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ $^ -o $@
+ 
+ endif
+ 
+ endif
+ 
+ lint:
+-	-splint $(LINT_FLAGS) $(CFLAGS) *.c
++	-splint $(LINT_FLAGS) $(CFLAGS) $(LDFLAGS) *.c
+ 
+ all-local: $(noinst_LCRSO)
+ 	@echo Built Live Component Replacement System
+--- services/Makefile.am
++++ services/Makefile.am
+@@ -68,10 +68,10 @@
+ 
+ else
+ quorum_%.lcrso: %.o
+-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+ 
+ service_%.lcrso: %.o
+-	$(CC) $(CFLAGS) -shared -Wl,-soname=$@ $^ -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ $^ -o $@
+ endif
+ 
+ endif
diff --git a/sys-cluster/corosync/metadata.xml b/sys-cluster/corosync/metadata.xml
index d0326fa1becc..218d954124b5 100644
--- a/sys-cluster/corosync/metadata.xml
+++ b/sys-cluster/corosync/metadata.xml
@@ -12,6 +12,7 @@
 	</maintainer>
 	<use>
 		<flag name='nss'>Enable NSS support for cryptography</flag>
+		<flag name='infiniband'>Enable Infiniband RDMA transport support</flag>
 	</use>
 </pkgmetadata>