Added 0.80.3 needed by gfs 2.01.00, fixed parallel build in 0.82 bug #210202,

fixed missing include in 0.82 bug #213716.
(Portage version: 2.1.4.4)

6 files changed, 137 insertions, 9 deletions

diff --git a/sys-cluster/openais/ChangeLog b/sys-cluster/openais/ChangeLog
index 472b28217bec..c33849861376 100644
--- a/sys-cluster/openais/ChangeLog
+++ b/sys-cluster/openais/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/openais
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/ChangeLog,v 1.2 2008/02/14 19:04:19 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/ChangeLog,v 1.3 2008/03/17 16:02:41 xmerlin Exp $
+
+*openais-0.80.3 (17 Mar 2008)
+
+  17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/openais-0.80.3-Makefile.inc-FLAGS.patch,
+  +files/openais-0.80.3-Makefile-ARCH.patch,
+  +files/openais-0.80.3-Makefile-LIBDIR.patch, +openais-0.80.3.ebuild,
+  openais-0.82.ebuild:
+  Added 0.80.3 needed by gfs 2.01.00, fixed parallel build in 0.82 bug #210202, 
+  fixed missing include in 0.82 bug #213716.
 
   14 Feb 2008; Wolfram Schlich <wschlich@gentoo.org> openais-0.82.ebuild:
   use custom openais.conf, fix init script
