commit: 8de6a91d7e7e61b849ffcd493b28e01a79f7fea7 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat May 15 00:07:07 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat May 15 00:07:07 2021 +0000 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 <soap <AT> 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..00000000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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..00000000000 --- a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001 -From: Alexey Gladkov <[email protected]> -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 <[email protected]> ---- - 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..00000000000 --- 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} == "9999" ]] ; 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 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}-cflags.patch" #691142 - "${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch" -) - -src_unpack() { - if [[ ${PV} == "9999" ]] ; 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 - 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 -} diff --git a/sys-apps/kbd/kbd-2.3.0-r1.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild deleted file mode 100644 index 698828be221..00000000000 --- a/sys-apps/kbd/kbd-2.3.0-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam - -if [[ ${PV} == "9999" ]] ; 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} == "9999" ]] ; 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} == "9999" ]] || [[ $(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 pam && pamd_mimic_system vlock auth account - - # USE="test" installs .la files - find "${ED}" -type f -name "*.la" -delete || die -}
