Bump to EAPI=3, add prefix keywords in revbump

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 178 insertions, 5 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 7bd07eb00190..e5fd00c136d5 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.256 2010/03/10 16:04:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.257 2010/04/06 05:39:37 abcd Exp $
+
+*pam-1.1.1-r2 (06 Apr 2010)
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org> +pam-1.1.1-r2.ebuild:
+  Bump to EAPI=3, add prefix keywords in revbump
 
 *pam-1.1.1-r1 (10 Mar 2010)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 86588d9b15fa..4b433e23cea7 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -17,13 +17,14 @@ DIST Linux-PAM-1.1.1.tar.bz2 1120055 RMD160 2d3c39cb2c3542d380e1331fef08c7086cc8
 EBUILD pam-1.0.4.ebuild 5778 RMD160 cc4dc0e2c775d5a1ade189654b4a8d2614e9e2ec SHA1 f51fcb9195440795755227b704e5a32ba7ce720c SHA256 89c7add87128c0e1089ddc93074f615f08e49f19fcde8d8ffe71de85e9ea00af
 EBUILD pam-1.1.0.ebuild 4911 RMD160 86cfa5eaca074ae876bc400ba2bac9f8d3082025 SHA1 016a2ac400f6902ab3567237223df54c9486c4cd SHA256 b87c7ce54a38611a884d272e0b925e7049d4cb1609ec8d31de971c261947ddcb
 EBUILD pam-1.1.1-r1.ebuild 4949 RMD160 4d401000d0f5121cbede80d82f2f7bc449f7e001 SHA1 235719e53d80252c520b59e6ba7d77cfac5e9603 SHA256 89c9bff232de9797d870cc161c3a800c246d3a6a998b8bd40cfe3c9afd36c436
+EBUILD pam-1.1.1-r2.ebuild 5071 RMD160 7a8e8bc0efb30054393fabada93b6f2b4aca7b23 SHA1 e973e3ed8db12308b41f8ee9b1b2cb6360493197 SHA256 fe765b73b9014174ef6e698cdbcefc292c613692ee9ec4a0b17a7d05141c454a
 EBUILD pam-1.1.1.ebuild 4773 RMD160 71c0046202e92c8c4eab14116bcbb0b72a8bce54 SHA1 11125dd3db0fbd65d12e7bc413d5d5ecc75b1f32 SHA256 21b5341e6c8d90c8b1468d53c18eb3e28c9936c8bdae31ac57b5858903d0dc08
-MISC ChangeLog 41119 RMD160 1a7bf28c79c7b2e7aba0742c2f30a5e05125d96b SHA1 e36d59e2ba6d7d738ed1c2f9007a874baf6b6cf4 SHA256 aa06cc7c424468a60d81d3169caead8d8573c84e7b462b634dbaa0f4b6a20d4b
+MISC ChangeLog 41264 RMD160 47f5652ee1105f2213e4cf114fcb60c7837d08c6 SHA1 a36f23c8241641ce00318b28615a48d4d47b452f SHA256 ef8cfd4f08d3f8f18e5ecc9f35802c48f4f82050ba309d679cb6b9b85f7a467e
 MISC metadata.xml 1129 RMD160 a800f5ac4255ca20c26791ff0b57c3c923666623 SHA1 99e58550271cf1c3e23c4547387469a0d211ae55 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuXwwEACgkQAiZjviIA2XiShgCeO5pUkxSSDGhXSpIsPRL5gYEs
