Fix crazy -Werror, bug #277291.

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

4 files changed, 24 insertions, 9 deletions

diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog
index d963240ae3e8..ac1938cd5396 100644
--- a/gnome-base/libgnomekbd/ChangeLog
+++ b/gnome-base/libgnomekbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnomekbd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.54 2009/05/10 19:24:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.55 2009/07/12 21:08:12 eva Exp $
+
+  12 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  libgnomekbd-2.24.0.ebuild, libgnomekbd-2.26.0.ebuild:
+  Fix crazy -Werror, bug #277291.
 
 *libgnomekbd-2.26.0 (10 May 2009)
 
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 608a35d7a97a..8a1b789d4d01 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -5,14 +5,14 @@ AUX libgnomekbd-2.21.1-no-libbonobo.patch 373 RMD160 8c277c8263cbc27b4c3144f1983
 AUX libgnomekbd-2.22.0-system-relink.patch 1043 RMD160 a85f5f5e46ba59ae5a7acf6360d4693b2d27a4d7 SHA1 fecdf02e335c36af95bf8871f132f5915e44705b SHA256 2e3291b483dd2dc96fa63e33aa1ffc2676148f7fddb54a22134e2012d1755355
 DIST libgnomekbd-2.24.0.tar.bz2 411322 RMD160 8ca98404615c405705fd82c917acb7b4b55b334e SHA1 3e81ade6050930a9d1e3443b89981cf36821032a SHA256 60f093b4fcbdfa12212d6e29dc2f7802a3234d8035f45efed4b426c0bb293c5a
 DIST libgnomekbd-2.26.0.tar.bz2 413560 RMD160 0a4b5d133efc8b08482d1dc27cdf2ca56655fd48 SHA1 0b7543df516271e16198135323471b2107dca0ec SHA256 26a53552f3eaeda8d386e31622ba605944eb97dfe5ffa834dc0708761811364f
-EBUILD libgnomekbd-2.24.0.ebuild 1439 RMD160 3cee86d49b5cd2ac0980099c8df066157714a2ea SHA1 04f044286d829e4bd045593e2f776ce5196b6a79 SHA256 646004ac08baa290d4628b38af35c0b590f61eecbc6d6b09adc7664d523926e9
-EBUILD libgnomekbd-2.26.0.ebuild 1356 RMD160 963ec028fe296ce88a90da9d72e80c09717722e4 SHA1 5be69e877437e0b6ce101a242b6c15b5b2e8620f SHA256 0cc8d3f6b877261bca0f875101827e9f6e4d5e27babd0526ebcbc35bc54259a2
-MISC ChangeLog 6615 RMD160 def6c3b69f7edacd43de2d56dd7094938b4670dc SHA1 f75a46118d29f48ca02db09c4fd7cc317c4382d2 SHA256 f2677987ba021ae000cc70ea2f251044c99486f41e3c8d4ef0b0656c2e350574
+EBUILD libgnomekbd-2.24.0.ebuild 1639 RMD160 75de5fa475e700d2463f1c2045db7fb4130ab82e SHA1 53921fd9ca94e87d78acbb01a6d1238913e6f933 SHA256 3875d3e06720ebc072457e82d45fdb131c767f92e740ae2a815dd02c37b6eea9
+EBUILD libgnomekbd-2.26.0.ebuild 1612 RMD160 8cfe9b38fe94b788d552a208a859853451b29e78 SHA1 8c6d460a77caeaecf8af35cad87463f98136d4e8 SHA256 6c0346e5e081cb752a8983eb70c48b8116e26de131240a8cb333a070bc28a13c
+MISC ChangeLog 6760 RMD160 0476925bc01a73569333a3633f3c93300b002e2d SHA1 373590133a8dc4f98c7b816a6c64d4b450584899 SHA256 f2251f1456461ae7ca902de538fe7d4e386ac0a48ff856da694efce29dda0c21
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoHKfYACgkQ1fmVwcYIWAYtvQCfS0lYdhD1KNw+L2ItIKKfo4Xn
-prIAoINHK5nvaOsPdiaF8z6xVCk10osY
-=jLMs
+iEYEARECAAYFAkpaUNkACgkQ1fmVwcYIWAZozQCcDekbbAdKEx6HNmXZsCvLqm93
+cHAAn150hWIznivZCghviMXoAdd2ShZM
+=aSD/
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild
index 85e1d214661c..71ef75b9da73 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.12 2009/04/28 11:23:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.24.0.ebuild,v 1.13 2009/07/12 21:08:12 eva Exp $
 
 EAPI="2"
 
@@ -40,6 +40,11 @@ src_prepare() {
 	# Fix linking to system's library, bug #265428
 	epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch"
 
+	# Fix silly upstream CFLAGS, bug #277291
+	sed "s/-Werror//g" -i capplet/Makefile.am capplet/Makefile.in \
+		test/Makefile.am test/Makefile.in \
+		configure.in configure || die "removing -Werror failed"
+
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
index 890a990e721e..b1ec9bbfd264 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild,v 1.1 2009/05/10 19:24:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.26.0.ebuild,v 1.2 2009/07/12 21:08:12 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -37,6 +37,12 @@ src_prepare() {
 	# Fix linking to system's library, bug #265428
 	epatch "${FILESDIR}/${PN}-2.22.0-system-relink.patch"
 
+	# Fix silly upstream CFLAGS, bug #277291
+	sed "s/-Werror//g" -i capplet/Makefile.am capplet/Makefile.in \
+		libgnomekbd/Makefile.am libgnomekbd/Makefile.in \
+		test/Makefile.am test/Makefile.in \
+		configure.in configure || die "removing -Werror failed"
+
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"