Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/
Date: Tue, 03 May 2022 13:03:10
Message-Id: 1651582937.67c192b1117d51b72b9ff638fe0563d00c65c64e.jsmolic@gentoo
1 commit: 67c192b1117d51b72b9ff638fe0563d00c65c64e
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 3 12:59:20 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Tue May 3 13:02:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c192b1
7
8 sys-apps/busybox: Drop obsolete make-symlinks warning
9
10 - USE=make-symlinks is no longer overwriting binaries on the target
11 system, so let's drop the obsolete warning
12
13 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
14
15 sys-apps/busybox/busybox-1.34.1.ebuild | 8 --------
16 sys-apps/busybox/busybox-1.35.0.ebuild | 8 --------
17 sys-apps/busybox/busybox-9999.ebuild | 8 --------
18 3 files changed, 24 deletions(-)
19
20 diff --git a/sys-apps/busybox/busybox-1.34.1.ebuild b/sys-apps/busybox/busybox-1.34.1.ebuild
21 index 693ba522154c..c4292394670b 100644
22 --- a/sys-apps/busybox/busybox-1.34.1.ebuild
23 +++ b/sys-apps/busybox/busybox-1.34.1.ebuild
24 @@ -310,14 +310,6 @@ src_install() {
25 }
26
27 pkg_preinst() {
28 - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
29 - ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
30 - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
31 - ewarn "If you are creating a binary only and not merging this is probably ok."
32 - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
33 - die "silly options will destroy your system"
34 - fi
35 -
36 if use make-symlinks ; then
37 mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
38 fi
39
40 diff --git a/sys-apps/busybox/busybox-1.35.0.ebuild b/sys-apps/busybox/busybox-1.35.0.ebuild
41 index dbdaa5ce70e2..826956c9d2f3 100644
42 --- a/sys-apps/busybox/busybox-1.35.0.ebuild
43 +++ b/sys-apps/busybox/busybox-1.35.0.ebuild
44 @@ -311,14 +311,6 @@ src_install() {
45 }
46
47 pkg_preinst() {
48 - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
49 - ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
50 - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
51 - ewarn "If you are creating a binary only and not merging this is probably ok."
52 - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
53 - die "silly options will destroy your system"
54 - fi
55 -
56 if use make-symlinks ; then
57 mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
58 fi
59
60 diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
61 index 9cca9167e60a..b73a93560532 100644
62 --- a/sys-apps/busybox/busybox-9999.ebuild
63 +++ b/sys-apps/busybox/busybox-9999.ebuild
64 @@ -310,14 +310,6 @@ src_install() {
65 }
66
67 pkg_preinst() {
68 - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
69 - ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
70 - ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
71 - ewarn "If you are creating a binary only and not merging this is probably ok."
72 - ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
73 - die "silly options will destroy your system"
74 - fi
75 -
76 if use make-symlinks ; then
77 mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
78 fi