6 files changed, 182 insertions, 7 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/Manifest b/sys-cluster/corosync/Manifest
index bcddb8e9c297..ef90e70107e4 100644
--- a/sys-cluster/corosync/Manifest
+++ b/sys-cluster/corosync/Manifest
@@ -1,15 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX corosync-docs.patch 1022 RMD160 9da3f7a1cdac81449062d5350442d3074f7af436 SHA1 5a128926e053e25ca96c8c6ade3a4f376f481137 SHA256 0c988b55ea471d9c413c0143d2a523a683a324c23de5dd82bcba62676eea6857
+AUX corosync-ldflags.patch 1689 RMD160 92061367529fc14af143bbd403e50d0cd40f78b2 SHA1 c5d5de5421a8edf398a3b205d36f7d1fe1f465d5 SHA256 f3f1cef6600f950e3f7c06a775f2ebd1b274ef10e3839bd1a655961656cf386a
 AUX corosync.initd 597 RMD160 303ac32e97905c1fe3ab140bb592e0ef6c5100d1 SHA1 538ba64c51661cfa1e1f516cc78369bbe452e142 SHA256 eb0c36f0f5c07772b097ec4e8dd34381f048b169b8a628bc990643929371a535
 DIST corosync-1.2.0.tar.gz 662226 RMD160 dcb62de83f3ce21b6e7f2fd50de8d9f4ce64b717 SHA1 c7f75cba87341d17f5badc99eabf40d1e1640a76 SHA256 3cee3be9f747c7031da9eafdffa5e3009513f4ac93ce021a49574e3de1fd93f0
+DIST corosync-1.2.5.tar.gz 684394 RMD160 c9dfd524d747ea508df0a6db225c7c2ef9f2e91b SHA1 df25d890bc171cc394f26b29cb65efbf1b58fd18 SHA256 a96bc771372fcd5db76b929aadf1d08d29c58310d1477e7c7f4438dda2ccecae
 EBUILD corosync-1.2.0.ebuild 822 RMD160 304c0e3e8b7aec16147fd1ab9ff106e6af6254ca SHA1 e016a94b5b854380cbedde4300a50859095f7c83 SHA256 2e8a853bde7c19ea71bf2252d5f84f5f1ee82fd924b03a8e2e6d56606c160de6
-MISC ChangeLog 415 RMD160 77c28c9087f3512832d9ff84b3a4b05149513f75 SHA1 0dfb99bf5772d21e0c4ccda8d459167c6d62048e SHA256 d5fff01167f31f9c88f48f13ee75d24d0e2082d8d9372a89a2393b5ba8eb5fef
-MISC metadata.xml 430 RMD160 41da7d404cbae21afaaaece54be217657db6c4f8 SHA1 77d671b3e0e72f9a9a5bb70606133c236ab32d42 SHA256 6816d7aa2ffca7c8e57201913fb2723d22c8a1e60b0181491cdaa9de42a56063
+EBUILD corosync-1.2.5.ebuild 1299 RMD160 1b14ec276f35c9b79ef1cadad9b6e373be43772c SHA1 0a3bef656756a6333c514a216ddc3c032c9b3c8f SHA256 246d77d8a28480477041ed766e47ecc39160beddba5236af341eda6b5682ccd0
+MISC ChangeLog 664 RMD160 78e608d169b8b0e5b38cad106bb1ee19ca50e41f SHA1 daa662d6981a9baef21243e7da6a3bf8819976d7 SHA256 9e03e0de422a846566ac712a650a6241454bdc20c31888e1e3663677963b8dac
+MISC metadata.xml 504 RMD160 eaf9dfd5bde9e92ba4c68d91602de8cfa99f54c2 SHA1 0bfe5582b29f6f5b921543545244dbd4b1d20683 SHA256 292d03ad0311ba40f54ea0722d96d99fe4443034382c24f5e16fd08de213f595
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkupN9sACgkQoeSe8B0zEfxS/ACfQtCYAqclkUYuDHm+YQQ9rrTl
-AlAAnjE4ykth6tWgQRjL0gBh9YerfbMe
-=47QZ
+iJwEAQECAAYFAkwmKfoACgkQIiMqcbOVdxTsDAP/YzxCcnBfDQN8wpr4dZrAxBFb
+6B1CMdhwYBjKKbcl/kJH9FFor9TfM9/uD6i4MUlpuWbOzzV2STUBJO8TVHAGcyF9
+6dDU1DnIQzP5Qrqx5FtP/vPpsPI54EVlmIT0SQ/qaxY8Q81VczmTFUTpP6qDNaF1
+18cKZ8h6O9UM40JMZhM=
+=bruU
 -----END PGP SIGNATURE-----
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>