From 9e4fc11e2c962a84444c7b6b6d0eaab3ab053f81 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 4 Jan 2008 15:33:50 +0000
Subject: Fix ebuild for pam and static again

---
 sys-apps/openrc/Manifest           |  8 ++++----
 sys-apps/openrc/openrc-9999.ebuild | 23 +++++++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index a012310..f896b92 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,7 +1,7 @@
-EBUILD openrc-9999.ebuild 4254 RMD160 4ee49267bf9f8ac88eb804f763a4f9dde9324ebb SHA1 7c9c39b8b54188c921d9c561cf417fcf836243b3 SHA256 9ef2031885540906faee12e613e065beada9cee8811504147a298850491fe41e
-MD5 f7fded4223287bf47cdd408010d3339e openrc-9999.ebuild 4254
-RMD160 4ee49267bf9f8ac88eb804f763a4f9dde9324ebb openrc-9999.ebuild 4254
-SHA256 9ef2031885540906faee12e613e065beada9cee8811504147a298850491fe41e openrc-9999.ebuild 4254
+EBUILD openrc-9999.ebuild 4291 RMD160 f9335e40a47a11268b79ef60ff3628ace2526291 SHA1 dd462a756609d4feae7f856b78e0424c6c62145c SHA256 fd457fba753b0dacf95ea8b5600152c6724514f96aba813deb2ae0b4b7a6f3da
+MD5 1a4f0ead5ec1b8d443db87af52e50783 openrc-9999.ebuild 4291
+RMD160 f9335e40a47a11268b79ef60ff3628ace2526291 openrc-9999.ebuild 4291
+SHA256 fd457fba753b0dacf95ea8b5600152c6724514f96aba813deb2ae0b4b7a6f3da openrc-9999.ebuild 4291
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openrc-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-openrc-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-openrc-9999 0
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index bd348f7..99011a8 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -43,18 +43,21 @@ pkg_setup() {
 	fi
 	[ -n "${brand}" ] && MAKE_ARGS="${MAKE_ARGS} BRANDING=Gentoo/${brand}"
 
-	local pamok=true
-	if use pam && use static; then
-		if has_version sys-libs/pam; then
-			ewarn "You cannot build a static OpenRC against LinuxPAM"
-			elog "Disabling PAM"
-			pamok=false
+	use ncurses && MAKE_ARGS="${MAKE_ARGS} TERMCAP=ncurses"
+	if use pam; then
+		MAKE_ARGS="${MAKE_ARGS} PAM=pam"
+		if use static; then
+			ewarn "OpenRC cannot be built statically with PAM"
+			elog "not building statically"
+		fi
+	fi
+	if use static && ! use pam; then
+		if use elibc_glibc; then
+			MAKE_ARGS="${MAKE_ARGS} BIN_LDFLAGS=-Wl,-Bstatic"
+		else
+			MAKE_ARGS="${MAKE_ARGS} BIN_LDFLAGS=-static"
 		fi
 	fi
-
-	use ncurses && MAKE_ARGS="${MAKE_ARGS} TERMCAP=ncurses"
-	use pam && ${pamok} && MAKE_ARGS="${MAKE_ARGS} PAM=pam"
-	use static && MAKE_ARGS="${MAKE_ARGS} BIN_LDFLAGS=-static"
 
 	MAKE_ARGS="${MAKE_ARGS} CC=$(tc-getCC)"
 }
-- 
cgit v1.2.3-65-gdbad