Added a patch to correct upstream's broken check for Werror and disabled it explicitly. Fixes bug 194921. Fixed several quoting issues and other minor QA stuff.

Package-Manager: portage-2.1.3.12

6 files changed, 63 insertions, 31 deletions

diff --git a/app-pda/pilot-link/ChangeLog b/app-pda/pilot-link/ChangeLog
index 45286d7de593..6c97d66233bd 100644
--- a/app-pda/pilot-link/ChangeLog
+++ b/app-pda/pilot-link/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-pda/pilot-link
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.29 2007/09/18 21:04:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/ChangeLog,v 1.30 2007/10/07 17:15:16 philantrop Exp $
+
+  07 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/pilot-link-0.12.2-werror_194921.patch, pilot-link-0.11.8.ebuild,
+  pilot-link-0.11.8-r1.ebuild, pilot-link-0.12.2.ebuild:
+  Added a patch to correct upstream's broken check for Werror and disabled it
+  explicitly. Fixes bug 194921. Fixed several quoting issues and other minor
+  QA stuff.
 
   18 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/pilot-link-0.11.8-missing-include.patch,
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index c4a4aa34ef39..ffc276ca2fc9 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -61,24 +61,28 @@ AUX pilot-link-0.12.2-threads.patch 711 RMD160 ec02e4300777b100ab51af6605028dee4
 MD5 8c2f9288c633cfdda4820d7ccec428c4 files/pilot-link-0.12.2-threads.patch 711
 RMD160 ec02e4300777b100ab51af6605028dee4b709db7 files/pilot-link-0.12.2-threads.patch 711
 SHA256 985b15bdd25ee3a167048be62ddd43fe1d74482d6cb7802ffe04454d967ae293 files/pilot-link-0.12.2-threads.patch 711
+AUX pilot-link-0.12.2-werror_194921.patch 810 RMD160 4268bebfc8a40c45ed70d571cbfb220abbb8bc9b SHA1 e0a8dfe2abbd6749e6774dff246ea2a8011aff89 SHA256 7e5e472e0c62fcaf5fe883928bd83402c848ac81ac50e61a571e6f64e7f21503
+MD5 1885158df81fd520592e8d05d1e63e62 files/pilot-link-0.12.2-werror_194921.patch 810
+RMD160 4268bebfc8a40c45ed70d571cbfb220abbb8bc9b files/pilot-link-0.12.2-werror_194921.patch 810
+SHA256 7e5e472e0c62fcaf5fe883928bd83402c848ac81ac50e61a571e6f64e7f21503 files/pilot-link-0.12.2-werror_194921.patch 810
 DIST pilot-link-0.11.8.tar.bz2 649034 RMD160 c51c069810edff6c2e38e4c81f2daa959c902ad4 SHA1 645d4bc49dd4dc4793d13b6e04dd61f24c2bf717 SHA256 952a97df5d13d926f0d5ce487e15268b1400fa0e7c43ea9303fba92818cce1cb
 DIST pilot-link-0.12.2.tar.bz2 964014 RMD160 3ae19f16b28c33cccb19fa218cdad4353d479875 SHA1 29a2b355ad8b0680e655c7e1ffa1ebef1b2ad5d9 SHA256 809df99a97aae215f93c1a0863644c0d3411462a5bac2d16d4d8941ce9c6d150