-hQwAoK8dpbjgW9e7DYFfQH/dE24iQ9qD
-=8oNd
+iEYEARECAAYFAku6ySUACgkQOypDUo0oQOrtXACgwUIcmKZMXr4Nil4aBtzwrwUs
+IzUAnR+W0CKtclVKHozUU6Blt18Vvyso
+=OrMv
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-1.1.1-r2.ebuild b/sys-libs/pam/pam-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..370e21cfcc91
--- /dev/null
+++ b/sys-libs/pam/pam-1.1.1-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.1-r2.ebuild,v 1.1 2010/04/06 05:39:37 abcd Exp $
+
+EAPI="3"
+
+inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic db-use
+
+MY_PN="Linux-PAM"
+MY_P="${MY_PN}-${PV}"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
+DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
+
+SRC_URI="mirror://kernel/linux/libs/pam/library/${MY_P}.tar.bz2
+	mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="cracklib nls elibc_FreeBSD selinux vim-syntax audit test elibc_glibc debug berkdb"
+
+RDEPEND="nls? ( virtual/libintl )
+	cracklib? ( >=sys-libs/cracklib-2.8.3 )
+	audit? ( sys-process/audit )
+	selinux? ( >=sys-libs/libselinux-1.28 )
+	berkdb? ( sys-libs/db )
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+PDEPEND="sys-auth/pambase
+	vim-syntax? ( app-vim/pam-syntax )"
+RDEPEND="${RDEPEND}
+	!sys-auth/pam_userdb"
+
+S="${WORKDIR}/${MY_P}"
+
+PROVIDE="virtual/pam"
+
+check_old_modules() {
+	local retval="0"
+
+	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
+		eerror ""
+		eerror "Your current setup is using the pam_stack module."
+		eerror "This module is deprecated and no longer supported, and since version"
+		eerror "0.99 is no longer installed, nor provided by any other package."
+		eerror "The package will be built (to allow binary package builds), but will"
+		eerror "not be installed."
+		eerror "Please replace pam_stack usage with proper include directive usage,"
+		eerror "following the PAM Upgrade guide at the following URL"
+		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror ""
+		ebeep 15
+
+		retval=1
+	fi
+
+	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
+		eerror ""
+		eerror "Your current setup is using one or more of the following modules,"
+		eerror "that are not built or supported anymore:"
+		eerror "pam_pwdb, pam_console"
+		eerror "If you are in real need for these modules, please contact the maintainers"
+		eerror "of PAM through http://bugs.gentoo.org/ providing information about its"
+		eerror "use cases."
+		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
+		eerror "  http://www.gentoo.org/proj/en/base/pam/upgrade-0.99.xml"
+		eerror ""
+		ebeep 10
+
+		retval=1
+	fi
+
+	return $retval
+}
+
+pkg_setup() {
+	check_old_modules
+}
+
+src_prepare() {
+	# Avoid building xtests during "make all"; note that for what
+	# we're concerned xtests are not even executed, so we should
+	# probably use EXTRA_PROGRAMS.
+	epatch "${FILESDIR}/${MY_PN}-0.99.8.1-xtests.patch"
+
+	# Fix building on uClibc; it is added since 1.1.1 but applies to
+	# 1.1.0 as well.
+	epatch "${FILESDIR}/${MY_PN}-1.1.0-uclibc.patch"
+
+	# Fix tests to find Berkeley DB as installed by Gentoo (with a
+	# library suffix but no suffix on the ELF symbols).
+	epatch "${FILESDIR}/${MY_PN}-1.1.1-gentoodb.patch"
+
+	# Remove libtool-2 libtool macros, see bug 261167
+	rm m4/libtool.m4 m4/lt*.m4 || die "rm libtool macros failed."
+
+	eautoreconf
+
+	elibtoolize
+}
+
+src_configure() {
+	local myconf
+
+	if use hppa || use elibc_FreeBSD; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--enable-securedir="${EPREFIX}"/$(get_libdir)/security \
+		--enable-isadir="${EPREFIX}"/$(get_libdir)/security \
+		$(use_enable nls) \
+		$(use_enable selinux) \
+		$(use_enable cracklib) \
+		$(use_enable audit) \
+		$(use_enable debug) \
+		$(use_enable berkdb db) \
+		--with-db-uniquename=-$(db_findver sys-libs/db) \
+		--disable-dependency-tracking \
+		--disable-prelude \
+		${myconf}
+}
+
+src_compile() {
+	emake sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "emake failed"
+}
+
+src_install() {
+	local lib
+
+	emake DESTDIR="${D}" install \
+		 sepermitlockdir="${EPREFIX}/var/run/sepermit" || die "make install failed"
+
+	# Need to be suid
+	fperms u+s /sbin/unix_chkpwd
+
+	gen_usr_ldscript -a pam pamc pam_misc
+
+	# create extra symlinks just in case something depends on them...
+	for lib in pam pamc pam_misc; do
+		if ! [[ -f "${ED}"/$(get_libdir)/lib${lib}$(get_libname) ]]; then
+			dosym lib${lib}$(get_libname 0) /$(get_libdir)/lib${lib}$(get_libname)
+		fi
+	done
+
+	dodoc CHANGELOG ChangeLog README AUTHORS Copyright NEWS || die
+
+	docinto modules
+	for dir in modules/pam_*; do
+		newdoc "${dir}"/README README."$(basename "${dir}")"
+	done
+
+	# Get rid of the .la files. We certainly don't need them for PAM
+	# modules, and libpam is installed as a shared object only, so we
+	# don't ned them for static linking either.
+	find "${D}" -name '*.la' -delete
+}
+
+pkg_preinst() {
+	check_old_modules || die "deprecated PAM modules still used"
+}