Re: [gentoo-dev] Copyright lines in the profiles directory
> On Mon, 21 Jun 2021, Joshua Kinard wrote:
>>> I am inclined to go with "Copyright 1999-2021 Gentoo Authors" across
>>> the board,
>>
>> Why would you move the starting year back in time? Please don't.
>>
>>> but given that copyright is always a touchy subject, figured I'd ask.
> Again, this is why I ask instead of what waltzing off and doing.
> Odds are really likely that many of those profile files were just copied
> from another one elsewhere in the tree. The starting year is all over the
> place, and really, we did not have cascading profiles in 1999, so any of the
> files that say "1999" as the start year likely have the wrong year in the
> first place. More reasonably, I'd want to hunt down the actual creation
> year of each file and then set the start year to the year that file first
> appeared in CVS. Though, that'd be a tad on the pedantic side, not to
> mention take a lot of time to trace each file individually.
> :: waits for someone to drop some magic git-fu that does this in one line ::
For a single file, something like this should do the job (assuming that
you've grafted the historical repo):
$ TZ=UTC git log --find-renames --find-copies --follow \
--pretty="format:%ad" --date="format-local:%Y" ${filename} | tail -n1
Ulrich
signature.asc
Description: PGP signature
[gentoo-dev] [PATCH 1/8] gnuconfig.eclass: Support EAPI 8
Signed-off-by: Ulrich Müller
---
eclass/gnuconfig.eclass | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index 173df6fd25e9..58bdcfd660a6 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -6,7 +6,7 @@
# Sam James
# @AUTHOR:
# Will Woods
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: Refresh bundled gnuconfig files (config.guess, config.sub)
# @DESCRIPTION:
# This eclass is used to automatically update files that typically come with
@@ -17,11 +17,8 @@
#
case ${EAPI:-0} in
- 5|6|7)
- ;;
- *)
- die "EAPI ${EAPI} is unsupported!"
- ;;
+ 5|6|7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then
--
2.32.0
[gentoo-dev] [PATCH 2/8] toolchain-funcs.eclass: Support EAPI 8
Signed-off-by: Ulrich Müller
---
eclass/toolchain-funcs.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 1643f64cab76..563d9deef40b 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -4,7 +4,7 @@
# @ECLASS: toolchain-funcs.eclass
# @MAINTAINER:
# Toolchain Ninjas
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: functions to query common info about the toolchain
# @DESCRIPTION:
# The toolchain-funcs aims to provide a complete suite of functions
@@ -15,7 +15,7 @@
case ${EAPI:-0} in
# EAPI=0 is still used by crossdev, bug #797367
- [0567]) ;;
+ 0|5|6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
--
2.32.0
[gentoo-dev] [PATCH 3/8] multilib.eclass: Support EAPI 8
Signed-off-by: Ulrich Müller
---
eclass/multilib.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 6ba820229de3..8422d5e18499 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -4,14 +4,14 @@
# @ECLASS: multilib.eclass
# @MAINTAINER:
# toolch...@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: This eclass is for all functions pertaining to handling multilib
configurations.
# @DESCRIPTION:
# This eclass is for all functions pertaining to handling multilib
configurations.
case ${EAPI:-0} in
# EAPI=0 is still used by crossdev, bug #797367
- [0567]) ;;
+ 0|5|6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
--
2.32.0
[gentoo-dev] [PATCH 4/8] multilib.eclass: Update a comment
Reported-by: Sam James
Signed-off-by: Ulrich Müller
---
eclass/multilib.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index 8422d5e18499..67cad9875a12 100644
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -519,7 +519,7 @@ multilib_toolchain_setup() {
fi
if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
- # Back that multilib-ass up so we can restore it later
+ # Backup multilib state so we can restore it later
for v in "${save_restore_variables[@]}" ; do
vv="_abi_saved_${v}"
[[ ${!v+set} == "set" ]] && export ${vv}="${!v}" ||
unset ${vv}
--
2.32.0
[gentoo-dev] [PATCH 5/8] libtool.eclass: Support EAPI 8
Drop support for EAPIs 0 to 4.
Remove uclibctoolize and darwintoolize (after 10+ years).
Signed-off-by: Ulrich Müller
---
eclass/libtool.eclass | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass
index 4565c8a8f6f8..a38f41588289 100644
--- a/eclass/libtool.eclass
+++ b/eclass/libtool.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: libtool.eclass
# @MAINTAINER:
# base-sys...@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: quickly update bundled libtool code
# @DESCRIPTION:
# This eclass patches ltmain.sh distributed with libtoolized packages with the
@@ -18,8 +18,8 @@ if [[ -z ${_LIBTOOL_ECLASS} ]]; then
_LIBTOOL_ECLASS=1
case ${EAPI:-0} in
- 0|1|2|3|4|5|6) DEPEND=">=app-portage/elt-patches-20170815" ;;
- 7) BDEPEND=">=app-portage/elt-patches-20170815" ;;
+ 5|6) DEPEND=">=app-portage/elt-patches-20170815" ;;
+ 7|8) BDEPEND=">=app-portage/elt-patches-20170815" ;;
*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
esac
@@ -43,7 +43,4 @@ elibtoolize() {
eltpatch "${@}" || die "eltpatch failed"
}
-uclibctoolize() { die "Use elibtoolize"; }
-darwintoolize() { die "Use elibtoolize"; }
-
fi
--
2.32.0
[gentoo-dev] [PATCH 6/8] flag-o-matic.eclass: Support EAPI 8
Signed-off-by: Ulrich Müller
---
eclass/flag-o-matic.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 2e04e2acb06b..d262a60b6bb2 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -4,7 +4,7 @@
# @ECLASS: flag-o-matic.eclass
# @MAINTAINER:
# toolch...@gentoo.org
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: common functions to manipulate and query toolchain flags
# @DESCRIPTION:
# This eclass contains a suite of functions to help developers sanely
@@ -12,7 +12,7 @@
case ${EAPI:-0} in
0|1|2|3|4) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;;
- 5|6|7) ;;
+ 5|6|7|8) ;;
*) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;;
esac
--
2.32.0
[gentoo-dev] [PATCH 7/8] git-r3.eclass: Support EAPI 8, drop support for EAPI 4
Signed-off-by: Ulrich Müller
---
eclass/git-r3.eclass | 18 ++
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 9c4f2c9d778e..365f21a4ed4c 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -4,21 +4,15 @@
# @ECLASS: git-r3.eclass
# @MAINTAINER:
# Michał Górny
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: Eclass for fetching and unpacking git repositories.
# @DESCRIPTION:
# Third generation eclass for easing maintenance of live ebuilds using
# git as remote repository.
-case "${EAPI:-0}" in
- 0|1|2|3)
- die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
- ;;
- 4|5|6|7)
- ;;
- *)
- die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
- ;;
+case ${EAPI:-0} in
+ 5|6|7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
EXPORT_FUNCTIONS src_unpack
@@ -28,7 +22,7 @@ if [[ ! ${_GIT_R3} ]]; then
PROPERTIES+=" live"
if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
- if [[ ${EAPI:-0} != [0123456] ]]; then
+ if [[ ${EAPI} != [56] ]]; then
BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
else
DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
@@ -612,7 +606,7 @@ git-r3_fetch() {
local commit_date=${4:-${EGIT_COMMIT_DATE}}
# support new override API for EAPI 6+
- if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
+ if [[ ${EAPI} != 5 ]]; then
# get the name and do some more processing:
# 1) kill .git suffix,
# 2) underscore (remaining) non-variable characters,
--
2.32.0
[gentoo-dev] [PATCH 8/8] git-r3.eclass: Remove git-2 backwards compatibility code
Signed-off-by: Ulrich Müller
---
eclass/git-r3.eclass | 54
1 file changed, 4 insertions(+), 50 deletions(-)
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 365f21a4ed4c..39817498 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -21,12 +21,10 @@ if [[ ! ${_GIT_R3} ]]; then
PROPERTIES+=" live"
-if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
- if [[ ${EAPI} != [56] ]]; then
- BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
- else
- DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
- fi
+if [[ ${EAPI} != [56] ]]; then
+ BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
+else
+ DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
fi
# @ECLASS-VARIABLE: EGIT_CLONE_TYPE
@@ -278,50 +276,6 @@ _git-r3_env_setup() {
if [[ ${EGIT_COMMIT} && ${EGIT_COMMIT_DATE} ]]; then
die "EGIT_COMMIT and EGIT_COMMIT_DATE can not be specified
simultaneously"
fi
-
- # Migration helpers. Remove them when git-2 is removed.
-
- if [[ ${EGIT_SOURCEDIR} ]]; then
- eerror "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR.
While updating"
- eerror "your ebuild, please check whether the variable is
necessary at all"
- eerror "since the default has been changed from \${S} to
\${WORKDIR}/\${P}."
- eerror "Therefore, proper setting of S may be sufficient."
- die "EGIT_SOURCEDIR has been replaced by EGIT_CHECKOUT_DIR."
- fi
-
- if [[ ${EGIT_MASTER} ]]; then
- eerror "EGIT_MASTER has been removed. Instead, the upstream
default (HEAD)"
- eerror "is used by the eclass. Please remove the assignment or
use EGIT_BRANCH"
- eerror "as necessary."
- die "EGIT_MASTER has been removed."
- fi
-
- if [[ ${EGIT_HAS_SUBMODULES} ]]; then
- eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no
longer needs"
- eerror "to switch the clone type in order to support submodules
and therefore"
- eerror "submodules are detected and fetched automatically. If
you need to"
- eerror "disable or filter submodules, see EGIT_SUBMODULES."
- die "EGIT_HAS_SUBMODULES is no longer necessary."
- fi
-
- if [[ ${EGIT_PROJECT} ]]; then
- eerror "EGIT_PROJECT has been removed. Instead, the eclass
determines"
- eerror "the local clone path using path in canonical
EGIT_REPO_URI."
- eerror "If the current algorithm causes issues for you, please
report a bug."
- die "EGIT_PROJECT is no longer necessary."
- fi
-
- if [[ ${EGIT_BOOTSTRAP} ]]; then
- eerror "EGIT_BOOTSTRAP has been removed. Please create proper
src_prepare()"
- eerror "instead."
- die "EGIT_BOOTSTRAP has been removed."
- fi
-
- if [[ ${EGIT_NOUNPACK} ]]; then
- eerror "EGIT_NOUNPACK has been removed. The eclass no longer
calls default"
- eerror "unpack function. If necessary, please declare proper
src_unpack()."
- die "EGIT_NOUNPACK has been removed."
- fi
}
# @FUNCTION: _git-r3_set_gitdir
--
2.32.0
Re: [gentoo-dev] [PATCH 2/8] toolchain-funcs.eclass: Support EAPI 8
On Mon, 21 Jun 2021 18:49:28 +0200
Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller
> ---
> eclass/toolchain-funcs.eclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
> index 1643f64cab76..563d9deef40b 100644
> --- a/eclass/toolchain-funcs.eclass
> +++ b/eclass/toolchain-funcs.eclass
> @@ -4,7 +4,7 @@
> # @ECLASS: toolchain-funcs.eclass
> # @MAINTAINER:
> # Toolchain Ninjas
> -# @SUPPORTED_EAPIS: 5 6 7
> +# @SUPPORTED_EAPIS: 5 6 7 8
> # @BLURB: functions to query common info about the toolchain
> # @DESCRIPTION:
> # The toolchain-funcs aims to provide a complete suite of functions
> @@ -15,7 +15,7 @@
>
> case ${EAPI:-0} in
> # EAPI=0 is still used by crossdev, bug #797367
> - [0567]) ;;
> + 0|5|6|7|8) ;;
> *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
> esac
>
> --
> 2.32.0
>
>
Looks good.
--
Sergei
Re: [gentoo-dev] [PATCH 3/8] multilib.eclass: Support EAPI 8
On Mon, 21 Jun 2021 18:49:29 +0200
Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller
> ---
> eclass/multilib.eclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
> index 6ba820229de3..8422d5e18499 100644
> --- a/eclass/multilib.eclass
> +++ b/eclass/multilib.eclass
> @@ -4,14 +4,14 @@
> # @ECLASS: multilib.eclass
> # @MAINTAINER:
> # toolch...@gentoo.org
> -# @SUPPORTED_EAPIS: 5 6 7
> +# @SUPPORTED_EAPIS: 5 6 7 8
> # @BLURB: This eclass is for all functions pertaining to handling multilib
> configurations.
> # @DESCRIPTION:
> # This eclass is for all functions pertaining to handling multilib
> configurations.
>
> case ${EAPI:-0} in
> # EAPI=0 is still used by crossdev, bug #797367
> - [0567]) ;;
> + 0|5|6|7|8) ;;
> *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
> esac
>
> --
> 2.32.0
>
>
Looks good.
--
Sergei
Re: [gentoo-dev] [PATCH 4/8] multilib.eclass: Update a comment
On Mon, 21 Jun 2021 18:49:30 +0200
Ulrich Müller wrote:
> Reported-by: Sam James
> Signed-off-by: Ulrich Müller
> ---
> eclass/multilib.eclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
> index 8422d5e18499..67cad9875a12 100644
> --- a/eclass/multilib.eclass
> +++ b/eclass/multilib.eclass
> @@ -519,7 +519,7 @@ multilib_toolchain_setup() {
> fi
>
> if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then
> - # Back that multilib-ass up so we can restore it later
> + # Backup multilib state so we can restore it later
> for v in "${save_restore_variables[@]}" ; do
> vv="_abi_saved_${v}"
> [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" ||
> unset ${vv}
> --
> 2.32.0
>
>
Looks good.
--
Sergei
Re: [gentoo-dev] [PATCH 6/8] flag-o-matic.eclass: Support EAPI 8
On Mon, 21 Jun 2021 18:49:32 +0200
Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller
> ---
> eclass/flag-o-matic.eclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index 2e04e2acb06b..d262a60b6bb2 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -4,7 +4,7 @@
> # @ECLASS: flag-o-matic.eclass
> # @MAINTAINER:
> # toolch...@gentoo.org
> -# @SUPPORTED_EAPIS: 5 6 7
> +# @SUPPORTED_EAPIS: 5 6 7 8
> # @BLURB: common functions to manipulate and query toolchain flags
> # @DESCRIPTION:
> # This eclass contains a suite of functions to help developers sanely
> @@ -12,7 +12,7 @@
>
> case ${EAPI:-0} in
> 0|1|2|3|4) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;;
> - 5|6|7) ;;
> + 5|6|7|8) ;;
> *) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;;
> esac
>
> --
> 2.32.0
>
>
Looks good.
--
Sergei
Re: [gentoo-dev] [PATCH 7/8] git-r3.eclass: Support EAPI 8, drop support for EAPI 4
On Mon, 2021-06-21 at 18:49 +0200, Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller
> ---
> eclass/git-r3.eclass | 18 ++
> 1 file changed, 6 insertions(+), 12 deletions(-)
>
> diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
> index 9c4f2c9d778e..365f21a4ed4c 100644
> --- a/eclass/git-r3.eclass
> +++ b/eclass/git-r3.eclass
> @@ -4,21 +4,15 @@
> # @ECLASS: git-r3.eclass
> # @MAINTAINER:
> # Michał Górny
> -# @SUPPORTED_EAPIS: 4 5 6 7
> +# @SUPPORTED_EAPIS: 5 6 7 8
> # @BLURB: Eclass for fetching and unpacking git repositories.
> # @DESCRIPTION:
> # Third generation eclass for easing maintenance of live ebuilds using
> # git as remote repository.
>
> -case "${EAPI:-0}" in
> - 0|1|2|3)
> - die "Unsupported EAPI=${EAPI} (obsolete) for ${ECLASS}"
> - ;;
> - 4|5|6|7)
> - ;;
> - *)
> - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
> - ;;
> +case ${EAPI:-0} in
> + 5|6|7|8) ;;
> + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
> esac
>
> EXPORT_FUNCTIONS src_unpack
> @@ -28,7 +22,7 @@ if [[ ! ${_GIT_R3} ]]; then
> PROPERTIES+=" live"
>
> if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
> - if [[ ${EAPI:-0} != [0123456] ]]; then
> + if [[ ${EAPI} != [56] ]]; then
> BDEPEND=">=dev-vcs/git-1.8.2.1[curl]"
> else
> DEPEND=">=dev-vcs/git-1.8.2.1[curl]"
> @@ -612,7 +606,7 @@ git-r3_fetch() {
> local commit_date=${4:-${EGIT_COMMIT_DATE}}
>
> # support new override API for EAPI 6+
> - if ! has "${EAPI:-0}" 0 1 2 3 4 5; then
> + if [[ ${EAPI} != 5 ]]; then
> # get the name and do some more processing:
> # 1) kill .git suffix,
> # 2) underscore (remaining) non-variable characters,
LGTM, for both git-r3 patches.
--
Best regards,
Michał Górny
Re: [gentoo-dev] Copyright lines in the profiles directory
On 6/21/2021 03:37, Ulrich Mueller wrote:
> TZ=UTC git log --find-renames --find-copies --follow \
> --pretty="format:%ad" --date="format-local:%Y" ${filename} | tail -n1
This looks like it works:
cat profiles/arch/mips/mips64/multilib/n64/use.force | head -n1
# Copyright 1999-2013 Gentoo Foundation
TZ=UTC git log --find-renames --find-copies --follow --pretty="format:%ad"
--date="format-local:%Y" profiles/arch/mips/mips64/multilib/n64/use.force |
tail -n1
2011
--
Joshua Kinard
Gentoo/MIPS
ku...@gentoo.org
rsa6144/5C63F4E3F5C6C943 2015-04-27
177C 1972 1FB8 F254 BAD0 3E72 5C63 F4E3 F5C6 C943
"The past tempts us, the present confuses us, the future frightens us. And
our lives slip away, moment by moment, lost in that vast, terrible in-between."
--Emperor Turhan, Centauri Republic
Re: [gentoo-dev] [PATCH 1/8] gnuconfig.eclass: Support EAPI 8
> On 21 Jun 2021, at 17:49, Ulrich Müller wrote: > > Signed-off-by: Ulrich Müller > --- > eclass/gnuconfig.eclass | 9 +++-- > 1 file changed, 3 insertions(+), 6 deletions(-) I'm happy with the whole series. Thanks for working on this. sam signature.asc Description: Message signed with OpenPGP
