Restore documentation install and fix installation of pam_namespace.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 71 insertions, 13 deletions

diff --git a/sys-libs/pam/ChangeLog b/sys-libs/pam/ChangeLog
index 0428222a2eaa..7d69629aaf65 100644
--- a/sys-libs/pam/ChangeLog
+++ b/sys-libs/pam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/pam
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.312 2012/08/17 14:09:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/ChangeLog,v 1.313 2012/08/17 14:26:10 flameeyes Exp $
+
+  17 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/Linux-PAM-1.1.6-destdir.patch, pam-1.1.6.ebuild:
+  Restore documentation install and fix installation of pam_namespace.
 
 *pam-1.1.6 (17 Aug 2012)
 
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 60ffb68c122d..1087b8f63ee6 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -2,21 +2,23 @@
 Hash: SHA256
 
 AUX Linux-PAM-1.1.5+glibc-2.16.patch 645 SHA256 a466a2db74a0fe304fb3bffe405b31e42b4e252611ebae32d785930b1c12be2a SHA512 a9c49301c39a45518ebe42ecfdd4bf099d699e7d02eaeb2c4d75c228e0ba59557b4b2d0d5a94751f6cc4811d8556d58d8ef69896e9ca285e10c07d5ee0cfe4f4 WHIRLPOOL 977c1b048640d54fe82a7ccbd995bfd4c4c74bf2df6162573f112f66fd84e0bb92dd51b6bbcd98768013f4d0811268e6d1b0085e43776163ebf600e56917cf2d
+AUX Linux-PAM-1.1.6-destdir.patch 1551 SHA256 21a6eb5d7a20b2f586a1747fc6a9819af356a6cbf205338a526a87d0b92a8f2e SHA512 be5c1b9c58f7727f9436d8d4876eae77e868ecc5c8acb1a29c808bf2ad479daeda5c42e576860165ac07af825298e438f7e36176ddfb43671c6a4d4841e08210 WHIRLPOOL 1e3f85d802f7b539891b73803d59b671ce42736a4a804dd5eabed046b1842ab986f3b634dccdd30e5520460e0db9d1aca0ece32075ad2ee08802cde78806d0a7
 DIST Linux-PAM-1.1.5-docs.tar.bz2 498228 SHA256 e4b10ffebe2e5cc355bd37c4e17a2288eb90d1396b06961738a7e7ef848c754c SHA512 6209b3d1936e0c0aef3a7bf24d497b867995261ad227f7d0c4b28796c0b1f9262c99e3e12d7e1d37e286af39367f6e2d79e06915dff77c65b547d62ee8772c5b WHIRLPOOL a26c778be99b21c6701260871ffd7348f7a302c5e4358b8419e9436131b83650bdf0f5bc1d845dba419bab6c50c89733bea4518f619b7b75d66b2f02408c3df1
 DIST Linux-PAM-1.1.5.tar.bz2 1123524 SHA256 65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116 SHA512 c898c3db3da1856b1b16c2bfe19963c30696345982253888c2edf85317cf82ab4daaf9d105a162975d4cfd818b7bbca3d0e63ea7267af435e8f88b8fdc83ddd0 WHIRLPOOL 29ad881f6b1d908fb84e8d5802cceff70838bd0e29f6c700ad64d3c5d43c189f0c122fdddfa4333f008a8ef2828bb0e2fd68cdd479b43efac9456b6d6a5bb25a
+DIST Linux-PAM-1.1.6-docs.tar.bz2 147359 SHA256 0244321b1c4b8a71064d984880566890cc809b1c77bdd0550f121fa7d8450497 SHA512 f158116c2a3d604a9195d96263f094a1c9c0e2ba78b54e0f8a92bfa73955d8cec36d68b985eb70f1bf0958fc54be5590b61669b3b777ba6bd2138bc156cec782 WHIRLPOOL 73b42d795b3ca06c3a22ea8a91258da9bd4662e72de8a72751eec3824524a44e13dbc13a7c0e79256429f583d21c2764512363921d5709e61752e391f8227577
 DIST Linux-PAM-1.1.6.tar.bz2 1147538 SHA256 bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2 SHA512 f68e3a0d648441eef7589efe0fad65c621d030a9425635f461f2882a5129240830a55d5a5b81d02b439c633870a96f61b4c4dea22d0eacfdd583f4fac353928a WHIRLPOOL 619214ecf859e1fc4e6f59e37045e370b98bae57ceeaed3f6a5e0732fc0caba41c040bea926830b678f6e5c243d73a607daea438f55cf28d339ce458eded7db5
 EBUILD pam-1.1.5.ebuild 5784 SHA256 a003975168a13a6ddd06fe26ce33e0da007bcd26ca145786abd525abd9fe72e3 SHA512 647b6c5c9aad340fbbf32efc0988e5678cef8175297eb921ce36b097838aa1bd8cfef6f96157235ff0e9017f938b72429d741b01ea1692f7134f2871473d9fa3 WHIRLPOOL 7296e3adcb6e04eacc61b563a2f00f40b84f4f3f247b77acc3c79d4c87ae61513c20eca12d2b442d10dadda40963387343d87a54c03ce74a06c06a521d1b6f8b
