Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: man/, lib/portage/package/ebuild/_config/, lib/portage/package/ebuild/
Date: Mon, 02 May 2022 18:45:31
Message-Id: 1651517091.14d9c755f7534e23f10719d0fe6c04b18534e854.mattst88@gentoo
1 commit: 14d9c755f7534e23f10719d0fe6c04b18534e854
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 21:04:10 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon May 2 18:44:51 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=14d9c755
7
8 Remove remnants of SIGNED_OFF_BY
9
10 Was only used by repoman.
11
12 Closes: https://github.com/gentoo/portage/pull/819
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 lib/portage/package/ebuild/_config/special_env_vars.py | 1 -
16 lib/portage/package/ebuild/config.py | 1 -
17 man/make.conf.5 | 11 -----------
18 3 files changed, 13 deletions(-)
19
20 diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py
21 index 9b2d77aea..04e4c5b9b 100644
22 --- a/lib/portage/package/ebuild/_config/special_env_vars.py
23 +++ b/lib/portage/package/ebuild/_config/special_env_vars.py
24 @@ -340,7 +340,6 @@ environ_filter += [
25 "RESUMECOMMAND_HTTPS",
26 "RESUMECOMMAND_RSYNC",
27 "RESUMECOMMAND_SFTP",
28 - "SIGNED_OFF_BY",
29 "UNINSTALL_IGNORE",
30 "USE_EXPAND_HIDDEN",
31 "USE_ORDER",
32
33 diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
34 index 5d9d5ce48..f35fcdf65 100644
35 --- a/lib/portage/package/ebuild/config.py
36 +++ b/lib/portage/package/ebuild/config.py
37 @@ -200,7 +200,6 @@ class config:
38 _deprecated_keys = {
39 "PORTAGE_LOGDIR": "PORT_LOGDIR",
40 "PORTAGE_LOGDIR_CLEAN": "PORT_LOGDIR_CLEAN",
41 - "SIGNED_OFF_BY": "DCO_SIGNED_OFF_BY",
42 }
43
44 _setcpv_aux_keys = (
45
46 diff --git a/man/make.conf.5 b/man/make.conf.5
47 index 8c77eda2e..bde92af1a 100644
48 --- a/man/make.conf.5
49 +++ b/man/make.conf.5
50 @@ -255,9 +255,6 @@ of \fBemerge\fR(1) for more information.
51 This variable is passed by the \fIebuild scripts\fR to the \fIconfigure\fR
52 as \fI\-\-target=${CTARGET}\fR only if it is defined.
53 .TP
54 -.B DCO_SIGNED_OFF_BY
55 -See \fISIGNED_OFF_BY\fR below. Deprecated.
56 -.TP
57 \fBDISTDIR\fR = \fI[path]\fR
58 Defines the location of your local source file repository. After packages
59 are built, it is safe to remove any and all files from this directory since
60 @@ -1280,14 +1277,6 @@ Defines the location where created RPM packages will be stored.
61 .br
62 Defaults to /var/cache/rpm.
63 .TP
64 -.B SIGNED_OFF_BY
65 -This variable may contain a name and email address which will be used by
66 -\fBrepoman\fR(1) to add a Signed\-off\-by line to each commit message.
67 -The meaning of a signoff depends on the project. Typically, it certifies
68 -that the committer has the rights to submit the work under a free license
69 -and agrees to a Certificate of Origin. (For example, see GLEP 76 for the
70 -Gentoo Linux policy: \fIhttps://www.gentoo.org/glep/glep-0076.html\fR.)
71 -.TP
72 \fBSYNC\fR = \fI[RSYNC]\fR
73 Insert your preferred rsync mirror here. This rsync server
74 is used to sync the local ebuild repository when `emerge \-\-sync` is run.