From f867e51599d1526852543ef645eaf07acacd53cf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Wed, 10 Mar 2010 00:37:55 +0000
Subject: [PATCH] Version bump and remove old version. The new version simply
 improves on the system-services stack to be usable with fcron.
 Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

---
 sys-auth/pambase/ChangeLog               |  11 ++-
 sys-auth/pambase/Manifest                |  16 +++-
 sys-auth/pambase/pambase-20081028.ebuild | 103 -----------------------
 sys-auth/pambase/pambase-20100310.ebuild |  90 ++++++++++++++++++++
 4 files changed, 112 insertions(+), 108 deletions(-)
 delete mode 100644 sys-auth/pambase/pambase-20081028.ebuild
 create mode 100644 sys-auth/pambase/pambase-20100310.ebuild

diff --git a/sys-auth/pambase/ChangeLog b/sys-auth/pambase/ChangeLog
index a43ce1f301dd..b83fe45b0b11 100644
--- a/sys-auth/pambase/ChangeLog
+++ b/sys-auth/pambase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pambase
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.78 2009/11/21 14:44:46 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/ChangeLog,v 1.79 2010/03/10 00:37:55 flameeyes Exp $
+
+*pambase-20100310 (10 Mar 2010)
+
+  10 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pambase-20081028.ebuild, +pambase-20100310.ebuild:
+  Version bump and remove old version. The new version simply improves on
+  the system-services stack to be usable with fcron.
 
   21 Nov 2009; Raúl Porcel <armin76@gentoo.org>
   pambase-20090620.1-r1.ebuild:
diff --git a/sys-auth/pambase/Manifest b/sys-auth/pambase/Manifest
index 30273e8a333e..165b999418c1 100644
--- a/sys-auth/pambase/Manifest
+++ b/sys-auth/pambase/Manifest
@@ -1,6 +1,16 @@
-DIST pambase-20081028.tar.bz2 2556 RMD160 c7ea746c7a9ab841b6438d125033f161043689a2 SHA1 0786d4c2325424d27a293adb9b787bb8467adcd3 SHA256 3ccfbc9aa70b1e1b248e21636f40625dfdb87952088e6fbebba7fce3ee8aa5cd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pambase-20090620.1.tar.bz2 2593 RMD160 9cd6717ad162f8f4f031d53c4a2cf827d91ac384 SHA1 9a91fa485ea016304adb4ec32cc9d812d1ec101d SHA256 d1b9acef139729c9e25d8571a96d8c186ffd85415e101b6e32db9d5f6f335208
-EBUILD pambase-20081028.ebuild 3534 RMD160 8053f52a9fb86ea0e22382e4e9ee3fba1c4e81bb SHA1 298dd0997035430513209dc07849eafab54ac177 SHA256 55b7713fd6e4db66a798194296d923584a748714b70e86d2dc009c1faeba0848
+DIST pambase-20100310.tar.bz2 2623 RMD160 2ac4982d96eb49396946373e17e2adea06358328 SHA1 7e6fe7b80f4b0ec8da4bdcda9a0392983646b151 SHA256 11dbda24c2534ac6230455561c395a42f71d6aed96242cdb7368f99a56999ca9
 EBUILD pambase-20090620.1-r1.ebuild 2822 RMD160 d068e0dbfac91c6b1d4b595dc4852df8f948db58 SHA1 10f2de0ed3143de8b2e60969e80f829004b4f005 SHA256 c8ab94cb14951f02270e71b92e0da29e92c5c0a64e92cfc8cf1aa7dc0a04233f