-EBUILD pilot-link-0.11.8-r1.ebuild 2298 RMD160 6b75ff90ed21f5e1b990766fb7277a612ed4e9d1 SHA1 a6b21f9a6d2a39a97c457ef2ec20447f50315842 SHA256 e2821bd1b2a4f0289f0c3284a596655b67611ab693827abc557b3f9985dcb3ff
-MD5 524a136fa8f6be3a54a27200a58e8703 pilot-link-0.11.8-r1.ebuild 2298
-RMD160 6b75ff90ed21f5e1b990766fb7277a612ed4e9d1 pilot-link-0.11.8-r1.ebuild 2298
-SHA256 e2821bd1b2a4f0289f0c3284a596655b67611ab693827abc557b3f9985dcb3ff pilot-link-0.11.8-r1.ebuild 2298
-EBUILD pilot-link-0.11.8.ebuild 1868 RMD160 5a875f902c68f34126170e10f0cfff2ec1c93723 SHA1 c8ada104b1b75befaa2e0a5b4c14d0666e01a080 SHA256 292c7334c253d5d7b59591a1faf81f1cc6e210b16670c583126281bb3e13812b
-MD5 d02b81f6ee7d4180aa130f90df0011b5 pilot-link-0.11.8.ebuild 1868
-RMD160 5a875f902c68f34126170e10f0cfff2ec1c93723 pilot-link-0.11.8.ebuild 1868
-SHA256 292c7334c253d5d7b59591a1faf81f1cc6e210b16670c583126281bb3e13812b pilot-link-0.11.8.ebuild 1868
-EBUILD pilot-link-0.12.2.ebuild 2495 RMD160 580789024b678091ea5f86a671b95224112a05ec SHA1 9a11fc71f5d2350f32c872ec218edd18256a2e03 SHA256 9fff695f88a6957ad1ce90591b9e8c10ab82510b49bf71bdfb16b3a55c2016db
-MD5 2328ab0158c532332eb08142feb363cf pilot-link-0.12.2.ebuild 2495
-RMD160 580789024b678091ea5f86a671b95224112a05ec pilot-link-0.12.2.ebuild 2495
-SHA256 9fff695f88a6957ad1ce90591b9e8c10ab82510b49bf71bdfb16b3a55c2016db pilot-link-0.12.2.ebuild 2495
-MISC ChangeLog 8021 RMD160 9335152d40ba09f02fcbb32fd812be624ae1f5c1 SHA1 fd62437265b050c28265fc48d5dbeb1d6cb13346 SHA256 b43c689a5fbe1e28abd8abe598d91072407a5135ba05be47083aab1182f6f828
-MD5 0ae5c1f2dbf231dc665b878a1e5efd9e ChangeLog 8021
-RMD160 9335152d40ba09f02fcbb32fd812be624ae1f5c1 ChangeLog 8021
-SHA256 b43c689a5fbe1e28abd8abe598d91072407a5135ba05be47083aab1182f6f828 ChangeLog 8021
+EBUILD pilot-link-0.11.8-r1.ebuild 2300 RMD160 d37e39d4986f78c7a14f5473c428c3a1537832ef SHA1 b68beb86c6afc81fb8a4a2a1dc24da376b4482b2 SHA256 488353fd08d00801370fdf331c624ef24f6a8617f2f54483ed4e32a961b73dc0
+MD5 a01424c0d0964643183dc0f0f2d6d94a pilot-link-0.11.8-r1.ebuild 2300
+RMD160 d37e39d4986f78c7a14f5473c428c3a1537832ef pilot-link-0.11.8-r1.ebuild 2300
+SHA256 488353fd08d00801370fdf331c624ef24f6a8617f2f54483ed4e32a961b73dc0 pilot-link-0.11.8-r1.ebuild 2300
+EBUILD pilot-link-0.11.8.ebuild 1867 RMD160 31cf7b8def2b60392d80771f37ba26303e70734c SHA1 45a218ced9da9a023abb312daa4db6a8e3a3c1c1 SHA256 287da11ee65fc77931322152801fc67ac0c38df5626cfb2d538620bd98fad459
+MD5 a892c871097b20ccd5ffc41f6163c849 pilot-link-0.11.8.ebuild 1867
+RMD160 31cf7b8def2b60392d80771f37ba26303e70734c pilot-link-0.11.8.ebuild 1867
+SHA256 287da11ee65fc77931322152801fc67ac0c38df5626cfb2d538620bd98fad459 pilot-link-0.11.8.ebuild 1867
+EBUILD pilot-link-0.12.2.ebuild 2632 RMD160 e203ecbd99e0207c256a9dbfcb9c3e28eb77142c SHA1 e136a177d7a2127105f51bd234bfd0e9168a4b4b SHA256 87152d234ac44bb8d0542eed0d1243c5d755ad3feb4bb5aa897ee158c595fad0
+MD5 28737c5663e20aab4031346e82a76136 pilot-link-0.12.2.ebuild 2632
+RMD160 e203ecbd99e0207c256a9dbfcb9c3e28eb77142c pilot-link-0.12.2.ebuild 2632
+SHA256 87152d234ac44bb8d0542eed0d1243c5d755ad3feb4bb5aa897ee158c595fad0 pilot-link-0.12.2.ebuild 2632
+MISC ChangeLog 8375 RMD160 0328ae7a2b8576a0a3f55ca51c606e1b1eba5af2 SHA1 d0813071e75489251e7895d478ad03246c4d1969 SHA256 71943ffc86f11b9f0a4f62a760c5eca691ed3881c78dc49683065fe0e8b7dfca
+MD5 42a3c8d366f1c9ab960f31a03e7693f2 ChangeLog 8375
+RMD160 0328ae7a2b8576a0a3f55ca51c606e1b1eba5af2 ChangeLog 8375
+SHA256 71943ffc86f11b9f0a4f62a760c5eca691ed3881c78dc49683065fe0e8b7dfca ChangeLog 8375
 MISC metadata.xml 156 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe SHA1 5b9cb277159d763c133920e483df8d3d587cf7e2 SHA256 7f72b73f6e0d6e26603d85e52cca524711faddf6b516640104c3b82aab4754fb
 MD5 075fea99b82d61028585dc3e42f00466 metadata.xml 156
 RMD160 6a6d0f6bfe83e3a54c2d72444564ed6ab19857fe metadata.xml 156
