Don't build test programs with FEATURES="-test" wrt #226255, thanks to Diego E. Pettenò for reporting. Remove -Werror from "make check" wrt #260946.

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

7 files changed, 44 insertions, 24 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 32ad1c76caf8..f691759ca58f 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.128 2009/07/19 19:50:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.129 2009/07/20 20:53:16 ssuominen Exp $
+
+  20 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  libxklavier-4.0.ebuild, +files/libxklavier-4.0-tests.patch:
+  Don't build test programs with FEATURES="-test" wrt #226255, thanks to
+  Diego E. Pettenò for reporting. Remove -Werror from "make check" wrt
+  #260946.
 
 *libxklavier-4.0 (19 Jul 2009)
 
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index e10e01fa2f2f..a582a8d7c46c 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libxklavier-3.8-tests.patch 1613 RMD160 901bfda51ceb81feca2e9ce62a768408e2b1f03c SHA1 c930cc465210f6be1e5cc052b248c1e6052ba279 SHA256 b919844340dd88603a664a3b21d8022908432441fe04a771f7e661b956307b28
+AUX libxklavier-4.0-tests.patch 619 RMD160 1903ba08a7f3632ace5356a5e1c63a31f1b9394f SHA1 0bf730273e44efb08a7f06b26bb5c590cd1404e6 SHA256 915fbbf645d627dcc28bd02b47aef72b7ee4d9d2301ec269f194692210305ee1
 AUX sun.xml 4572 RMD160 3255a22dafebb60df1fb115a39eccf349f63d658 SHA1 cb9fb9f87879090ef20082054b0fa730b067a89f SHA256 ba4be6b7737b09875adf109384fb375377540fbb213d62b647ba36baad28a7a0
 DIST libxklavier-3.3.tar.gz 475629 RMD160 70f38f3212a5c14f9894582ee41f65c72a917a82 SHA1 19312997d5ec929f4057cb33c3806d494606c5cf SHA256 050a14ddeda0bbf5c742cb60dee56de48736968d050543fc2e46bcd2e1837870
 DIST libxklavier-3.6.tar.gz 462046 RMD160 34f68b11f523cab3b9c6b1da75f19c787ead932c SHA1 fdbf95a615a8daea7d9f417f42cb8ea6ecfcb192 SHA256 92e2044414b86b820f85333ae626f3ca9d5bd0b1be35148f3c50f88a87c4d5ce
@@ -9,16 +7,9 @@ DIST libxklavier-3.8.tar.bz2 343107 RMD160 0c853a18056193802e74a7f30f3df1eef1820
 DIST libxklavier-3.9.tar.bz2 339409 RMD160 b92ce43e0c18183029aaf3d94b8960c022854f5d SHA1 f093950923361310f80c2c434f7cc1a17c09f301 SHA256 462a4e427f201a23de194f824dce70c84867464956f2f6c8dd4a5e07f1f4a554
 DIST libxklavier-4.0.tar.bz2 354149 RMD160 e99904f7886701c7d37177999dff87261fd94ef3 SHA1 37c6e9fb8b436d6a646a6eea09cf196baad28756 SHA256 210ed5803109a8cef3b2ab1195bc73fe3385a97a8749d01673e020642d8e5a71
 EBUILD libxklavier-3.3.ebuild 1192 RMD160 a69c2535d7791dc0bde1e4b69171f6cc5d672e29 SHA1 b13426e5de1344cdad7ee024af26d8767d09d09b SHA256 b96780dd3587cf8f2dd7c52aa3510c3ac7431bd367d3be90a9f22bfdf2b217e5
