Fix building with autoconf 2.62 (error in AC_HELP_STRING parameters), closes bug #218237. Also install documentation in the canonical directory, closes bug #179586.

Package-Manager: portage-2.1.5_rc5

4 files changed, 18 insertions, 13 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index a4c4d6866c11..935bf11f560d 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.170 2008/02/18 00:32:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.171 2008/04/22 10:57:37 flameeyes Exp $
+
+  22 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/distcc-avahi-configure.patch, distcc-2.18.3-r12.ebuild:
+  Fix building with autoconf 2.62 (error in AC_HELP_STRING parameters),
+  closes bug #218237. Also install documentation in the canonical directory,
+  closes bug #179586.
 
   17 Feb 2008; Alexis Ballier <aballier@gentoo.org>
   distcc-2.18.3-r12.ebuild:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 2bf6f2659222..c18e33747fcb 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -7,7 +7,7 @@ AUX 2.18/conf 1267 RMD160 a12045786088255c9bc8f4ad826928c00efac567 SHA1 828f62be
 AUX 2.18/distcc-config.patch 1200 RMD160 46adf137db41c3278463125caeb132b9626ead54 SHA1 080ba28e0cc2eab5cdcb9c860dd255460926cadd SHA256 0abca6ee532de72ef19f1b210a09bd661ea7110cf36654c8c8ac016ee6573e55
 AUX 2.18/init 733 RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b SHA1 737e969b122c70df6d54c7a98bfdc872af278ff6 SHA256 1477ab79b8be398b6acb7d44e0f0a66bb75d1918365b350b824e16b8b02af22b
 AUX distcc-as-needed.patch 558 RMD160 faebf24490e3dd2a5247cfb6914dc88fb7b98e35 SHA1 5e5547032b6492f9f8b0511fd621a005dbd455a2 SHA256 9e87d3b0487ffc52ccf6362866e967dff9c2a85681175096ece11413f8c91e54
-AUX distcc-avahi-configure.patch 1263 RMD160 6da8e07acda9ccdcee796d87546d548d1489c4a4 SHA1 eafd2b64f8b0608cdf6ea157759745ff878dd973 SHA256 f468f98bfdb86614ffba98d3ce991209fc765a435040a99163b449ea9caf5713
+AUX distcc-avahi-configure.patch 1263 RMD160 de3ba2d651b5a76d5ee71cde79a2555f77a70b1b SHA1 eddae708be95f4bbd7cbfed53439e2dc38a979e8 SHA256 9d967456da6631845b4262ae7508948d629764149fd568c367e76e89168bb132
 AUX distcc-config 4874 RMD160 07bd612fc11c785691bd56e4e7bb7994a2e4dbb8 SHA1 85b5f38d6024e4f454bfa07d96c13b4749ce3e2a SHA256 c6a7bb74eb235fd7896ca101c033a2e9faf80afeb7232bff3afe22f8a6268a5c
 AUX distcc-create-dir.patch 1404 RMD160 c9c878715ac02952d791da8776952e69d5de7e57 SHA1 387572bc6c05896386aef50db0d490168c1058f1 SHA256 b327b879f200d7a78cfe665cdba864e4d92a9fdecdd81149d75d72c8ba756bde
 AUX distcc-freedesktop.patch 2519 RMD160 98020f40eebe7ca9cd629e602a9ff216df0b97f9 SHA1 1cdcacc021a51ad3469ab16b90f43379538629f9 SHA256 632f7865da9f35773fb95df53ae77089e1bbf7aa936b86d0f4b938603a8c37c3
@@ -17,13 +17,13 @@ DIST distcc-2.18-avahi.patch.bz2 9447 RMD160 eaf358bc417566bb8cf7ea005ce853df880
 DIST distcc-2.18.3.tar.bz2 341601 RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d SHA1 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
 EBUILD distcc-2.18.3-r10.ebuild 5024 RMD160 aab0d5722d91e8750af8cacb6955f26f1ee6f9fe SHA1 ad839094a36e25bc00c8dc51507a39247b564154 SHA256 161fcca282ef4299e50ba8e542dc16452eb0565e794509f225c761e26e7f1462
 EBUILD distcc-2.18.3-r11.ebuild 5719 RMD160 fe3b672e01872ed4142e7095c9004cd258ef4d29 SHA1 69988ab58903a3ff96f42afb9b6dd1ac6363167f SHA256 ee00138d23314faa440ecf93b660071d6ddcc4f74eb9baf50494e9f1c05c0e74
