Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
Date: Sat, 26 Nov 2022 22:05:14
Message-Id: 1669500258.56444ec8f0916a5a2881d888aae9a8082cf87ac5.floppym@gentoo
1 commit: 56444ec8f0916a5a2881d888aae9a8082cf87ac5
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 17:00:05 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 22:04:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56444ec8
7
8 sys-apps/portage: warn about obsolete enotice in profile.bashrc
9
10 Closes: https://bugs.gentoo.org/867010
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 .../{portage-3.0.38.1-r3.ebuild => portage-3.0.38.1-r4.ebuild} | 10 ++++++++++
14 .../{portage-3.0.39-r1.ebuild => portage-3.0.39-r2.ebuild} | 10 ++++++++++
15 sys-apps/portage/portage-9999.ebuild | 10 ++++++++++
16 3 files changed, 30 insertions(+)
17
18 diff --git a/sys-apps/portage/portage-3.0.38.1-r3.ebuild b/sys-apps/portage/portage-3.0.38.1-r4.ebuild
19 similarity index 96%
20 rename from sys-apps/portage/portage-3.0.38.1-r3.ebuild
21 rename to sys-apps/portage/portage-3.0.38.1-r4.ebuild
22 index 0ba541e800e8..24229a75876e 100644
23 --- a/sys-apps/portage/portage-3.0.38.1-r3.ebuild
24 +++ b/sys-apps/portage/portage-3.0.38.1-r4.ebuild
25 @@ -272,3 +272,13 @@ pkg_preinst() {
26 elog "change, see https://bugs.gentoo.org/658648."
27 fi
28 }
29 +
30 +pkg_postinst() {
31 + # Warn about obsolete "enotice" script, bug #867010
32 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
33 + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
34 + eerror "Obsolete 'enotice' script detected!"
35 + eerror "Please remove this from ${bashrc} to avoid problems."
36 + eerror "See bug 867010 for more details."
37 + fi
38 +}
39
40 diff --git a/sys-apps/portage/portage-3.0.39-r1.ebuild b/sys-apps/portage/portage-3.0.39-r2.ebuild
41 similarity index 96%
42 rename from sys-apps/portage/portage-3.0.39-r1.ebuild
43 rename to sys-apps/portage/portage-3.0.39-r2.ebuild
44 index 040a60847373..430e100baf73 100644
45 --- a/sys-apps/portage/portage-3.0.39-r1.ebuild
46 +++ b/sys-apps/portage/portage-3.0.39-r2.ebuild
47 @@ -272,3 +272,13 @@ pkg_preinst() {
48 elog "change, see https://bugs.gentoo.org/658648."
49 fi
50 }
51 +
52 +pkg_postinst() {
53 + # Warn about obsolete "enotice" script, bug #867010
54 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
55 + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
56 + eerror "Obsolete 'enotice' script detected!"
57 + eerror "Please remove this from ${bashrc} to avoid problems."
58 + eerror "See bug 867010 for more details."
59 + fi
60 +}
61
62 diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
63 index cd92c9d2da5d..9d56bb80d781 100644
64 --- a/sys-apps/portage/portage-9999.ebuild
65 +++ b/sys-apps/portage/portage-9999.ebuild
66 @@ -256,3 +256,13 @@ pkg_preinst() {
67 chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
68 fi
69 }
70 +
71 +pkg_postinst() {
72 + # Warn about obsolete "enotice" script, bug #867010
73 + local bashrc=${EROOT}/etc/portage/profile/profile.bashrc
74 + if [[ -e ${bashrc} ]] && grep -q enotice "${bashrc}"; then
75 + eerror "Obsolete 'enotice' script detected!"
76 + eerror "Please remove this from ${bashrc} to avoid problems."
77 + eerror "See bug 867010 for more details."
78 + fi
79 +}