Bump to latest Linux-PAM version, use a newer Berkeley DB version, move to EAPI=1 and make sure dependencies are satisfied only by the correct slot of berkdb. Thanks to Michael Orlitzky in bug #287298.

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

4 files changed, 140 insertions, 12 deletions

diff --git a/sys-auth/pam_userdb/ChangeLog b/sys-auth/pam_userdb/ChangeLog
index 810f146f9d7e..77729ddb2639 100644
--- a/sys-auth/pam_userdb/ChangeLog
+++ b/sys-auth/pam_userdb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-auth/pam_userdb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.17 2008/11/26 22:10:26 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.18 2009/10/07 19:59:55 flameeyes Exp $
+
+*pam_userdb-1.1.0 (07 Oct 2009)
+
+  07 Oct 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  pam_userdb-0.99.8.1.ebuild, +pam_userdb-1.1.0.ebuild:
+  Bump to latest Linux-PAM version, use a newer Berkeley DB version, move to
+  EAPI=1 and make sure dependencies are satisfied only by the correct slot
+  of berkdb. Thanks to Michael Orlitzky in bug #287298.
 
   26 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   pam_userdb-0.99.8.1.ebuild:
diff --git a/sys-auth/pam_userdb/Manifest b/sys-auth/pam_userdb/Manifest
index e29d05f10527..ee6ac7374157 100644
--- a/sys-auth/pam_userdb/Manifest
+++ b/sys-auth/pam_userdb/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 DIST Linux-PAM-0.99.8.1.tar.bz2 903827 RMD160 bac7908aebb4671bdf95d0c31086f2ed2d879ef8 SHA1 41ea4d3296cfd0f1709e8b250d5afd3c4e98ef8b SHA256 47abe93a4d451ff6403c04898d386fb568ba7578520c4cf2687122a12e286cd2
+DIST Linux-PAM-1.1.0.tar.bz2 1106379 RMD160 b57473ac39ef5c5ec22459e78e00abdbead396e5 SHA1 1ef5b91bf483ecf31e8f07c3c0322b397b13af70 SHA256 139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
 DIST db-4.3.29.tar.gz 6103264 RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b SHA1 7ddac51fcbd5945aed154be2ee1fe166b3acd628 SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4
-EBUILD pam_userdb-0.99.8.1.ebuild 3341 RMD160 e8ba06cc3c1bd1056fa62710d2c230f270a82a82 SHA1 c2ed574d4e99d2db20ddd53a421414f4cbaa2ef8 SHA256 e668c7762147b37380869744f35b2c74cf30454869111a3ca151c27b5aefaf04
-MISC ChangeLog 2855 RMD160 b73c8b2f97e5ac7c9b380e83671f770123a6a6d4 SHA1 fe801923cfb446010f723afe9297c9f43f6b7b78 SHA256 16f5a31cd08b2498a27aef33e8d89f3c41fd08656523fe92f44db13baee3294f
+DIST db-4.6.21.tar.gz 11881885 RMD160 ccf9a4b85cc0464b2f3c2f2da29d99328fd4978e SHA1 5be3beb82e42a78ff671a3f5a4c30e5652972119 SHA256 53ea9c9f03746a0aa415e6706e9c6da18ca18148f20ad1465b182411a7985e21
+EBUILD pam_userdb-0.99.8.1.ebuild 3407 RMD160 0b006f64e6c6b21ef9297e507d9bec425aae8b28 SHA1 b7ab1808ff7d928c80a65a37b4fda1a39db885df SHA256 4a4319d454fa15a7eda3ca212c0be395eb81872fe6205cace9940a4d690b1534
+EBUILD pam_userdb-1.1.0.ebuild 3282 RMD160 7f32951742b52c93e6dbcf17550183c7f34b7ca0 SHA1 a868e0ad8c89cffe80b45e80ca7d5c18a15b13b6 SHA256 ab66401f567e947b4dbf1e4df19e2f825071a4598cf8335936566de2d6689f23
+MISC ChangeLog 3209 RMD160 d51e991bc80a6e24e40cabce2cfc0cfa7fd15f9c SHA1 b7f97315e78abc0537cd3f95e7fa4ceece7f91e8 SHA256 9a3a542fa54e50a7243ebae449cb0c7011957fa7e0f4adc5c30f8776d0a0bf22
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkktyVgACgkQAiZjviIA2Xj71QCgtQguUUDa8GYYdIL16GVoDOMH
-B30AoKde3rAIBVYJZThN6A1xtm+hz6X7
-=sII6
+iEYEARECAAYFAkrM80AACgkQAiZjviIA2XgtMQCfV/Qqm1XytMKuU9IwnRznT1FT
+aVEAn0XSeLYh09GEGO/hhDHIX1YN/qT0
+=2p63
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild b/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild
index dfaf0f67821a..f37197efd8c9 100644
--- a/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild
+++ b/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild,v 1.5 2008/11/26 22:10:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild,v 1.6 2009/10/07 19:59:55 flameeyes Exp $
 
