Fix build with USE=-nfsv4.

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

4 files changed, 75 insertions, 17 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index da034388d4e2..665eb30d5755 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.198 2012/05/17 05:42:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.199 2012/05/17 23:41:38 flameeyes Exp $
+
+  17 May 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/nfs-utils-1.2.6-conditionals.patch, nfs-utils-1.2.6.ebuild:
+  Fix build with USE=-nfsv4.
 
 *nfs-utils-1.2.6 (17 May 2012)
 
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index f8460720013a..d9f0a8df40b0 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -15,6 +15,7 @@ AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 RMD160 062c6897c9d939df8b4b6bb1
 AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 RMD160 0da3208e243bcd794faa9e189fbd983dd949fa3f SHA1 9081b7b193d3e54ef246c5dc96b6d650699a536d SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce
 AUX nfs-utils-1.2.4-nfsidmap.patch 1925 RMD160 f11d80ee9ce99beb250301573630b2a6710d6892 SHA1 7b7ff10bcc2b053e3cd6fc9897a5238eb9cf726a SHA256 ae15774002b877a75376c176bb313ca950100ba95be2d1641b1dacb8aaa0c33c
 AUX nfs-utils-1.2.4-no-nfsctl.patch 1043 RMD160 d9762cf7441c91df4ac64cb57023845ebe7fe124 SHA1 cbb5c5b35b3fae789f0b47e64825b42993e499ce SHA256 cb2f92895762337e377989835a360f423f6f0e3e2b4a82bde600496da16631b5
+AUX nfs-utils-1.2.6-conditionals.patch 2020 RMD160 5aea475ea2ca2fb4753dfaad4b8a4a0151048c18 SHA1 f8b44135ef1be0479e44e4901f1313157960ae1d SHA256 3f083ad6efa96110e46df09743a6988a004a73ce6213a954b303f191b9c76582
 AUX nfs-utils-1.2.6-cross-build.patch 1909 RMD160 d0e7ffc502491461745997249bea29ce3425b2ea SHA1 9644a4f4b672f11a87c665105690fd38f7c1167f SHA256 847f22436f8f389c390beb9bc99195cad182910eff68769317a5dd9902f8c0ab
 AUX nfs-utils-1.2.6-osd-install.patch 1726 RMD160 f1b422631f27dd7183ec2fb0f4e0075ca3872e44 SHA1 262b59666989caf11af1abfceb4e361b7bfed8ac SHA256 04ee2915fcba7c9d459b0f1b701314ad997e61e6898dda03fe670f63113cf155
 AUX nfs.confd 948 RMD160 eee237aeb641e823d3b505371faf8c4a33582a51 SHA1 bf296a1ea20478d729307496b2d34299a493168c SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e
@@ -45,23 +46,17 @@ EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf8
 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba
 EBUILD nfs-utils-1.2.4.ebuild 3737 RMD160 dad31c550469e1ce4653c0e22ca0ca650a4fdd08 SHA1 ca7c676a5eecda86bf6313c6c6d53edcffaaa3b3 SHA256 13042431e301d9181e6d8d54fa207a2581f675c3a2cb766c47b7fb6037ca088e
 EBUILD nfs-utils-1.2.5.ebuild 3515 RMD160 1814d44ef8322d6a834d2efe9b2421e960313fb8 SHA1 205f3495707c6f521bd7007f9becff6f4f41344d SHA256 f666cf561ecbfe6e4a5c1eed271957ba296c5b90a1bfefbfc741f033661d952c
-EBUILD nfs-utils-1.2.6.ebuild 3571 RMD160 729f39310ad351119cff52a98c0583c3261c4fef SHA1 02aa9987f62958a9770424b7751ddc941e341c56 SHA256 75b52154b1cb06f2077367e6af4aef05bd0e0a97d0b8d0214967da1830b46f99
-MISC ChangeLog 31528 RMD160 8ac68a30bd9adec306d2c32aeabc4165de8019e1 SHA1 8d296edf5ee7aac4ff62ea1409d9a491aae1bbc2 SHA256 df9ba8f08b02d783981903a2f46f72ea16849b8ae9a756e6fa6d06f93b55e3e1
+EBUILD nfs-utils-1.2.6.ebuild 3627 RMD160 9f04cd95d2788076455a1f54c231b0f2791ce112 SHA1 74447fd952e09e0101569b2ba0cf7b0996836554 SHA256 08ba207829a1a081b8d01d5f03c2fdbb53eb2183e4f70362c9fbc91a1846994a
+MISC ChangeLog 31686 RMD160 83f4f3b03691463a0b9e83fde52d9e736b8f05a0 SHA1 97d982c32f2c9a6c1a19f55875d69bf984ad6cd9 SHA256 67e8c6641f90f3e09f66d9a38b486afc6b540e078a680d5d311b95f77e167905
 MISC metadata.xml 606 RMD160 35d8f40b76caf984c77b72703bcbbdeb98d8941d SHA1 908e08f85c5fd6943d7eb766d774563ad346ec8a SHA256 46f51dc8c661de9ec04d0ad748f8dd69f7c38a3379071f422c203f340dbdc3ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPtI/YAAoJELEHsLL7fEFWkEsP/jWU+muAIv7A6BC7AjlJmQ3x
