Conditionally build tests (bug #485116, patches by Arfrever).

Package-Manager: portage-2.2.6/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 61 insertions, 15 deletions

diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 9ccaaed3b394..1c5f2ef27c2d 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/kbd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.109 2013/09/16 15:10:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.110 2013/09/16 19:51:10 radhermit Exp $
+
+  16 Sep 2013; Tim Harder <radhermit@gentoo.org> kbd-2.0.0.ebuild,
+  +files/kbd-2.0.0-tests.patch:
+  Conditionally build tests (bug #485116, patches by Arfrever).
 
 *kbd-2.0.0 (16 Sep 2013)
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 064a34d7c855..d009ffd68b21 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -18,6 +18,7 @@ AUX kbd-1.12-xcompile.patch 680 SHA256 78d29c76075cf5ee347461e28ae0ac25a06ce4461
 AUX kbd-1.13-dont-use-error.patch 414 SHA256 9f9e7e860362b7e5402c1c0af55ff301e0542e34aacc71167f9252f50a4f74ca SHA512 26143bb24b3be67b7c3192a2f0bbd22c41fa125ea398fdb5201b51e99207b40bdd12ae0f9e423a8a652cce08631f0a1c659453f4d72dd480a05654078ce951ae WHIRLPOOL ba96cee5b4c07ed1657cf0aedd1a52a474918f6395ad1b3934278f84a6f2bfec6614323773b75e0a09ca03073618436c759597d65be9e8145d316b3d4bde4b0b
 AUX kbd-1.14.1-missing-configure.patch 444 SHA256 0a2a530ac1d2baa03c7cc12e10a242bbc9d128304136f5dba4909d3df2b16eb1 SHA512 daae8e7a0d2a01c66f28964c2208047f561a5587b6ab9ae13f6db217856689f41ea5886367805adbd8e1c77c562727d7013360dd42db6a00a534fbd92031df2d WHIRLPOOL c7efb5d02cd25ccb2dcd376a5c13c32b3972d9ba8e868bbab0b94d8bd9e107e5f4c082242f00335f4786ebca9beb484af64e0681f9b6049348cbdfec8ba01d8c
 AUX kbd-1.15.5-loadkeys-parse.patch 2163 SHA256 8fa928854ee1e3298df99e600cfdb08ccf8b44b7a7fc42423569fecc9365aa22 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d WHIRLPOOL 26b1adadc347b534675c7426eb9aca535556b81cffdd1ccd7ef50c603e127c1f9f6774af1b8050c67fc81daefe0c33da4593f74d3b77c47a089d6772363153e8
+AUX kbd-2.0.0-tests.patch 747 SHA256 b1bd608043ecd19a9f0a9431afd4f3202e4d953b7f5c361d3e5949de65eda852 SHA512 408df2b4a9409c10c350d4c879a273cf7126ba58b49546a910cc93e0fd3119014a32b3e8b9c19eddecc9f601aa9d2a1b2b25c563f9529691c2d44f8db4cd0974 WHIRLPOOL 27e78a5dfb6d4ee3e117cbbfdd3025ee99980201e590c4631fab399a89a408a5275d17beac60da2364d2dfaf7f9e1cfda5c8cc8e74713d4160241bffd41c9b6a
 DIST kbd-1.12.tar.gz 884827 SHA256 f3bc6747dba7d1a35cd125ca0bd4649f88704be211cf7e47d36b43c7f44ce803 SHA512 b0c86b7ccb5e03edfeacf12153fe045aca496aaaf1638bd680fc23db23e59c0acf14868597c4f3e4b60ddb405843cbea010e06176c453a191c067517a117f26b WHIRLPOOL 78d1835617707fe000ca09cd9cff3dfee4a4b8d92d28f695df8b8c83145612a4663e47deb879765edc7eb34920987843a3b720fd4f1279f326771b5ea05a9c8f
 DIST kbd-1.13.tar.bz2 667373 SHA256 c8a5be1a606d925c3229fa91d3e9dde4e0b61b2c755aff8e699b855f1a402bf6
 DIST kbd-1.14.1.tar.gz 1010836 SHA256 e97ed7ec4ec937a27ac2e72789e76db4b661f7ce2c2b7b68524f55ee69dce491
@@ -40,17 +41,17 @@ EBUILD kbd-1.15.4.ebuild 1089 SHA256 3e7a4c3e020721021849e2b7477f5bdbb6ab8af9286
 EBUILD kbd-1.15.5-r1.ebuild 1154 SHA256 2fc545a037fc8d508d5bf5b603dc867fdf843032f11fde9a4fa9f35832b1ac06 SHA512 0e7795d8e61130ade5b47a9792cd2ccd7243d8da252673c2d91cd7bd579dd6a745a9ff2bccf0a2a9b0bb08c5e2c537e750e28668f01a7e14814643eab78dfaca WHIRLPOOL 6b66f7f1cab8dac89aa7a0acc467f86dc4ccf705815068e3d737be9927a12264ec9d44aa06707eb3204197ffdb093c5bf23d4233b26cad2d5d9154d9e085ff8c
 EBUILD kbd-1.15.5.ebuild 1060 SHA256 75ad193dbb5ec82033b6adc51b7b0d0728bf37f9066ae7c2cbe8b89a953d7ecf SHA512 5befeb232ab8aa28faa07268dc4bfa4e6d90d8fb29d5ba777fa651ba3c28a965b3c8a04d9fef2a05373787f0c96e1ab043c41fdf6861f3beefd165423c4d51a6 WHIRLPOOL 25025efe0d2c8b02c6462736bc7471d21524e56f3618eb0f49df182f0bb780c50f2a225cdca8712bf2f8de5cf4ff2ed344efae623b0dea0be926e35451460967
 EBUILD kbd-1.15.ebuild 832 SHA256 2376f968fe6add3c593c7c4b1cecc4c72e02f900c7d1361b921851676c8c6992 SHA512 3c3d824a309514fbd1a66b305532a43d225664f96670e9f46c5c07946ab5fa44a9db925433e05c10a726605056ed3c653a6fd9511f3a6ed00470983e342babc4 WHIRLPOOL 36c01101ade4b77e6d419d2b26d2c403bfded06d7afd7723cec02f99f7d6bde00aab3b4f89feaa615d57f25d3b473a0f00f8d35f9f1338d65ded81e60605dccd
-EBUILD kbd-2.0.0.ebuild 1079 SHA256 d9f58a000cf3282f47d40e4b0843868f7b67fcf25c599e081f268c2686f63133 SHA512 37d9f9de974ebd4a3679b86d3afc5310592440e7c3ab3aa5499e08f4444947077c3d5ffb675643add16877235b75d8553ae7b9b6bf195d768f4a488c16d9ce93 WHIRLPOOL 4fa1c24433538e997d191c5d5da6adebd3ecb87ac35ec39c2163f3f2cc144d205e6b13e897bef24a04c98f0d7e01acf950511a996ca9c3ab8409a9aee344be0a
-MISC ChangeLog 15259 SHA256 49032976bace8a1a6bdb2d575eb5a1d33f50668c086a496f3c0d0fbd94eeec39 SHA512 1d9d790ea8795ecf7866cce39e92a97538f5f223b8a8c0bebf952bf465919a3d7e9765cfbc7f7de84f8895b4c422cab4247e3991c37b3a1bf2e3a176dc3bbab8 WHIRLPOOL ac618717f0744e785d027fa4c082f41e3cd91dad8575cc705b586002d9d76ccb50322b8721ee8bab27a8592b9f0aab968a00d64fcd7682c5cc951d0637f432d2
+EBUILD kbd-2.0.0.ebuild 1243 SHA256 a17952f8c73fa19d3e0132fa1e91104218e58989d5a83ce2d708b7a8ed1d3c87 SHA512 536f36006b8ff1db836e9b58143ac868d724a9d712ed084c23df7f2ad546362c12ca9d9e0d8a70418d7286e821abb5a56ce7253072638f327f18cd9dc61d081b WHIRLPOOL dcb57bb7545d7af1f908afccd199b3ea519404a0da9148bb9d2102823be7f0c1e69f8e50939cbe9e670edc9a02241a90ba75fbd5d38a2297888bf59a120b64ed
+MISC ChangeLog 15423 SHA256 be665e5db1aebe48ca34be88aaead33050cb652ad58c6a55a2a6155fd4e82943 SHA512 9ba8c69f58cc9534d63f5d80275ac938f9830403e0b32b839b145ea99b681b630cd851e3a4465ea14bad9092304f2af8a8d8a58576abb72c4743f9d448c67d84 WHIRLPOOL 1293155cd59c41bdd94ebb9610e20ed7fcc299bb49250a972ae9e51b09f19d11804ea3c13edfbb49f331b10b2f8be40cbb8bdb8743b87c0ab03733be426804f7
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSNx9QAAoJEEqz6FtPBkyjBVsH/RswsklJfmvBFqgpCNns2P1A
-yp9rZSVELc4iArd6acJxlntoufQ+wN5gaLMUQa7IcqEvvEL4xeKV0K6PkTizvyYy
-f9fpSMBITZ+9S06UakEtYmpDtuamM/TYL5pefuBqQ0BXAyiIRJCwRsiYiL9rALNd
-cOK1oiZ2xZ7/5mREiIMFbKWRLiOrRbJUwcM2GpFHHcSpIWhFedspkHXsJsi83Lre
-1VGPlNAMH+TVUpRTuO33/Ol2H+7RTVy/CcRdubW8zhAnwGFFhBwnjnfl9J7S843T
-igaHgfdqHeBtcIgnUMOq7mhYN4yCwNu40bldIWQzC8vNml/3V/FsJwFUIUFCWfk=
-=Xps5
+iQEcBAEBCAAGBQJSN2EyAAoJEEqz6FtPBkyjGKoH/j0gQvVccg2q8Ve/pQX7KyTT
+kS+ZDDYG0m2woY6UotcNiTk1/RoFl2H+pzq9hmgV+tjOcVQCzvwyGiCPwQWhiNkX
+NgqEsPV6IGqhnJs8eNpRs2A3Wgs6BJgg4v0lWwNm5nKZZCaO+dEwN1I7LkO/aczM
+gImUqGySdxKpWxop991Dsk3aYWTmXq/iVmnjEeSKyGs27rMlYrY8ZMgxfFQytZwP
+kSC3GucifARa47kdhDOLw3tpqT4twUvgQlYtVgjFV1dDAHPum6oiCr65g0xkQQuI
+RmwHjtq4eQRg8PbLPtVdhmMufTOUhIqsgBlRmcxdA/AywvVAPzTqi9f8I2LZcaQ=
+=1P4Y
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
new file mode 100644
index 000000000000..7a4e186cbce9
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
@@ -0,0 +1,31 @@
+--- configure.ac
++++ configure.ac
+@@ -11,7 +11,13 @@
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+ 
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++AC_ARG_ENABLE(tests,
++	AS_HELP_STRING(--enable-tests, [build tests]),
++	[BUILD_TESTS=$enableval],[BUILD_TESTS=no])
++AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
++if test "$BUILD_TESTS" = "yes"; then
++	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++fi
+ 
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+--- Makefile.am
++++ Makefile.am
+@@ -8,7 +8,10 @@
+ 	CREDITS \
+ 	contrib docs rc
+ 
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
++if BUILD_TESTS
++SUBDIRS += tests
++endif
+ 
+ kbd-$(VERSION).tar.xz:
+ 	make distcheck
diff --git a/sys-apps/kbd/kbd-2.0.0.ebuild b/sys-apps/kbd/kbd-2.0.0.ebuild
index d014db22096b..1c6e83e3fa80 100644
--- a/sys-apps/kbd/kbd-2.0.0.ebuild
+++ b/sys-apps/kbd/kbd-2.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-2.0.0.ebuild,v 1.1 2013/09/16 15:10:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-2.0.0.ebuild,v 1.2 2013/09/16 19:51:10 radhermit Exp $
 
 EAPI="5"
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Keyboard and console utilities"
 HOMEPAGE="http://freshmeat.net/projects/kbd/"
@@ -13,10 +13,14 @@ SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls pam"
+IUSE="nls pam test"
 
 RDEPEND="pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/check
+		virtual/pkgconfig
+	)"
 
 src_unpack() {
 	default
@@ -34,10 +38,16 @@ src_unpack() {
 	mv qwerty/cz.map qwerty/cz-qwerty.map
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tests.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable pam vlock)
+		$(use_enable pam vlock) \
+		$(use_enable test tests)
 }
 
 src_install() {