@@ -95,7 +99,7 @@ SHA256 8e247afc68e1f741adcff994523248987e858ee23c07b3887ae03cb62d095ace files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG8D1dCkvF58q80IkRAnjuAJ9ZAxfQbsQ5TRrzi7oSTOk2ms63HACghGW6
-C7B2kTg7j+kTem9rCjs6rI8=
-=Z6Xt
+iD8DBQFHCRQ1CkvF58q80IkRAjaBAJ9Up1vKZCc51dTV51IwN8VCpXT5aQCbBVYz
+IVwEISSs0OZr+OyZAw90e8U=
+=etw/
 -----END PGP SIGNATURE-----
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch b/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch
new file mode 100644
index 000000000000..a49000490d5d
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.2-werror_194921.patch
@@ -0,0 +1,18 @@
+diff -Naur pilot-link-0.12.2.orig/configure.ac pilot-link-0.12.2/configure.ac
+--- pilot-link-0.12.2.orig/configure.ac	2007-10-07 18:18:47.000000000 +0200
++++ pilot-link-0.12.2/configure.ac	2007-10-07 18:18:35.000000000 +0200
+@@ -757,11 +757,9 @@
+ dnl *************************************
+ dnl (already done) enable_werror=no
+ 
+-AC_ARG_ENABLE(compile-werror,
+-	      [  --enable-compile-werror
+-                          Causes warnings to be treated as errors in GCC],
+-	      enable_werror=yes)
+-if test "x$GCC" = "xyes" -a "x$enable_werror" = "xyes"; then
++AC_ARG_ENABLE([compile-werror], AS_HELP_STRING([--enable-compile-werror], [Causes warnings to be treated as errors in GCC (default: disabled)]))
++
++if test "x$GCC" = "xyes" -a "x$enable_compile_werror" = "xyes"; then
+ 	CFLAGS="$CFLAGS -Werror"
+ fi
+ 
diff --git a/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild b/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild
index 9bb3a99f35e2..e72881b943e9 100644
--- a/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild,v 1.19 2007/09/18 21:04:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8-r1.ebuild,v 1.20 2007/10/07 17:15:16 philantrop Exp $
 
 inherit perl-module eutils
 
@@ -88,7 +88,7 @@ src_install() {
 	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS
 
 	if use perl ; then
-		cd ${S}/bindings/Perl
+		cd "${S}/bindings/Perl"
 		perl-module_src_install
 	fi
 }
diff --git a/app-pda/pilot-link/pilot-link-0.11.8.ebuild b/app-pda/pilot-link/pilot-link-0.11.8.ebuild
index d7190f67b14e..1094c31f7888 100644
--- a/app-pda/pilot-link/pilot-link-0.11.8.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.11.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8.ebuild,v 1.16 2006/11/28 17:34:39 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.11.8.ebuild,v 1.17 2007/10/07 17:15:16 philantrop Exp $
 
 inherit perl-module eutils
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="perl java tk python png readline"
 
-DEPEND="virtual/libc
-	sys-libs/ncurses
+DEPEND="sys-libs/ncurses
 	perl? ( dev-lang/perl )
 	java? ( virtual/jre )
 	tk? ( dev-lang/tcl dev-tcltk/itcl dev-lang/tk )
@@ -24,7 +23,7 @@ DEPEND="virtual/libc
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-java_install_all.patch
+	epatch "${FILESDIR}/${P}-java_install_all.patch"
 }
 
 src_compile() {
@@ -57,19 +56,19 @@ src_compile() {
 	make || die
 
 	if use perl ; then
-		cd ${S}/bindings/Perl
+		cd "${S}/bindings/Perl"
 		perl-module_src_prep
 		perl-module_src_compile
 	fi
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc ChangeLog README doc/README* doc/TODO NEWS AUTHORS
 
 	if use perl ; then
-		cd ${S}/bindings/Perl
+		cd "${S}/bindings/Perl"
 		perl-module_src_install
 	fi
 }
diff --git a/app-pda/pilot-link/pilot-link-0.12.2.ebuild b/app-pda/pilot-link/pilot-link-0.12.2.ebuild
index a2287c9bd1da..b177dbf63e4e 100644
--- a/app-pda/pilot-link/pilot-link-0.12.2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.2.ebuild,v 1.1 2007/08/25 19:17:04 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.2.ebuild,v 1.2 2007/10/07 17:15:16 philantrop Exp $
 
 inherit perl-module java-pkg-opt-2 eutils autotools
 
@@ -43,6 +43,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-readline.patch"
 	epatch "${FILESDIR}/${P}-threads.patch"
 
+	# Upstream's check for Werror was wrong. Fxies bug 194921.
+	epatch "${FILESDIR}/${P}-werror_194921.patch"
+
 	# Some Java fixes.
 	if use java ; then
 		epatch "${FILESDIR}/${P}-java-compile.patch"
@@ -59,6 +62,7 @@ src_compile() {
 		--enable-conduits \
 		--with-tcl=no \
 		--without-included-popt \
+		--disable-compile-werror \
 		$(use_enable threads) \
 		$(use_enable usb libusb) \
 		$(use_enable debug) \