diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-apps/kbd | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'sys-apps/kbd')
-rw-r--r-- | sys-apps/kbd/Manifest | 8 | ||||
-rw-r--r-- | sys-apps/kbd/kbd-2.4.0.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/kbd/kbd-2.5.1.ebuild | 83 | ||||
-rw-r--r-- | sys-apps/kbd/kbd-9999.ebuild | 45 | ||||
-rw-r--r-- | sys-apps/kbd/metadata.xml | 14 |
5 files changed, 118 insertions, 34 deletions
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index ff950d9cf61f..fd1f13e2e4dd 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,4 +1,6 @@ DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb -EBUILD kbd-2.4.0.ebuild 1859 BLAKE2B 30abb362d5bca1d525ca6d96cf844ab79a8c12bcf8c83e65d78ee3227b805aceef699040e9315e11b2c80cb9615fd217e343ef0dac856fd99aaad8da6859dc5d SHA512 314268d654df7524bf8ba61cd7c234127f9171044bc20136f99e9b3c013529226e872bb9fea05a32b22953588a0b3d198a58fa16eed343e0072d1a25e5d2c71c -EBUILD kbd-9999.ebuild 1860 BLAKE2B beaf59ae73c17d9d01a5bd7d4a807f8f80259cc9194d0f9b221f3ac329e72eb290fc7b70bdb4b66b666f51bfc3bc5cf2c2b3541469881c1fc318a522cf7b31bc SHA512 939675dfc61faac63a75c968fe5d2cc73672316f16aa1ea4f0f1382e0e515a82e9ac1800e136ddfa8dc6eb0fc5018133ea81cd09f55414e56f86746bdd1cf884 -MISC metadata.xml 322 BLAKE2B c059619ec7424e63ad96d2be7d4d5a0872b494d24dcb923eb159898563ac7a79f6c51cf1b4027c1a3e40f1177107e24dd7485e73010625c64eb7bce2a35429fc SHA512 813a710b7238c4b0366da55c1180a9f1df97d3e58207680dc902739e4306d28183b5a5b04bb98714b488a12b09a9b388a30eb1407f41fdab49e86cab3b5f51f9 +DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0 +EBUILD kbd-2.4.0.ebuild 1836 BLAKE2B 1797a7b563ec3ef7e55ce1d5c164ea035bbe7da3a3f1f0abb033a3de3015d2b676c4bb24c942e6b1ebfd9bd3f15120914f042ee6f3649130fbe5adfba74b7199 SHA512 7d74a77490c4fe1c041995f6a7bf3424ae4d7c33199e14ccec9a50837144121d8090446636a39e9675b02fc835f3098c97b99cf037631fbdd963aa6276d2f9d6 +EBUILD kbd-2.5.1.ebuild 2027 BLAKE2B efa4617f0d185b8a6689977985af9da0b028077ca1e89aa135c292f0e534b2295da7bc75ab14039a2d3bda6497a015ff7b2ce16d3b9bd7317386cf02a1ead1b3 SHA512 cadc6fcd9ec5b2623722d3b12d53cb6e2abff2dccf7154068803b6eb01adc455b809b69beadb11dd6e20d2e30840d25e9801fa516aef8758cf64543a33e6af35 +EBUILD kbd-9999.ebuild 2027 BLAKE2B efa4617f0d185b8a6689977985af9da0b028077ca1e89aa135c292f0e534b2295da7bc75ab14039a2d3bda6497a015ff7b2ce16d3b9bd7317386cf02a1ead1b3 SHA512 cadc6fcd9ec5b2623722d3b12d53cb6e2abff2dccf7154068803b6eb01adc455b809b69beadb11dd6e20d2e30840d25e9801fa516aef8758cf64543a33e6af35 +MISC metadata.xml 335 BLAKE2B 3b00a31428edc76e9a758c347107ad15e2f91a440a49e5167878555eda6dad176f8936ca22acbbecb5ff4827d8605b28db53ca990284b4e18c536a04d46616ed SHA512 86a6b134e0403abf5c22e868e2013a2051f504401d5ff8aa1ad682638d866ab8d837470ed87434286b77933483d7675646f382b15aed19772b2fff17258fc0f7 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=" diff --git a/sys-apps/kbd/kbd-2.5.1.ebuild b/sys-apps/kbd/kbd-2.5.1.ebuild new file mode 100644 index 000000000000..a8607b2c1f1d --- /dev/null +++ b/sys-apps/kbd/kbd-2.5.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]] ; 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_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} == 9999 ]] || [[ $(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 +} diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild index b430d89f0657..a8607b2c1f1d 100644 --- a/sys-apps/kbd/kbd-9999.ebuild +++ b/sys-apps/kbd/kbd-9999.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 +EAPI=8 -if [[ ${PV} == "9999" ]] ; then +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_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 @@ -41,41 +43,38 @@ BDEPEND=" test? ( dev-libs/check ) " -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - else - default - fi +src_prepare() { + default # Rename conflicting keymaps to have unique names, bug #293228 - cd "${S}"/data/keymaps/i386 || die + # 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 -src_prepare() { - default - if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then + if [[ ${PV} == 9999 ]] || [[ $(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_install() { default + docinto html dodoc docs/doc/*.html 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 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="freshmeat">kbd</remote-id> -</upstream> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <upstream> + <remote-id type="github">legionus/kbd</remote-id> + </upstream> </pkgmetadata> |