-EBUILD pam-1.1.6.ebuild 5762 SHA256 16b9b126ab74cabdcff8c6a2bd3ef2dfe38952d8c3a1df680cb8bd7bcfb054e1 SHA512 3963f936d5992ceb7850c63e8a7c0c68734bb0dfc2f50b9555861d7605841ba349eb4b3b3700567555b1a7bc936c2da8f0c022101d2bf529e81326a67a8e8438 WHIRLPOOL 2f841c25e9da701a81a9642dc6a298efa15afe7f8ad8b43d3d24ada7242d4814a81da220d590f3b1fd99292aab53a4ad6e34021ea64b366236cd1c3f3ed904c6
-MISC ChangeLog 49873 SHA256 695f1d1c6b43e1f084f71249a2243c3ee5f6a7f476645990fd1b170263619a20 SHA512 1baa2d2f20602b1f3b405e538e724b39b439fa251b14e6578b0137b025a9e9d4c2fa64b53ee1a642377082b5dacce73b94ef43ae5798cb4efdfc9c69a9a10738 WHIRLPOOL b493c4e12bf5e7088c5cbc07b6cfa9201f2f1655e59dafea2e5ddf09c762d0c456ecc555f3c94a604cd83fcaa5f4ffb7d70a1afff302386bab92a7e0f4fdcccc
+EBUILD pam-1.1.6.ebuild 5891 SHA256 fda25aec816a0bd0eded79d0f9797a7d22e7a3cc7a9201d9ad5c736e3a075bf1 SHA512 f53380c3e358d377589a87ce7a27de9fd4c595c9ecc61276efc98541b10a6dd6db3163bab959b62cfbb7de2916c936b489d6f7d3fc90151ba43eddfcdd66c9d4 WHIRLPOOL 679677a1879e832a00fc40d61af80ac540963efbdc01555936d41c9302c00b7d4eecffd45686aa6289c054a3cae0e0d6c5b1cfcc6c48d8ce8d85944b59a032d5
+MISC ChangeLog 50059 SHA256 e1b4504b260442029bd5c3f07774051b99124813da37c048fa8fd3e1db199a2b SHA512 7f972b48d4e7b5f12569dd4b2ebeebc7a560ddd9423abe6b27803d83c166674936a2c04db954a7e2f71dc5b871efb67ae9531de54e1a0ac449a914c2c2f4a4da WHIRLPOOL 1abf966fcf3464af870e4ea600ed06dcfbc70217ed4d98972ab40a45cc05ad4d73b0805c2afe90bbaf892af58d598ec30108734209c670f981eb6636de2c3230
 MISC metadata.xml 1129 SHA256 e160643aca26e0418b31429836ae1b4c673474cd6130b7e2ac0d0bf41380df0b SHA512 ad3fa4cbe664d992849c7ef17fbf49519289d1a8d2e568014ae5c08eec1030eb2d6874c5b6f877d311cb9f920c5f78b1199aa7d778ffbffea377a7f539281362 WHIRLPOOL 69d3406bd7f903292a3c84e806fe9ae5ee0e63473c4c7005449dba7af09e7d405209b66c25ef8369a53aaa92626bea8dc84ad1e34da1a717d6926ee9925e2c62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQLlDJAAoJEBzRPIrUMBNCjAcIAJNqTwUnm1Q75aCTX2LtoKoj