-EBUILD distcc-2.18.3-r12.ebuild 5646 RMD160 92d69127d8960f28e0d1747639648c606e257ca0 SHA1 e5ee0e4144a18999ec830fd4bdf8af8efc6cf8fd SHA256 152a2d4d1435aa022967af3706f2bf0fd28d455b79a1504f31ee9531d372c651
-MISC ChangeLog 31187 RMD160 3a0f7a12d905c58eb859d49584dd914e5ac11911 SHA1 d223e583691a265058becac1768d2061808fa903 SHA256 21cb1a1690788d0e13347086e4d92a05b0480d78d582af70b37c977cc7a9c480
+EBUILD distcc-2.18.3-r12.ebuild 5646 RMD160 8497d239573cd890840a26991493abf99d688a02 SHA1 a69ec88ba24d8aeeec8ad697f8eb6a8c323e6af8 SHA256 99b360a39a4576b8c8a1180fcec95a340904191a8ec35358ea5bb24ae471ec76
+MISC ChangeLog 31477 RMD160 1a401df52854caa6a1d4cc2de1a3fd83490e9a75 SHA1 1ba97b5febd2e3e3686b9816e2cf813c8eed32b9 SHA256 5f34e119bcb330773c709335ff54f4f20128b9c701bb43920d0c91fb626a34f2
 MISC metadata.xml 379 RMD160 420726180bf16a6ecc3f4be5f57ed0841926fb9c SHA1 cec305f87acbaeea3c2c106df48c9654451ab346 SHA256 fdee311afe18ec1446a2da7b4cf5c59189e7adb5b3c3f2955762d01b04bb6ad9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHuNILvFcC4BYPU0oRAlieAJ9rPUVuDEwdL2nrR/nyzaEoAl7s/gCfcRxR
-DkGkNc6kW90eCqr5KxmjHjw=
-=t2cp
+iEYEARECAAYFAkgNxKgACgkQAiZjviIA2XiDlwCggffIoGNIArOVB13i9+R3Hfl3
+ya4AoOaR9d1Ikth7zj1xRkw4OW5EpJ2I
+=H8c4
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/distcc/distcc-2.18.3-r12.ebuild b/sys-devel/distcc/distcc-2.18.3-r12.ebuild
index b948b1cbfd9e..5d75a62febc3 100644
--- a/sys-devel/distcc/distcc-2.18.3-r12.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r12.ebuild,v 1.2 2008/02/18 00:32:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r12.ebuild,v 1.3 2008/04/22 10:57:37 flameeyes Exp $
 
 # If you change this in any way please email lisa@gentoo.org and make an
 # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye
@@ -73,7 +73,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="--without-included-popt "
+	local myconf="--without-included-popt --docdir=/usr/share/doc/${PF}"
 
 	#More legacy stuff?
 	[ `gcc-major-version` -eq 2 ] && filter-lfs-flags
@@ -98,8 +98,7 @@ handle_avahi() {
 src_install() {
 	make DESTDIR="${D%/}" install
 
-	insinto /usr/share/doc/${PN}
-	doins "${S}/survey.txt"
+	dodoc "${S}/survey.txt"
 
 	exeinto /usr/bin
 	doexe "${FILESDIR}/distcc-config"
diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch
index 9f42764f2845..cc1097d643d1 100644
--- a/sys-devel/distcc/files/distcc-avahi-configure.patch
+++ b/sys-devel/distcc/files/distcc-avahi-configure.patch
@@ -5,7 +5,7 @@ diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac
      [#include <sys/socket.h>])
  
  dnl check for avahi
-+AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support], [], [enable_avahi=auto]))
++AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support]), [], [enable_avahi=auto])
 +ZEROCONF_DISTCC_OBJS=""
 +ZEROCONF_DISTCCD_OBJS=""
  PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5],