diff --git a/sys-cluster/openais/files/openais-0.80.3-Makefile-ARCH.patch b/sys-cluster/openais/files/openais-0.80.3-Makefile-ARCH.patch
new file mode 100644
index 000000000000..70464d8ca343
--- /dev/null
+++ b/sys-cluster/openais/files/openais-0.80.3-Makefile-ARCH.patch
@@ -0,0 +1,11 @@
+--- openais-0.80.3/Makefile.orig	2008-02-17 18:30:57.000000000 +0100
++++ openais-0.80.3/Makefile	2008-02-17 18:31:07.000000000 +0100
+@@ -38,7 +38,7 @@
+ MANDIR=/usr/share/man
+ ETCDIR=/etc/ais
+ LCRSODIR=/usr/libexec/lcrso
+-ARCH=$(shell uname -p)
++ARCH=$(shell uname -m)
+ 
+ ifeq (,$(findstring 64,$(ARCH)))
+ LIBDIR=/usr/lib/openais
diff --git a/sys-cluster/openais/files/openais-0.80.3-Makefile-LIBDIR.patch b/sys-cluster/openais/files/openais-0.80.3-Makefile-LIBDIR.patch
new file mode 100644
index 000000000000..ca4566d89dc5
--- /dev/null
+++ b/sys-cluster/openais/files/openais-0.80.3-Makefile-LIBDIR.patch
@@ -0,0 +1,19 @@
+--- openais-0.80.3/Makefile.orig	2008-02-17 18:34:13.000000000 +0100
++++ openais-0.80.3/Makefile	2008-02-17 18:34:58.000000000 +0100
+@@ -80,7 +80,6 @@
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man3
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man5
+ 	mkdir -p $(DESTDIR)$(MANDIR)/man8
+-	mkdir -p $(DESTDIR)/etc/ld.so.conf.d
+ 
+ 	ln -sf libais.so.2.0.0 lib/libais.so
+ 	ln -sf libSaAmf.so.2.0.0 lib/libSaAmf.so
+@@ -158,8 +157,6 @@
+ 	install -m 755 exec/libtotem_pg.a $(DESTDIR)$(LIBDIR)
+ endif
+ 
+-	echo $(LIBDIR) > $(DESTDIR)/etc/ld.so.conf.d/openais-$(ARCH).conf
+-
+ 	install -m 755 exec/*lcrso $(DESTDIR)$(LCRSODIR)
+ 
+ 	install -m 755 exec/aisexec $(DESTDIR)$(SBINDIR)
diff --git a/sys-cluster/openais/files/openais-0.80.3-Makefile.inc-FLAGS.patch b/sys-cluster/openais/files/openais-0.80.3-Makefile.inc-FLAGS.patch
new file mode 100644
index 000000000000..9d41751488a2
--- /dev/null
+++ b/sys-cluster/openais/files/openais-0.80.3-Makefile.inc-FLAGS.patch
@@ -0,0 +1,21 @@
+--- openais-0.80.3/Makefile.inc.orig	2008-02-17 18:39:07.000000000 +0100
++++ openais-0.80.3/Makefile.inc	2008-02-17 18:39:36.000000000 +0100
+@@ -61,14 +61,14 @@
+ 
+ # default CFLAGS, LDFLAGS
+ #
+-CFLAGS = 
+-LDFLAGS =
+-DYFLAGS =
++CFLAGS ?= 
++LDFLAGS ?=
++DYFLAGS ?=
+ 
+ # build CFLAGS, LDFLAGS
+ #
+ ifeq (${OPENAIS_BUILD}, RELEASE) 
+-	CFLAGS += -O3 -Wall
++	CFLAGS += -Wall
+ # -Wstrict-aliasing=2 TODO sameday fix all of these
+ ifndef OPENAIS_PROFILE
+ 	CFLAGS += -fomit-frame-pointer
diff --git a/sys-cluster/openais/openais-0.80.3.ebuild b/sys-cluster/openais/openais-0.80.3.ebuild
new file mode 100644
index 000000000000..9a044328a86f
--- /dev/null
+++ b/sys-cluster/openais/openais-0.80.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/openais-0.80.3.ebuild,v 1.1 2008/03/17 16:02:41 xmerlin Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+IUSE="debug"
+DESCRIPTION="Open Application Interface Specification cluster framework"
+HOMEPAGE="http://www.openais.org/"
+#SRC_URI="ftp://ftp%40openais%2Eorg:downloads@openais.org/downloads/${P}/${P}.tar.gz"
+SRC_URI="http://devresources.linux-foundation.org/dev/openais/downloads/${P}/${P}.tar.gz"
+LICENSE="BSD public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile-ARCH.patch || die
+	epatch "${FILESDIR}"/${P}-Makefile-LIBDIR.patch || die
+	epatch "${FILESDIR}"/${P}-Makefile.inc-FLAGS.patch || die
+}
+
+pkg_setup() {
+	enewgroup ais
+	enewuser ais -1 -1 -1 ais
+}
+
+src_compile() {
+	useq debug && append-flags -O0 -ggdb -Wall -DDEBUG
+	emake -j1 LIBDIR="/usr/$(get_libdir)/openais" \
+		CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake LIBDIR="/usr/$(get_libdir)/openais" \
+		DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc/ais
+	doins "${FILESDIR}"/openais.conf
+
+	# http://bugs.gentoo.org/show_bug.cgi?id=160847#c16
+	dosym /usr/sbin/aisexec /sbin/aisexec
+
+	dodir /etc/env.d
+	echo LDPATH="/usr/$(get_libdir)/openais" > "${D}"/etc/env.d/03openais
+
+	newinitd "${FILESDIR}"/ais.initd ais
+
+	diropts -o ais -g ais -m 0750
+	keepdir /var/log/ais
+
+	exeinto /usr/libexec/openais
+	doexe exec/openais-instantiate || die
+	doexe test/{ckptbench,ckptbenchth,ckpt-rd,ckptstress,ckpt-wr,clc_cli_script} || die
+	doexe test/{cpgbench,evsbench,evtbench} || die
+	doexe test/{publish,subscription,testamf1,testckpt,testclm,testclm2,testcpg,testcpg2} || die
+	doexe test/{testevs,testevt,testlck,testmsg,unlink} || die
+
+	dosbin test/openais-cfgtool || die
+
+	dodoc CHANGELOG QUICKSTART README.* SECURITY TODO conf/*
+}
diff --git a/sys-cluster/openais/openais-0.82.ebuild b/sys-cluster/openais/openais-0.82.ebuild
index 97995f4ce46f..0e3cb6e27a33 100644
--- a/sys-cluster/openais/openais-0.82.ebuild
+++ b/sys-cluster/openais/openais-0.82.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/openais-0.82.ebuild,v 1.2 2008/02/14 19:04:19 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/openais-0.82.ebuild,v 1.3 2008/03/17 16:02:41 xmerlin Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -30,7 +30,7 @@ pkg_setup() {
 
 src_compile() {
 	useq debug && append-flags -O0 -ggdb -Wall -DDEBUG
-	emake LIBDIR="/usr/$(get_libdir)/openais" \
+	emake -j1 LIBDIR="/usr/$(get_libdir)/openais" \
 		CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
@@ -41,6 +41,9 @@ src_install() {
 	insinto /etc/ais
 	doins "${FILESDIR}"/openais.conf
 
+	insinto /usr/include/openais/service
+	doins exec/logsys.h || die
+
 	# http://bugs.gentoo.org/show_bug.cgi?id=160847#c16
 	dosym /usr/sbin/aisexec /sbin/aisexec
 
@@ -53,13 +56,13 @@ src_install() {
 	keepdir /var/log/ais
 
 	exeinto /usr/libexec/openais
-	doexe exec/openais-instantiate
-	doexe test/{ckptbench,ckptbenchth,ckpt-rd,ckptstress,ckpt-wr,clc_cli_script}
-	doexe test/{cpgbench,evsbench,evtbench,logsys_s,logsys_t1,logsys_t2}
-	doexe test/{publish,subscription,testamf1,testckpt,testclm,testclm2,testcpg,testcpg2}
-	doexe test/{testevs,testevt,testlck,testmsg,unlink}
+	doexe exec/openais-instantiate || die
+	doexe test/{ckptbench,ckptbenchth,ckpt-rd,ckptstress,ckpt-wr,clc_cli_script} || die
+	doexe test/{cpgbench,evsbench,evtbench,logsys_s,logsys_t1,logsys_t2} || die
+	doexe test/{publish,subscription,testamf1,testckpt,testclm,testclm2,testcpg,testcpg2} || die
+	doexe test/{testevs,testevt,testlck,testmsg,unlink} || die
 
-	dosbin test/openais-cfgtool
+	dosbin test/openais-cfgtool || die
 
 	dodoc CHANGELOG QUICKSTART README.* SECURITY TODO conf/*
 }