1 |
commit: dd1f25a19bdc00e0e2c3ad5a68a9f52d24a25ccf |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 22 18:20:38 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 22 18:24:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1f25a1 |
7 |
|
8 |
sys-apps/util-linux: Synced live ebuild |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-apps/util-linux/util-linux-9999.ebuild | 27 +-------------------------- |
13 |
1 file changed, 1 insertion(+), 26 deletions(-) |
14 |
|
15 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
16 |
index 58017396bb6..141bdf409cb 100644 |
17 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
18 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
19 |
@@ -17,8 +17,7 @@ if [[ ${PV} == 9999 ]] ; then |
20 |
else |
21 |
[[ "${PV}" = *_rc* ]] || \ |
22 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
23 |
- SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz |
24 |
- https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" |
25 |
+ SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" |
26 |
fi |
27 |
|
28 |
DESCRIPTION="Various useful Linux utilities" |
29 |
@@ -87,18 +86,6 @@ RESTRICT="!test? ( test )" |
30 |
|
31 |
S="${WORKDIR}/${MY_P}" |
32 |
|
33 |
-PATCHES=( |
34 |
-) |
35 |
- |
36 |
-rm_man() { |
37 |
- [[ -n $1 ]] || die |
38 |
- local el |
39 |
- for el in $1 ; do |
40 |
- find "${WORKDIR}/man" -type f -name "${el}.?" -delete \ |
41 |
- || die |
42 |
- done |
43 |
-} |
44 |
- |
45 |
src_prepare() { |
46 |
default |
47 |
|
48 |
@@ -117,14 +104,6 @@ src_prepare() { |
49 |
if [[ ${PV} == 9999 ]] ; then |
50 |
po/update-potfiles |
51 |
eautoreconf |
52 |
- else |
53 |
- # Conditionally remove some man-pages |
54 |
- use hardlink || rm_man "hardlink" |
55 |
- use kill || rm_man "kill" |
56 |
- use logger || rm_man "logger" |
57 |
- use ncurses || rm_man "pg" |
58 |
- use su || rm_man "su" |
59 |
- use tty-helpers || rm_man "mesg wall write" |
60 |
fi |
61 |
|
62 |
elibtoolize |
63 |
@@ -320,10 +299,6 @@ multilib_src_install_all() { |
64 |
# e2fsprogs-libs didnt install .la files, and .pc work fine |
65 |
find "${ED}" -name "*.la" -delete || die |
66 |
|
67 |
- if [[ ${PV} != 9999 ]] ; then |
68 |
- doman "${WORKDIR}"/man/man*/* |
69 |
- fi |
70 |
- |
71 |
if ! use userland_GNU ; then |
72 |
# manpage collisions |
73 |
# TODO: figure out a good way to keep them |