Fix static lib handling and block newer nfs-utils due to man page collision #337213 by Robin Johnson.

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

4 files changed, 71 insertions, 8 deletions

diff --git a/net-libs/libnfsidmap/ChangeLog b/net-libs/libnfsidmap/ChangeLog
index 9cb3c5b06028..c92b7e0cd374 100644
--- a/net-libs/libnfsidmap/ChangeLog
+++ b/net-libs/libnfsidmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libnfsidmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfsidmap/ChangeLog,v 1.33 2010/07/27 00:18:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfsidmap/ChangeLog,v 1.34 2010/09/14 12:32:22 vapier Exp $
+
+*libnfsidmap-0.23-r1 (14 Sep 2010)
+
+  14 Sep 2010; Mike Frysinger <vapier@gentoo.org>
+  files/libnfsidmap-0.21-headers.patch, +libnfsidmap-0.23-r1.ebuild:
+  Fix static lib handling and block newer nfs-utils due to man page collision
+  #337213 by Robin Johnson.
 
 *libnfsidmap-0.23 (27 Jul 2010)
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 92089e0a5f44..e25ac0aa7636 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libnfsidmap-0.19-getgrouplist.patch 3408 RMD160 1757c16fc8f2358f4bb046495b9a48604a9dbf4c SHA1 394b34f80ba545120643da48e9fd7477bb5e09e4 SHA256 45589d101fb83cda293cbe8f76b6b39ae074a7e56729a9f7f513df3ff1c4927b
-AUX libnfsidmap-0.21-headers.patch 200 RMD160 de164384fae8ccd900290e0c8491f70d3525ef9a SHA1 e7876d37df8f3bfbb681f4683ca56ec8b0ca9cf4 SHA256 141c50022da90e46e8c458665d27bd0a5d579f1a17ad09e9e1644b2f04195f76
+AUX libnfsidmap-0.21-headers.patch 438 RMD160 441fd6de0b6221f7826fcaa30f4f5da26437b6d6 SHA1 eebf96785aee0d114f2ef0d4937b12e1f915ea2d SHA256 755314afbbdc82d2cb2e5f0114a3d6eae0d0978da859f215bb858e44a11296ff
 DIST libnfsidmap-0.21.tar.gz 343954 RMD160 56dc494c2d21b2051ea979888052a925c62cb4ea SHA1 576e3775517c34fbddf62ae99f4122c2d84c8715 SHA256 92f55c3e89784e2cc4230cdf49d99360cf1e2279bc81fd0174225571dc857771
 DIST libnfsidmap-0.23.tar.gz 358990 RMD160 343657b4208cef38bc5ab22782278822f9b2e05e SHA1 bd9647582f7d863a483460815f0a0b1450884c3d SHA256 69d20cfc6be6bf7ede2a55da687dc6853f2db6c8ef826a0b5e3235e7d46f4051
 EBUILD libnfsidmap-0.21-r1.ebuild 1011 RMD160 18767f84be44a831f8f8fe6fb4274c9420bfad7c SHA1 2654a08fd946b6480140852927233f1c839cf70f SHA256 f79c30b87d0af57c28f7ef24278dd1386993d9ffab842653150433b7d8682469
-EBUILD libnfsidmap-0.23.ebuild 1091 RMD160 4d6c2a67d39730445f786de3f02e2809105d91cd SHA1 9382a9153f7f16d84a242b3330ae19ec23c78df9 SHA256 0f7d06860eaa5ef25621001745d30462944ab315ab15790dc37f8013c88ec0d8
-MISC ChangeLog 4838 RMD160 9a3ff06bdce18609dcb6c07088c1353cf7e26ea4 SHA1 85326b02c067bc830fc36f13007e5758462063c3 SHA256 f146467ec815c0d8ff984796383eab3955016694e9d72bdb7e449dc27ee0c45f
+EBUILD libnfsidmap-0.23-r1.ebuild 1101 RMD160 daf179a26ce25766fbe921f2ef610fc0b7bd02c6 SHA1 9d3347f9823324cc5d90e6550a96e4cc48f109fe SHA256 5245d9b2d1df2798b4ec389b476505a0ec3c75a763510d9bb12b9ebfaac13564
+MISC ChangeLog 5097 RMD160 35add7675ba5e4c8a1ea41505460107945a30ca8 SHA1 b141d2c0bb74a94083e4ec78e2ee5f294e4a8859 SHA256 362024d0876e644a7b8593678c7aeed7e416c1c093f6357b1b3e1ac2d764e3a6
 MISC metadata.xml 159 RMD160 8e0977b9abd90afe9e1d5c1326823a5726f6e2a4 SHA1 33f35324ce730e28838be228d9ee4e4dd1bab1e5 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxOJdgACgkQAiZjviIA2Xj3xgCg6j0b7v/l8666Q0YJjIz0dJW+
-MD8AoLXuzWaZYf6BRTrsQl3ei5AJm7i+
-=MRL7
+iF4EAREIAAYFAkyPa9sACgkQTwhj9JtAlp5T4AD/eUWVG3x4yAOEEQC4KCqJws2s
+T5hUw+J5G48ISYzW/J4BAIQif0mmMXdmDaFUWrdNEgcVcTcPjIYkNWfxb5FbnH2Z
+=D2B7
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
index ee9371ec49e1..6ef12d44e44f 100644
--- a/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
+++ b/net-libs/libnfsidmap/files/libnfsidmap-0.21-headers.patch
@@ -1,3 +1,5 @@
+for toupper and such
+
 --- a/nss.c
 +++ b/nss.c
 @@ -34,6 +34,7 @@
@@ -8,3 +10,13 @@
  #include <sys/types.h>
  #include <errno.h>
  #include <unistd.h>
+--- a/libnfsidmap.c
++++ b/libnfsidmap.c
+@@ -37,6 +37,7 @@
+  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#include <ctype.h>
+ #include <sys/types.h>
+ #include <errno.h>
+ #include <unistd.h>
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.23-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.23-r1.ebuild
new file mode 100644
index 000000000000..45ca14483865
--- /dev/null
+++ b/net-libs/libnfsidmap/libnfsidmap-0.23-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnfsidmap/libnfsidmap-0.23-r1.ebuild,v 1.1 2010/09/14 12:32:22 vapier Exp $
+
+EAPI="2"
+
+inherit autotools
+
+DESCRIPTION="NFSv4 ID <-> name mapping library"
+HOMEPAGE="http://www.citi.umich.edu/projects/nfsv4/linux/"
+SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ldap"
+
+DEPEND="ldap? ( net-nds/openldap )"
+RDEPEND="${DEPEND}
+	!<net-fs/nfs-utils-1.2.2
+	!net-fs/idmapd"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.19-getgrouplist.patch #169909
+	epatch "${FILESDIR}"/${PN}-0.21-headers.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable ldap)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	insinto /etc
+	doins idmapd.conf || die
+
+	# remove useless files
+	rm "${D}"/usr/lib*/libnfsidmap/*.{a,la} || die
+}