[gentoo-commits] repo/gentoo:master commit in: sys-auth/munge/

[Justin Lecher]

commit:     65307f0832a207c72ea1f85e952cb9fbfcbe6d5d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 20:43:07 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 21:08:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65307f08

sys-auth/munge: Version Bump

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sys-auth/munge/Manifest                                     |  1 +
 sys-auth/munge/munge-0.5.10-r2.ebuild                       |  6 ++++--
 sys-auth/munge/munge-0.5.11-r1.ebuild                       |  8 +++++---
 sys-auth/munge/munge-0.5.12.ebuild                          |  2 +-
 sys-auth/munge/{munge-0.5.12.ebuild => munge-0.5.13.ebuild} | 10 ++++++++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/sys-auth/munge/Manifest b/sys-auth/munge/Manifest
index 16af6b081c1..9ed0eded004 100644
--- a/sys-auth/munge/Manifest
+++ b/sys-auth/munge/Manifest
@@ -1,3 +1,4 @@
 DIST munge-0.5.10.tar.bz2 424285 SHA256 00e0125c2895877b555872647b0a98d13838a54acda78614bb6c6e70daadabc6 SHA512 b1b780d205d6cfbadfe6096156840d559c70de5b0023cbd604acfc29e1135036c98a949981d5c022e994c77213ee3d8d70e8fe825b645b030ad1adef92ed9479 WHIRLPOOL 72bb331f3651473b482b3ad5b4f0e934537d93911e8c55e5d253511de273da7719a26f2f9d98ee6bee7968a705f41f648f52cdf67107edbc2565cadd473d0d46
 DIST munge-0.5.11.tar.bz2 423232 SHA256 8e075614f81cb0a6df21a0aafdc825498611a04429d0876f074fc828739351a5 SHA512 b9d4cd76c4fe605ad67934af48809205de0f0e5fa1a10dd3b6e382da2cb8bc274bd2a8c0d4bc49d1d58155bf008945a584afd0b6e01cc8052aa1d21c8de2815b WHIRLPOOL 00898e86b05955109799d81b1da7cdb9300c8af6f73a7d0d2d9f678c8fce6878f093b77ce1406797b7814a7c099d3f22d2c93b08e4cdbf77cc61ec624604b87c
 DIST munge-0.5.12.tar.xz 370160 SHA256 e972e3c3e947995a99e023f5758047db16cfe2f0c2c9ca76399dc1511fa71be8 SHA512 088f5ee7f5f37011d90666b87db05de6a2b8bb7cec1b43167bc3459cb365a45ebdf09d583095fabdc1e547c3c96433ca9d71a79ff05b983e8623f8d429a6852b WHIRLPOOL d8fb1693174b2aec76ce2defa5f0c02e4074970c51ca6ab68033ee03a4b5cb25546b465e7912b0d08132e086b9bfcef226d20530425953038786ad69d1118520
+DIST munge-0.5.13.tar.xz 389952 SHA256 99753dfd06a4f063c36f3fb0eb1964f394feb649937d94c4734d85b7964144da SHA512 2e024c0438f9208379a037daabd1c31f206820ab74a410e2bb69870755e99f9c9fbf60c294c96941008bc43425fbb31dd2374e5f088b7978479e7c65816e9002 WHIRLPOOL 5fd193c38ad2d0c5313a61a644b8e154069202f90456a36af79db96f050152e2524db4908adbc014b5b202f52027a4e04bb2e6285ca7ec221f7e090fdb43d1bc

diff --git a/sys-auth/munge/munge-0.5.10-r2.ebuild b/sys-auth/munge/munge-0.5.10-r2.ebuild
index 90cbf190d6a..7054e80d56d 100644
--- a/sys-auth/munge/munge-0.5.10-r2.ebuild
+++ b/sys-auth/munge/munge-0.5.10-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
+
 inherit user
 
 DESCRIPTION="An authentication service for creating and validating credentials"
@@ -13,7 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="gcrypt"
 
-DEPEND="app-arch/bzip2
+DEPEND="
+	app-arch/bzip2
 	sys-libs/zlib
 	gcrypt? ( dev-libs/libgcrypt:0 )
 	!gcrypt? ( dev-libs/openssl )"

diff --git a/sys-auth/munge/munge-0.5.11-r1.ebuild b/sys-auth/munge/munge-0.5.11-r1.ebuild
index d42b3e72b89..ee2f11fd150 100644
--- a/sys-auth/munge/munge-0.5.11-r1.ebuild
+++ b/sys-auth/munge/munge-0.5.11-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils user prefix
+
+inherit autotools eutils user
 
 DESCRIPTION="An authentication service for creating and validating credentials"
 HOMEPAGE="https://github.com/dun/munge"
@@ -14,7 +15,8 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="gcrypt"
 
-DEPEND="app-arch/bzip2
+DEPEND="
+	app-arch/bzip2
 	sys-libs/zlib
 	gcrypt? ( dev-libs/libgcrypt:0 )
 	!gcrypt? ( dev-libs/openssl:0 )"

diff --git a/sys-auth/munge/munge-0.5.12.ebuild b/sys-auth/munge/munge-0.5.12.ebuild
index be4d2881ee1..1c250f99b3f 100644
--- a/sys-auth/munge/munge-0.5.12.ebuild
+++ b/sys-auth/munge/munge-0.5.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools user prefix
+inherit autotools user
 
 DESCRIPTION="An authentication service for creating and validating credentials"
 HOMEPAGE="https://github.com/dun/munge"

diff --git a/sys-auth/munge/munge-0.5.12.ebuild b/sys-auth/munge/munge-0.5.13.ebuild
similarity index 84%
copy from sys-auth/munge/munge-0.5.12.ebuild
copy to sys-auth/munge/munge-0.5.13.ebuild
index be4d2881ee1..fff766b94b0 100644
--- a/sys-auth/munge/munge-0.5.12.ebuild
+++ b/sys-auth/munge/munge-0.5.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dun/munge/releases/download/munge-${PV}/munge-${PV}.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gcrypt"
+IUSE="debug gcrypt static-libs"
 
 DEPEND="
 	app-arch/bzip2
@@ -37,7 +37,9 @@ src_prepare() {
 src_configure() {
 	econf \
 		--localstatedir="${EPREFIX}"/var \
-		--with-crypto-lib=$(usex gcrypt libgcrypt openssl)
+		--with-crypto-lib=$(usex gcrypt libgcrypt openssl) \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
 }
 
 src_install() {
@@ -60,4 +62,8 @@ src_install() {
 
 	newconfd "$(prefixify_ro "${FILESDIR}"/${PN}d.confd)" ${PN}d
 	newinitd "$(prefixify_ro "${FILESDIR}"/${PN}d.initd)" ${PN}d
+
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -delete || die
+	fi
 }