Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
Date: Thu, 04 Aug 2022 23:49:50
Message-Id: 1659655804.488c97915c8fb8e1a2bcb7fff45d1f350e2e6052.sam@gentoo
1 commit: 488c97915c8fb8e1a2bcb7fff45d1f350e2e6052
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 4 23:29:36 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 4 23:30:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488c9791
7
8 sys-apps/util-linux: add 2.38.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-apps/util-linux/Manifest | 2 ++
13 .../{util-linux-9999.ebuild => util-linux-2.38.1.ebuild} | 12 ++++++------
14 sys-apps/util-linux/util-linux-9999.ebuild | 12 ++++++------
15 3 files changed, 14 insertions(+), 12 deletions(-)
16
17 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
18 index 4cf9a91086f4..b7f84b87bef0 100644
19 --- a/sys-apps/util-linux/Manifest
20 +++ b/sys-apps/util-linux/Manifest
21 @@ -1,3 +1,5 @@
22 DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdfbb37710df36d4278d869676ba531afd414097e57e5287efed6c7c80d6b6ef36d5812ff2bea611080d3ce5bf5ad4ac5 SHA512 ada2629b0a8e83ea83513e04f7b1ccceb3b8ab82acd119c5d8389d1abc48c92d0b591f39fb34b1fd65db3ab630f03a672a9f3dacf1a6e4f124bdb083fc1be6d7
23 +DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
24 +DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
25 DIST util-linux-2.38.tar.sign 833 BLAKE2B bddde8cf392155eabe1e5f3c77d4f61cc9cb235c6d668cb289bf78650775d309dbe633e8a272ca52ff208e18bc8eaa4f8664ac239e285feb1eea5e3def1b8c2f SHA512 8909576d64c74e43496d45fcf87a761d9960cd8867534923bb280f2e4abaf4df871723aed10ac4e514e14dcbce147bdc9590de3c84994b11227923264313ac2c
26 DIST util-linux-2.38.tar.xz 7349140 BLAKE2B dd3b2abb3fedd91e35cc5665b49f1913aa93927cbb6eb5c9715a9f2ce06269d43c28fe96f6c67be88c210ca20e574177b06780ab4798cbbb0d7c76df07f3eeab SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c
27
28 diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild
29 similarity index 97%
30 copy from sys-apps/util-linux/util-linux-9999.ebuild
31 copy to sys-apps/util-linux/util-linux-2.38.1.ebuild
32 index 60535b687ba6..59eecef07674 100644
33 --- a/sys-apps/util-linux/util-linux-9999.ebuild
34 +++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild
35 @@ -1,9 +1,9 @@
36 # Copyright 1999-2022 Gentoo Authors
37 # Distributed under the terms of the GNU General Public License v2
38
39 -EAPI=7
40 +EAPI=8
41
42 -PYTHON_COMPAT=( python3_{8,9,10} )
43 +PYTHON_COMPAT=( python3_{8..10} )
44
45 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
46 pam python-r1 multilib-minimal multiprocessing systemd
47 @@ -12,14 +12,14 @@ MY_PV="${PV/_/-}"
48 MY_P="${PN}-${MY_PV}"
49
50 if [[ ${PV} == 9999 ]] ; then
51 - inherit git-r3 autotools
52 EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
53 + inherit autotools git-r3
54 else
55 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
56 inherit verify-sig
57
58 if [[ ${PV} != *_rc* ]] ; then
59 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
60 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
61 fi
62
63 SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
64 @@ -29,7 +29,7 @@ fi
65 S="${WORKDIR}/${MY_P}"
66
67 DESCRIPTION="Various useful Linux utilities"
68 -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
69 +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
70
71 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
72 SLOT="0"
73 @@ -347,7 +347,7 @@ multilib_src_install() {
74 multilib_src_install_all() {
75 dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
76
77 - # e2fsprogs-libs didnt install .la files, and .pc work fine
78 + # e2fsprogs-libs didn't install .la files, and .pc work fine
79 find "${ED}" -name "*.la" -delete || die
80
81 if use pam ; then
82
83 diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
84 index 60535b687ba6..59eecef07674 100644
85 --- a/sys-apps/util-linux/util-linux-9999.ebuild
86 +++ b/sys-apps/util-linux/util-linux-9999.ebuild
87 @@ -1,9 +1,9 @@
88 # Copyright 1999-2022 Gentoo Authors
89 # Distributed under the terms of the GNU General Public License v2
90
91 -EAPI=7
92 +EAPI=8
93
94 -PYTHON_COMPAT=( python3_{8,9,10} )
95 +PYTHON_COMPAT=( python3_{8..10} )
96
97 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
98 pam python-r1 multilib-minimal multiprocessing systemd
99 @@ -12,14 +12,14 @@ MY_PV="${PV/_/-}"
100 MY_P="${PN}-${MY_PV}"
101
102 if [[ ${PV} == 9999 ]] ; then
103 - inherit git-r3 autotools
104 EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
105 + inherit autotools git-r3
106 else
107 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/karelzak.asc
108 inherit verify-sig
109
110 if [[ ${PV} != *_rc* ]] ; then
111 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
112 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
113 fi
114
115 SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
116 @@ -29,7 +29,7 @@ fi
117 S="${WORKDIR}/${MY_P}"
118
119 DESCRIPTION="Various useful Linux utilities"
120 -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
121 +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/util-linux/util-linux"
122
123 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
124 SLOT="0"
125 @@ -347,7 +347,7 @@ multilib_src_install() {
126 multilib_src_install_all() {
127 dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
128
129 - # e2fsprogs-libs didnt install .la files, and .pc work fine
130 + # e2fsprogs-libs didn't install .la files, and .pc work fine
131 find "${ED}" -name "*.la" -delete || die
132
133 if use pam ; then