Version bump, remove old version and merged patches.

(Portage version: 2.1.3_rc9)

8 files changed, 22 insertions, 182 deletions

diff --git a/sys-auth/pam_userdb/ChangeLog b/sys-auth/pam_userdb/ChangeLog
index 3fdbbbe4a109..62d263b001b8 100644
--- a/sys-auth/pam_userdb/ChangeLog
+++ b/sys-auth/pam_userdb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-auth/pam_userdb
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.12 2007/07/08 15:37:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/ChangeLog,v 1.13 2007/07/26 17:01:27 flameeyes Exp $
+
+*pam_userdb-0.99.8.1 (26 Jul 2007)
+
+  26 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.6.3-berkdbpam.patch,
+  -files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch,
+  -pam_userdb-0.99.6.3.ebuild, -pam_userdb-0.99.8.0.ebuild,
+  +pam_userdb-0.99.8.1.ebuild:
+  Version bump, remove old version and merged patches.
 
 *pam_userdb-0.99.8.0 (08 Jul 2007)
 
diff --git a/sys-auth/pam_userdb/files/Linux-PAM-0.99.6.3-berkdbpam.patch b/sys-auth/pam_userdb/files/Linux-PAM-0.99.6.3-berkdbpam.patch
deleted file mode 100644
index b42c4e9a4ee7..000000000000
--- a/sys-auth/pam_userdb/files/Linux-PAM-0.99.6.3-berkdbpam.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- Linux-PAM-0.99.5.0/configure.in	2006-07-01 16:21:41.000000000 +0200
-+++ Linux-PAM-0.99.5.0.az/configure.in	2006-07-01 16:22:03.000000000 +0200
-@@ -331,9 +331,9 @@
- 
- dnl check for libdb or libndbm as fallback. Some libndbm compat
- dnl libraries are unuseable, so try libdb first.
--AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="")
-+AC_CHECK_LIB([db_pam], [db_create_pam], LIBDB="-ldb_pam", LIBDB="")
- if test -z "$LIBDB" ; then
--    AC_CHECK_LIB([db], [dbm_store], LIBDB="-ldb", LIBDB="")
-+    AC_CHECK_LIB([db_pam], [dbm_store_pam], LIBDB="-ldb_pam", LIBDB="")
- fi
- if test -z "$LIBDB" ; then
-     AC_CHECK_LIB([ndbm],[dbm_store], LIBDB="-lndbm", LIBDB="")
diff --git a/sys-auth/pam_userdb/files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch b/sys-auth/pam_userdb/files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch
deleted file mode 100644
index 45223a6809de..000000000000
--- a/sys-auth/pam_userdb/files/Linux-PAM-0.99.8.0-berkdb-uniquename.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: Linux-PAM-0.99.8.0/configure.in
-===================================================================
---- Linux-PAM-0.99.8.0.orig/configure.in
-+++ Linux-PAM-0.99.8.0/configure.in
-@@ -351,11 +351,13 @@ dnl libraries are unuseable, so try libd
- AC_ARG_ENABLE([db],
-         AC_HELP_STRING([--enable-db=(db|ndbm|yes|no)],[Default behavior 'yes', which is to check for libdb first, followed by ndbm. Use 'no' to disable db support.]),
-         WITH_DB=$enableval, WITH_DB=yes)
-+AC_ARG_WITH([db-uniquename],
-+	AC_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.]))
- if test x"$WITH_DB" != xno ; then
-         if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then
--              AC_CHECK_LIB([db], [db_create], LIBDB="-ldb", LIBDB="")
-+              AC_CHECK_LIB([db$with_db_uniquename], [db_create$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
-               if test -z "$LIBDB" ; then
--                  AC_CHECK_LIB([db], [dbm_store], LIBDB="-ldb", LIBDB="")
-+                  AC_CHECK_LIB([db$with_db_uniquename], [dbm_store$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
-               fi
-         fi
-         if test -z "$LIBDB" ; then
diff --git a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3 b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3
deleted file mode 100644
index f293a5c1b81a..000000000000
--- a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.6.3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4c2830ed55a41e795af6a482009a036c Linux-PAM-0.99.6.3.tar.bz2 863340
-RMD160 9c02478d0b5fe5af72b736a64ede6b09618c98e0 Linux-PAM-0.99.6.3.tar.bz2 863340
-SHA256 8468b0fd062cead62a66a048280d28ed70420eefc55b5c9a3fdb361891f2ccd4 Linux-PAM-0.99.6.3.tar.bz2 863340
-MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264
-RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b db-4.3.29.tar.gz 6103264
-SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 db-4.3.29.tar.gz 6103264
diff --git a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.0 b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.0
deleted file mode 100644
index 1938eb9fdce8..000000000000
--- a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 e05a9a1e95ec9bcfa5c09d44f46ad943 Linux-PAM-0.99.8.0.tar.bz2 903366
-RMD160 9e2c9bc00318ef711a2af4561a1c763c2ca28db5 Linux-PAM-0.99.8.0.tar.bz2 903366
-SHA256 4b42990b4cada5ad0abefd6048b8646b17813448fbf13d758cbce605908f02a2 Linux-PAM-0.99.8.0.tar.bz2 903366
-MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264
-RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b db-4.3.29.tar.gz 6103264
-SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 db-4.3.29.tar.gz 6103264
diff --git a/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.1 b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.1
new file mode 100644
index 000000000000..975fce99d3e4
--- /dev/null
+++ b/sys-auth/pam_userdb/files/digest-pam_userdb-0.99.8.1
@@ -0,0 +1,6 @@
+MD5 a6472db4afe13850cb401922211bba4e Linux-PAM-0.99.8.1.tar.bz2 903827
+RMD160 bac7908aebb4671bdf95d0c31086f2ed2d879ef8 Linux-PAM-0.99.8.1.tar.bz2 903827
+SHA256 47abe93a4d451ff6403c04898d386fb568ba7578520c4cf2687122a12e286cd2 Linux-PAM-0.99.8.1.tar.bz2 903827
+MD5 13585a20ce32f113b8e8cdb57f52e3bb db-4.3.29.tar.gz 6103264
+RMD160 fac910828a74087124e9cc3cad99c6a6dc88c14b db-4.3.29.tar.gz 6103264
+SHA256 db3e762d819f9a31bc4ebf5ecada53e9787aeb26fc92fa6064b2ba57df806af4 db-4.3.29.tar.gz 6103264
diff --git a/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild b/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild
deleted file mode 100644
index 5490a40a1450..000000000000
--- a/sys-auth/pam_userdb/pam_userdb-0.99.8.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2007 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.0.ebuild,v 1.2 2007/07/15 02:34:06 mr_bones_ Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit libtool multilib eutils pam autotools toolchain-funcs flag-o-matic
-
-# 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.3.29"
-
-MY_P="Linux-PAM-${PV}"
-
-HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
-DESCRIPTION="Linux-PAM pam_userdb (Berkeley DB) module"
-
-SRC_URI="http://www.kernel.org/pub/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-0.99.6.3-r1"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	>=sys-libs/db-${BDB_VER}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${MY_P}-berkdb-uniquename.patch"
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-}
-
-src_compile() {
-	local myconf
-
-	# don't build documentation as it doesn't seem to really work
-	export SGML2PS=no
-	export SGML2TXT=no
-	export SGML2HTML=no
-	export SGML2LATEX=no
-	export PS2PDF=no
-
-	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"
-
-	# XXX: hack out O_DIRECT support in db4 for now.
-	#	   (Done above now with --disable-o_direct now)
-
-	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-berkdb \
-		--enable-securedir=/$(get_libdir)/security \
-		--enable-isadir=/$(get_libdir)/security \
-		--disable-dependency-tracking \
-		--disable-prelude \
-		--enable-docdir=/usr/share/doc/${PF} \
-		--with-db-uniquename=_pam \
-		${myconf} || die "econf failed"
-
-	cd "${S}/modules/pam_userdb"
-	emake || die "emake failed"
-}
-
-src_install() {
-	cd "${S}/modules/pam_userdb"
-	emake 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
-}
diff --git a/sys-auth/pam_userdb/pam_userdb-0.99.6.3.ebuild b/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild
index eb935748b19a..ac704a2d16d1 100644
--- a/sys-auth/pam_userdb/pam_userdb-0.99.6.3.ebuild
+++ b/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2007 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.6.3.ebuild,v 1.14 2007/07/15 02:34:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_userdb/pam_userdb-0.99.8.1.ebuild,v 1.1 2007/07/26 17:01:27 flameeyes Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit libtool multilib eutils pam autotools toolchain-funcs flag-o-matic
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic
 
 # 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
@@ -26,6 +23,7 @@ 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-0.99.6.3-r1"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
@@ -38,9 +36,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${MY_P}-berkdbpam.patch"
-	AT_M4DIR="m4" eautoreconf
-
 	elibtoolize
 }
 
@@ -108,6 +103,7 @@ src_compile() {
 		--disable-dependency-tracking \
 		--disable-prelude \
 		--enable-docdir=/usr/share/doc/${PF} \
+		--with-db-uniquename=_pam \
 		${myconf} || die "econf failed"
 
 	cd "${S}/modules/pam_userdb"
@@ -118,6 +114,8 @@ src_install() {
 	cd "${S}/modules/pam_userdb"
 	emake 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
 }