sys-apps/kbd: add missing include stdarg.h, bug #497200

5 files changed, 107 insertions, 0 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
new file mode 100644
index 00000000..b1cde8b9
--- /dev/null
+++ b/sys-apps/kbd/Manifest
@@ -0,0 +1,5 @@
+AUX kbd-2.0.0-tests.patch 747 SHA256 b1bd608043ecd19a9f0a9431afd4f3202e4d953b7f5c361d3e5949de65eda852 SHA512 408df2b4a9409c10c350d4c879a273cf7126ba58b49546a910cc93e0fd3119014a32b3e8b9c19eddecc9f601aa9d2a1b2b25c563f9529691c2d44f8db4cd0974 WHIRLPOOL 27e78a5dfb6d4ee3e117cbbfdd3025ee99980201e590c4631fab399a89a408a5275d17beac60da2364d2dfaf7f9e1cfda5c8cc8e74713d4160241bffd41c9b6a
+AUX kbd-2.0.1-include-stdarg.patch 454 SHA256 2ccb196629fb76513e14951c4008d79ac1a1f8613321ffcc9f2bb567dc89815d SHA512 d3bf2de9342e54fb165553b3a4df8621925365d3121cc21423bd60c6523347f75c841fc98ca7f001030d0c24163833a696b4304723ec8195bf15fd44da1efc15 WHIRLPOOL 5b02bd2b509465af0489b7bca9baa2eae72b0d93c76488967dc6b67e78752c1e4e168712ad355bb084f7ef0feedaafe9ab8f4b423ab14a7c405db9d416f98a19
+DIST kbd-2.0.1.tar.xz 951132 SHA256 55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af SHA512 8d6f663611a99426a7259909d1276732635edc90e61a4affc4cebbdd8bcb180c91a19c8f90bc1b6511c57abee66d5fa513f13bc05cfb3903ee51b5048577d836 WHIRLPOOL 3be2d1fb0cae1443dbd813a45cd815664e4bab94fa1bc37b0c3054f86846fa3d69c8c1a5e620413da34d65f58a90768eac22cd24972366f2d8d24fafcd094703
+EBUILD kbd-2.0.1-r99.ebuild 1293 SHA256 c42e0fed216d1ef886baa4a3405ae7da44aee6ff1892b2e109d9c77661d31dda SHA512 224edc7c3d5d920dba9a14f58b145fa1466d90a76021a57243344b5b018b8b46ee63c201685edf76808c0adde3bae6183139b40bb74422cac5a7ec781d559b0a WHIRLPOOL cf05232d6ead0e55d9601db732ee701d39da01c4165919fa72ce57b044b795a64853cbf7b5b93689d860e079d587690a791f92ba4b4fae7fe4e5d12a169e558e
+MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
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 00000000..7a4e186c
--- /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/files/kbd-2.0.1-include-stdarg.patch b/sys-apps/kbd/files/kbd-2.0.1-include-stdarg.patch
new file mode 100644
index 00000000..e716b329
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.0.1-include-stdarg.patch
@@ -0,0 +1,11 @@
+diff -Naur kbd-2.0.1.orig/src/libkeymap/keymap/common.h kbd-2.0.1/src/libkeymap/keymap/common.h
+--- kbd-2.0.1.orig/src/libkeymap/keymap/common.h	2014-01-06 01:22:23.000000000 +0000
++++ kbd-2.0.1/src/libkeymap/keymap/common.h	2014-01-06 00:50:15.000000000 +0000
+@@ -5,6 +5,7 @@
+  * as well as functions to handle parameters.
+  */
+ 
++#include <stdarg.h>
+ #include <keymap/context.h>
+ 
+ /** Initializes the structures necessary to read and/or parse keymap.
diff --git a/sys-apps/kbd/kbd-2.0.1-r99.ebuild b/sys-apps/kbd/kbd-2.0.1-r99.ebuild
new file mode 100644
index 00000000..102d4cc4
--- /dev/null
+++ b/sys-apps/kbd/kbd-2.0.1-r99.ebuild
@@ -0,0 +1,55 @@
+# 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.1.ebuild,v 1.1 2013/12/13 22:31:51 polynomial-c Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Keyboard and console utilities"
+HOMEPAGE="http://kbd-project.org/"
+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 test"
+
+RDEPEND="pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_unpack() {
+	default
+	cd "${S}"
+
+	# broken file ... upstream git punted it
+	rm po/es.po
+
+	# Rename conflicting keymaps to have unique names, bug #293228
+	cd "${S}"/data/keymaps/i386
+	mv dvorak/no.map dvorak/no-dvorak.map
+	mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+	mv olpc/es.map olpc/es-olpc.map
+	mv olpc/pt.map olpc/pt-olpc.map
+	mv qwerty/cz.map qwerty/cz-qwerty.map
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch
+	epatch "${FILESDIR}"/${PN}-2.0.1-include-stdarg.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable pam vlock) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	dohtml docs/doc/*.html
+}
diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
new file mode 100644
index 00000000..96a2d586
--- /dev/null
+++ b/sys-apps/kbd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>