Restore the patch to disable man regeneration, comment it so that there is a bug reference too; also comment the xtests patch. Fix the warning for broken setups, removing pam_timestamp (which is present again).

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

3 files changed, 24 insertions, 9 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 2dbd60c28185..da259f677fd0 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.242 2009/06/21 09:31:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.243 2009/06/21 16:23:23 flameeyes Exp $
+
+  21 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.0.ebuild:
+  Restore the patch to disable man regeneration, comment it so that there is
+  a bug reference too; also comment the xtests patch. Fix the warning for
+  broken setups, removing pam_timestamp (which is present again).
 
   21 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.0.ebuild,
   +files/Linux-PAM-1.1.0-nonls.patch:
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index d3e0874c82f4..3983b2d5b117 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -10,13 +10,13 @@ AUX Linux-PAM-1.1.0-nonls.patch 367 RMD160 80ff3ce536e3bf3cb4e4448bf1062972b2b14
 DIST Linux-PAM-1.0.4.tar.bz2 1004979 RMD160 8eacf6344663c0ce2f42d374d82d717211ca10e5 SHA1 60146a363b653324d4477dce4a3e999834a2d713 SHA256 13136d438f5748d08dcb2227e44e53a3c611351b96e11891052e0c8c2557f3ca
 DIST Linux-PAM-1.1.0.tar.bz2 1106379 RMD160 b57473ac39ef5c5ec22459e78e00abdbead396e5 SHA1 1ef5b91bf483ecf31e8f07c3c0322b397b13af70 SHA256 139b1abb0f1c402e443ad9083b5ff0512f4a5ae7bc806528e9d7eced13384ed7
 EBUILD pam-1.0.4.ebuild 5771 RMD160 2a095e5d9e844e93c840e234d51580f2daa7b347 SHA1 a6b57a9386e5a25dd211490ada17a4df152be26e SHA256 d182992833d985a568716fc65b06182d588b481ab250f99a6a3caf1c792403c8
-EBUILD pam-1.1.0.ebuild 4702 RMD160 43a6cea7945d52e513d1fd29d79fad976f20f9e9 SHA1 6acd704de7c75b795444bef8952abb98cbd5933c SHA256 a56026f0dd2c4edba92d122be38a92e7e5d978e0433a25e26c65124030c8710e
-MISC ChangeLog 38474 RMD160 786e5d500a2cfc3e7dc170a14e0f6579d369c459 SHA1 dc9d0c8022935f6670bd8b5d1ecdfdf5de91cf21 SHA256 9e210f9182a6186872a7b913926dbca152f98e176a03ae059876df2926e450e8
+EBUILD pam-1.1.0.ebuild 5189 RMD160 5e78738204c6e1ab6d8a3b9a0d39b626c4a62cee SHA1 9ee056b0dcc3551706c3d953de07f0237df53b3c SHA256 1482d4c65da6841b3a2f092faabb7a94688f441f0709d746dc49b873b9adea25
+MISC ChangeLog 38766 RMD160 0072b0711761c000826fcb2eb51865c2ffcfdda6 SHA1 1af1428f0cb019c52b33f1e8bae1185e68e1371e SHA256 36664f2bc097ed8db4229c228a56609ad1160f006620933f571b7ed8176e81e2
 MISC metadata.xml 306 RMD160 d8d5dbaaf990cfc32c5294d2d63234ed4da3bff2 SHA1 5d66f934ae3ebd65dca4c3c3a6d7cb318c9b00d9 SHA256 eb34afcf75eebf8d17686d207e1196d8c00a2be82d0225c2d0e68a8dc71b13f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAko9/e4ACgkQAiZjviIA2XhDNgCgkJw3fRjmGpRpOAlUU+XKxfUC
-XIYAn2215rhAKYyC9TS5RxNb7tEpIz/t
-=+mDk
+iEYEARECAAYFAko+XoQACgkQAiZjviIA2XjFAQCggdZvZb//kb2Sf6tDZVwgFA+K
+WyIAmwbmATNdKB1vCDpl+C0lvy1+Wsg1
+=d4s6
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/pam-1.1.0.ebuild b/sys-libs/pam/pam-1.1.0.ebuild
index 8ae0091ed4e4..ce78e66860f2 100644
--- a/sys-libs/pam/pam-1.1.0.ebuild
+++ b/sys-libs/pam/pam-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.3 2009/06/21 09:31:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.4 2009/06/21 16:23:23 flameeyes Exp $
 
 inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
 
@@ -55,7 +55,7 @@ check_old_modules() {
 		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_timestamp, pam_console"
+		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."
@@ -78,6 +78,15 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Avoid regeneration man _and_ documentation. The documentation
+	# regeneration requires the xsl stylesheets for DocBook as well as
+	# a browser; if lynx is not found, the buildsystem will also
+	# default to Firefox, bad choice. — bug #274929
+	epatch "${FILESDIR}/${MY_PN}-0.99.7.0-disable-regenerate-man.patch"
+
+	# 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"
 
 	# Remove NIS dependencies, see bug #235431
@@ -118,6 +127,7 @@ src_compile() {
 		--disable-db \
 		--disable-dependency-tracking \
 		--disable-prelude \
+		--disable-regenerate-man \
 		${myconf} || die "econf failed"
 	emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
 }