Version bump, fix linking for all modules (huge patch), disable manpage regeneration, cuts down the dependencies over docbook stuff, use mirror://kernel.

(Portage version: 2.1.2-r1)

9 files changed, 52 insertions, 91 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 90c9e3d1af8e..2dd6024334bf 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for sys-libs/pam
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.137 2007/01/05 20:55:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.138 2007/01/23 06:34:51 flameeyes Exp $
+
+*pam-0.99.7.0 (23 Jan 2007)
+
+  23 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/Linux-PAM-0.99.6.3-linking.patch,
+  -files/Linux-PAM-0.99.6.3-selinux.patch,
+  +files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch,
+  pam-0.78-r3.ebuild, pam-0.78-r5.ebuild, -pam-0.99.6.3-r2.ebuild,
+  +pam-0.99.7.0.ebuild:
+  Version bump, fix linking for all modules (huge patch), disable manpage
+  regeneration, cuts down the dependencies over docbook stuff, use
+  mirror://kernel.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> pam-0.78-r3.ebuild,
   pam-0.78-r5.ebuild:
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.6.3-linking.patch b/sys-libs/pam/files/Linux-PAM-0.99.6.3-linking.patch
deleted file mode 100644
index d9cebddc40f7..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.6.3-linking.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: Linux-PAM-0.99.6.3/libpam/Makefile.am
-===================================================================
---- Linux-PAM-0.99.6.3.orig/libpam/Makefile.am
-+++ Linux-PAM-0.99.6.3/libpam/Makefile.am
-@@ -8,7 +8,7 @@ if HAVE_LIBSELINUX
-   AM_CFLAGS += -D"WITH_SELINUX"
- endif
- 
--AM_LDFLAGS = $(LIBPRELUDE_LIBS) @LIBDL@
-+libpam_la_LIBADD = $(LIBPRELUDE_LIBS) @LIBDL@
- 
- CLEANFILES = *~
- 
-Index: Linux-PAM-0.99.6.3/modules/pam_unix/Makefile.am
-===================================================================
---- Linux-PAM-0.99.6.3.orig/modules/pam_unix/Makefile.am
-+++ Linux-PAM-0.99.6.3/modules/pam_unix/Makefile.am
-@@ -17,8 +17,6 @@ secureconfdir = $(SCONFIGDIR)
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
- 	-DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\"
- 
--AM_LDFLAGS = -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
--
- if HAVE_LIBSELINUX
-   AM_CFLAGS += -D"WITH_SELINUX"
- endif
-@@ -26,8 +24,8 @@ if HAVE_LIBCRACK
-   AM_CFLAGS += -D"USE_CRACKLIB"
- endif
- 
--pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
--	@LIBCRACK@ @LIBNSL@
-+pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module
-+pam_unix_la_LIBADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
- if HAVE_VERSIONING
-   pam_unix_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
- endif
-@@ -46,7 +44,9 @@ pam_unix_la_SOURCES = bigcrypt.c pam_uni
- 
- bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
- bigcrypt_CFLAGS = $(AM_CFLAGS)
-+bigcrypt_LDADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
- 
- unix_chkpwd_SOURCES = unix_chkpwd.c md5_good.c md5_broken.c bigcrypt.c
- unix_chkpwd_CFLAGS = $(AM_CFLAGS) @PIE_CFLAGS@
- unix_chkpwd_LDFLAGS = @PIE_LDFLAGS@
-+unix_chkpwd_LDADD = @LIBCRACK@ @LIBNSL@ -L$(top_builddir)/libpam -lpam @LIBCRYPT@ @LIBSELINUX@
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.6.3-selinux.patch b/sys-libs/pam/files/Linux-PAM-0.99.6.3-selinux.patch
deleted file mode 100644
index 833daf90a8ec..000000000000
--- a/sys-libs/pam/files/Linux-PAM-0.99.6.3-selinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: Linux-PAM-0.99.6.3/modules/pam_selinux/Makefile.am
-===================================================================
---- Linux-PAM-0.99.6.3.orig/modules/pam_selinux/Makefile.am
-+++ Linux-PAM-0.99.6.3/modules/pam_selinux/Makefile.am
-@@ -19,10 +19,10 @@ secureconfdir = $(SCONFIGDIR)
- 
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
- 	-I$(top_srcdir)/libpam_misc/include
--AM_LDFLAGS = -no-undefined \
--	-L$(top_builddir)/libpam -lpam @LIBSELINUX@
-+AM_LDFLAGS = -no-undefined
- 
--pam_selinux_check_LDFLAGS = -L$(top_builddir)/libpam_misc -lpam_misc
-+pam_selinux_check_LDADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ -L$(top_builddir)/libpam_misc -lpam_misc
-+pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@
- 
- if HAVE_VERSIONING
-   pam_selinux_la_LDFLAGS = -avoid-version -module \
diff --git a/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch b/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch
new file mode 100644
index 000000000000..a988b18bf7ed
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-0.99.7.0-disable-regenerate-man.patch
@@ -0,0 +1,18 @@
+Index: Linux-PAM-0.99.7.0/configure.in
+===================================================================
+--- Linux-PAM-0.99.7.0.orig/configure.in
++++ Linux-PAM-0.99.7.0/configure.in
+@@ -420,10 +420,12 @@ AC_CHECK_FUNCS(inet_ntop inet_pton ruser
+ AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no])
+ AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes])
+ 
++AC_ARG_ENABLE([regenerate-man],
++  AC_HELP_STRING([--disable-regenerate-man], [Don't re-build manpages from XML souces]),
++  [enable_man=$enableval], [enable_man=yes])
+ dnl
+ dnl Check for xsltproc
+ dnl
+-enable_man=yes
+ AC_PATH_PROG([XSLTPROC], [xsltproc])
+ if test -z "$XSLTPROC"; then
+      enable_man=no
diff --git a/sys-libs/pam/files/digest-pam-0.99.6.3-r2 b/sys-libs/pam/files/digest-pam-0.99.6.3-r2
deleted file mode 100644
index 48bbbcaac6a2..000000000000
--- a/sys-libs/pam/files/digest-pam-0.99.6.3-r2
+++ /dev/null
@@ -1,3 +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
diff --git a/sys-libs/pam/files/digest-pam-0.99.7.0 b/sys-libs/pam/files/digest-pam-0.99.7.0
new file mode 100644
index 000000000000..a658654078fa
--- /dev/null
+++ b/sys-libs/pam/files/digest-pam-0.99.7.0
@@ -0,0 +1,6 @@
+MD5 15de5c615198edcb0fb8aad577a55ab5 Linux-PAM-0.99.7.0-ldflags-to-libadd.patch.bz2 2551
+RMD160 e626ab8cb36245361f14e73c04288fc8585d8c12 Linux-PAM-0.99.7.0-ldflags-to-libadd.patch.bz2 2551
+SHA256 9b3042c79f413bca2ab2e729bf19add1a6ff98334f36c2fa52b901df1be27ed0 Linux-PAM-0.99.7.0-ldflags-to-libadd.patch.bz2 2551
+MD5 e4c9e503ac6af0efdd6031a46bdf506f Linux-PAM-0.99.7.0.tar.bz2 873101
+RMD160 b6b3c6135425d1cd84e931f848578f4cc5e48055 Linux-PAM-0.99.7.0.tar.bz2 873101
+SHA256 d6ab51e55897182343b4f4866d85d6df523cdc3f9112fa4dc6f99f0b409ba187 Linux-PAM-0.99.7.0.tar.bz2 873101
diff --git a/sys-libs/pam/pam-0.78-r3.ebuild b/sys-libs/pam/pam-0.78-r3.ebuild
index a55d6c65cd87..ddf33325882b 100644
--- a/sys-libs/pam/pam-0.78-r3.ebuild
+++ b/sys-libs/pam/pam-0.78-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r3.ebuild,v 1.5 2007/01/05 20:55:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r3.ebuild,v 1.6 2007/01/23 06:34:51 flameeyes Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
 
 S="${WORKDIR}/Linux-PAM-${PV}"
 S2="${WORKDIR}/pam-${PV}-patches"
-SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
+SRC_URI="mirror://kernel/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
 	mirror://gentoo/pam-${PV}-patches-${PATCH_LEVEL}.tar.bz2
 	berkdb? ( http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz )
 	pam_console? ( ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${GLIB_VER}.tar.bz2 )"
diff --git a/sys-libs/pam/pam-0.78-r5.ebuild b/sys-libs/pam/pam-0.78-r5.ebuild
index 9198dd0e07d5..1202d181e1b6 100644
--- a/sys-libs/pam/pam-0.78-r5.ebuild
+++ b/sys-libs/pam/pam-0.78-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.4 2007/01/05 20:55:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.78-r5.ebuild,v 1.5 2007/01/23 06:34:51 flameeyes Exp $
 
 FORCE_SYSTEMAUTH_UPDATE="no"
 
@@ -21,7 +21,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/libs/pam/"
 
 S="${WORKDIR}/Linux-PAM-${PV}"
 S2="${WORKDIR}/pam-${PV}-patches"
-SRC_URI="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
+SRC_URI="mirror://kernel/linux/libs/pam/pre/library/Linux-PAM-${PV}.tar.gz
 	mirror://gentoo/pam-${PV}-patches-${PATCH_LEVEL}.tar.bz2
 	berkdb? ( http://downloads.sleepycat.com/db-${BDB_VER}.tar.gz )
 	pam_console? ( ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${GLIB_VER}.tar.bz2 )"
diff --git a/sys-libs/pam/pam-0.99.6.3-r2.ebuild b/sys-libs/pam/pam-0.99.7.0.ebuild
index 770bc1559168..530316a8a296 100644
--- a/sys-libs/pam/pam-0.99.6.3-r2.ebuild
+++ b/sys-libs/pam/pam-0.99.7.0.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.6.3-r2.ebuild,v 1.2 2006/11/24 20:17:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-0.99.7.0.ebuild,v 1.1 2007/01/23 06:34:51 flameeyes Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
 inherit libtool multilib eutils autotools pam toolchain-funcs
 
-MY_P="Linux-PAM-${PV}"
+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="http://www.kernel.org/pub/linux/libs/pam/pre/library/${MY_P}.tar.bz2"
+SRC_URI="mirror://kernel/linux/libs/pam/pre/library/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-ldflags-to-libadd.patch.bz2"
 
 LICENSE="PAM"
 SLOT="0"
@@ -24,9 +26,6 @@ RDEPEND="nls? ( virtual/libintl )
 	sys-libs/pwdb
 	selinux? ( >=sys-libs/libselinux-1.28 )"
 DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	~app-text/docbook-xml-dtd-4.3
-	~app-text/docbook-xml-dtd-4.4
 	nls? ( sys-devel/gettext )"
 PDEPEND="vim-syntax? ( app-vim/pam-syntax )"
 
@@ -46,9 +45,9 @@ src_unpack() {
 			sed -e 's|^modules/||')
 	done
 
-	epatch "${FILESDIR}/${MY_P}-berkdb.patch"
-	epatch "${FILESDIR}/${MY_P}-linking.patch"
-	epatch "${FILESDIR}/${MY_P}-selinux.patch"
+	epatch "${FILESDIR}/${MY_PN}-0.99.6.3-berkdb.patch"
+	epatch "${DISTDIR}/${MY_P}-ldflags-to-libadd.patch.bz2"
+	epatch "${FILESDIR}/${MY_P}-disable-regenerate-man.patch"
 
 	AT_M4DIR="m4" eautoreconf
 
@@ -58,13 +57,6 @@ src_unpack() {
 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
@@ -79,6 +71,7 @@ src_compile() {
 		--disable-dependency-tracking \
 		--disable-prelude \
 		--enable-docdir=/usr/share/doc/${PF} \
+		--disable-regenerate-man \
 		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
@@ -105,7 +98,7 @@ src_install() {
 		[[ -f "${x}" ]] && dopamd "${x}"
 	done
 
-	# Remove the wrongly isntalled manpage
+	# Remove the wrongly installed manpage
 	rm -f "${D}"/usr/share/man/man8/pam_userdb.8*
 }