commit: d7ada41065c91b3cf76613825e980be30a073f6c Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Wed Apr 22 17:48:06 2015 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Wed Apr 22 17:48:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=d7ada410
sys-apps/kbd: in tree versions work. Package-Manager: portage-2.2.18 Manifest-Sign-Key: 0xF52D4BBA sys-apps/kbd/files/kbd-2.0.0-tests.patch | 31 ------------- sys-apps/kbd/files/kbd-2.0.1-include-stdarg.patch | 11 ----- sys-apps/kbd/kbd-2.0.1-r99.ebuild | 55 ----------------------- sys-apps/kbd/metadata.xml | 5 --- 4 files changed, 102 deletions(-) diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch deleted file mode 100644 index 7a4e186..0000000 --- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index e716b32..0000000 --- a/sys-apps/kbd/files/kbd-2.0.1-include-stdarg.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 102d4cc..0000000 --- a/sys-apps/kbd/kbd-2.0.1-r99.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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 deleted file mode 100644 index 96a2d58..0000000 --- a/sys-apps/kbd/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>base-system</herd> -</pkgmetadata>
