From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- sys-apps/kbd/Manifest | 8 +- 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 ---------------------- sys-apps/kbd/kbd-2.4.0.ebuild | 4 +- 6 files changed, 3 insertions(+), 238 deletions(-) delete mode 100644 sys-apps/kbd/files/kbd-2.2.0-cflags.patch delete mode 100644 sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch delete mode 100644 sys-apps/kbd/kbd-2.2.0-r2.ebuild delete mode 100644 sys-apps/kbd/kbd-2.3.0-r1.ebuild (limited to 'sys-apps/kbd') diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 199bdae869a2..d64d920d1a3c 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,10 +1,4 @@ -AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28443ba7e340ee6306dcc6a429c6e939684ed3058213681476342a428e06384739a8e51f08c549058b0c8b686 SHA512 14645a299e22afd38d2b118b9f1029280392880ce56c2b65a8e61bcfebd818d5e3b61f9a701d3b362b4f1d31bee4db2d23179b6e31e235e6e82b05b1e17d22b1 -AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed -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 -EBUILD kbd-2.2.0-r2.ebuild 1597 BLAKE2B e56136d4d7a0bbae100e8886731a09c30b908b7d075dcb8c935726cc8a6795ee91a45d994d42457ee5435eb6f143639c678e8458e1f2dcf48b81a9092bdc1a02 SHA512 0060f49d5a29b83264f4a975774cd28dec0b4b1869400d7e2a05de23912e81e53b2aa68353c47a951d6efa83e36c19669ef4e6ca965ce866d5855d0f20968679 -EBUILD kbd-2.3.0-r1.ebuild 1914 BLAKE2B 133b815160a2d3a1b0f46a6c9f8fc92124b52c6802430f98deaf807408df0de01d0ac2bdde07b848145f82927eb81dbd0a07211a91ef8cfec680c98972bc9058 SHA512 202008234ffec81f951b5f0864e005e0bb30825e02cf3998fc0007979aa1d7304bcd35ad35976dafe76e88f2f7cbd76afddd487064d364bcaddc71f4341b6860 -EBUILD kbd-2.4.0.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c +EBUILD kbd-2.4.0.ebuild 1865 BLAKE2B b1c9d1961a1c74522ede9368f28d603fd76fb1242628a15e73e0e1f0d0d723072abecd5f2aee1d1300d18bb0be34a2ea8312b1f6c291b670a8ac76d3e304638f SHA512 81f5955d377a44933291bc1d693a2d316bf696ec0f8cfd76f44b035e135be14578f6efa7734aff93a4dfa3ffc83d1b4f0e910b8afaa6d7f8012f8ed22903f9bf EBUILD kbd-9999.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 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 86c0f45074ac..000000000000 --- 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 4b545f5bc2a2..000000000000 --- 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 -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 b7b82aca99ef..000000000000 --- 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 698828be221c..000000000000 --- 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 -} diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild index ef571616a3ab..bb7dfea2b036 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} == "9999" ]] ; 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" -- cgit v1.2.3