From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-apps/kbd/Manifest | 8 ++-- sys-apps/kbd/kbd-2.2.0-r2.ebuild | 2 +- sys-apps/kbd/kbd-2.2.90.ebuild | 80 ------------------------------------ sys-apps/kbd/kbd-2.3.0-r1.ebuild | 87 ++++++++++++++++++++++++++++++++++++++++ sys-apps/kbd/kbd-9999.ebuild | 9 ++++- 5 files changed, 100 insertions(+), 86 deletions(-) delete mode 100644 sys-apps/kbd/kbd-2.2.90.ebuild create 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 6d7a9c8bde93..10bb835a002b 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -3,10 +3,10 @@ AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28 AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed 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 EBUILD kbd-2.0.4-r1.ebuild 1536 BLAKE2B 3bf3fb6e985557b4ac62a75fc64d9e9608716e5914ff151ab11af68bf16f499e06216bb26da494b39f93d032d57fc8b9a74680196659d76d48b8ff5460f26d7f SHA512 a0e5b222f7321d5094a3dc67737b09d6ac1e3881029bbc402feeb58a4e269d3dfb103cff0fddd5c962b0c0cbe8345e986ead373b1592b1a1a82c7e2520f34257 EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 604d3d89c6a4a5f579607bdb03563edc51f3d29731dab80e1b202ceaa1658c70c48f84bcf09c8de958ce3acfcdae79224718897f21ef07803eadf07d900428be SHA512 f568ee8f7d27ee59b2c3e408c602a2d4daf8281964dc509ce251b7dd6b3fc35e6babae2c0f5023d6bd0453a1fe842c992366cf7cc633c21145ded70706d80384 -EBUILD kbd-2.2.0-r2.ebuild 1601 BLAKE2B 4164b0070547959848ef4b8adc05f8ec1ae3e8785bd1d4c9801f9f3ad77a3e515afa51c3e5eb86ec60d4877c14cf4d2d89d7473b1b2d31caafdb04b0f5aae9e7 SHA512 c323e91149fa0842e5b7587db49759e3bb61e6d36fcf74d7df17f3f6fe0c69877abdb50502bc04cd2f3a5878c52eff36f8586f96c04aa15349081454c11bf2f2 -EBUILD kbd-2.2.90.ebuild 1699 BLAKE2B 652e68d5c215b1a8c72f69aa50d338f3e859fb35e1b3c3b8f684909adfc8fad17d528bd4a6990cabe87177b7bdfd0fa1391a4a50d71792457900cbb0667777a6 SHA512 7b757726aac91df126742c41da5230d00a2f712b2b38edc193926c98b98a7acc57982dff33b530df86780b0839d57593e4cbcf9f2d1afe1ac3d979047d076eec -EBUILD kbd-9999.ebuild 1699 BLAKE2B 652e68d5c215b1a8c72f69aa50d338f3e859fb35e1b3c3b8f684909adfc8fad17d528bd4a6990cabe87177b7bdfd0fa1391a4a50d71792457900cbb0667777a6 SHA512 7b757726aac91df126742c41da5230d00a2f712b2b38edc193926c98b98a7acc57982dff33b530df86780b0839d57593e4cbcf9f2d1afe1ac3d979047d076eec +EBUILD kbd-2.2.0-r2.ebuild 1598 BLAKE2B 9bb3f2f83246815e5f0f6835c32f823d5ed9ca87986b953b9d63322df2ebf8c1ee9aa411dc044c5b47cd8b97e4fb3fe855ea331f4475bd1de662317fb9cf7919 SHA512 cd644fabd032ee93c783d197bade61cb14e0a99e9cedfb83b4284de6f7c3eadce8a83489f6e715f73fe8ca45a7b1f22c47b377bc8cfef57d4372961764edc01a +EBUILD kbd-2.3.0-r1.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a +EBUILD kbd-9999.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild index 2b5350ae8b23..ad709279f2d4 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} == "9999" ]] ; 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" diff --git a/sys-apps/kbd/kbd-2.2.90.ebuild b/sys-apps/kbd/kbd-2.2.90.ebuild deleted file mode 100644 index 32395a108a73..000000000000 --- a/sys-apps/kbd/kbd-2.2.90.ebuild +++ /dev/null @@ -1,80 +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 )" - -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_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 new file mode 100644 index 000000000000..3cb9fb4edd0d --- /dev/null +++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild @@ -0,0 +1,87 @@ +# 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-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild index 32395a108a73..3cb9fb4edd0d 100644 --- a/sys-apps/kbd/kbd-9999.ebuild +++ b/sys-apps/kbd/kbd-9999.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 } -- cgit v1.2.3