-EBUILD libxklavier-3.6.ebuild 1481 RMD160 d6b202a40b858bae7fcbd2d4f74bf5fb711e7097 SHA1 24857c417869378115e687e7e0bc09cdf3ec7a6b SHA256 e06cd3073f12198e5a37eff5e395a6d99551bc15c26d56a35d288b28d8ee3900
-EBUILD libxklavier-3.8.ebuild 1698 RMD160 9ad6638f6a501213acef017a0c172f16b39d8e9b SHA1 f4826ec8d5ea13a2f079c70b4c5ce75b9d071b1f SHA256 c84d2e8075db7887ae892b5550aa8b01c0fdf85a0fe99a37e6bac02dd0528a2c
-EBUILD libxklavier-3.9.ebuild 1552 RMD160 c4f87e38bd96c2a801713365a226d96859cd7df1 SHA1 ea51d2c9d5d4c3c1aa44ae7b6dff204ae6d379b8 SHA256 bef5915913281e57a2e6439ba1306c056b503c89076417bca5c6d6b2753900c5
-EBUILD libxklavier-4.0.ebuild 1510 RMD160 f91287068ed3d489510d338c5d17cf5ed00e033b SHA1 71ca4918593a3b74f068297c290a76e60ad17f0c SHA256 a995ccbc48777b59e9aee1fc71d9ea8a915b6f66023af826779778d97362fc5e
-MISC ChangeLog 15495 RMD160 32535cf96593dc750c8d99760bde18ba948b85f2 SHA1 15c727e355e100e3a7fb80299561531e8771b227 SHA256 137bf48fdd3916d38858716121444632f424803281a2379ec890b3aff36ee4dd
+EBUILD libxklavier-3.6.ebuild 1483 RMD160 b9c0b2596b48a002be11a0ff5c45534891b1aad4 SHA1 618f0e963e83451c4d5d9df3b3b01b225e07432c SHA256 24ff4e6c4e61a9a7864a9888240615e5b03858b899ef67510d5fc26c4f7331d5
+EBUILD libxklavier-3.8.ebuild 1701 RMD160 b7d208e95d829c23dbd35c7e168dc6bf184cf1e4 SHA1 08a4cfb1b474abccd158995d3746ce2793d665ec SHA256 9bc541cb23f0bc574504fc978986a6362f3d359bdd75bd71d7f2f86f2100a6cf
+EBUILD libxklavier-3.9.ebuild 1554 RMD160 d6ee58bfc80c5a1e42cfab4b99569dd65e80d03a SHA1 a197cc55a685db2e75003f3568dce9339c0d4a33 SHA256 402b4f775acaa55addb473976570f6b90b683012c59ce8ae6481334cb13e1544
+EBUILD libxklavier-4.0.ebuild 1620 RMD160 3b1c8ad36186fb3f41bafb3718af1aa44fa241f6 SHA1 93e2d064e5501e930afeaae14e28d70c8c770593 SHA256 4e6a574cc338271a04d8504517edd59c4cfad08ef50c3206b632538a6b6f5852
+MISC ChangeLog 15774 RMD160 c4a6c0097949d2458a9c276b418148c5532a02d3 SHA1 f86291e3c9d780ca644e142ea7e0570fab820174 SHA256 10b62cf1bc266c4014c70587a3afefdeb52eea90c61b16e4e8fc7a4ed3675b7a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpjePwACgkQ1fmVwcYIWAbn+ACg5PYd/PrSOt5652ktZ4pPK0JW
-/BIAoJPeVV+3iddW+599AIYXmhoBdtFx
-=y8bv
------END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/files/libxklavier-4.0-tests.patch b/x11-libs/libxklavier/files/libxklavier-4.0-tests.patch
new file mode 100644
index 000000000000..959a0b3736f5
--- /dev/null
+++ b/x11-libs/libxklavier/files/libxklavier-4.0-tests.patch
@@ -0,0 +1,16 @@
+diff -ur libxklavier-4.0.orig/tests/Makefile.am libxklavier-4.0/tests/Makefile.am
+--- libxklavier-4.0.orig/tests/Makefile.am	2009-04-07 01:50:08.000000000 +0300
++++ libxklavier-4.0/tests/Makefile.am	2009-07-20 23:44:22.000000000 +0300
+@@ -1,10 +1,10 @@
+-noinst_PROGRAMS=test_config test_monitor
++check_PROGRAMS=test_config test_monitor
+ 
+ test_config_SOURCES=test_config.c
+ 
+ test_monitor_SOURCES=test_monitor.c
+ 
+-AM_CFLAGS=-Wall -Werror -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
++AM_CFLAGS=-Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
+ 
+ LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
+ 
diff --git a/x11-libs/libxklavier/libxklavier-3.6.ebuild b/x11-libs/libxklavier/libxklavier-3.6.ebuild
index 3e964612b45a..5ba7b69b4b28 100644
--- a/x11-libs/libxklavier/libxklavier-3.6.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.6.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/x11-libs/libxklavier/libxklavier-3.6.ebuild,v 1.10 2009/05/05 16:14:52 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.6.ebuild,v 1.11 2009/07/20 20:53:16 ssuominen Exp $
 
 inherit eutils
 
