sys-cluster/openmpi: bump

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)

3 files changed, 205 insertions, 2 deletions

diff --git a/sys-auth/munge/ChangeLog b/sys-auth/munge/ChangeLog
index e4bc5c1e0d8c..2ae26ccc862c 100644
--- a/sys-auth/munge/ChangeLog
+++ b/sys-auth/munge/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/munge
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.22 2014/03/01 22:38:37 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/ChangeLog,v 1.23 2015/06/24 14:54:25 jsbronder Exp $
+
+*munge-0.5.11 (24 Jun 2015)
+
+  24 Jun 2015; Justin Bronder <jsbronder@gentoo.org> +munge-0.5.11.ebuild,
+  +files/fixed-recursive-use-of-make-in-makefiles.patch:
+  Bump (#551136), thanks to Brendan Horan for the bump and the patch
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> munge-0.5.10-r1.ebuild:
   Update libgcrypt dep to use slot :0.
diff --git a/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch b/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch
new file mode 100644
index 000000000000..1810abc91f4a
--- /dev/null
+++ b/sys-auth/munge/files/fixed-recursive-use-of-make-in-makefiles.patch
@@ -0,0 +1,134 @@
+From 5634ce9890da48f9ea88feece856361ce8f1563c Mon Sep 17 00:00:00 2001
+From: Brendan Horan <brendan@horan.hk>
+Date: Tue, 23 Jun 2015 09:32:31 +0800
+Subject: [PATCH] Fixed recursive use of make in makefiles [ make -> $(MAKE) ]
+
+---
+ Makefile.in                | 2 +-
+ config/Make-inc.mk         | 2 +-
+ src/Makefile.in            | 2 +-
+ src/etc/Makefile.in        | 2 +-
+ src/libcommon/Makefile.in  | 2 +-
+ src/libmissing/Makefile.in | 2 +-
+ src/libmunge/Makefile.in   | 2 +-
+ src/munge/Makefile.in      | 2 +-
+ src/munged/Makefile.in     | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 8b8ca76..df53ff1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -830,7 +830,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/config/Make-inc.mk b/config/Make-inc.mk
+index 03a9622..edffea1 100644
+--- a/config/Make-inc.mk
++++ b/config/Make-inc.mk
+@@ -31,7 +31,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c89ec9c..38c32da 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -648,7 +648,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
+index ffd41a0..d1eed84 100644
+--- a/src/etc/Makefile.in
++++ b/src/etc/Makefile.in
+@@ -451,7 +451,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/libcommon/Makefile.in b/src/libcommon/Makefile.in
+index 45419a8..8512b74 100644
+--- a/src/libcommon/Makefile.in
++++ b/src/libcommon/Makefile.in
+@@ -683,7 +683,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/libmissing/Makefile.in b/src/libmissing/Makefile.in
+index 10b1a78..187f4b3 100644
+--- a/src/libmissing/Makefile.in
++++ b/src/libmissing/Makefile.in
+@@ -572,7 +572,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/libmunge/Makefile.in b/src/libmunge/Makefile.in
+index 69dc54f..ab21fdc 100644
+--- a/src/libmunge/Makefile.in
++++ b/src/libmunge/Makefile.in
+@@ -752,7 +752,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/munge/Makefile.in b/src/munge/Makefile.in
+index f411d7e..411ec3b 100644
+--- a/src/munge/Makefile.in
++++ b/src/munge/Makefile.in
+@@ -752,7 +752,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
+diff --git a/src/munged/Makefile.in b/src/munged/Makefile.in
+index c14fd0b..5112da3 100644
+--- a/src/munged/Makefile.in
++++ b/src/munged/Makefile.in
+@@ -1243,7 +1243,7 @@ $(top_builddir)/src/libcommon/libcommon.la \
+ $(top_builddir)/src/libmissing/libmissing.la \
+ $(top_builddir)/src/libmunge/libmunge.la \
+ : force-dependency-check
+-	@cd `dirname $@` && make `basename $@`
++	@cd `dirname $@` && $(MAKE) `basename $@`
+ 
+ force-dependency-check:
+ 
diff --git a/sys-auth/munge/munge-0.5.11.ebuild b/sys-auth/munge/munge-0.5.11.ebuild
new file mode 100644
index 000000000000..ff2f5c0644df
--- /dev/null
+++ b/sys-auth/munge/munge-0.5.11.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/munge/munge-0.5.11.ebuild,v 1.1 2015/06/24 14:54:25 jsbronder Exp $
+
+EAPI=5
+inherit autotools eutils user
+
+DESCRIPTION="An authentication service for creating and validating credentials"
+HOMEPAGE="https://github.com/dun/munge"
+SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gcrypt"
+
+DEPEND="app-arch/bzip2
+	sys-libs/zlib
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	!gcrypt? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup munge
+	enewuser munge -1 -1 /var/lib/munge munge
+}
+
+src_prepare() {
+	# Accepted upstream, https://github.com/dun/munge/pull/40
+	epatch "${FILESDIR}"/fixed-recursive-use-of-make-in-makefiles.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-crypto-lib=$(usex gcrypt libgcrypt openssl)
+}
+
+src_install() {
+	local d
+
+	default
+
+	# 450830
+	if [ -d "${D}"/var/run ]; then
+		rm -rf "${D}"/var/run || die
+	fi
+
+	diropts -o munge -g munge -m700
+	dodir /etc/munge
+
+	for d in "init.d" "default" "sysconfig"; do
+		if [ -d "${D}"/etc/${d} ]; then
+			rm -r "${D}"/etc/${d} || die
+		fi
+	done
+
+	newconfd "${FILESDIR}"/${PN}d.confd ${PN}d
+	newinitd "${FILESDIR}"/${PN}d.initd ${PN}d
+}