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.
Package-Manager: portage-2.1.4.4

7 files changed, 154 insertions, 11 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/Manifest b/sys-cluster/openais/Manifest
index d1f93acda90d..989f1617aac8 100644
--- a/sys-cluster/openais/Manifest
+++ b/sys-cluster/openais/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Makefile-ARCH.patch 310 RMD160 0de6d7a374244a94403ee9bae986665aadf6961b SHA1 a03e1f692bba004b8e5ca92b4c7a46609ce76621 SHA256 56b704911a1dec1bebd224963ad9a558f22b1bbc2edad6fda72d6951e304f8d1
 AUX Makefile-LIBDIR.patch 612 RMD160 61faaa4bc8a131e3678b84cacb1888b8283f4846 SHA1 67fadcebf9f27fb3a8a6df3f8190af8bb96eda41 SHA256 ef47cddbb3e818109a6db31d14d0ae1138801420104a67241aad1057e332a9b4
 AUX Makefile-install.patch 550 RMD160 6ac244e612a8d772110acbb8695ca20a9b78d208 SHA1 08f74c320269a55332b86ecdfcab05b867ed9340 SHA256 7d92c37621ffb0e91cd62cce0d31fc9373cbb3e09ca3917ab412a04391e0d16c
 AUX Makefile.inc-FLAGS.patch 543 RMD160 79bf38f396aa117ebbd6bae2dccb56ef89050d0e SHA1 9b19ef59f5a9b53e58a378a6fe17b9522bc63f41 SHA256 35c28501c6ea3942fb29ca9736e386f06738dc576c4931ae10964918d080d479
 AUX ais.initd 530 RMD160 2d70f36431dd38dc64b3e6f6929ab811ee6ce392 SHA1 60ac1227eb475dfb7f32a88f62275747ed91c60a SHA256 13598e30f5ff826e2df24e851a1149449d0839a7c53639cc19522e47852a2d36
+AUX openais-0.80.3-Makefile-ARCH.patch 329 RMD160 1ddcc3071f0df052efeb2f5337b4e8207cd7c87a SHA1 d3f4ca12bb1cb9a5b75309a39a6420041450156f SHA256 4c1a2ee61084d90615e97e89e1cfcd9e94c69230997230f4282363545b17429a
+AUX openais-0.80.3-Makefile-LIBDIR.patch 641 RMD160 cbd1432f056ef8e8e051c06fdbe1452d3b821720 SHA1 5551aefb26d057f8e9e6810712ebc74a98a064eb SHA256 a54492cbc614e569c757791f2eae4fa05f4a1d5b2da510c58cce88580589bc2d
+AUX openais-0.80.3-Makefile.inc-FLAGS.patch 477 RMD160 77807cfabfbab634262ccb1d38d533fdebd91cbe SHA1 1ec9c03a78b206a25cee92220517e125ccabfbfe SHA256 04f0abeb15de7a82c99313177a6d27a9e9c5e5aa9b39fe8b5df3df8b113be93f
 AUX openais.conf 586 RMD160 568405f8e0eb839361c3018369a1e5244589da26 SHA1 42f1deabf9af30bbdd29ca3b34cf83ae33d77bc1 SHA256 18e9290eca7bc28e2d99e62148deac9e0c45659c381b64c990d6354b06804191
+DIST openais-0.80.3.tar.gz 478936 RMD160 5c8643b7cb9ed15d18adaf02e9a4ca1e22480325 SHA1 4a176a59008486fde74f532738db422828298af2 SHA256 eeefdab923a2141d2921c0e94006c5e7101764919ae8eb880deaec2295ff5866
 DIST openais-0.82.tar.gz 556910 RMD160 018110f43a73544719148306ed5913174851bed7 SHA1 1e48e94b0371a9badf430ceb0024b266a94627d1 SHA256 9eab207260e8d476e841eb83930f9e20c0092f524b579f9344b98f35c857b498
-EBUILD openais-0.82.ebuild 1968 RMD160 c1408fd32f21339e529e1995410d8864d9f0ed3a SHA1 22d435a00a1e07ec2d7965089f6acfe3b5cc49d6 SHA256 7d047d73a853784d26587fcd3b4fbc769976183d5b575c521ced03f6e4a719ef
-MISC ChangeLog 637 RMD160 03b53ecd1b99af266682f7389c01061569a57f02 SHA1 270598571cc2dfb90d69412061b43514f4a3bee2 SHA256 404cffde4dc442b0b750e20f6468fdce63a3aa76f6b3cc57a21f73d327e23786
+EBUILD openais-0.80.3.ebuild 1977 RMD160 062a715775daaae7b9da0ac8ba40f617b037b5a8 SHA1 21ef72d74a65f0c778da82c7eee18e77cc69c52f SHA256 530eea8b4713fbd0d88cfce3b43ebdfd40c9984a27ff7b197f38824074a0cf7e
+EBUILD openais-0.82.ebuild 2080 RMD160 638712a118d9d16c5ee8dad1bf12ed406df72e46 SHA1 04c1d36397e6869a86a5e1612d3725a1c0fec741 SHA256 33ce3b938af986ea7ce0391b5a1912b054ecd6857f7ef2816d4997ae0afc0cd9
+MISC ChangeLog 1037 RMD160 2ead688c9e0ddcc519370490b4203c44a4d80589 SHA1 5477f48918b9a40ee50f4e025a9cb2ccfcd19ed4 SHA256 3eb72b536bb2f616a85666b5ce6038144fd71e8106d12e4fdab5eb01c56c6591
 MISC metadata.xml 948 RMD160 f80004810bbc4b6b0d5d576aa24bc477743362cb SHA1 f44da23c55b7e4dc597c005cd712fd53948d6dab SHA256 f28f29c0afa1ae746a290e6f4694b53b622f5453b9c9024265e26f84fb6e37a6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH3pYpgMUyd/cdjWsRApL9AJ4q9/1It2/pmMtiwym918qgdyBv1QCaAqgj
+q77wKxTmFWlcJMc3iW1ccnU=
+=EZhc
+-----END PGP SIGNATURE-----
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/*
 }