-uWmjd9fx/Pz1I7rr+JrY9VvylTWsqsY666upwzS/8WAvazzi9b3Nh3e7vgkduU/M
-Zixk7EBmF/ZPa5gBtZLdSoklwI0uSbs84AbS+Tf2rjZt87vFM62kYIEbvI7ygh+z
-B3EA0Ajig60cpO2zUuShB6O2EHJPT90/tUedlN6ZufunUOF1MEmJmNPLFRZ/om0K
-e92jKgr7hvmx3oO+lmhN9ee3b1A6H5qUYUDtqxjfhDscyhvoGD6U+td7wZgIdmcY
-ebPLslrcaZTeHu2L/Ju/LyJ9E3NBsyGDLdhuVELpg+e32xL9hG1V29dAPAECKP20
-YrQvTgH/I2eVJj/cl7Vxxr2cONA6pIiV7Oivpe90qvVo4aretMybPcDh49/DXnUo
-Uj7vDtejm6blaaq4uQImJFVUbKBxUpt/bdAuTNJC2HFgtyHxCf2ZJHjMJLYDQlxH
-qphVCTmuhrsNfevudLCAN82BriYVMbfdyG64hXjDDDeKt5XUAL/SbkZjKDkqqr4c
-Kx/Y2y+ouNzC4ly5K2Xb/yihG0jq3c+Xcf7K+kEGOzleka/Pfj2RP6PRBE205ksS
-dsoH0ZsAhkOA5OSxBVbiE4gj2s+mCdmPjnyOrKII5Ii11LSN9ZfGFQ4AC/Xzuaw7
-YyU90XGIlZ4s+6ZIZcPg
-=nePj
+iQEcBAEBAgAGBQJPtYzBAAoJEBzRPIrUMBNC7K4H/0eH6XhAoYeOQPKqUWrM2VGm
+4DeweN/djprzsh7gstASvNi68QaYjKs9YyhGb3nmc/ZGhzEuaSssJpqqb9vEsiNN
+U43PWJSnuT/+EXu/ey7CYk8bpk9fFLwvW06uEl83D/joe6wLSGMvam0sH3IT4MTZ
+lk1Y73L5l5lqQRFc9a6uRKVx8b4fZYRhIq76uVTU1qEc04dRV58CyWhXVArrCTJI
+NJbeWUPDAiMnYVvLadBdoPAo1+LUAANZymjg4zTgjtSpTkzZC0/MmgHKuf7bUsWT
+VEuJCwBAB4Nq3SH0ULr9/ASxlQL4qMSmQQqIYivLiRGIldtXxmIWlDIipcspILA=
+=h1CU
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch
new file mode 100644
index 000000000000..a2342b36b969
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-1.2.6-conditionals.patch
@@ -0,0 +1,58 @@
+From 869d37a16d1e409cedd95b03cea29a6db65f9276 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Thu, 17 May 2012 16:26:44 -0700
+Subject: [nfs-utils PATCH] build: avoid AM_CONDITIONAL in conditional
+ execution.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Automake does not support conditional AM_CONDITIONAL calls; what that
+means is that you always have to execute AM_CONDITIONAL one way or the
+other. Both the libsqlite3.m4 file and the nfsdcld conditionals are
+executed only when NFSv4 is enabled, which breaks building with
+--disable-nfsv4.
+
+Remove the SQLite3 conditional altogether as it's never used, and move
+the nfsdcld conditional outside of the conditional code.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ aclocal/libsqlite3.m4 |    1 -
+ configure.ac          |    3 +--
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4
+index 73d1e46..8c38993 100644
+--- a/aclocal/libsqlite3.m4
++++ b/aclocal/libsqlite3.m4
+@@ -29,5 +29,4 @@ AC_DEFUN([AC_SQLITE3_VERS], [
+     LIBS="$saved_LIBS"])
+ 
+   AC_MSG_RESULT($libsqlite3_cv_is_recent)
+-  AM_CONDITIONAL(CONFIG_SQLITE3, [test "$libsqlite3_cv_is_recent" = "yes"])
+ ])dnl
+diff --git a/configure.ac b/configure.ac
+index 9ba53e2..b408f1b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -278,8 +278,6 @@ if test "$enable_nfsv4" = yes; then
+ 	fi
+   fi
+ 
+-  AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+-
+   dnl librpcsecgss already has a dependency on libgssapi,
+   dnl but we need to make sure we get the right version
+   if test "$enable_gss" = yes; then
+@@ -293,6 +291,7 @@ if test "$enable_nfsv41" = yes; then
+ fi
+ 
+ dnl enable nfsidmap when its support by libnfsidmap
++AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
+ AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+ 
+ 
+-- 
+1.7.8.6
+
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
index 0bb2fbea3dce..1086b9bee635 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.1 2012/05/17 05:42:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.6.ebuild,v 1.2 2012/05/17 23:41:38 flameeyes Exp $
 
 EAPI="4"
 
@@ -56,6 +56,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.2.6-cross-build.patch
 	epatch "${FILESDIR}"/${PN}-1.2.6-osd-install.patch
+	epatch "${FILESDIR}"/${PN}-1.2.6-conditionals.patch
 	eautoreconf
 }