Use a different alternative to avoid applying the disable-regenerate-man for now: download the doc tarball and merge it in. This increses the downloaded data by 500k and also installs quite a bit more documentation, but also solves bug #206166 in a nice way, provide the full documentation set and so on. If upstream will provide a --disable-regenerate-doc in the future, then I'll add the doc USE flag to disable the extra download, for now this will work out, I think.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

2 files changed, 13 insertions, 10 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index da259f677fd0..c91dc9791c64 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,15 @@
 # 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.243 2009/06/21 16:23:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.244 2009/06/21 16:50:28 flameeyes Exp $
+
+  21 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> pam-1.1.0.ebuild:
+  Use a different alternative to avoid applying the disable-regenerate-man
+  for now: download the doc tarball and merge it in. This increses the
+  downloaded data by 500k and also installs quite a bit more documentation,
+  but also solves bug #206166 in a nice way, provide the full documentation
+  set and so on. If upstream will provide a --disable-regenerate-doc in the
+  future, then I'll add the doc USE flag to disable the extra download, for
+  now this will work out, I think.
 
   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
diff --git a/sys-libs/pam/pam-1.1.0.ebuild b/sys-libs/pam/pam-1.1.0.ebuild
index ce78e66860f2..c1515e884272 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.4 2009/06/21 16:23:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.0.ebuild,v 1.5 2009/06/21 16:50:28 flameeyes Exp $
 
 inherit libtool multilib eutils autotools pam toolchain-funcs flag-o-matic
 
@@ -10,7 +10,8 @@ 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"
+SRC_URI="mirror://kernel/linux/libs/pam/library/${MY_P}.tar.bz2
+	mirror://kernel/linux/libs/pam/documentation/${MY_P}-docs.tar.bz2"
 
 LICENSE="PAM"
 SLOT="0"
@@ -78,12 +79,6 @@ 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.
@@ -127,7 +122,6 @@ src_compile() {
 		--disable-db \
 		--disable-dependency-tracking \
 		--disable-prelude \
-		--disable-regenerate-man \
 		${myconf} || die "econf failed"
 	emake sepermitlockdir="/var/run/sepermit" || die "emake failed"
 }