-OUXGexinqaS5PN81cv8jKxmRuKBtQggQtM15XkUX7pXFy+ZSxezh28gEWgHcNA4J
-PqSxcMkIMZGKgbDo1J9/+1LBwEOEy/HAxxHR8v3CWCp+3iqm7Z9J9weCcptFJA6I
-KkkXJqBs8UacFQ3z/Q/EoTkAZIdPCZAsi7la00HbvodjP5PXUEai+wASIWehXRsi
-odzX4sfnkA2hDL1noQuNj45YJngymwzP6I6ctzonXl2C7oHtROBiWxcKBe71oH3s
-SNSxSxXULlmCj38EkAg0T/ehcgNEbwPH97ikCTXILHxpkEtIDbAbqP17ExEtZsc=
-=X3zv
+iQEcBAEBCAAGBQJQLlSeAAoJEBzRPIrUMBNCNMMH/RsEh8Kbw1X8ZAjiRC2SjqAy
+1DRjK74bKO9QXKefR9ZAhkoyOsunINdbqSahLEVU3gUl6AxghTXS9dcaS5PuDpvh
+d6mNlkNGbI9l+EYwqdV4pLxG4rVbjUX0bXvDsY22E+ZUwQW5hqDhycLnw1N7Gm0M
+PoJdz9dbpRLWsvRdtwyNfM1q0Il5RaVxmSAqbYHz9MGTPgYAgFgDFF40AXyiiPOm
+rh81SMv6Dl9hNyibghuVO2Vkjr34152CIYISvBio4dxp9WB8Q6Xwd+9o3SD8Rs4M
+hr3q1u5Un43R3yHsZjj8SUFz2559BHKO9/7cDsVoPz4U7npTVhO555bhhgHEhNA=
+=Rbbk
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/pam/files/Linux-PAM-1.1.6-destdir.patch b/sys-libs/pam/files/Linux-PAM-1.1.6-destdir.patch
new file mode 100644
index 000000000000..6859ccb60d3f
--- /dev/null
+++ b/sys-libs/pam/files/Linux-PAM-1.1.6-destdir.patch
@@ -0,0 +1,48 @@
+From d7e6b921cd34f7ad8fc4d05065c75d13ba330896 Mon Sep 17 00:00:00 2001
+From: Tomas Mraz <tmraz@fedoraproject.org>
+Date: Fri, 17 Aug 2012 14:46:40 +0200
+Subject: [PATCH] Add missing $(DESTDIR) when making directories on install.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+modules/pam_namespace/Makefile.am: Add missing $(DESTDIR) when making
+$(namespaceddir) on install.
+modules/pam_sepermit/Makefile.am: Add missing $(DESTDIR) when making
+$(sepermitlockdir) on install.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ modules/pam_namespace/Makefile.am |    2 +-
+ modules/pam_sepermit/Makefile.am  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am
+index a28f196..ebb00f3 100644
+--- a/modules/pam_namespace/Makefile.am
++++ b/modules/pam_namespace/Makefile.am
+@@ -40,7 +40,7 @@ if HAVE_UNSHARE
+   secureconf_SCRIPTS = namespace.init
+ 
+ install-data-local:
+-	mkdir -p $(namespaceddir)
++	mkdir -p $(DESTDIR)$(namespaceddir)
+ endif
+ 
+ 
+diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am
+index cfc5594..bc82275 100644
+--- a/modules/pam_sepermit/Makefile.am
++++ b/modules/pam_sepermit/Makefile.am
+@@ -35,7 +35,7 @@ if HAVE_LIBSELINUX
+   securelib_LTLIBRARIES = pam_sepermit.la
+ 
+ install-data-local:
+-	mkdir -p $(sepermitlockdir)
++	mkdir -p $(DESTDIR)$(sepermitlockdir)
+ endif
+ if ENABLE_REGENERATE_MAN
+ noinst_DATA = README pam_sepermit.8 sepermit.conf.5
+-- 
+1.7.8.6
+
diff --git a/sys-libs/pam/pam-1.1.6.ebuild b/sys-libs/pam/pam-1.1.6.ebuild
index 4fb7a1604def..390f946d1296 100644
--- a/sys-libs/pam/pam-1.1.6.ebuild
+++ b/sys-libs/pam/pam-1.1.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6.ebuild,v 1.1 2012/08/17 14:09:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pam/pam-1.1.6.ebuild,v 1.2 2012/08/17 14:26:10 flameeyes Exp $
 
 EAPI=4
 
-inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use
+inherit libtool multilib eutils pam toolchain-funcs flag-o-matic db-use autotools
 
 MY_PN="Linux-PAM"
 MY_P="${MY_PN}-${PV}"
@@ -12,7 +12,8 @@ MY_P="${MY_PN}-${PV}"
 HOMEPAGE="https://fedorahosted.org/linux-pam/"
 DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
 
-SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2"
+SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
+	http://www.linux-pam.org/documentation/${MY_P}-docs.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
@@ -84,6 +85,9 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}-destdir.patch
+
+	eautoreconf
 	elibtoolize
 }