-MISC ChangeLog 11491 RMD160 74de8c9b6d0a4fd2b7c875975c22f52ac4b01c7c SHA1 3f5cdf83e59ff63f6c2db5ba05d6c0ea5c75aa9d SHA256 cf3fe38514e490312d2e761399dd19f25614e5ae1627f2515fc3f7f8112583fa
+EBUILD pambase-20100310.ebuild 2831 RMD160 384159b4c2015c4669ce29e68e37f2acd2a72351 SHA1 c3b9a08ef691f6c61ac1ee6a58f0080650d9a6d9 SHA256 7acd88a9bfce69c852cb272ea719946c8724ce0047674dcdc73f18e35a866d9d
+MISC ChangeLog 11764 RMD160 0706c722a0986e8967e1c90f8c32d49dc814cd56 SHA1 fa28e49bbc62bae118c4b7890101da22133299d8 SHA256 b3fa8f1b7b7543fe1c8103bd98677231648150a18f355145ecb2e4e586b6ca2d
 MISC metadata.xml 2874 RMD160 74035c58791c92882c1e3e7c0f9f12f93481759a SHA1 c386b00664c9fa6a816a45af75d9805a850c4031 SHA256 ebb8c90cd39aca27e3cd03bf6432dc40a3af886248fd816f7c69b6e096784e9f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuW6ewACgkQAiZjviIA2XjbEwCdEixjijpEetp0f7CjMbs1tD+k
