[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 450384483225d06657024d96dddc9ad533f2fdc7 Author: Sam James gentoo org> AuthorDate: Thu Dec 28 04:00:45 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 04:00:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45038448 sys-apps/kbd: drop 2.6.1, 2.6.2, 2.6.3, 2.6.3-r1 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 3 - .../kbd-2.6.3-no-redefine-fortify-source.patch | 45 -- sys-apps/kbd/kbd-2.6.1.ebuild | 86 --- sys-apps/kbd/kbd-2.6.2.ebuild | 86 --- sys-apps/kbd/kbd-2.6.3-r1.ebuild | 96 -- sys-apps/kbd/kbd-2.6.3.ebuild | 86 --- 6 files changed, 402 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 5ed51b0457da..8203afcb6248 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,5 +1,2 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 -DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 -DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2 -DIST kbd-2.6.3.tar.xz 1503048 BLAKE2B 9c3f9e2ec9abd3a18bd4159b3a223deee6aee74610ed843582dc2a0397bb80075ae5e76a67d030fcd7a706641a8fb4604840eec67057271ce3e75a0630145942 SHA512 7daf59557408e1cd29140130094b43d8d89b25b3094fd03912d878483f27d128ad25163ea7023e5a10b7d8b8bf8434447927b69fe0094f8db97484881f23ed60 DIST kbd-2.6.4.tar.xz 1504584 BLAKE2B 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88fb7eb28f7bbb8dd0d86473f48444fd9d80dfc624ce7ba8b39bfe1152ee6cf1877fab444e09600e93dae0ee SHA512 a4149cb0f85fd79b333a6c137d70896a30ebceb1cf9d4b5eef3abb2e1866d83b46cee651e4f3e512bf7e0ccd232d955c14f693e57020a3626e4943c4695fc8ab diff --git a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch deleted file mode 100644 index 2edd547d1ed2.. --- a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/legionus/kbd/pull/103 - -From 3392e2038dee97361d7438512653736d72a02109 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Wed, 4 Oct 2023 14:47:33 +0100 -Subject: [PATCH] Use `AX_ADD_FORTIFY_SOURCE` to avoid redefining - `_FORTIFY_SOURCE` - -Some distributions are now setting -D_FORTIFY_SOURCE=3 by default in their -toolchains rather than _F_S=2. By forcing _F_S=2, this causes both a warning -and a downgrade in the effective protection. - -Use the autoconf-archive macro for this purpose (AX_ADD_FORTIFY_SOURCE) -to add the fortification at the highest supported level if the compiler doesn't -already default to it. - -Bug: https://bugs.gentoo.org/892834 -Signed-off-by: Sam James - configure.ac| 5 +- - m4/ax_add_fortify_source.m4 | 119 - 2 files changed, 122 insertions(+), 2 deletions(-) - create mode 100644 m4/ax_add_fortify_source.m4 - -diff --git a/configure.ac b/configure.ac -index 66023ff8..7fdbe7d6 100644 a/configure.ac -+++ b/configure.ac -@@ -63,13 +63,14 @@ strspn strstr strtol strtoul setpgrp malloc realloc]) - - AC_SEARCH_LIBS([timer_create], [rt]) - -+AX_ADD_FORTIFY_SOURCE -+ - # Optimization level - CC_O_LEVEL="-O2" --FORTIFY_SOURCE="-D_FORTIFY_SOURCE=2" - - if test "$enable_code_coverage" = yes; then - CC_O_LEVEL="-O0" -- FORTIFY_SOURCE= -+ FORTIFY_SOURCE="-U_FORTIFY_SOURCE" - fi - - case "$GCC,$ac_cv_prog_cc_g" in diff --git a/sys-apps/kbd/kbd-2.6.1.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild deleted file mode 100644 index d08263ba5bdd.. --- a/sys-apps/kbd/kbd-2.6.1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_BRANCH="master" -else - if [[ $(ver_cut 3) -lt 90 ]] ; then - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: bcb72bcfdad0fa86af8942401c3d02a536efed04 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 15 10:47:14 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 15 10:47:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb72bcf sys-apps/kbd: Stabilize 2.6.4 ppc64, #919954 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kbd/kbd-2.6.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.4.ebuild b/sys-apps/kbd/kbd-2.6.4.ebuild index 84052019ac2f..bc12f711c4bc 100644 --- a/sys-apps/kbd/kbd-2.6.4.ebuild +++ b/sys-apps/kbd/kbd-2.6.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 21fcf91db4c3351d4c7d11151341e27b1743c935 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 08:41:44 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 08:41:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fcf91d sys-apps/kbd: Stabilize 2.6.4 amd64, #919954 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.4.ebuild b/sys-apps/kbd/kbd-2.6.4.ebuild index b041ce72b135..a9bb85e3f5ee 100644 --- a/sys-apps/kbd/kbd-2.6.4.ebuild +++ b/sys-apps/kbd/kbd-2.6.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 84efc1870a29e0ed2d33d3cdc502aa0043b38a7f Author: Sam James gentoo org> AuthorDate: Fri Dec 15 08:29:09 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 08:29:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84efc187 sys-apps/kbd: Stabilize 2.6.4 arm, #919954 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.4.ebuild b/sys-apps/kbd/kbd-2.6.4.ebuild index 4f34c94bc61c..b041ce72b135 100644 --- a/sys-apps/kbd/kbd-2.6.4.ebuild +++ b/sys-apps/kbd/kbd-2.6.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 7ebbf3f1c76a99b2d8469d40cbc8a3956b031561 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:48:49 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:48:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebbf3f1 sys-apps/kbd: Stabilize 2.6.4 arm64, #919954 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.4.ebuild b/sys-apps/kbd/kbd-2.6.4.ebuild index 23a50e0bfa38..4f34c94bc61c 100644 --- a/sys-apps/kbd/kbd-2.6.4.ebuild +++ b/sys-apps/kbd/kbd-2.6.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 7165725c89256b243851005c7f76880b56d87396 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:33:57 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:33:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7165725c sys-apps/kbd: Stabilize 2.6.3-r1 sparc, #919954 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.3-r1.ebuild b/sys-apps/kbd/kbd-2.6.3-r1.ebuild index eed10f10659a..864d91a66b0d 100644 --- a/sys-apps/kbd/kbd-2.6.3-r1.ebuild +++ b/sys-apps/kbd/kbd-2.6.3-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86" else SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: b22aae7c3478b0d7de98be7b81d91bc3e3b259c0 Author: Sam James gentoo org> AuthorDate: Fri Dec 15 07:13:29 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 15 07:13:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22aae7c sys-apps/kbd: Stabilize 2.6.3-r1 arm, #919954 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.3-r1.ebuild b/sys-apps/kbd/kbd-2.6.3-r1.ebuild index 0bacea6493e4..eed10f10659a 100644 --- a/sys-apps/kbd/kbd-2.6.3-r1.ebuild +++ b/sys-apps/kbd/kbd-2.6.3-r1.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 03be10df9dd6b8f85909de2a042e2a86f2f0aa01 Author: Sam James gentoo org> AuthorDate: Tue Dec 12 04:57:09 2023 + Commit: Sam James gentoo org> CommitDate: Tue Dec 12 04:57:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03be10df sys-apps/kbd: add 2.6.4 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.6.4.ebuild | 86 +++ 2 files changed, 87 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 4763bd1a80fc..5ed51b0457da 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -2,3 +2,4 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e1 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2 DIST kbd-2.6.3.tar.xz 1503048 BLAKE2B 9c3f9e2ec9abd3a18bd4159b3a223deee6aee74610ed843582dc2a0397bb80075ae5e76a67d030fcd7a706641a8fb4604840eec67057271ce3e75a0630145942 SHA512 7daf59557408e1cd29140130094b43d8d89b25b3094fd03912d878483f27d128ad25163ea7023e5a10b7d8b8bf8434447927b69fe0094f8db97484881f23ed60 +DIST kbd-2.6.4.tar.xz 1504584 BLAKE2B 25e55be0210c206c1f5eb0d85045bb1cbb2442cf88fb7eb28f7bbb8dd0d86473f48444fd9d80dfc624ce7ba8b39bfe1152ee6cf1877fab444e09600e93dae0ee SHA512 a4149cb0f85fd79b333a6c137d70896a30ebceb1cf9d4b5eef3abb2e1866d83b46cee651e4f3e512bf7e0ccd232d955c14f693e57020a3626e4943c4695fc8ab diff --git a/sys-apps/kbd/kbd-2.6.4.ebuild b/sys-apps/kbd/kbd-2.6.4.ebuild new file mode 100644 index ..23a50e0bfa38 --- /dev/null +++ b/sys-apps/kbd/kbd-2.6.4.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="https://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls selinux pam test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +DEPEND=" + app-alternatives/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_prepare() { + default + + # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. + pushd "${S}"/data/keymaps/i386 &> /dev/null || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die + + if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + --disable-werror + + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 68508019cec4a5622ffab2825ea9e8f6cdd42a84 Author: Sam James gentoo org> AuthorDate: Fri Oct 6 15:03:57 2023 + Commit: Sam James gentoo org> CommitDate: Fri Oct 6 15:03:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68508019 sys-apps/kbd: BDEPEND on autoconf-archive Needed for ax_check_compile_flag too. Closes: https://bugs.gentoo.org/915257 Signed-off-by: Sam James gentoo.org> .../kbd-2.6.3-no-redefine-fortify-source.patch | 126 - sys-apps/kbd/kbd-2.6.3-r1.ebuild | 2 + 2 files changed, 2 insertions(+), 126 deletions(-) diff --git a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch index b18fb9f751cf..2edd547d1ed2 100644 --- a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch +++ b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch @@ -43,129 +43,3 @@ index 66023ff8..7fdbe7d6 100644 fi case "$GCC,$ac_cv_prog_cc_g" in -diff --git a/m4/ax_add_fortify_source.m4 b/m4/ax_add_fortify_source.m4 -new file mode 100644 -index ..860c1598 /dev/null -+++ b/m4/ax_add_fortify_source.m4 -@@ -0,0 +1,119 @@ -+# === -+# https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html -+# === -+# -+# SYNOPSIS -+# -+# AX_ADD_FORTIFY_SOURCE -+# -+# DESCRIPTION -+# -+# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro -+# redefinition warnings, other cpp warnings or linker. Some distributions -+# (such as Ubuntu or Gentoo Linux) enable _FORTIFY_SOURCE globally in -+# their compilers, leading to unnecessary warnings in the form of -+# -+# :0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] -+# : note: this is the location of the previous definition -+# -+# which is a problem if -Werror is enabled. This macro checks whether -+# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2 -+# to CPPFLAGS. -+# -+# Newer mingw-w64 msys2 package comes with a bug in -+# headers-git-7.0.0.5546.d200317d-1. It broke -D_FORTIFY_SOURCE support, -+# and would need -lssp or -fstack-protector. See -+# https://github.com/msys2/MINGW-packages/issues/5803. Try to actually -+# link it. -+# -+# LICENSE -+# -+# Copyright (c) 2017 David Seifert -+# Copyright (c) 2019, 2023 Reini Urban -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 10 -+ -+AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[ -+ac_save_cflags=$CFLAGS -+ac_cwerror_flag=yes -+AX_CHECK_COMPILE_FLAG([-Werror],[CFLAGS="$CFLAGS -Werror"]) -+ax_add_fortify_3_failed= -+AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=3 to CPPFLAGS]) -+AC_LINK_IFELSE([ -+AC_LANG_PROGRAM([], -+[[ -+#ifndef _FORTIFY_SOURCE -+return 0; -+#else -+_FORTIFY_SOURCE_already_defined; -+#endif -+]] -+)], -+AC_LINK_IFELSE([ -+AC_LANG_SOURCE([[ -+#define _FORTIFY_SOURCE 3 -+#include -+int main(void) { -+char *s = " "; -+strcpy(s, "x"); -+return strlen(s)-1; -+} -+ ]] -+)], -+[ -+ AC_MSG_RESULT([yes]) -+ CFLAGS=$ac_save_cflags -+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=3" -+], [ -+ AC_MSG_RESULT([no]) -+ ax_add_fortify_3_failed=1 -+], -+), -+[ -+ AC_MSG_RESULT([no]) -+ ax_add_fortify_3_failed=1 -+]) -+if test -n "$ax_add_fortify_3_failed" -+then -+AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS]) -+AC_LINK_IFELSE([ -+AC_LANG_PROGRAM([], -+[[ -+#ifndef _FORTIFY_SOURCE -+return 0; -+#else -+_FORTIFY_SOURCE_already_defined; -+#endif -+]] -+)], -+AC_LINK_IFELSE([ -+AC_LANG_SOURCE([[ -+#define _FORTIFY_SOURCE 2 -+#include -+int main(void) { -+char *s = " "; -+strcpy(s, "x"); -+return strlen(s)-1; -+} -+ ]] -+)], -+[ -+ AC_MSG_RESULT([yes]) -+ CFLAGS=$ac_save_cflags -+ CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" -+], [ -+ AC_MSG_R
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/, sys-apps/kbd/files/
commit: a82615f6b9ef054b0d937bbde647c552905945e6 Author: Sam James gentoo org> AuthorDate: Wed Oct 4 14:04:39 2023 + Commit: Sam James gentoo org> CommitDate: Wed Oct 4 15:10:43 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82615f6 sys-apps/kbd: don't redefine _FORTIFY_SOURCE Closes: https://bugs.gentoo.org/892834 Signed-off-by: Sam James gentoo.org> .../kbd-2.6.3-no-redefine-fortify-source.patch | 171 + sys-apps/kbd/kbd-2.6.3-r1.ebuild | 94 +++ 2 files changed, 265 insertions(+) diff --git a/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch new file mode 100644 index ..b18fb9f751cf --- /dev/null +++ b/sys-apps/kbd/files/kbd-2.6.3-no-redefine-fortify-source.patch @@ -0,0 +1,171 @@ +https://github.com/legionus/kbd/pull/103 + +From 3392e2038dee97361d7438512653736d72a02109 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 4 Oct 2023 14:47:33 +0100 +Subject: [PATCH] Use `AX_ADD_FORTIFY_SOURCE` to avoid redefining + `_FORTIFY_SOURCE` + +Some distributions are now setting -D_FORTIFY_SOURCE=3 by default in their +toolchains rather than _F_S=2. By forcing _F_S=2, this causes both a warning +and a downgrade in the effective protection. + +Use the autoconf-archive macro for this purpose (AX_ADD_FORTIFY_SOURCE) +to add the fortification at the highest supported level if the compiler doesn't +already default to it. + +Bug: https://bugs.gentoo.org/892834 +Signed-off-by: Sam James +--- + configure.ac| 5 +- + m4/ax_add_fortify_source.m4 | 119 + 2 files changed, 122 insertions(+), 2 deletions(-) + create mode 100644 m4/ax_add_fortify_source.m4 + +diff --git a/configure.ac b/configure.ac +index 66023ff8..7fdbe7d6 100644 +--- a/configure.ac b/configure.ac +@@ -63,13 +63,14 @@ strspn strstr strtol strtoul setpgrp malloc realloc]) + + AC_SEARCH_LIBS([timer_create], [rt]) + ++AX_ADD_FORTIFY_SOURCE ++ + # Optimization level + CC_O_LEVEL="-O2" +-FORTIFY_SOURCE="-D_FORTIFY_SOURCE=2" + + if test "$enable_code_coverage" = yes; then + CC_O_LEVEL="-O0" +- FORTIFY_SOURCE= ++ FORTIFY_SOURCE="-U_FORTIFY_SOURCE" + fi + + case "$GCC,$ac_cv_prog_cc_g" in +diff --git a/m4/ax_add_fortify_source.m4 b/m4/ax_add_fortify_source.m4 +new file mode 100644 +index ..860c1598 +--- /dev/null b/m4/ax_add_fortify_source.m4 +@@ -0,0 +1,119 @@ ++# === ++# https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html ++# === ++# ++# SYNOPSIS ++# ++# AX_ADD_FORTIFY_SOURCE ++# ++# DESCRIPTION ++# ++# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro ++# redefinition warnings, other cpp warnings or linker. Some distributions ++# (such as Ubuntu or Gentoo Linux) enable _FORTIFY_SOURCE globally in ++# their compilers, leading to unnecessary warnings in the form of ++# ++# :0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] ++# : note: this is the location of the previous definition ++# ++# which is a problem if -Werror is enabled. This macro checks whether ++# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2 ++# to CPPFLAGS. ++# ++# Newer mingw-w64 msys2 package comes with a bug in ++# headers-git-7.0.0.5546.d200317d-1. It broke -D_FORTIFY_SOURCE support, ++# and would need -lssp or -fstack-protector. See ++# https://github.com/msys2/MINGW-packages/issues/5803. Try to actually ++# link it. ++# ++# LICENSE ++# ++# Copyright (c) 2017 David Seifert ++# Copyright (c) 2019, 2023 Reini Urban ++# ++# Copying and distribution of this file, with or without modification, are ++# permitted in any medium without royalty provided the copyright notice ++# and this notice are preserved. This file is offered as-is, without any ++# warranty. ++ ++#serial 10 ++ ++AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[ ++ac_save_cflags=$CFLAGS ++ac_cwerror_flag=yes ++AX_CHECK_COMPILE_FLAG([-Werror],[CFLAGS="$CFLAGS -Werror"]) ++ax_add_fortify_3_failed= ++AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=3 to CPPFLAGS]) ++AC_LINK_IFELSE([ ++AC_LANG_PROGRAM([], ++[[ ++#ifndef _FORTIFY_SOURCE ++return 0; ++#else ++_FORTIFY_SOURCE_already_defined; ++#endif ++]] ++)], ++AC_LINK_IFELSE([ ++AC_LANG_SOURCE([[ ++#define _FORTIFY_SOURCE 3 ++#include ++int main(void) { ++char *s = " "; ++strcpy(s, "x"); ++return strlen(s)-1; ++} ++ ]] ++)], ++
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 8f6f8dd02e2c34517718402ebdad08ecf63d5869 Author: Sam James gentoo org> AuthorDate: Thu Sep 21 07:38:17 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 21 07:38:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6f8dd0 sys-apps/kbd: add 2.6.3 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.6.3.ebuild | 86 +++ 2 files changed, 87 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 50659e27479a..4763bd1a80fc 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,4 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2 +DIST kbd-2.6.3.tar.xz 1503048 BLAKE2B 9c3f9e2ec9abd3a18bd4159b3a223deee6aee74610ed843582dc2a0397bb80075ae5e76a67d030fcd7a706641a8fb4604840eec67057271ce3e75a0630145942 SHA512 7daf59557408e1cd29140130094b43d8d89b25b3094fd03912d878483f27d128ad25163ea7023e5a10b7d8b8bf8434447927b69fe0094f8db97484881f23ed60 diff --git a/sys-apps/kbd/kbd-2.6.3.ebuild b/sys-apps/kbd/kbd-2.6.3.ebuild new file mode 100644 index ..23a50e0bfa38 --- /dev/null +++ b/sys-apps/kbd/kbd-2.6.3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="https://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls selinux pam test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +DEPEND=" + app-alternatives/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_prepare() { + default + + # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. + pushd "${S}"/data/keymaps/i386 &> /dev/null || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die + + if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + --disable-werror + + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: a8f806d71e791d2384e9ed4b6a17457e6c011e74 Author: Sam James gentoo org> AuthorDate: Thu Sep 7 20:52:22 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 7 20:52:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f806d7 sys-apps/kbd: Stabilize 2.6.1 arm, #913803 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.1.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild index 0952b49ff0a8..8a1357968d35 100644 --- a/sys-apps/kbd/kbd-2.6.1.ebuild +++ b/sys-apps/kbd/kbd-2.6.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 56a8cfc5865f9f5949f5f3384e21b37551ca8426 Author: Sam James gentoo org> AuthorDate: Thu Sep 7 20:52:23 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 7 20:52:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a8cfc5 sys-apps/kbd: Stabilize 2.6.1 sparc, #913803 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.1.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild index 8a1357968d35..b40c72edc29d 100644 --- a/sys-apps/kbd/kbd-2.6.1.ebuild +++ b/sys-apps/kbd/kbd-2.6.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: a57a77441eefded51c5c8864c51817ac08c583f8 Author: Sam James gentoo org> AuthorDate: Thu Sep 7 20:16:07 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 7 20:16:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57a7744 sys-apps/kbd: Stabilize 2.6.1 x86, #913803 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.6.1.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild index 23a50e0bfa38..0952b49ff0a8 100644 --- a/sys-apps/kbd/kbd-2.6.1.ebuild +++ b/sys-apps/kbd/kbd-2.6.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 0f9b75d8d58528a0a92567d501e55a760d8d4314 Author: Sam James gentoo org> AuthorDate: Thu Aug 17 05:45:53 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 17 05:54:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9b75d8 sys-apps/kbd: add 2.6.2 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.6.2.ebuild | 86 +++ 2 files changed, 87 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index d1aaae7085d8..50659e27479a 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1,3 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 +DIST kbd-2.6.2.tar.xz 1503532 BLAKE2B aa146177b2ffd9d6d396c253ce54d0ee42e1a1a2ba471ae0f8950a72b49f2f83aa4660337a581150cfd9fae0b9a4415725f4d152e83c0bdf26b833a31f6e2696 SHA512 afcac33e2e8eecd6f9cfa20bb39254deffc4d8924c4f722d003bdfaf286dac7d87f55ed0a5a35d341ae88fc48162966d5aa1ab8125b11e845bf3c2589a17c8d2 diff --git a/sys-apps/kbd/kbd-2.6.2.ebuild b/sys-apps/kbd/kbd-2.6.2.ebuild new file mode 100644 index ..23a50e0bfa38 --- /dev/null +++ b/sys-apps/kbd/kbd-2.6.2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="https://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls selinux pam test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +DEPEND=" + app-alternatives/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_prepare() { + default + + # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. + pushd "${S}"/data/keymaps/i386 &> /dev/null || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die + + if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + --disable-werror + + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 4a8a46e0a73109883117d43b75ab71d6e33b31c8 Author: Sam James gentoo org> AuthorDate: Wed Jun 28 22:38:21 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jun 28 22:38:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8a46e0 sys-apps/kbd: drop 2.6.0 2.6.1 is a bug fix release on 2.6.0 to fix a regression, 2.6.0 was a short-lived release. Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 - sys-apps/kbd/kbd-2.6.0.ebuild | 86 --- 2 files changed, 87 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index a13778d95a8b..d1aaae7085d8 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,2 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 -DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27 DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 diff --git a/sys-apps/kbd/kbd-2.6.0.ebuild b/sys-apps/kbd/kbd-2.6.0.ebuild deleted file mode 100644 index 23a50e0bfa38.. --- a/sys-apps/kbd/kbd-2.6.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} == ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_BRANCH="master" -else - if [[ $(ver_cut 3) -lt 90 ]] ; then - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - else - inherit autotools - SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - fi -fi - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="https://kbd-project.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls selinux pam test" -RESTRICT="!test? ( test )" - -# Testsuite's Makefile.am calls missing(!) -# ... but this seems to be consistent with the autoconf docs? -# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html -QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" - -DEPEND=" - app-alternatives/gzip - pam? ( - !app-misc/vlock - sys-libs/pam - ) -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-loadkeys ) -" -BDEPEND=" - virtual/pkgconfig - test? ( dev-libs/check ) -" - -src_prepare() { - default - - # Rename conflicting keymaps to have unique names, bug #293228 - # See also https://github.com/legionus/kbd/issues/76. - pushd "${S}"/data/keymaps/i386 &> /dev/null || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die - popd &> /dev/null || die - - if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then - eautoreconf - fi -} - -src_configure() { - local myeconfargs=( - --disable-werror - - $(use_enable nls) - $(use_enable pam vlock) - $(use_enable test tests) - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - docinto html - dodoc docs/doc/*.html - - # USE="test" installs .la files - find "${ED}" -type f -name "*.la" -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: f535671746e4de849eca6595a44b774bc26c2849 Author: Sam James gentoo org> AuthorDate: Wed Jun 28 22:14:19 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jun 28 22:14:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5356717 sys-apps/kbd: add 2.6.1 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.6.1.ebuild | 86 +++ 2 files changed, 87 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 44730a32557c..a13778d95a8b 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1,3 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27 +DIST kbd-2.6.1.tar.xz 1591240 BLAKE2B 15c738379cfa9420e218ddbf6562e2c75b6bf5eb31ce159d798d49546991ca0c02bf9a11486d99bd2ba7d99f3bf6abb53ad799c6314df6d9ca9b1e8cf808b738 SHA512 8d7f39efa91ef16f4c0601c1744e7f00e411c121607660c8f585d3e085d8e8bea4ea095f6c7f491af763097a9844fb4a07d4b78a8358cb7caafbfda0626acf91 diff --git a/sys-apps/kbd/kbd-2.6.1.ebuild b/sys-apps/kbd/kbd-2.6.1.ebuild new file mode 100644 index ..23a50e0bfa38 --- /dev/null +++ b/sys-apps/kbd/kbd-2.6.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="https://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls selinux pam test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +DEPEND=" + app-alternatives/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_prepare() { + default + + # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. + pushd "${S}"/data/keymaps/i386 &> /dev/null || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die + + if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + --disable-werror + + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: d423fe7350d9d29e949cc7b7cf41f89cfc53f448 Author: Sam James gentoo org> AuthorDate: Wed Jun 28 07:43:55 2023 + Commit: Sam James gentoo org> CommitDate: Wed Jun 28 07:50:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d423fe73 sys-apps/kbd: add missing selinux policy dep Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.6.0.ebuild | 9 ++--- sys-apps/kbd/kbd-.ebuild | 9 ++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sys-apps/kbd/kbd-2.6.0.ebuild b/sys-apps/kbd/kbd-2.6.0.ebuild index 47ef0e794f21..23a50e0bfa38 100644 --- a/sys-apps/kbd/kbd-2.6.0.ebuild +++ b/sys-apps/kbd/kbd-2.6.0.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://kbd-project.org/"; LICENSE="GPL-2" SLOT="0" -IUSE="nls pam test" +IUSE="nls selinux pam test" RESTRICT="!test? ( test )" # Testsuite's Makefile.am calls missing(!) @@ -30,14 +30,17 @@ RESTRICT="!test? ( test )" # Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" -RDEPEND=" +DEPEND=" app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam ) " -DEPEND="${RDEPEND}" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" BDEPEND=" virtual/pkgconfig test? ( dev-libs/check ) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 47ef0e794f21..23a50e0bfa38 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -22,7 +22,7 @@ HOMEPAGE="https://kbd-project.org/"; LICENSE="GPL-2" SLOT="0" -IUSE="nls pam test" +IUSE="nls selinux pam test" RESTRICT="!test? ( test )" # Testsuite's Makefile.am calls missing(!) @@ -30,14 +30,17 @@ RESTRICT="!test? ( test )" # Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" -RDEPEND=" +DEPEND=" app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam ) " -DEPEND="${RDEPEND}" +RDEPEND=" + ${DEPEND} + selinux? ( sec-policy/selinux-loadkeys ) +" BDEPEND=" virtual/pkgconfig test? ( dev-libs/check )
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: ab25a51f63840634ef6765904abd0eaa63afe66a Author: Sam James gentoo org> AuthorDate: Mon Jun 12 20:41:35 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jun 12 20:41:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab25a51f sys-apps/kbd: add 2.6.0 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.6.0.ebuild | 83 +++ 2 files changed, 84 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 760515e63a39..44730a32557c 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1 +1,2 @@ DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 +DIST kbd-2.6.0.tar.xz 1590196 BLAKE2B 9894bab607694cc60cece959573b8f13f687d47b4346fa84e57bffd2c062a5ac2830f9a6766aca70d2242f63f486c898fe5d777fc01dfabe85d004b1f29d364a SHA512 4b8cec06ea2143a285bedb95cb66c313ebac79dc3c64956f969f389186609bc1a066dbf32d6ae308e18947dcbe2f6f684f6c69d4210b40d449735e5704707b27 diff --git a/sys-apps/kbd/kbd-2.6.0.ebuild b/sys-apps/kbd/kbd-2.6.0.ebuild new file mode 100644 index ..47ef0e794f21 --- /dev/null +++ b/sys-apps/kbd/kbd-2.6.0.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="https://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" + +RDEPEND=" + app-alternatives/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_prepare() { + default + + # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. + pushd "${S}"/data/keymaps/i386 &> /dev/null || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die + + if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + --disable-werror + + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 19e18130b1210774201080bd434beb6f4dbb585e Author: Sam James gentoo org> AuthorDate: Sun May 28 13:29:07 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 28 13:29:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19e18130 sys-apps/kbd: crank copyright Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- sys-apps/kbd/kbd-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index 31d013a64b2d..4b306c04b9fd 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index e1b766bdd010..47ef0e794f21 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: bd9bc46aefc25565e7a9ed968d61f07604686344 Author: NRK disroot org> AuthorDate: Sat May 13 05:05:58 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 28 13:28:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9bc46a sys-apps/kbd: depend on app-alternatives/gzip ...instead of directly depending on app-arch/gzip since users can select alternative implementations (such as pigz) through the app-alternatives system. Closes: https://bugs.gentoo.org/907296 Signed-off-by: NRK disroot.org> Closes: https://github.com/gentoo/gentoo/pull/31014 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- sys-apps/kbd/kbd-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index 9820c07ff6ee..31d013a64b2d 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -31,7 +31,7 @@ RESTRICT="!test? ( test )" QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" RDEPEND=" - app-arch/gzip + app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index a8607b2c1f1d..e1b766bdd010 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -31,7 +31,7 @@ RESTRICT="!test? ( test )" QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" RDEPEND=" - app-arch/gzip + app-alternatives/gzip pam? ( !app-misc/vlock sys-libs/pam
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: b5cd05a5aa76d6c929499327c0a9df318763430e Author: Sam James gentoo org> AuthorDate: Fri Sep 23 02:10:45 2022 + Commit: Sam James gentoo org> CommitDate: Fri Sep 23 02:13:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5cd05a5 sys-apps/kbd: drop 2.4.0 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 - sys-apps/kbd/kbd-2.4.0.ebuild | 84 --- 2 files changed, 85 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 18b8b26b539f..760515e63a39 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1 @@ -DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild deleted file mode 100644 index d857523a184d.. --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == "" ]] ; then - inherit autotools git-r3 - #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_REPO_URI="https://github.com/legionus/kbd.git"; - EGIT_BRANCH="master" -else - if [[ $(ver_cut 3) -lt 90 ]] ; then - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - else - inherit autotools - SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - fi -fi - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" -#RESTRICT="!test? ( test )" -# Need to check autotest bit (see bug #732868) -RESTRICT="test" - -RDEPEND=" - app-arch/gzip - pam? ( - !app-misc/vlock - sys-libs/pam - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( dev-libs/check ) -" - -src_unpack() { - if [[ ${PV} == "" ]] ; then - git-r3_src_unpack - else - default - fi - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die -} - -src_prepare() { - default - if [[ ${PV} == "" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then - eautoreconf - fi -} - -src_configure() { - local myeconfargs=( - # USE="test" installs .a files - --disable-static - $(use_enable nls) - $(use_enable pam vlock) - $(use_enable test tests) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - docinto html - dodoc docs/doc/*.html - - # USE="test" installs .la files - find "${ED}" -type f -name "*.la" -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 77e4993396abf0bd5329178a4102ecdc3ff75466 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Sep 17 05:38:04 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Sep 17 05:38:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e49933 sys-apps/kbd: Stabilize 2.5.1 ppc64, #868987 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index f644320790bb..9820c07ff6ee 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 1c9da974817caae66f69ea2703a3faf92517a9d3 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 16 18:18:42 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 16 18:18:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c9da974 sys-apps/kbd: Stabilize 2.5.1 ppc, #868987 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index ae4dd1af0149..f644320790bb 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: bbbde6f6affe8cd74035661c55b9c5b290171ebc Author: Arthur Zamarin gentoo org> AuthorDate: Fri Sep 16 08:50:30 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Sep 16 08:50:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbbde6f6 sys-apps/kbd: Stabilize 2.5.1 hppa, #868987 Signed-off-by: Arthur Zamarin gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index d0ec6e836f33..ae4dd1af0149 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 852e05608eac184d1415c1d37e2e0617eb21d28b Author: Sam James gentoo org> AuthorDate: Wed Sep 7 01:49:22 2022 + Commit: Sam James gentoo org> CommitDate: Wed Sep 7 01:49:22 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852e0560 sys-apps/kbd: Stabilize 2.5.1 sparc, #868987 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index ef9e8d420757..d0ec6e836f33 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 91079c0b605a392b7e784e8c7bbd518902019d68 Author: Jakov Smolić gentoo org> AuthorDate: Tue Sep 6 21:58:57 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Sep 6 21:58:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91079c0b sys-apps/kbd: Stabilize 2.5.1 amd64, #868987 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index 78eacc4e0d0e..ef9e8d420757 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: df885eaf70e4fd04c9d81cbd946de17abff36853 Author: Jakov Smolić gentoo org> AuthorDate: Tue Sep 6 21:49:00 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Sep 6 21:49:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df885eaf sys-apps/kbd: Stabilize 2.5.1 x86, #868987 Signed-off-by: Jakov Smolić gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index 9a04919fa689..78eacc4e0d0e 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: e302a61df2f132ed24d0872d1dd8cf37f0d12264 Author: Sam James gentoo org> AuthorDate: Tue Sep 6 21:35:09 2022 + Commit: Sam James gentoo org> CommitDate: Tue Sep 6 21:35:09 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e302a61d sys-apps/kbd: Stabilize 2.5.1 arm64, #868987 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index d7819b13a760..9a04919fa689 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 5f0e55c1d06170ada69da0e960db5c7a261b72fb Author: Sam James gentoo org> AuthorDate: Tue Sep 6 21:27:52 2022 + Commit: Sam James gentoo org> CommitDate: Tue Sep 6 21:27:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0e55c1 sys-apps/kbd: Stabilize 2.5.1 arm, #868987 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.5.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild index a8607b2c1f1d..d7819b13a760 100644 --- a/sys-apps/kbd/kbd-2.5.1.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 37ab865e122f009f734240616852c80e08353f0c Author: David Seifert gentoo org> AuthorDate: Tue Jun 21 09:40:40 2022 + Commit: David Seifert gentoo org> CommitDate: Tue Jun 21 09:40:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ab865e sys-apps/kbd: drop 2.5.0 Signed-off-by: David Seifert gentoo.org> sys-apps/kbd/Manifest | 1 - sys-apps/kbd/kbd-2.5.0.ebuild | 100 -- 2 files changed, 101 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 5ef0f4c45812..18b8b26b539f 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,2 @@ DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb -DIST kbd-2.5.0.tar.xz 1490112 BLAKE2B c123982d5c80fa3996f6328d7151a9dcc8c969e7beeb65e83204857b044355a3531dd1efe5634d844bc43f8d5715ec63e41120679a3d34888766ef7bf6014f2b SHA512 740c4c7b8a2729f5d0539399f691d4201dab97c6eec554b82cc8c80935e956072e9735a739f8f4febc9849c1e8d9d195318b1d0d4e10dce4d34b5fb6d84111d7 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 diff --git a/sys-apps/kbd/kbd-2.5.0.ebuild b/sys-apps/kbd/kbd-2.5.0.ebuild deleted file mode 100644 index d0f3a2573fa7.. --- a/sys-apps/kbd/kbd-2.5.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} == ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_BRANCH="master" -else - if [[ $(ver_cut 3) -lt 90 ]] ; then - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - else - inherit autotools - SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - fi -fi - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="https://kbd-project.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" -RESTRICT="!test? ( test )" - -# Testsuite's Makefile.am calls missing(!) -# ... but this seems to be consistent with the autoconf docs? -# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html -QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" - -RDEPEND=" - app-arch/gzip - pam? ( - !app-misc/vlock - sys-libs/pam - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( dev-libs/check ) -" - -src_unpack() { - if [[ ${PV} == ]] ; then - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - default - - # Rename conflicting keymaps to have unique names, bug #293228 - # See also https://github.com/legionus/kbd/issues/76. - cd "${S}"/data/keymaps/i386 || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die - - if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then - eautoreconf - fi -} - -src_configure() { - local myeconfargs=( - # USE="test" installs .a files - --disable-static - --disable-werror - $(use_enable nls) - $(use_enable pam vlock) - $(use_enable test tests) - ) - - econf "${myeconfargs[@]}" -} - -src_test() { - # Cheesy hack for now for https://github.com/legionus/kbd/issues/76 - mv "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map "${S}"/data/keymaps/i386/qwerty/cz.map || die - - default - - mv "${S}"/data/keymaps/i386/qwerty/cz.map "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map || die -} - -src_install() { - default - - docinto html - dodoc docs/doc/*.html - - # USE="test" installs .la files - find "${ED}" -type f -name "*.la" -delete || die -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 71868b05b9ec0054659eaea73c0695695d804ddb Author: Sam James gentoo org> AuthorDate: Thu Jun 16 17:07:28 2022 + Commit: Sam James gentoo org> CommitDate: Thu Jun 16 17:07:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71868b05 sys-apps/kbd: add 2.5.1 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/{kbd-.ebuild => kbd-2.5.1.ebuild} | 25 -- sys-apps/kbd/kbd-.ebuild | 25 -- 3 files changed, 9 insertions(+), 42 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 01c0afbdec91..5ef0f4c45812 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1,3 @@ DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb DIST kbd-2.5.0.tar.xz 1490112 BLAKE2B c123982d5c80fa3996f6328d7151a9dcc8c969e7beeb65e83204857b044355a3531dd1efe5634d844bc43f8d5715ec63e41120679a3d34888766ef7bf6014f2b SHA512 740c4c7b8a2729f5d0539399f691d4201dab97c6eec554b82cc8c80935e956072e9735a739f8f4febc9849c1e8d9d195318b1d0d4e10dce4d34b5fb6d84111d7 +DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild similarity index 80% copy from sys-apps/kbd/kbd-.ebuild copy to sys-apps/kbd/kbd-2.5.1.ebuild index d0f3a2573fa7..a8607b2c1f1d 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == ]] ; then inherit autotools git-r3 @@ -43,24 +43,17 @@ BDEPEND=" test? ( dev-libs/check ) " -src_unpack() { - if [[ ${PV} == ]] ; then - git-r3_src_unpack - else - default - fi -} - src_prepare() { default # Rename conflicting keymaps to have unique names, bug #293228 # See also https://github.com/legionus/kbd/issues/76. - cd "${S}"/data/keymaps/i386 || die + pushd "${S}"/data/keymaps/i386 &> /dev/null || die mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die mv olpc/es.map olpc/es-olpc.map || die mv olpc/pt.map olpc/pt-olpc.map || die mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then eautoreconf @@ -69,9 +62,8 @@ src_prepare() { src_configure() { local myeconfargs=( - # USE="test" installs .a files - --disable-static --disable-werror + $(use_enable nls) $(use_enable pam vlock) $(use_enable test tests) @@ -80,15 +72,6 @@ src_configure() { econf "${myeconfargs[@]}" } -src_test() { - # Cheesy hack for now for https://github.com/legionus/kbd/issues/76 - mv "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map "${S}"/data/keymaps/i386/qwerty/cz.map || die - - default - - mv "${S}"/data/keymaps/i386/qwerty/cz.map "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map || die -} - src_install() { default diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index d0f3a2573fa7..a8607b2c1f1d 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 if [[ ${PV} == ]] ; then inherit autotools git-r3 @@ -43,24 +43,17 @@ BDEPEND=" test? ( dev-libs/check ) " -src_unpack() { - if [[ ${PV} == ]] ; then - git-r3_src_unpack - else - default - fi -} - src_prepare() { default # Rename conflicting keymaps to have unique names, bug #293228 # See also https://github.com/legionus/kbd/issues/76. - cd "${S}"/data/keymaps/i386 || die + pushd "${S}"/data/keymaps/i386 &> /dev/null || die mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die mv olpc/es.map olpc/es-olpc.map || die mv olpc/pt.map olpc/pt-olpc.map || die mv qwerty/cz.map qwerty/cz-qwerty.map || die + popd &> /dev/null || die if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then eautoreconf @@ -69,9 +62,8 @@ src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 1fe6b8b959464c36e1251490c21f82c05ba2e76a Author: Sam James gentoo org> AuthorDate: Fri Jun 3 01:16:02 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jun 3 01:31:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe6b8b9 sys-apps/kbd: add 2.5.0 Bug: https://bugs.gentoo.org/732868 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/{kbd-.ebuild => kbd-2.5.0.ebuild} | 44 +++--- sys-apps/kbd/kbd-.ebuild | 44 +++--- 3 files changed, 61 insertions(+), 28 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 3db59f47a2c2..01c0afbdec91 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1 +1,2 @@ DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb +DIST kbd-2.5.0.tar.xz 1490112 BLAKE2B c123982d5c80fa3996f6328d7151a9dcc8c969e7beeb65e83204857b044355a3531dd1efe5634d844bc43f8d5715ec63e41120679a3d34888766ef7bf6014f2b SHA512 740c4c7b8a2729f5d0539399f691d4201dab97c6eec554b82cc8c80935e956072e9735a739f8f4febc9849c1e8d9d195318b1d0d4e10dce4d34b5fb6d84111d7 diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-2.5.0.ebuild similarity index 54% copy from sys-apps/kbd/kbd-.ebuild copy to sys-apps/kbd/kbd-2.5.0.ebuild index b430d89f0657..d0f3a2573fa7 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-2.5.0.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -if [[ ${PV} == "" ]] ; then +if [[ ${PV} == ]] ; then inherit autotools git-r3 - #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_REPO_URI="https://github.com/legionus/kbd.git"; + EGIT_REPO_URI="https://github.com/legionus/kbd.git https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; EGIT_BRANCH="master" else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -19,14 +18,17 @@ else fi DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/"; +HOMEPAGE="https://kbd-project.org/"; LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -#RESTRICT="!test? ( test )" -# Upstream has strange assumptions how to run tests (see bug #732868) -RESTRICT="test" +RESTRICT="!test? ( test )" + +# Testsuite's Makefile.am calls missing(!) +# ... but this seems to be consistent with the autoconf docs? +# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html +QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*" RDEPEND=" app-arch/gzip @@ -42,23 +44,25 @@ BDEPEND=" " src_unpack() { - if [[ ${PV} == "" ]] ; then + if [[ ${PV} == ]] ; then git-r3_src_unpack else default fi +} + +src_prepare() { + default # Rename conflicting keymaps to have unique names, bug #293228 + # See also https://github.com/legionus/kbd/issues/76. cd "${S}"/data/keymaps/i386 || die mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die mv olpc/es.map olpc/es-olpc.map || die mv olpc/pt.map olpc/pt-olpc.map || die mv qwerty/cz.map qwerty/cz-qwerty.map || die -} -src_prepare() { - default - if [[ ${PV} == "" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + if [[ ${PV} == ]] || [[ $(ver_cut 3) -ge 90 ]] ; then eautoreconf fi } @@ -67,15 +71,27 @@ src_configure() { local myeconfargs=( # USE="test" installs .a files --disable-static + --disable-werror $(use_enable nls) $(use_enable pam vlock) $(use_enable test tests) ) + econf "${myeconfargs[@]}" } +src_test() { + # Cheesy hack for now for https://github.com/legionus/kbd/issues/76 + mv "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map "${S}"/data/keymaps/i386/qwerty/cz.map || die + + default + + mv "${S}"/data/keymaps/i386/qwerty/cz.map "${S}"/data/keymaps/i386/qwerty/cz-qwerty.map || die
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: c74ea643572dddcdaac0e3f72f8b48ae04317cda Author: Sam James gentoo org> AuthorDate: Fri Jun 3 01:07:44 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jun 3 01:07:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74ea643 sys-apps/kbd: rephrase comment Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 70122423cadd..d857523a184d 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -25,7 +25,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" #RESTRICT="!test? ( test )" -# Upstream has strange assumptions how to run tests (see bug #732868) +# Need to check autotest bit (see bug #732868) RESTRICT="test" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 3ddc4381d17786d64182884d3ff17a63549f8606 Author: Sam James gentoo org> AuthorDate: Sat May 21 19:07:38 2022 + Commit: Sam James gentoo org> CommitDate: Sat May 21 19:07:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ddc4381 sys-apps/kbd: update upstream metadata Signed-off-by: Sam James gentoo.org> sys-apps/kbd/metadata.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml index c9f6f6355fc7..9ef7f5ef4a9d 100644 --- a/sys-apps/kbd/metadata.xml +++ b/sys-apps/kbd/metadata.xml @@ -1,11 +1,11 @@ https://www.gentoo.org/dtd/metadata.dtd";> - - base-sys...@gentoo.org - Gentoo Base System - - - kbd - + + base-sys...@gentoo.org + Gentoo Base System + + + legionus/kbd +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/, sys-apps/kbd/files/
commit: 8de6a91d7e7e61b849ffcd493b28e01a79f7fea7 Author: David Seifert gentoo org> AuthorDate: Sat May 15 00:07:07 2021 + Commit: David Seifert gentoo org> CommitDate: Sat May 15 00:07:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de6a91d sys-apps/kbd: drop 2.2.0-r2, 2.3.0-r1 Signed-off-by: David Seifert gentoo.org> sys-apps/kbd/Manifest | 2 - sys-apps/kbd/files/kbd-2.2.0-cflags.patch | 33 ...bd-2.2.0-kbdfile-dont_stop_on_first_error.patch | 31 sys-apps/kbd/kbd-2.2.0-r2.ebuild | 78 --- sys-apps/kbd/kbd-2.3.0-r1.ebuild | 87 -- 5 files changed, 231 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index be4a70b1248..3db59f47a2c 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1 @@ -DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 -DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb diff --git a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch deleted file mode 100644 index 86c0f45074a..000 --- a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3b4f3ffbc9fedff83a0618f3dd3c6aafced3e72a Mon Sep 17 00:00:00 2001 -From: Lars Wendler -Date: Wed, 31 Jul 2019 18:07:33 +0200 -Subject: [PATCH] configure.ac: respect user CFLAGS - -Do not override user CFLAGS. Do not unconditionally add -g to CFLAGS. - -Gentoo-bug: https://bugs.gentoo.org/691142 -Signed-off-by: Lars Wendler - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6bf6401..0f5ed2f 100644 a/configure.ac -+++ b/configure.ac -@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; then - fi - - case "$GCC,$ac_cv_prog_cc_g" in -- yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;; -- yes,)CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;; -- ,yes) CFLAGS="-g" ;; -+ yes,yes) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; -+ yes,)CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; -+ ,yes) CFLAGS="$CFLAGS" ;; - esac - - CC_CHECK_CFLAGS_APPEND([\ --- -2.22.0 - diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch deleted file mode 100644 index 4b545f5bc2a..000 --- a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From acf93e44f6d036303f9069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov -Date: Tue, 6 Aug 2019 13:59:34 +0200 -Subject: [PATCH] libkbdfile: Do not stop on the first error - -The kbdfile_find() gets a list of directories in which the filename. If -we could not find the filename in the first directory, you do not need -to return an error. - -Link: https://github.com/legionus/kbd/issues/31 - -Signed-off-by: Alexey Gladkov - src/libkbdfile/kbdfile.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c -index 804f04a..fb8e035 100644 a/src/libkbdfile/kbdfile.c -+++ b/src/libkbdfile/kbdfile.c -@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp) - rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp); - free(dir); - -- if (rc <= 0) -- return rc; -+ if (!rc) -+ return 0; - } - - return 1; diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild deleted file mode 100644 index b7b82aca99e..000 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam - -if [[ ${PV} == "" ]] ; then - inherit autotools git-r3 - #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_REPO_URI="https://g
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 972dd434b026c7bbb9271ec299ad18af076fe3dd Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri May 14 19:52:05 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri May 14 20:34:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972dd434 sys-apps/kbd: stable 2.4.0 for hppa, bug #789846 Package-Manager: Portage-3.0.18, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 5f9a53a20f3..bb7dfea2b03 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 963da71f76c036f443c634e10ecad7076ef8cc05 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri May 14 09:34:38 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri May 14 09:34:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=963da71f sys-apps/kbd: sparc stable wrt bug #789846 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 8e70c6dbb00..5f9a53a20f3 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 694d118094f60745ad0aff73635508e472cc956b Author: Sam James gentoo org> AuthorDate: Thu May 13 17:53:21 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 17:53:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694d1180 sys-apps/kbd: Stabilize 2.4.0 ppc, #789846 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 061f4fcc7d6..8e70c6dbb00 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 32af5490e26b979c64894721082df0bed7d6756f Author: Sam James gentoo org> AuthorDate: Thu May 13 16:54:59 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 16:54:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32af5490 sys-apps/kbd: Stabilize 2.4.0 ppc64, #789846 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 5cdb9d1dafa..061f4fcc7d6 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 392ea919d26f604be2bc460f6a092c014e2cf3fa Author: Sam James gentoo org> AuthorDate: Thu May 13 16:54:26 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 16:54:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=392ea919 sys-apps/kbd: Stabilize 2.4.0 x86, #789846 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 24547511c97..5cdb9d1dafa 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 327e4335965692b6d53ccdcc49786f6e22fabd59 Author: Sam James gentoo org> AuthorDate: Thu May 13 16:20:50 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 16:20:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327e4335 sys-apps/kbd: Stabilize 2.4.0 arm, #789846 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index 6d6ee9829fc..24547511c97 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 253896b08dcdb76477047df1525449ee47c8e43b Author: Sam James gentoo org> AuthorDate: Thu May 13 16:17:01 2021 + Commit: Sam James gentoo org> CommitDate: Thu May 13 16:17:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253896b0 sys-apps/kbd: Stabilize 2.4.0 amd64, #789846 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.4.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index ef571616a3a..694a1acb0da 100644 --- a/sys-apps/kbd/kbd-2.4.0.ebuild +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 3bc3470a556eb65c36b3d8172c68338fe2314078 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Dec 27 12:49:06 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Dec 27 12:51:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc3470a sys-apps/kbd: stable 2.3.0-r1 for hppa stable wrt bug #759367 Package-Manager: Portage-3.0.12, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index 4513917a234..698828be221 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 9ea9dc3bb1645a5ecddbe71c5dc8b1c78f0eeb7d Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Dec 24 18:39:54 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Dec 24 22:06:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea9dc3b sys-apps/kbd: stable 2.3.0-r1 for ppc64 stable wrt bug #759367 Package-Manager: Portage-3.0.12, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index c962e82ae2a..4513917a234 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 3501f438c8899877d6c57abd842204818cb49d25 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Dec 23 11:46:19 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Dec 23 13:57:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3501f438 sys-apps/kbd: stable 2.3.0-r1 for sparc, bug #759367 Package-Manager: Portage-3.0.9, Repoman-3.0.2 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index a19486d9a4a..c962e82ae2a 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 2821a8c1fca3a397604afb31cd1163db569d6f0c Author: Sam James gentoo org> AuthorDate: Tue Dec 22 06:29:03 2020 + Commit: Sam James gentoo org> CommitDate: Tue Dec 22 06:29:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2821a8c1 sys-apps/kbd: Stabilize 2.3.0-r1 arm64, #759367 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index 56c4de3dba3..a19486d9a4a 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: d9b71b23f6b6de3e0a9a8a0568215f57f446682c Author: Sam James gentoo org> AuthorDate: Tue Dec 22 01:41:09 2020 + Commit: Sam James gentoo org> CommitDate: Tue Dec 22 01:41:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b71b23 sys-apps/kbd: Stabilize 2.3.0-r1 amd64, #759367 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index 721c4ce8b68..56c4de3dba3 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 783995cdeef55564eb902e726f99880a5e1f7a80 Author: Sam James gentoo org> AuthorDate: Mon Dec 21 23:57:49 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 23:58:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783995cd sys-apps/kbd: Stabilize 2.3.0-r1 ppc, #759367 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index f5e7e01c10e..721c4ce8b68 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 7dbf0b742ba7f479ff55cb9b0e48c36dfae4fe7d Author: Sam James gentoo org> AuthorDate: Mon Dec 21 21:27:54 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 21:27:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbf0b74 sys-apps/kbd: Stabilize 2.3.0-r1 arm, #759367 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index 6672ae4a945..f5e7e01c10e 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 6368f9c16f7cb16bca3b37e5184766499c6cec97 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Dec 21 01:35:42 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Dec 21 01:35:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6368f9c1 sys-apps/kbd: x86 stable (bug #759367) Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/kbd/kbd-2.3.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild index 3cb9fb4edd0..6672ae4a945 100644 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then else if [[ $(ver_cut 3) -lt 90 ]] ; then SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" else inherit autotools SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 11ef12911eb659281901d8a5913ffdcfe250d157 Author: Lars Wendler gentoo org> AuthorDate: Wed Dec 16 17:37:44 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Dec 16 17:46:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ef1291 sys-apps/kbd: Bump to version 2.4.0 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.4.0.ebuild | 86 +++ 2 files changed, 87 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 42f2396f56a..2e198b9ba9f 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,4 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927 +DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild new file mode 100644 index 000..ef571616a3a --- /dev/null +++ b/sys-apps/kbd/kbd-2.4.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pam + +if [[ ${PV} == "" ]] ; then + inherit autotools git-r3 + #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_REPO_URI="https://github.com/legionus/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" +#RESTRICT="!test? ( test )" +# Upstream has strange assumptions how to run tests (see bug #732868) +RESTRICT="test" + +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_unpack() { + if [[ ${PV} == "" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + default + if [[ ${PV} == "" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + # USE="test" installs .a files + --disable-static + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + docinto html + dodoc docs/doc/*.html + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 2c22b7d0de6f0ec2049ea7be468f27a3d98e60b5 Author: Lars Wendler gentoo org> AuthorDate: Wed Dec 16 17:46:23 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Dec 16 17:46:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c22b7d0 sys-apps/kbd: Removed old Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest | 1 - .../files/kbd-2.0.4-vlock_configure_switch.patch | 25 --- sys-apps/kbd/kbd-2.0.4-r1.ebuild | 77 -- sys-apps/kbd/kbd-2.0.4.ebuild | 64 -- 4 files changed, 167 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 2e198b9ba9f..be4a70b1248 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,4 +1,3 @@ -DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927 DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb diff --git a/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch b/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch deleted file mode 100644 index c3f5b660cbd..000 --- a/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001 -From: Garry Filakhtov -Date: Fri, 20 Jul 2018 15:58:56 +0200 -Subject: [PATCH] configure.ac: Fix logic of vlock configure switch - -Downstream bug report: https://bugs.gentoo.org/661650 - -Signed-off-by: Lars Wendler - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 87eb63c..07098cf 100644 a/configure.ac -+++ b/configure.ac -@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes") - - AC_ARG_ENABLE(vlock, - AS_HELP_STRING(--disable-vlock, [do not build vlock]), -- [VLOCK_PROG=no],[VLOCK_PROG=yes]) -+ [VLOCK_PROG=$enableval],[VLOCK_PROG=yes]) - AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") - - if test "$VLOCK_PROG" = "yes"; then diff --git a/sys-apps/kbd/kbd-2.0.4-r1.ebuild b/sys-apps/kbd/kbd-2.0.4-r1.ebuild deleted file mode 100644 index aeabdfc9bae..000 --- a/sys-apps/kbd/kbd-2.0.4-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam - -if [[ ${PV} == "" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_BRANCH="master" -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/gzip - pam? ( - !app-misc/vlock - sys-libs/pam - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( dev-libs/check ) -" - -PATCHES=( - "${FILESDIR}/${P}-vlock_configure_switch.patch" -) - -src_unpack() { - if [[ ${PV} == "" ]] ; then - git-r3_src_unpack - else - default - fi - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die - mv dvorak/no.map dvorak/no-dvorak.map || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die -} - -src_prepare() { - default - eautoreconf -} - -src_con
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 3ade55f66abcbe95780ac3bbf01f67f0dbe0f8cf Author: Lars Wendler gentoo org> AuthorDate: Wed Dec 16 17:44:10 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Dec 16 17:46:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ade55f6 sys-apps/kbd: Synced live ebuild Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 3cb9fb4edd0..ef571616a3a 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -80,7 +80,6 @@ src_install() { default docinto html dodoc docs/doc/*.html - use pam && pamd_mimic_system vlock auth account # USE="test" installs .la files find "${ED}" -type f -name "*.la" -delete || die
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 09e68ab0a40a2ba0564a7a445ac54b794cd82a95 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Sep 14 15:17:20 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Sep 14 16:33:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e68ab0 sys-apps/kbd: stable 2.2.0-r2 for hppa, bug #722158 Package-Manager: Portage-3.0.4, Repoman-3.0.1 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index ad709279f2d..b7b82aca99e 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: d7b8cc1d3943ff5d414accbac47d0a0e011a555b Author: Sam James gentoo org> AuthorDate: Sat Jul 25 02:27:19 2020 + Commit: Sam James gentoo org> CommitDate: Sat Jul 25 02:27:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b8cc1d sys-apps/kbd: sparc stable (bug #722158) Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 219221bcfb1..ad709279f2d 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 083a49fbca12c7e604f88db45a99d04a94010d64 Author: Sam James gentoo org> AuthorDate: Mon Jul 20 00:52:33 2020 + Commit: Sam James gentoo org> CommitDate: Mon Jul 20 00:52:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=083a49fb sys-apps/kbd: ppc64 stable (bug #722158) Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 3c70d707dcc..219221bcfb1 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 36a2813036032372ccfe60e03c9b0f9d20fd7f35 Author: Sam James gentoo org> AuthorDate: Sun Jul 19 12:50:32 2020 + Commit: Sam James gentoo org> CommitDate: Sun Jul 19 12:50:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a28130 sys-apps/kbd: ppc stable (bug #722158) Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Sam James gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 2b5350ae8b2..3c70d707dcc 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: a8fe76da1efe36a6572e82240eacf35071c1b933 Author: Lars Wendler gentoo org> AuthorDate: Thu Jul 16 10:03:33 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Jul 16 10:05:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8fe76da sys-apps/kbd: Revbump to no longer install *.a and *.la files with USE="test". Also disabled tests until upstream fixed their test suite. Bug: https://bugs.gentoo.org/732868 Closes: https://bugs.gentoo.org/732612 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/{kbd-2.3.0.ebuild => kbd-2.3.0-r1.ebuild} | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.3.0.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild similarity index 86% rename from sys-apps/kbd/kbd-2.3.0.ebuild rename to sys-apps/kbd/kbd-2.3.0-r1.ebuild index 32395a108a7..3cb9fb4edd0 100644 --- a/sys-apps/kbd/kbd-2.3.0.ebuild +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -26,7 +26,9 @@ HOMEPAGE="http://kbd-project.org/"; LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RESTRICT="!test? ( test )" +#RESTRICT="!test? ( test )" +# Upstream has strange assumptions how to run tests (see bug #732868) +RESTRICT="test" RDEPEND=" app-arch/gzip @@ -65,6 +67,8 @@ src_prepare() { src_configure() { local myeconfargs=( + # USE="test" installs .a files + --disable-static $(use_enable nls) $(use_enable pam vlock) $(use_enable test tests) @@ -77,4 +81,7 @@ src_install() { docinto html dodoc docs/doc/*.html use pam && pamd_mimic_system vlock auth account + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: f671d917fbb8728607e2af5b57e3506493928b8b Author: Lars Wendler gentoo org> AuthorDate: Thu Jul 16 10:05:09 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Jul 16 10:05:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f671d917 sys-apps/kbd: Synced live ebuild Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 32395a108a7..3cb9fb4edd0 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -26,7 +26,9 @@ HOMEPAGE="http://kbd-project.org/"; LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RESTRICT="!test? ( test )" +#RESTRICT="!test? ( test )" +# Upstream has strange assumptions how to run tests (see bug #732868) +RESTRICT="test" RDEPEND=" app-arch/gzip @@ -65,6 +67,8 @@ src_prepare() { src_configure() { local myeconfargs=( + # USE="test" installs .a files + --disable-static $(use_enable nls) $(use_enable pam vlock) $(use_enable test tests) @@ -77,4 +81,7 @@ src_install() { docinto html dodoc docs/doc/*.html use pam && pamd_mimic_system vlock auth account + + # USE="test" installs .la files + find "${ED}" -type f -name "*.la" -delete || die }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 2a9d1606b691c720a578eda4418d9122f5a4cd92 Author: Lars Wendler gentoo org> AuthorDate: Sat Jul 11 16:37:06 2020 + Commit: Lars Wendler gentoo org> CommitDate: Sat Jul 11 16:37:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9d1606 sys-apps/kbd: Bump to version 2.3.0. Removed old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest| 2 +- sys-apps/kbd/{kbd-2.2.90.ebuild => kbd-2.3.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index bea95c84c30..42f2396f56a 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,3 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 -DIST kbd-2.2.90.tar.gz 1636546 BLAKE2B 8bfdd3d09e38a0b91684fee481f63e8118b2a37568f2e9ac28c164256033449fc035c2f2179b0a15d4e1e4c28a5fc00c1906c1b47e97bb9b76cc7eae81f453d7 SHA512 dbbbd0bd0d293ce7fa9f6a03b5ea2213e6beb01917137a13f507939657afcab8b69b759691755d85925c87276b4e43637ff840c24b1de4ca4e2c4a301e050926 +DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927 diff --git a/sys-apps/kbd/kbd-2.2.90.ebuild b/sys-apps/kbd/kbd-2.3.0.ebuild similarity index 100% rename from sys-apps/kbd/kbd-2.2.90.ebuild rename to sys-apps/kbd/kbd-2.3.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: dc2dcd5c302bced959ea43929ec8f44b207a92a0 Author: Lars Wendler gentoo org> AuthorDate: Tue Jun 16 13:27:44 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jun 16 13:27:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2dcd5c sys-apps/kbd: Synced live ebuild Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index faad110fb54..32395a108a7 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -11,8 +11,13 @@ if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://github.com/legionus/kbd.git"; EGIT_BRANCH="master" else - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi fi DESCRIPTION="Keyboard and console utilities" @@ -53,7 +58,7 @@ src_unpack() { src_prepare() { default - if [[ ${PV} == "" ]] ; then + if [[ ${PV} == "" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then eautoreconf fi }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 29695a85f3ca22a3a650aaaf46f5659939721eeb Author: Lars Wendler gentoo org> AuthorDate: Tue Jun 16 13:25:43 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jun 16 13:27:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29695a85 sys-apps/kbd: Bump to version 2.2.90 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.2.90.ebuild | 80 ++ 2 files changed, 81 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index c2306ce5e8c..bea95c84c30 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1,3 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 +DIST kbd-2.2.90.tar.gz 1636546 BLAKE2B 8bfdd3d09e38a0b91684fee481f63e8118b2a37568f2e9ac28c164256033449fc035c2f2179b0a15d4e1e4c28a5fc00c1906c1b47e97bb9b76cc7eae81f453d7 SHA512 dbbbd0bd0d293ce7fa9f6a03b5ea2213e6beb01917137a13f507939657afcab8b69b759691755d85925c87276b4e43637ff840c24b1de4ca4e2c4a301e050926 diff --git a/sys-apps/kbd/kbd-2.2.90.ebuild b/sys-apps/kbd/kbd-2.2.90.ebuild new file mode 100644 index 000..32395a108a7 --- /dev/null +++ b/sys-apps/kbd/kbd-2.2.90.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pam + +if [[ ${PV} == "" ]] ; then + inherit autotools git-r3 + #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_REPO_URI="https://github.com/legionus/kbd.git"; + EGIT_BRANCH="master" +else + if [[ $(ver_cut 3) -lt 90 ]] ; then + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + else + inherit autotools + SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + fi +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + sys-libs/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_unpack() { + if [[ ${PV} == "" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + default + if [[ ${PV} == "" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + docinto html + dodoc docs/doc/*.html + use pam && pamd_mimic_system vlock auth account +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 349686d55f1e6d3448228c1b9bfb04db0aff136c Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jun 12 07:52:22 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jun 12 07:52:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=349686d5 sys-apps/kbd: arm stable wrt bug #722158 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 051a2409b41..2b5350ae8b2 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 0ddf03b0f87784219c094c0c32ed89a2463f2b20 Author: Sam James (sam_c) cmpct info> AuthorDate: Wed Jun 10 19:03:44 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Thu Jun 11 22:08:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddf03b0 sys-apps/kbd: arm64 stable (bug #722158) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 25828b7c1af..051a2409b41 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: cafcf491f23a5f1145d39a371f50ede108da64dd Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jun 11 08:33:22 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jun 11 08:34:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cafcf491 sys-apps/kbd: x86 stable wrt bug #722158 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index ca429192ac7..25828b7c1af 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 4d538c7c8ad2f1df121a95c1422df7992772bf55 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jun 11 08:24:34 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jun 11 08:24:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d538c7c sys-apps/kbd: amd64 stable wrt bug #722158 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 465bc5b881e..ca429192ac7 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Keyboard and console utilities"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: fa6ec0f4bbd499c5f661c0b0b736c0d56896ffd6 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Oct 12 19:05:07 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Oct 12 19:05:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6ec0f4 sys-apps/kbd: migrate to sys-libs/pam Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-apps/kbd/kbd-2.0.4-r1.ebuild | 2 +- sys-apps/kbd/kbd-2.0.4.ebuild| 2 +- sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- sys-apps/kbd/kbd-.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys-apps/kbd/kbd-2.0.4-r1.ebuild b/sys-apps/kbd/kbd-2.0.4-r1.ebuild index fa8186612c0..3be269cae6c 100644 --- a/sys-apps/kbd/kbd-2.0.4-r1.ebuild +++ b/sys-apps/kbd/kbd-2.0.4-r1.ebuild @@ -25,7 +25,7 @@ RDEPEND=" app-arch/gzip pam? ( !app-misc/vlock - virtual/pam + sys-libs/pam ) " DEPEND="${RDEPEND}" diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index 63233a698f8..87cfa64484e 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -22,7 +22,7 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RDEPEND="pam? ( virtual/pam ) +RDEPEND="pam? ( sys-libs/pam ) app-arch/gzip" DEPEND="${RDEPEND} virtual/pkgconfig diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 3675430c7a9..da63a90d2ce 100644 --- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -26,7 +26,7 @@ RDEPEND=" app-arch/gzip pam? ( !app-misc/vlock - virtual/pam + sys-libs/pam ) " DEPEND="${RDEPEND}" diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 097ab17ac29..06fb77295c4 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -26,7 +26,7 @@ RDEPEND=" app-arch/gzip pam? ( !app-misc/vlock - virtual/pam + sys-libs/pam ) " DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 468fac8b3ce93a2f486b68401189a80c137c5d16 Author: Lars Wendler gentoo org> AuthorDate: Wed Aug 14 06:19:50 2019 + Commit: Lars Wendler gentoo org> CommitDate: Wed Aug 14 06:21:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468fac8b sys-apps/kbd: Revbump to make "loadkeys -d" not stop on first error Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> ...bd-2.2.0-kbdfile-dont_stop_on_first_error.patch | 31 ++ .../{kbd-2.2.0-r1.ebuild => kbd-2.2.0-r2.ebuild} | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch new file mode 100644 index 000..4b545f5bc2a --- /dev/null +++ b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch @@ -0,0 +1,31 @@ +From acf93e44f6d036303f9069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov +Date: Tue, 6 Aug 2019 13:59:34 +0200 +Subject: [PATCH] libkbdfile: Do not stop on the first error + +The kbdfile_find() gets a list of directories in which the filename. If +we could not find the filename in the first directory, you do not need +to return an error. + +Link: https://github.com/legionus/kbd/issues/31 + +Signed-off-by: Alexey Gladkov +--- + src/libkbdfile/kbdfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c +index 804f04a..fb8e035 100644 +--- a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c +@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp) + rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp); + free(dir); + +- if (rc <= 0) +- return rc; ++ if (!rc) ++ return 0; + } + + return 1; diff --git a/sys-apps/kbd/kbd-2.2.0-r1.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild similarity index 93% rename from sys-apps/kbd/kbd-2.2.0-r1.ebuild rename to sys-apps/kbd/kbd-2.2.0-r2.ebuild index 895a4995c52..3675430c7a9 100644 --- a/sys-apps/kbd/kbd-2.2.0-r1.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild @@ -36,7 +36,8 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-2.2.0-cflags.patch" #691142 + "${FILESDIR}/${P}-cflags.patch" #691142 + "${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch" ) src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: b6f4e5bd8aeeea00704ffd77554d8c3d7291f1d4 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 31 16:16:21 2019 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 31 16:18:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f4e5bd sys-apps/kbd: Respect user CFLAGS Thanks-to: Michał Górny gentoo.org> Bug: https://bugs.gentoo.org/691142 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/files/kbd-2.2.0-cflags.patch | 33 ++ .../kbd/{kbd-2.2.0.ebuild => kbd-2.2.0-r1.ebuild} | 10 --- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch new file mode 100644 index 000..86c0f45074a --- /dev/null +++ b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch @@ -0,0 +1,33 @@ +From 3b4f3ffbc9fedff83a0618f3dd3c6aafced3e72a Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Wed, 31 Jul 2019 18:07:33 +0200 +Subject: [PATCH] configure.ac: respect user CFLAGS + +Do not override user CFLAGS. Do not unconditionally add -g to CFLAGS. + +Gentoo-bug: https://bugs.gentoo.org/691142 +Signed-off-by: Lars Wendler +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6bf6401..0f5ed2f 100644 +--- a/configure.ac b/configure.ac +@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; then + fi + + case "$GCC,$ac_cv_prog_cc_g" in +- yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;; +- yes,)CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;; +- ,yes) CFLAGS="-g" ;; ++ yes,yes) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; ++ yes,)CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; ++ ,yes) CFLAGS="$CFLAGS" ;; + esac + + CC_CHECK_CFLAGS_APPEND([\ +-- +2.22.0 + diff --git a/sys-apps/kbd/kbd-2.2.0.ebuild b/sys-apps/kbd/kbd-2.2.0-r1.ebuild similarity index 93% rename from sys-apps/kbd/kbd-2.2.0.ebuild rename to sys-apps/kbd/kbd-2.2.0-r1.ebuild index 097ab17ac29..895a4995c52 100644 --- a/sys-apps/kbd/kbd-2.2.0.ebuild +++ b/sys-apps/kbd/kbd-2.2.0-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit pam +inherit autotools pam if [[ ${PV} == "" ]] ; then inherit autotools git-r3 @@ -35,6 +35,10 @@ BDEPEND=" test? ( dev-libs/check ) " +PATCHES=( + "${FILESDIR}/${PN}-2.2.0-cflags.patch" #691142 +) + src_unpack() { if [[ ${PV} == "" ]] ; then git-r3_src_unpack @@ -52,9 +56,7 @@ src_unpack() { src_prepare() { default - if [[ ${PV} == "" ]] ; then - eautoreconf - fi + eautoreconf } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: c2360b273f99e25b7bc7f1245ff0ae673e7768e2 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 31 10:51:53 2019 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 31 10:54:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2360b27 sys-apps/kbd: Bump to version 2.2.0 Closes: https://bugs.gentoo.org/690738 Closes: https://bugs.gentoo.org/690806 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.2.0.ebuild | 74 +++ 2 files changed, 75 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index eca4c0877c8..93fc96d2895 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1,3 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f DIST kbd-2.1.0.tar.xz 1114896 BLAKE2B 273b1149ac1ba6220d786fa6fedf22432937c8e7a8c3317eecc11d4533a72f6c29566dda75be2fb0fae3c0f02d63a10e6207cbe96719051639fc661c859e1040 SHA512 bfb3e7c4ab2973bf68ee6ce8fd90b4e51cff5a466c04b375c1a6d9418319cf041a593edb4915637cd0c3b472614cd39d8184837d14e9177f163817da4e769849 +DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 diff --git a/sys-apps/kbd/kbd-2.2.0.ebuild b/sys-apps/kbd/kbd-2.2.0.ebuild new file mode 100644 index 000..097ab17ac29 --- /dev/null +++ b/sys-apps/kbd/kbd-2.2.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit pam + +if [[ ${PV} == "" ]] ; then + inherit autotools git-r3 + #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_REPO_URI="https://github.com/legionus/kbd.git"; + EGIT_BRANCH="master" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" + +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + virtual/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_unpack() { + if [[ ${PV} == "" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + default + if [[ ${PV} == "" ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + docinto html + dodoc docs/doc/*.html + use pam && pamd_mimic_system vlock auth account +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 22caf15fcb993315c4e285182fdcd237debc7026 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 31 10:52:57 2019 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 31 10:54:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22caf15f sys-apps/kbd: Removed old. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest| 1 - sys-apps/kbd/kbd-2.1.0-r1.ebuild | 73 2 files changed, 74 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 93fc96d2895..c2306ce5e8c 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,2 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f -DIST kbd-2.1.0.tar.xz 1114896 BLAKE2B 273b1149ac1ba6220d786fa6fedf22432937c8e7a8c3317eecc11d4533a72f6c29566dda75be2fb0fae3c0f02d63a10e6207cbe96719051639fc661c859e1040 SHA512 bfb3e7c4ab2973bf68ee6ce8fd90b4e51cff5a466c04b375c1a6d9418319cf041a593edb4915637cd0c3b472614cd39d8184837d14e9177f163817da4e769849 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13 diff --git a/sys-apps/kbd/kbd-2.1.0-r1.ebuild b/sys-apps/kbd/kbd-2.1.0-r1.ebuild deleted file mode 100644 index 5c0afcf48a5..000 --- a/sys-apps/kbd/kbd-2.1.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam - -if [[ ${PV} == "" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; - EGIT_BRANCH="master" -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" -fi - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" - -RDEPEND=" - app-arch/gzip - pam? ( - !app-misc/vlock - virtual/pam - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( dev-libs/check ) -" - -src_unpack() { - if [[ ${PV} == "" ]] ; then - git-r3_src_unpack - else - default - fi - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die -} - -src_prepare() { - default - if [[ ${PV} == "" ]] ; then - eautoreconf - fi -} - -src_configure() { - local myeconfargs=( - $(use_enable nls) - $(use_enable pam vlock) - $(use_enable test tests) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - docinto html - dodoc docs/doc/*.html - use pam && pamd_mimic_system vlock auth account -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 7faca05f85d4f5b652d46d6e0db8419819f65b4e Author: Lars Wendler gentoo org> AuthorDate: Sun Jul 28 14:38:55 2019 + Commit: Lars Wendler gentoo org> CommitDate: Sun Jul 28 14:39:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7faca05f sys-apps/kbd: Use GitHub repo in live ebuild. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 5c0afcf48a5..097ab17ac29 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -7,7 +7,8 @@ inherit pam if [[ ${PV} == "" ]] ; then inherit autotools git-r3 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + #EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_REPO_URI="https://github.com/legionus/kbd.git"; EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 367c7a144dafe9ce5e81eccc6bb4ee60af5b842b Author: Lars Wendler gentoo org> AuthorDate: Sat Jul 27 10:38:38 2019 + Commit: Lars Wendler gentoo org> CommitDate: Sat Jul 27 10:40:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367c7a14 sys-apps/kbd: Backported vlock build fix Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> .../files/kbd-2.0.4-vlock_configure_switch.patch | 25 +++ sys-apps/kbd/kbd-2.0.4-r1.ebuild | 76 ++ 2 files changed, 101 insertions(+) diff --git a/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch b/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch new file mode 100644 index 000..c3f5b660cbd --- /dev/null +++ b/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch @@ -0,0 +1,25 @@ +From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001 +From: Garry Filakhtov +Date: Fri, 20 Jul 2018 15:58:56 +0200 +Subject: [PATCH] configure.ac: Fix logic of vlock configure switch + +Downstream bug report: https://bugs.gentoo.org/661650 + +Signed-off-by: Lars Wendler +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 87eb63c..07098cf 100644 +--- a/configure.ac b/configure.ac +@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes") + + AC_ARG_ENABLE(vlock, + AS_HELP_STRING(--disable-vlock, [do not build vlock]), +- [VLOCK_PROG=no],[VLOCK_PROG=yes]) ++ [VLOCK_PROG=$enableval],[VLOCK_PROG=yes]) + AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes") + + if test "$VLOCK_PROG" = "yes"; then diff --git a/sys-apps/kbd/kbd-2.0.4-r1.ebuild b/sys-apps/kbd/kbd-2.0.4-r1.ebuild new file mode 100644 index 000..fa8186612c0 --- /dev/null +++ b/sys-apps/kbd/kbd-2.0.4-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools pam + +if [[ ${PV} == "" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" + +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + virtual/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +PATCHES=( + "${FILESDIR}/${P}-vlock_configure_switch.patch" +) + +src_unpack() { + if [[ ${PV} == "" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv dvorak/no.map dvorak/no-dvorak.map || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + docinto html + dodoc docs/doc/*.html + use pam && pamd_mimic_system vlock auth account +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 2aad18b2eb6fd019d1c651d300a70dc097c7a13e Author: Lars Wendler gentoo org> AuthorDate: Fri Jul 26 08:26:57 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jul 26 08:26:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aad18b2 sys-apps/kbd: Revbump for previous fix Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/{kbd-2.1.0.ebuild => kbd-2.1.0-r1.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/sys-apps/kbd/kbd-2.1.0.ebuild b/sys-apps/kbd/kbd-2.1.0-r1.ebuild similarity index 100% rename from sys-apps/kbd/kbd-2.1.0.ebuild rename to sys-apps/kbd/kbd-2.1.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: e7e1fd63a0e629a70477a80e07b22a1f1e485aa5 Author: Lars Wendler gentoo org> AuthorDate: Fri Jul 26 08:27:28 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jul 26 08:27:28 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e1fd63 sys-apps/kbd: Synced live ebuild Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 12711a24eca..5c0afcf48a5 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit pam + if [[ ${PV} == "" ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; @@ -67,4 +69,5 @@ src_install() { default docinto html dodoc docs/doc/*.html + use pam && pamd_mimic_system vlock auth account }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 20d156c15dd4deaf4976c21eda27eb3fc4e63a5e Author: Takeshi Ito <85nrdzgv gmail com> AuthorDate: Sat Jul 20 07:16:50 2019 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jul 26 08:26:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d156c1 sys-apps/kbd: fix pam config to be created for vlock Added pam eclass and create pam config file when `pam` flag is enabled. `vlock` command needs it to work correctly. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Closes: https://bugs.gentoo.org/690746 Signed-off-by: Takeshi Ito <85nrdzgv gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12480 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-2.1.0.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/kbd/kbd-2.1.0.ebuild b/sys-apps/kbd/kbd-2.1.0.ebuild index 12711a24eca..5c0afcf48a5 100644 --- a/sys-apps/kbd/kbd-2.1.0.ebuild +++ b/sys-apps/kbd/kbd-2.1.0.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit pam + if [[ ${PV} == "" ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; @@ -67,4 +69,5 @@ src_install() { default docinto html dodoc docs/doc/*.html + use pam && pamd_mimic_system vlock auth account }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 579046676a71d2e38c21c2b50b53f4904fd51052 Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 16 09:31:37 2019 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jul 16 09:34:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57904667 sys-apps/kbd: Synced live ebuild Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index a05c81063a0..12711a24eca 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == "" ]] ; then inherit autotools git-r3 @@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" fi DESCRIPTION="Keyboard and console utilities" @@ -19,11 +19,18 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RDEPEND="pam? ( virtual/pam ) - app-arch/gzip" -DEPEND="${RDEPEND} +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + virtual/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig - test? ( dev-libs/check )" + test? ( dev-libs/check ) +" src_unpack() { if [[ ${PV} == "" ]] ; then @@ -34,7 +41,6 @@ src_unpack() { # Rename conflicting keymaps to have unique names, bug #293228 cd "${S}"/data/keymaps/i386 || die - mv dvorak/no.map dvorak/no-dvorak.map || die mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die mv olpc/es.map olpc/es-olpc.map || die mv olpc/pt.map olpc/pt-olpc.map || die
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 0c88fd4d16bd6407fe188e449b6b99549978427f Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 16 09:30:11 2019 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jul 16 09:34:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c88fd4d sys-apps/kbd: Bump to version 2.1.0 Closes: https://bugs.gentoo.org/661650 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.1.0.ebuild | 70 +++ 2 files changed, 71 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index c23aeeba3b9..eca4c0877c8 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1 +1,2 @@ DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f +DIST kbd-2.1.0.tar.xz 1114896 BLAKE2B 273b1149ac1ba6220d786fa6fedf22432937c8e7a8c3317eecc11d4533a72f6c29566dda75be2fb0fae3c0f02d63a10e6207cbe96719051639fc661c859e1040 SHA512 bfb3e7c4ab2973bf68ee6ce8fd90b4e51cff5a466c04b375c1a6d9418319cf041a593edb4915637cd0c3b472614cd39d8184837d14e9177f163817da4e769849 diff --git a/sys-apps/kbd/kbd-2.1.0.ebuild b/sys-apps/kbd/kbd-2.1.0.ebuild new file mode 100644 index 000..12711a24eca --- /dev/null +++ b/sys-apps/kbd/kbd-2.1.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} == "" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; + EGIT_BRANCH="master" +else + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" + +RDEPEND=" + app-arch/gzip + pam? ( + !app-misc/vlock + virtual/pam + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + test? ( dev-libs/check ) +" + +src_unpack() { + if [[ ${PV} == "" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + default + if [[ ${PV} == "" ]] ; then + eautoreconf + fi +} + +src_configure() { + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) + $(use_enable test tests) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + docinto html + dodoc docs/doc/*.html +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: fabcf997e1d7e869920b61f46d28fc81c44eda9d Author: Mikle Kolyada gentoo org> AuthorDate: Sat May 4 16:16:20 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat May 4 16:16:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fabcf997 sys-apps/kbd: Add ~riscv keyword Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 sys-apps/kbd/kbd-2.0.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index 3ce85f64ff3..63233a698f8 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 0b0bfa4bcc7edec36c9eab8984d8bfbf2d83f747 Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 11 14:43:56 2019 + Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 11 14:43:56 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b0bfa4b sys-apps/kbd: Minor improvements in live ebuild. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/kbd/kbd-.ebuild | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 60f4d971854..a05c81063a0 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -SCM="" if [[ ${PV} == "" ]] ; then - SCM="autotools git-r3" + inherit autotools git-r3 EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; EGIT_BRANCH="master" else @@ -13,8 +12,6 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -inherit eutils ${SCM} - DESCRIPTION="Keyboard and console utilities" HOMEPAGE="http://kbd-project.org/";
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 502b4d8b39bf626c8ae0baecfa8a9a74a56e8430 Author: Lars Wendler gentoo org> AuthorDate: Fri Apr 20 10:43:28 2018 + Commit: Lars Wendler gentoo org> CommitDate: Fri Apr 20 11:12:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502b4d8b sys-apps/kbd: Removed old. Package-Manager: Portage-2.3.31, Repoman-2.3.9 sys-apps/kbd/Manifest| 1 - sys-apps/kbd/files/kbd-2.0.0-tests.patch | 34 -- sys-apps/kbd/kbd-2.0.3.ebuild| 62 3 files changed, 97 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 50b5caac7ff..c23aeeba3b9 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,2 +1 @@ -DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f 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 6a1c7ea851e..000 --- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/485116 -http://lists.altlinux.org/pipermail/kbd/2015-July/000558.html - 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.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild deleted file mode 100644 index 3d02370de95..000 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -SCM="" -if [[ ${PV} == "" ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"; - EGIT_BRANCH="master" -else - SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" -fi - -inherit autotools eutils ${SCM} - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="nls pam test" - -RDEPEND="pam? ( virtual/pam ) - app-arch/gzip" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-libs/check )" - -src_unpack() { - if [[ ${PV} == "" ]] ; then - git-r3_src_unpack - else - default - fi - - # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die - mv dvorak/no.map dvorak/no-dvorak.map || die - mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die - mv olpc/es.map olpc/es-olpc.map || die - mv olpc/pt.map olpc/pt-olpc.map || die - mv qwerty/cz.map qwerty/cz-qwerty.map || die -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch #485116 - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) \ - $(use_enable test tests) -} - -src_install() { - default - dohtml docs/doc/*.html -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 920469098376e06ff28acc79316823617b014fca Author: Matt Turner gentoo org> AuthorDate: Sun Mar 18 01:15:20 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun Mar 18 01:15:20 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92046909 sys-apps/kbd-2.0.4: ppc64 stable, bug 645022 sys-apps/kbd/kbd-2.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index 8871e7569c4..3ce85f64ff3 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 4533279583066c8d73f84934666f988f59afa342 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 18 01:15:16 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun Mar 18 01:15:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45332795 sys-apps/kbd-2.0.4: ppc stable, bug 645022 sys-apps/kbd/kbd-2.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index 5372bc2f87c..8871e7569c4 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 1757fcf7721d9261c48ca629574d34f8e674f0e1 Author: Tobias Klausmann gentoo org> AuthorDate: Sun Mar 4 16:22:58 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Sun Mar 4 16:22:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1757fcf7 sys-apps/kbd-2.0.4-r0: alpha stable Gentoo-Bug: http://bugs.gentoo.org/645022 sys-apps/kbd/kbd-2.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index a21a9a298a7..5372bc2f87c 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 10f3928d32544a61f7c9cc1058d47571be68f4a6 Author: Mike Frysinger gentoo org> AuthorDate: Sat Jan 27 19:07:29 2018 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 27 19:07:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f3928d sys-apps/kbd: mark 2.0.4 arm/arm64/ia64/m68k/s390/sh stable sys-apps/kbd/kbd-2.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index aa313ff81c3..a21a9a298a7 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" + KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: ba5ab003dd8ef58f73a8eff2b475405d0fe1b2da Author: Mikle Kolyada gentoo org> AuthorDate: Fri Jan 26 01:16:52 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Jan 26 01:16:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5ab003 sys-apps/kbd: Drop old Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/kbd/Manifest | 1 - sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch | 90 -- sys-apps/kbd/kbd-1.15.5-r1.ebuild | 49 3 files changed, 140 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index d6c4a8c16e7..50b5caac7ff 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,2 @@ -DIST kbd-1.15.5.tar.xz 790680 BLAKE2B f34883fea204a292c91bd0b06924e5a93f0157ef2b1a4f7e8b424770103222685c0e11ae9897c9f5da3ee5e2a87dbea808ca1405fb92a55bfef3dc3e75b21ec4 SHA512 fed954bfe231a46debc2a0d6e919335b42d8cfc879821137424440289de248f6a1705e48745cf19e5bd16d7f66c2a8ff2793341f9906d2d4b2b88ac7774d8c7f DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f diff --git a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch deleted file mode 100644 index c78a2278084..000 --- a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch +++ /dev/null @@ -1,90 +0,0 @@ -https://bugs.gentoo.org/447440 - -From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov -Date: Tue, 11 Dec 2012 14:24:44 +0400 -Subject: [PATCH] Fix regression in 16117ce6ab - -Signed-off-by: Alexey Gladkov - src/loadkeys.analyze.l | 14 +- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l -index c18dcea..f817c78 100644 a/src/loadkeys.analyze.l -+++ b/src/loadkeys.analyze.l -@@ -307,8 +307,10 @@ To to|To|TO - char *s = xstrndup(yytext+1, strlen(yytext)-2); - /* use static pathname to store *s ? */ - open_include(s); -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - } - [^"]|\"\"|\"[^"\n]*{Eol} { - yyerror(_("expected filename between quotes")); -@@ -323,7 +325,7 @@ To to|To|TO - } - {Eol} { - line_nr++; -- if (state_ptr > 0) { -+ while (state_ptr > 0) { - yy_pop_state(); - state_ptr--; - } -@@ -428,8 +430,10 @@ To to|To|TO - } - \" { - *p = '\0'; -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - return(STRLITERAL); - } - . { a/src/loadkeys.analyze.c -+++ b/src/loadkeys.analyze.c -@@ -1359,8 +1359,10 @@ YY_RULE_SETUP - char *s = xstrndup(yytext+1, strlen(yytext)-2); - /* use static pathname to store *s ? */ - open_include(s); -- yy_pop_state(); -- state_ptr--; -+ while (state_ptr > 0) { -+ yy_pop_state(); -+ state_ptr--; -+ } - } - YY_BREAK - case 3: -@@ -1393,7 +1395,7 @@ YY_RULE_SETUP - #line 324 "loadkeys.analyze.l" - { - line_nr++; -- if (state_ptr > 0) { -+ while (state_ptr > 0) { -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 233e2b3a5edf07978d0107cbb71dd26b64c8a9c3 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Jan 26 01:11:45 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Jan 26 01:11:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233e2b3a sys-apps/kbd: amd64 stable wrt bug #645022 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/kbd/kbd-2.0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index 34e40d96753..aa313ff81c3 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: f0d819c62123e9c42ae47e2821ef38ed544e82b6 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jan 23 10:20:56 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jan 23 10:21:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d819c6 sys-apps/kbd: switch SRC_URI since ftp.kernel.org is deprecated Package-Manager: Portage-2.3.13, Repoman-2.3.3 sys-apps/kbd/Manifest | 2 +- sys-apps/kbd/kbd-1.15.5-r1.ebuild | 4 ++-- sys-apps/kbd/kbd-2.0.3.ebuild | 4 ++-- sys-apps/kbd/kbd-2.0.4.ebuild | 2 +- sys-apps/kbd/kbd-.ebuild | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index aa013d42f49..d6c4a8c16e7 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,3 +1,3 @@ -DIST kbd-1.15.5.tar.gz 1730719 BLAKE2B 3a331237b235a0731abbfd6d2846bb1fd8e90ba6641559598d7c970fb6be12a0d57f293a7e1d79ac93d5bf4279513825e7ebbbad0c5d13afad5de349fa7b5100 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c +DIST kbd-1.15.5.tar.xz 790680 BLAKE2B f34883fea204a292c91bd0b06924e5a93f0157ef2b1a4f7e8b424770103222685c0e11ae9897c9f5da3ee5e2a87dbea808ca1405fb92a55bfef3dc3e75b21ec4 SHA512 fed954bfe231a46debc2a0d6e919335b42d8cfc879821137424440289de248f6a1705e48745cf19e5bd16d7f66c2a8ff2793341f9906d2d4b2b88ac7774d8c7f DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f diff --git a/sys-apps/kbd/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild index 7c4451fcab1..aeb194b6ee4 100644 --- a/sys-apps/kbd/kbd-1.15.5-r1.ebuild +++ b/sys-apps/kbd/kbd-1.15.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -7,7 +7,7 @@ inherit eutils DESCRIPTION="Keyboard and console utilities" HOMEPAGE="http://freshmeat.net/projects/kbd/"; -SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"; +SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; LICENSE="GPL-2" SLOT="0" diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild index 084b72febed..3d02370de95 100644 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ b/sys-apps/kbd/kbd-2.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"; EGIT_BRANCH="master" else - SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" fi diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index 2e18b81b94f..34e40d96753 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"; EGIT_BRANCH="master" else - SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" fi diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index df8a5adeb6c..60f4d971854 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} == "" ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; EGIT_BRANCH="master" else - SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 1dcfa78c57101e88ee3621ad209b5d64405afdd9 Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Jan 19 16:22:40 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Jan 19 20:27:36 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcfa78c sys-apps/kbd: stable 2.0.4 for hppa/sparc Bug: https://bugs.gentoo.org/show_bug.cgi?id=645022 Package-Manager: Portage-2.3.19, Repoman-2.3.6 RepoMan-Options: --include-arches="hppa sparc" sys-apps/kbd/kbd-2.0.4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index e16d0d8ce7d..d1af17e39a9 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,7 +10,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86" fi inherit eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: b6501f9a8465e71b3159af088f7d1e2eb28b4941 Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 19 12:49:14 2018 + Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 19 12:49:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6501f9a sys-apps/kbd: Ported live ebuild to EAPI-6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/kbd/kbd-.ebuild | 30 ++ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys-apps/kbd/kbd-.ebuild b/sys-apps/kbd/kbd-.ebuild index 139d12639fd..df8a5adeb6c 100644 --- a/sys-apps/kbd/kbd-.ebuild +++ b/sys-apps/kbd/kbd-.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 SCM="" if [[ ${PV} == "" ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/kbd.git"; + SCM="autotools git-r3" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"; EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -inherit autotools eutils ${SCM} +inherit eutils ${SCM} DESCRIPTION="Keyboard and console utilities" HOMEPAGE="http://kbd-project.org/"; @@ -22,7 +22,8 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RDEPEND="pam? ( virtual/pam )" +RDEPEND="pam? ( virtual/pam ) + app-arch/gzip" DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" @@ -44,18 +45,23 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch - eautoreconf + default + if [[ ${PV} == "" ]] ; then + eautoreconf + fi } src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) \ + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) $(use_enable test tests) + ) + econf "${myeconfargs[@]}" } src_install() { default - dohtml docs/doc/*.html + docinto html + dodoc docs/doc/*.html }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 937772385d823fa8102c776fcee924d3fce2e48a Author: A. Wilcox Wilcox-Tech com> AuthorDate: Mon Jan 23 00:03:32 2017 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Jan 23 19:58:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93777238 sys-apps/kbd: Add app-arch/gzip to RDEPEND (#606862) Prevents errors on embedded profile or during bootstrap: sh: gzip: command not found Package-Manager: portage-2.3.1 X-Gentoo-Bug: 606862 (cherry picked from commit 90d8f502401006e0a4a00330571698039379481c) Signed-off-by: Robin H. Johnson gentoo.org> Fixes: https://github.com/gentoo/gentoo/pull/3602 sys-apps/kbd/kbd-2.0.3.ebuild | 3 ++- sys-apps/kbd/kbd-2.0.4.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild index c123ddd..d9faa4d 100644 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ b/sys-apps/kbd/kbd-2.0.3.ebuild @@ -23,7 +23,8 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RDEPEND="pam? ( virtual/pam )" +RDEPEND="pam? ( virtual/pam ) + app-arch/gzip" DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild index e5d450c..636c498 100644 --- a/sys-apps/kbd/kbd-2.0.4.ebuild +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -23,7 +23,8 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RDEPEND="pam? ( virtual/pam )" +RDEPEND="pam? ( virtual/pam ) + app-arch/gzip" DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: c18de96120036990b13d4f2a38f44d9d6167e183 Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 9 18:30:58 2017 + Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 9 18:33:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18de961 sys-apps/kbd: Bump to version 2.0.4 Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-apps/kbd/Manifest | 1 + sys-apps/kbd/kbd-2.0.4.ebuild | 63 +++ 2 files changed, 64 insertions(+) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 2687a82..725e095 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -2,3 +2,4 @@ DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904 DIST kbd-2.0.1.tar.xz 951132 SHA256 55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af SHA512 8d6f663611a99426a7259909d1276732635edc90e61a4affc4cebbdd8bcb180c91a19c8f90bc1b6511c57abee66d5fa513f13bc05cfb3903ee51b5048577d836 WHIRLPOOL 3be2d1fb0cae1443dbd813a45cd815664e4bab94fa1bc37b0c3054f86846fa3d69c8c1a5e620413da34d65f58a90768eac22cd24972366f2d8d24fafcd094703 DIST kbd-2.0.2.tar.xz 1023980 SHA256 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 SHA512 8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa WHIRLPOOL e6a5be104b11266f8be9ba653e9e0de701cdf4c56b249af9bc52ea5eea374d1de82e3f4a02214552750adebb8ae21c8c964a4161d661e460f765306920e23849 DIST kbd-2.0.3.tar.xz 1037036 SHA256 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f WHIRLPOOL 7534370cd0410119775c564269ada152248c75711332e2d6884d1503cef4f573617d7d7d4bb29c581ee993be2f8e96f6c290feb07bfabbb8c14a12ca6d33841e +DIST kbd-2.0.4.tar.xz 1031864 SHA256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f WHIRLPOOL bde3f8ac3900cc7a39e8d8fd4bc0e87e777e21cb559c1efc9ca1dd0192fba6e8983e40011b702e1be14bb92d238ef89bde23ed40269dbeb8719c622c4d7cb8d9 diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild new file mode 100644 index ..e5d450c --- /dev/null +++ b/sys-apps/kbd/kbd-2.0.4.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +SCM="" +if [[ ${PV} == "" ]] ; then + SCM="autotools git-r3" + EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"; + EGIT_BRANCH="master" +else + SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +inherit eutils ${SCM} + +DESCRIPTION="Keyboard and console utilities" +HOMEPAGE="http://kbd-project.org/"; + +LICENSE="GPL-2" +SLOT="0" +IUSE="nls pam test" + +RDEPEND="pam? ( virtual/pam )" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-libs/check )" + +src_unpack() { + if [[ ${PV} == "" ]] ; then + git-r3_src_unpack + else + default + fi + + # Rename conflicting keymaps to have unique names, bug #293228 + cd "${S}"/data/keymaps/i386 || die + mv dvorak/no.map dvorak/no-dvorak.map || die + mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die + mv olpc/es.map olpc/es-olpc.map || die + mv olpc/pt.map olpc/pt-olpc.map || die + mv qwerty/cz.map qwerty/cz-qwerty.map || die +} + +src_prepare() { + if [[ ${PV} == "" ]] ; then + eautoreconf + fi +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable pam vlock) \ + $(use_enable test tests) +} + +src_install() { + default + dohtml docs/doc/*.html +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/files/, sys-apps/kbd/
commit: 3dbd6d8a84a1d7d7dc2809735e660f247bcc09fd Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 9 18:32:56 2017 + Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 9 18:33:17 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dbd6d8a sys-apps/kbd: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-apps/kbd/Manifest | 2 - sys-apps/kbd/files/kbd-2.0.1-big_endian.patch | 27 --- sys-apps/kbd/files/kbd-2.0.1-stdarg.patch | 43 -- sys-apps/kbd/kbd-2.0.1-r1.ebuild | 64 --- sys-apps/kbd/kbd-2.0.1.ebuild | 55 --- sys-apps/kbd/kbd-2.0.2.ebuild | 62 -- 6 files changed, 253 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 725e095..87bcad6 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,5 +1,3 @@ DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c WHIRLPOOL 431873623d4125b73622894c511711a2153fae498a17dc59851219405c69a641c24bb591fa66001eb4cc7491fc4f90e532661c2bf56f69e2a17dd435d1e14ace -DIST kbd-2.0.1.tar.xz 951132 SHA256 55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af SHA512 8d6f663611a99426a7259909d1276732635edc90e61a4affc4cebbdd8bcb180c91a19c8f90bc1b6511c57abee66d5fa513f13bc05cfb3903ee51b5048577d836 WHIRLPOOL 3be2d1fb0cae1443dbd813a45cd815664e4bab94fa1bc37b0c3054f86846fa3d69c8c1a5e620413da34d65f58a90768eac22cd24972366f2d8d24fafcd094703 -DIST kbd-2.0.2.tar.xz 1023980 SHA256 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 SHA512 8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa WHIRLPOOL e6a5be104b11266f8be9ba653e9e0de701cdf4c56b249af9bc52ea5eea374d1de82e3f4a02214552750adebb8ae21c8c964a4161d661e460f765306920e23849 DIST kbd-2.0.3.tar.xz 1037036 SHA256 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f WHIRLPOOL 7534370cd0410119775c564269ada152248c75711332e2d6884d1503cef4f573617d7d7d4bb29c581ee993be2f8e96f6c290feb07bfabbb8c14a12ca6d33841e DIST kbd-2.0.4.tar.xz 1031864 SHA256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f WHIRLPOOL bde3f8ac3900cc7a39e8d8fd4bc0e87e777e21cb559c1efc9ca1dd0192fba6e8983e40011b702e1be14bb92d238ef89bde23ed40269dbeb8719c622c4d7cb8d9 diff --git a/sys-apps/kbd/files/kbd-2.0.1-big_endian.patch b/sys-apps/kbd/files/kbd-2.0.1-big_endian.patch deleted file mode 100644 index f69b7f9.. --- a/sys-apps/kbd/files/kbd-2.0.1-big_endian.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 363185b72ccb5279fa950a378ebd93c082078d39 Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen -Date: Sat, 15 Mar 2014 01:32:56 +0200 -Subject: libkeymap: fix kmap on big-endian machines - -Currently "loadkeys" does not work properly (no keys are ever changed) -on big-endian machines (e.g. SPARC and other classic hardware) -due to incorrect typing. The patch fixes this. - -Signed-off-by: Aaro Koskinen - -diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c -index e529136..85a3bb3 100644 a/src/libkeymap/kmap.c -+++ b/src/libkeymap/kmap.c -@@ -37,7 +37,7 @@ int - lk_key_exists(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) - { - struct lk_array *map; -- u_short *key; -+ unsigned int *key; - - map = lk_array_get_ptr(ctx->keymap, k_table); - if (!map) { --- -cgit v0.10.1 - diff --git a/sys-apps/kbd/files/kbd-2.0.1-stdarg.patch b/sys-apps/kbd/files/kbd-2.0.1-stdarg.patch deleted file mode 100644 index b325af4.. --- a/sys-apps/kbd/files/kbd-2.0.1-stdarg.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7955ccd650dc3235df3bf6333222c2811dd43141 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 6 Jan 2014 10:27:23 -0500 -Subject: [PATCH] libkeymap: include stdarg.h where used - -Some of these headers use va_list but don't include stdarg.h for it. - -Reported-by: Anthony Basile -Signed-off-by: Mike Frysinger - src/libkeymap/contextP.h | 2 ++ - src/libkeymap/keymap/common.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/libkeymap/contextP.h b/src/libkeymap/contextP.h -index e3798e3..8ee3fab 100644 a/src/libkeymap/contextP.h -+++ b/src/libkeymap/contextP.h -@@ -1,6 +1,8 @@ - #ifndef LK_CONTEXTP_H - #define LK_CONTEXTP_H - -+#include -+ - #include "keymap.h" - - /** -diff --git a/src/libkeymap/keymap/common.h b/src/libkeymap/keymap/common.
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 84611fb4c710e40bf45b11afb17b3d4f44ae9338 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jul 19 18:39:57 2016 + Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jul 19 18:43:31 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84611fb4 sys-apps/kbd: stable on x86, bug #563350 Package-Manager: portage-2.2.28 sys-apps/kbd/kbd-2.0.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild index 3684678..375113a 100644 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ b/sys-apps/kbd/kbd-2.0.3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86" fi inherit autotools eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 1e68a43302ffe51c5341a99fa3272fca45aa23e2 Author: Markus Meier gentoo org> AuthorDate: Sat May 28 11:03:54 2016 + Commit: Markus Meier gentoo org> CommitDate: Sat May 28 11:03:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e68a433 sys-apps/kbd: arm stable, bug #563350 Package-Manager: portage-2.3.0_rc1 RepoMan-Options: --include-arches="arm" sys-apps/kbd/kbd-2.0.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild index 36df191..9233d2a 100644 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ b/sys-apps/kbd/kbd-2.0.3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" fi inherit autotools eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: 5fc6baca66280e89211adb7e5bb10e5145e2fb5f Author: Jeroen Roovers gentoo org> AuthorDate: Wed May 25 05:20:24 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Wed May 25 05:20:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc6baca sys-apps/kbd: Stable for HPPA PPC64 (bug #563350). Package-Manager: portage-2.3.0_rc1 RepoMan-Options: --ignore-arches sys-apps/kbd/kbd-2.0.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild index 4e9b228..36df191 100644 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ b/sys-apps/kbd/kbd-2.0.3.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86" fi inherit autotools eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/
commit: b21cd2a297f5a860e06cd5fb2845a282fa5e4e3d Author: Tobias Klausmann gentoo org> AuthorDate: Tue May 24 10:23:46 2016 + Commit: Tobias Klausmann gentoo org> CommitDate: Tue May 24 10:23:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21cd2a2 sys-apps/kbd-2.0.3-r0: add alpha keyword Gentoo-Bug: 563350 Package-Manager: portage-2.3.0_rc1 sys-apps/kbd/kbd-2.0.3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild index 67a1d26..4e9b228 100644 --- a/sys-apps/kbd/kbd-2.0.3.ebuild +++ b/sys-apps/kbd/kbd-2.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ if [[ ${PV} == "" ]] ; then EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi inherit autotools eutils ${SCM}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/, media-sound/freebirth/, x11-misc/peksystray/
commit: 4b24c20aa77136909b70e5a9444d2372f0a85f44 Author: Justin Lecher gentoo org> AuthorDate: Thu Oct 1 11:11:41 2015 + Commit: Justin Lecher gentoo org> CommitDate: Thu Oct 1 12:01:58 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b24c20a Add missing remote-id type=freshmeat Signed-off-by: Justin Lecher gentoo.org> media-sound/freebirth/metadata.xml | 7 +-- sys-apps/kbd/metadata.xml | 7 +-- x11-misc/peksystray/metadata.xml | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/media-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml index e1774e3..33401c0 100644 --- a/media-sound/freebirth/metadata.xml +++ b/media-sound/freebirth/metadata.xml @@ -1,5 +1,8 @@ - + http://www.gentoo.org/dtd/metadata.dtd";> -sound + sound + + 8834 + diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml index 96a2d58..cfeb124 100644 --- a/sys-apps/kbd/metadata.xml +++ b/sys-apps/kbd/metadata.xml @@ -1,5 +1,8 @@ - + http://www.gentoo.org/dtd/metadata.dtd";> -base-system + base-system + + kbd + diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml index c45a76d..00bc271 100644 --- a/x11-misc/peksystray/metadata.xml +++ b/x11-misc/peksystray/metadata.xml @@ -1,4 +1,4 @@ - + http://www.gentoo.org/dtd/metadata.dtd";> @@ -6,5 +6,6 @@ peksystray + peksystray