diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2013-09-16 19:51:11 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2013-09-16 19:51:11 +0000 |
| commit | 0eb27a787ce1acc1b6101122033f641eb540ff4e (patch) | |
| tree | 0acbcf5bbb7c420367204dedc84a121f5ac24023 /sys-apps/kbd | |
| parent | EAPI-bump for EPREFIX (diff) | |
| download | gentoo-2-0eb27a787ce1acc1b6101122033f641eb540ff4e.tar.gz gentoo-2-0eb27a787ce1acc1b6101122033f641eb540ff4e.tar.bz2 gentoo-2-0eb27a787ce1acc1b6101122033f641eb540ff4e.zip | |
Conditionally build tests (bug #485116, patches by Arfrever).
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'sys-apps/kbd')
| -rw-r--r-- | sys-apps/kbd/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/kbd/files/kbd-2.0.0-tests.patch | 31 | ||||
| -rw-r--r-- | sys-apps/kbd/kbd-2.0.0.ebuild | 20 |
3 files changed, 51 insertions, 6 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/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() { |