+q9cAoNP3Z4cWxde/hBUbbYZsVdyNuJ+w
+=t+fJ
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/pambase/pambase-20081028.ebuild b/sys-auth/pambase/pambase-20081028.ebuild
deleted file mode 100644
index 8e871f359359..000000000000
--- a/sys-auth/pambase/pambase-20081028.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20081028.ebuild,v 1.8 2009/03/21 02:36:41 jer Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="PAM base configuration files"
-HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
-SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512"
-RESTRICT="binchecks"
-
-RDEPEND="
-	|| (
-		>=sys-libs/pam-0.99.9.0-r1
-		( sys-auth/openpam
-		  || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules )
-		)
-	)
-	cracklib? ( >=sys-libs/pam-0.99 )
-	consolekit? ( sys-auth/consolekit )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20 )
-	selinux? ( >=sys-libs/pam-0.99 )
-	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
-	mktemp? ( sys-auth/pam_mktemp )
-	ssh? ( sys-auth/pam_ssh )
-	sha512? ( >=sys-libs/pam-1.0.1 )
-	!<sys-freebsd/freebsd-pam-modules-6.2-r1
-	!<sys-libs/pam-0.99.9.0-r1"
-DEPEND=""
-
-pkg_setup() {
-	if use cracklib && ! built_with_use sys-libs/pam cracklib; then
-		eerror "To enable cracklib support in the main PAM configuration"
-		eerror "you need to enable cracklib USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_cracklib"
-	fi
-
-	if use selinux && ! built_with_use sys-libs/pam selinux; then
-		eerror "To enable selinux support in the main PAM configuration"
-		eerror "you need to enable selinux USE flag on sys-libs/pam"
-		eerror "first."
-		die "Missing pam_selinux"
-	fi
-
-	if use consolekit && ! built_with_use sys-auth/consolekit pam; then
-		eerror "To enable ConsoleKit support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on sys-auth/consolekit"
-		eerror "first."
-		die "Missing pam_ck_connector"
-	fi
-
-	if use gnome-keyring && ! built_with_use gnome-base/gnome-keyring pam; then
-		eerror "To enable GNOME Keyring support in the main PAM configuration"
-		eerror "you need to enable pam USE flag on gnome-base/gnome-keyring"
-		eerror "first."
-		die "Missing pam_gnome_keyring"
-	fi
-}
-
-src_compile() {
-	has_version sys-libs/pam && implementation="linux-pam"
-	has_version sys-auth/openpam && implementation="openpam"
-
-	emake \
-		GIT=true \
-		DEBUG=$(use debug && echo yes || echo no) \
-		CRACKLIB=$(use cracklib && echo yes || echo no) \
-		PASSWDQC=$(use passwdqc && echo yes || echo no) \
-		CONSOLEKIT=$(use consolekit && echo yes || echo no) \
-		GNOME_KEYRING=$(use gnome-keyring && echo yes || echo no) \
-		SELINUX=$(use selinux && echo yes || echo no) \
-		MKTEMP=$(use mktemp && echo yes || echo no) \
-		PAM_SSH=$(use ssh && echo yes || echo no) \
-		SHA512=$(use sha512 && echo yes || echo no) \
-		IMPLEMENTATION=${implementation} \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake GIT=true DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
-	if use sha512; then
-		elog "Starting from version 20080801, pambase optionally enables"
-		elog "SHA512-hashed passwords. For this to work, you need sys-libs/pam-1.0.1"
-		elog "built against sys-libs/glibc-2.7 or later."
-		elog "If you don't have support for this, it will automatically fallback"
-		elog "to MD5-hashed passwords, just like before."
-		elog
-		elog "Please note that the change only affects the newly-changed passwords"
-		elog "and that SHA512-hashed passwords will not work on earlier versions"
-		elog "of glibc or Linux-PAM."
-	fi
-}
diff --git a/sys-auth/pambase/pambase-20100310.ebuild b/sys-auth/pambase/pambase-20100310.ebuild
new file mode 100644
index 000000000000..c7cf7ffb893f
--- /dev/null
+++ b/sys-auth/pambase/pambase-20100310.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pambase/pambase-20100310.ebuild,v 1.1 2010/03/10 00:37:55 flameeyes Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="PAM base configuration files"
+HOMEPAGE="http://www.gentoo.org/proj/en/base/pam/"
+SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug cracklib passwdqc consolekit gnome-keyring selinux mktemp ssh +sha512"
+RESTRICT="binchecks"
+
+RDEPEND="
+	|| (
+		>=sys-libs/pam-0.99.9.0-r1
+		( sys-auth/openpam
+		  || ( sys-freebsd/freebsd-pam-modules sys-netbsd/netbsd-pam-modules )
+		)
+	)
+	cracklib? ( >=sys-libs/pam-0.99[cracklib] )
+	consolekit? ( >=sys-auth/consolekit-0.3[pam] )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.20[pam] )
+	selinux? ( >=sys-libs/pam-0.99[selinux] )
+	passwdqc? ( >=sys-auth/pam_passwdqc-1.0.4 )
+	mktemp? ( sys-auth/pam_mktemp )
+	ssh? ( sys-auth/pam_ssh )
+	sha512? ( >=sys-libs/pam-1.0.1 )
+	!<sys-freebsd/freebsd-pam-modules-6.2-r1
+	!<sys-libs/pam-0.99.9.0-r1"
+DEPEND="app-portage/portage-utils"
+
+src_compile() {
+	local implementation=
+	local linux_pam_version=
+	if has_version sys-libs/pam; then
+		implementation="linux-pam"
+		local ver_str=$(qatom `best_version sys-libs/pam` | cut -d ' ' -f 3)
+		linux_pam_version=$(printf "0x%02x%02x%02x" ${ver_str//\./ })
+	elif has_version sys-auth/openpam; then
+		implementation="openpam"
+	else
+		die "PAM implementation not identified"
+	fi
+
+	use_var() {
+		local varname=$(echo $1 | tr [a-z] [A-Z])
+		local usename=${2-$(echo $1 | tr [A-Z] [a-z])}
+		local varvalue=$(use $usename && echo yes || echo no)
+		echo "${varname}=${varvalue}"
+	}
+
+	emake \
+		GIT=true \
+		$(use_var debug) \
+		$(use_var cracklib) \
+		$(use_var passwdqc) \
+		$(use_var consolekit) \
+		$(use_var GNOME_KEYRING gnome-keyring) \
+		$(use_var selinux) \
+		$(use_var mktemp) \
+		$(use_var PAM_SSH ssh) \
+		$(use_var sha512) \
+		IMPLEMENTATION=${implementation} \
+		LINUX_PAM_VERSION=${linux_pam_version} \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake GIT=true DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+	if use sha512; then
+		elog "Starting from version 20080801, pambase optionally enables"
+		elog "SHA512-hashed passwords. For this to work, you need sys-libs/pam-1.0.1"
+		elog "built against sys-libs/glibc-2.7 or later."
+		elog "If you don't have support for this, it will automatically fallback"
+		elog "to MD5-hashed passwords, just like before."
+		elog
+		elog "Please note that the change only affects the newly-changed passwords"
+		elog "and that SHA512-hashed passwords will not work on earlier versions"
+		elog "of glibc or Linux-PAM."
+	fi
+}
-- 
2.26.2