-inherit libtool multilib eutils pam toolchain-funcs flag-o-matic
+EAPI=1
+
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic versionator
 
 # BDB is internalized to get a non-threaded lib for pam_userdb.so to
 # be built with.  The runtime-only dependency on BDB suggests the user
@@ -28,7 +30,7 @@ RDEPEND="nls? ( virtual/libintl )
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 RDEPEND="${RDEPEND}
-	>=sys-libs/db-${BDB_VER}"
+	>=sys-libs/db-${BDB_VER}:$(get_version_component_range 1-2 ${BDB_VER})"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild b/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild
new file mode 100644
index 000000000000..cf0b98a402a2
--- /dev/null
+++ b/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-1.1.0.ebuild,v 1.1 2009/10/07 19:59:55 flameeyes Exp $
+
+EAPI=1
+
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic versionator
+
+# BDB is internalized to get a non-threaded lib for pam_userdb.so to
+# be built with.  The runtime-only dependency on BDB suggests the user
+# will use the system-installed db_load to create pam_userdb databases.
+BDB_VER="4.6.21"
+
+MY_P="Linux-PAM-${PV}"
+
+HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
+DESCRIPTION="Linux-PAM pam_userdb (Berkeley DB) module"
+
+SRC_URI="mirror://kernel/linux/libs/pam/pre/library/${MY_P}.tar.bz2
+	http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz"
+
+LICENSE="PAM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls elibc_FreeBSD"
+
+RDEPEND="nls? ( virtual/libintl )
+	!<sys-libs/pam-0.99
+	>=sys-libs/pam-1.1.0"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${RDEPEND}
+	>=sys-libs/db-${BDB_VER}:$(get_version_component_range 1-2 ${BDB_VER})"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	if use hppa || use elibc_FreeBSD; then
+		myconf="${myconf} --disable-pie"
+	fi
+
+	local BDB_DIR="${WORKDIR}/db-${BDB_VER}"
+
+	# BDB is internalized to get a non-threaded lib for pam_userdb.so to
+	# be built with.  To demand-load a shared library which uses threads
+	# into an application which doesn't is a Very Bad Idea!
+	einfo "Building Berkley DB ${BDB_VER}..."
+	cd "${BDB_DIR}/build_unix" || die
+
+	CFLAGS="${CFLAGS} -fPIC" \
+		ECONF_SOURCE="../dist" \
+		econf \
+		--disable-compat185 \
+		--disable-cxx \
+		--disable-diagnostic \
+		--disable-dump185 \
+		--disable-java \
+		--disable-rpc \
+		--disable-tcl \
+		--disable-shared \
+		--disable-o_direct \
+		--with-pic \
+		--with-uniquename="_pam" \
+		--with-mutex="UNIX/fcntl" \
+		--prefix="${S}/modules/pam_userdb" \
+		--includedir="${S}/modules/pam_userdb" \
+		--libdir="${S}/modules/pam_userdb" || die "Bad BDB ./configure"
+
+	emake CC="$(tc-getCC)" || die "BDB build failed"
+	emake install || die
+
+	# We link against libdb_pam (*-dbpam.patch), else stupid libtool goes
+	# and relinks it during install to libdb in /usr/lib
+	cp -f "${S}"/modules/pam_userdb/libdb{,_pam}.a
+
+	# Make sure out static libs are used
+	append-flags -I"{S}/modules/pam_userdb"
+	append-ldflags -L"${S}/modules/pam_userdb"
+
+	cd "${S}"
+	econf \
+		$(use_enable nls) \
+		--enable-db \
+		--enable-securedir=/$(get_libdir)/security \
+		--enable-isadir=/$(get_libdir)/security \
+		--disable-dependency-tracking \
+		--disable-prelude \
+		--with-db-uniquename=_pam \
+		${myconf} || die "econf failed"
+
+	emake -C modules/pam_userdb || die "emake failed"
+}
+
+src_install() {
+	emake -C modules/pam_userdb DESTDIR="${D}" install || die "make install failed"
+
+	dodoc "${S}/modules/pam_userdb/README"
+
+	# No, we don't really need .la files for PAM modules.
+	rm -f "${D}/$(get_libdir)/security/"*.la
+}
+
+pkg_postinst() {
+	elog "Since ${CATEGORY}/${PN}-1.1.0 the internal Berkeley DB version"
+	elog "used is ${BDB_VER}; if you're updating from an older version"
+	elog "you will have to dump and re-load the user database."
+}