@@ -53,5 +53,5 @@ pkg_postinst() {
 	ewarn "Please note that the soname of the library changed!"
 	ewarn "If you are upgrading from a version prior to 3.4 you need"
 	ewarn "to fix dynamic linking inconsistencies by executing:"
-	ewarn "revdep-rebuild -X --library libxklavier.so.11"
+	ewarn "revdep-rebuild --library libxklavier.so.11"
 }
diff --git a/x11-libs/libxklavier/libxklavier-3.8.ebuild b/x11-libs/libxklavier/libxklavier-3.8.ebuild
index 177fa388bddc..1b5de96b6479 100644
--- a/x11-libs/libxklavier/libxklavier-3.8.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.8.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/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.9 2009/05/05 16:14:52 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.8.ebuild,v 1.10 2009/07/20 20:53:16 ssuominen Exp $
 
 inherit autotools eutils
 
@@ -67,5 +67,5 @@ pkg_postinst() {
 	ewarn "Please note that the soname of the library changed!"
 	ewarn "If you are upgrading from a version prior to 3.4 you need"
 	ewarn "to fix dynamic linking inconsistencies by executing:"
-	ewarn "revdep-rebuild -X --library libxklavier.so.11"
+	ewarn "revdep-rebuild --library libxklavier.so.11"
 }
diff --git a/x11-libs/libxklavier/libxklavier-3.9.ebuild b/x11-libs/libxklavier/libxklavier-3.9.ebuild
index 94430407f05e..68e6e0db05b6 100644
--- a/x11-libs/libxklavier/libxklavier-3.9.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.9.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/x11-libs/libxklavier/libxklavier-3.9.ebuild,v 1.2 2009/05/05 16:14:52 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.9.ebuild,v 1.3 2009/07/20 20:53:16 ssuominen Exp $
 
 inherit eutils
 
@@ -56,5 +56,5 @@ pkg_postinst() {
 	ewarn "Please note that the soname of the library changed!"
 	ewarn "If you are upgrading from a version prior to 3.4 you need"
 	ewarn "to fix dynamic linking inconsistencies by executing:"
-	ewarn "revdep-rebuild -X --library libxklavier.so.11"
+	ewarn "revdep-rebuild --library libxklavier.so.11"
 }
diff --git a/x11-libs/libxklavier/libxklavier-4.0.ebuild b/x11-libs/libxklavier/libxklavier-4.0.ebuild
index 1f11f3ed0911..85a4a46efb9b 100644
--- a/x11-libs/libxklavier/libxklavier-4.0.ebuild
+++ b/x11-libs/libxklavier/libxklavier-4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-4.0.ebuild,v 1.1 2009/07/19 19:50:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-4.0.ebuild,v 1.2 2009/07/20 20:53:16 ssuominen Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="High level XKB library"
 HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
@@ -25,6 +25,13 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.4 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-tests.patch
+	eautoreconf
+}
+
 src_compile() {
 	local xkbbase