Re: [gentoo-dev] [PATCH] virtualx.eclass: Support EAPI-8
On Sun, 2021-07-18 at 22:46 +0200, Andreas Sturmlechner wrote:
> Standardise include guard, fix minor typo.
>
> Signed-off-by: Andreas Sturmlechner
> ---
> eclass/virtualx.eclass | 13 ++---
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
> index ca52e8d2815..f362327cf77 100644
> --- a/eclass/virtualx.eclass
> +++ b/eclass/virtualx.eclass
> @@ -6,17 +6,16 @@
> # x...@gentoo.org
> # @AUTHOR:
> # Original author: Martin Schlemmer
> -# @SUPPORTED_EAPIS: 6 7
> -# @BLURB: This eclass can be used for packages that needs a working X
> environment to build.
> +# @SUPPORTED_EAPIS: 6 7 8
> +# @BLURB: This eclass can be used for packages that need a working X
> environment to build.
>
> case ${EAPI:-0} in
> - [0-5]) die "virtualx.eclass: EAPI ${EAPI} is too old." ;;
> - 6|7) ;;
> - *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;;
> + 6|7|8) ;;
> + *) die "virtualx.eclass: EAPI ${EAPI:-0} is not supported." ;;
> esac
>
> -if [[ ! ${_VIRTUAL_X} ]]; then
> -_VIRTUAL_X=1
> +if [[ ! ${_VIRTUAL_X_ECLASS} ]]; then
> +_VIRTUAL_X_ECLASS=1
>
> # @ECLASS-VARIABLE: VIRTUALX_REQUIRED
> # @PRE_INHERIT
Things to consider changing:
1. The dual-function of VIRTUALX_DEPEND is ugly (and I don't think it
meets global variable invariancy requirements; not that the assignment
variant is used anywhere).
2. Maybe VIRTUALX_DEPEND can be exported conditionally to
VIRTUALX_REQUIRED!=always, to avoid some mistakes.
3. The eclass is leaving stray BDEPEND in global scope in EAPI 6.
--
Best regards,
Michał Górny
Re: [gentoo-dev] [PATCH] kernel-2.eclass: Add EAPI 8 support
On 7/19/21 2:50 AM, mpag...@gentoo.org wrote:
From: Mike Pagano
Signed-off-by: Mike Pagano
---
eclass/kernel-2.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 831dd5b5d..f94dd9c43 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -8,7 +8,7 @@
# John Mylchreest
# Mike Pagano
#
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Eclass for kernel packages
# @DESCRIPTION:
# This is the kernel.eclass rewrite for a clean base regarding the 2.6
@@ -201,7 +201,7 @@
inherit estack toolchain-funcs
[[ ${EAPI:-0} == 6 ]] && inherit eapi7-ver
case ${EAPI:-0} in
- 6|7)
+ 6|7|8)
EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
pkg_{setup,preinst,postinst,postrm} ;;
*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
looks good for me
OpenPGP_0x1D6802D75C10FEF6.asc
Description: application/pgp-keys
OpenPGP_signature
Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH 1/2] check-reqs.eclass: Support EAPI-8
On 18/07/2021 21:52, Andreas Sturmlechner wrote:
> Move EAPI check and EXPORT_FUNCTIONS on top, before include guard.
> Standardise include guard.
>
> Signed-off-by: Andreas Sturmlechner
> ---
> eclass/check-reqs.eclass | 20 ++--
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
> index 5c4a420ee06..70c740d0363 100644
> --- a/eclass/check-reqs.eclass
> +++ b/eclass/check-reqs.eclass
> @@ -7,7 +7,7 @@
> # @AUTHOR:
> # Bo Ørsted Andresen
> # Original Author: Ciaran McCreesh
> -# @SUPPORTED_EAPIS: 4 5 6 7
> +# @SUPPORTED_EAPIS: 4 5 6 7 8
> # @BLURB: Provides a uniform way of handling ebuild which have very high
> build requirements
I know that this patch did not introduce it, but there is a typo here
('ebuild' should be 'ebuilds'). Is this something that can be fixed now?
> # @DESCRIPTION:
> # This eclass provides a uniform way of handling ebuilds which have very high
> @@ -38,7 +38,15 @@
> # These checks should probably mostly work on non-Linux, and they should
> # probably degrade gracefully if they don't. Probably.
>
> -if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
> +case ${EAPI:-0} in
> + 4|5|6|7|8) ;;
> + *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
> +esac
> +
> +EXPORT_FUNCTIONS pkg_pretend pkg_setup
> +
> +if [[ ! ${_CHECK_REQS_ECLASS} ]]; then
> +_CHECK_REQS_ECLASS=1
>
> # @ECLASS-VARIABLE: CHECKREQS_MEMORY
> # @DEFAULT_UNSET
> @@ -60,13 +68,6 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
> # @DESCRIPTION:
> # How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M
>
> -case ${EAPI:-0} in
> - 4|5|6|7) ;;
> - *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
> -esac
> -
> -EXPORT_FUNCTIONS pkg_pretend pkg_setup
> -
> # Obsolete function executing all the checks and printing out results
> check_reqs() {
> eerror "Package calling old ${FUNCNAME} function."
> @@ -357,5 +358,4 @@ check-reqs_unsatisfied() {
> CHECKREQS_FAILED="true"
> }
>
> -_CHECK_REQS_ECLASS_=1
> fi
>
Re: [gentoo-dev] [PATCH] virtualx.eclass: Support EAPI-8
> On Sun, 18 Jul 2021, Andreas Sturmlechner wrote:
> case ${EAPI:-0} in
This could be just ${EAPI} now (same for check-reqs.eclass).
> - [0-5]) die "virtualx.eclass: EAPI ${EAPI} is too old." ;;
> - 6|7) ;;
> - *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;;
> + 6|7|8) ;;
> + *) die "virtualx.eclass: EAPI ${EAPI:-0} is not supported." ;;
Use ${ECLASS} instead of explicit name?
> esac
signature.asc
Description: PGP signature
[gentoo-dev] [PATCH 2/2] check-reqs.eclass: Drop obsolete check_reqs(), errored out for >3yrs
Signed-off-by: Andreas Sturmlechner
---
eclass/check-reqs.eclass | 7 ---
1 file changed, 7 deletions(-)
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 70c740d0363..d606e1a8749 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -68,13 +68,6 @@ _CHECK_REQS_ECLASS=1
# @DESCRIPTION:
# How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M
-# Obsolete function executing all the checks and printing out results
-check_reqs() {
- eerror "Package calling old ${FUNCNAME} function."
- eerror "It should call check-reqs_pkg_pretend and check-reqs_pkg_setup."
- die "${FUNCNAME} is banned"
-}
-
# @FUNCTION: check-reqs_pkg_setup
# @DESCRIPTION:
# Exported function running the resources checks in pkg_setup phase.
--
2.32.0
signature.asc
Description: This is a digitally signed message part.
[gentoo-dev] [PATCH 1/2] check-reqs.eclass: Support EAPI-8
Move EAPI check and EXPORT_FUNCTIONS on top, before include guard.
Standardise include guard.
Signed-off-by: Andreas Sturmlechner
---
eclass/check-reqs.eclass | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index 5c4a420ee06..70c740d0363 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -7,7 +7,7 @@
# @AUTHOR:
# Bo Ørsted Andresen
# Original Author: Ciaran McCreesh
-# @SUPPORTED_EAPIS: 4 5 6 7
+# @SUPPORTED_EAPIS: 4 5 6 7 8
# @BLURB: Provides a uniform way of handling ebuild which have very high build
requirements
# @DESCRIPTION:
# This eclass provides a uniform way of handling ebuilds which have very high
@@ -38,7 +38,15 @@
# These checks should probably mostly work on non-Linux, and they should
# probably degrade gracefully if they don't. Probably.
-if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
+case ${EAPI:-0} in
+ 4|5|6|7|8) ;;
+ *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
+esac
+
+EXPORT_FUNCTIONS pkg_pretend pkg_setup
+
+if [[ ! ${_CHECK_REQS_ECLASS} ]]; then
+_CHECK_REQS_ECLASS=1
# @ECLASS-VARIABLE: CHECKREQS_MEMORY
# @DEFAULT_UNSET
@@ -60,13 +68,6 @@ if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
# @DESCRIPTION:
# How much space is needed in /var? Eg.: CHECKREQS_DISK_VAR=3000M
-case ${EAPI:-0} in
- 4|5|6|7) ;;
- *) die "${ECLASS}: EAPI=${EAPI:-0} is not supported" ;;
-esac
-
-EXPORT_FUNCTIONS pkg_pretend pkg_setup
-
# Obsolete function executing all the checks and printing out results
check_reqs() {
eerror "Package calling old ${FUNCNAME} function."
@@ -357,5 +358,4 @@ check-reqs_unsatisfied() {
CHECKREQS_FAILED="true"
}
-_CHECK_REQS_ECLASS_=1
fi
--
2.32.0
signature.asc
Description: This is a digitally signed message part.
[gentoo-dev] [PATCH] virtualx.eclass: Support EAPI-8
Standardise include guard, fix minor typo.
Signed-off-by: Andreas Sturmlechner
---
eclass/virtualx.eclass | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass
index ca52e8d2815..f362327cf77 100644
--- a/eclass/virtualx.eclass
+++ b/eclass/virtualx.eclass
@@ -6,17 +6,16 @@
# x...@gentoo.org
# @AUTHOR:
# Original author: Martin Schlemmer
-# @SUPPORTED_EAPIS: 6 7
-# @BLURB: This eclass can be used for packages that needs a working X
environment to build.
+# @SUPPORTED_EAPIS: 6 7 8
+# @BLURB: This eclass can be used for packages that need a working X
environment to build.
case ${EAPI:-0} in
- [0-5]) die "virtualx.eclass: EAPI ${EAPI} is too old." ;;
- 6|7) ;;
- *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;;
+ 6|7|8) ;;
+ *) die "virtualx.eclass: EAPI ${EAPI:-0} is not supported." ;;
esac
-if [[ ! ${_VIRTUAL_X} ]]; then
-_VIRTUAL_X=1
+if [[ ! ${_VIRTUAL_X_ECLASS} ]]; then
+_VIRTUAL_X_ECLASS=1
# @ECLASS-VARIABLE: VIRTUALX_REQUIRED
# @PRE_INHERIT
--
2.32.0
signature.asc
Description: This is a digitally signed message part.
[gentoo-dev] [PATCH] optfeature.eclass: Support EAPI-8
Signed-off-by: Andreas Sturmlechner
---
eclass/optfeature.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
index 8fc346c3ac6..b853f61be32 100644
--- a/eclass/optfeature.eclass
+++ b/eclass/optfeature.eclass
@@ -4,11 +4,11 @@
# @ECLASS: optfeature.eclass
# @MAINTAINER:
# base-sys...@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 8
# @BLURB: Advertise optional functionality that might be useful to users
case ${EAPI:-0} in
- [0-7]) ;;
+ [0-8]) ;;
*) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
esac
--
2.32.0
signature.asc
Description: This is a digitally signed message part.
[gentoo-dev] [PATCH] verify-sig.eclass: Fix the example to use BROOT
Signed-off-by: Michał Górny
---
eclass/verify-sig.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 7f89e5388ba3..2bc5bd5ddba9 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -29,7 +29,7 @@
# BDEPEND="
# verify-sig? ( app-crypt/openpgp-keys-example )"
#
-# VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/example.asc
+# VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/example.asc
# @CODE
case ${EAPI} in
--
2.32.0
[gentoo-dev] [PATCH] kernel-2.eclass: Add EAPI 8 support
From: Mike Pagano
Signed-off-by: Mike Pagano
---
eclass/kernel-2.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 831dd5b5d..f94dd9c43 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -8,7 +8,7 @@
# John Mylchreest
# Mike Pagano
#
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Eclass for kernel packages
# @DESCRIPTION:
# This is the kernel.eclass rewrite for a clean base regarding the 2.6
@@ -201,7 +201,7 @@
inherit estack toolchain-funcs
[[ ${EAPI:-0} == 6 ]] && inherit eapi7-ver
case ${EAPI:-0} in
- 6|7)
+ 6|7|8)
EXPORT_FUNCTIONS src_{unpack,prepare,compile,install,test} \
pkg_{setup,preinst,postinst,postrm} ;;
*) die "${ECLASS}: EAPI ${EAPI} not supported" ;;
--
2.31.1
Re: [gentoo-portage-dev] [PATCH] bin/estrip: avoid copying directories in FEATURES=installsources
On Sat, 17 Jul 2021 15:34:12 -0700
Zac Medico wrote:
> On 7/17/21 12:59 PM, Sergei Trofimovich wrote:
> > Initially problem is noticed on gcc-11 as a full ${WORKDIR} syncing
> > into /usr/src/debug. It happens because `debug.sources` sometimes
> > contains directory. For example on bash-5 it has:
> >
> > $ grep -zv '/<[^/>]*>$' debug.sources | LANG=C sort -z -u | sed -e
> > 's/\x00/\n/g'
> > bash-5.0/
> > bash-5.0/alias.c
> > ...
> >
> > This causes syncing object files, config.log, final binaries
> > and other unexpected data. The change avoids syncking paths
> > that end with '/'.
> >
> > Signed-off-by: Sergei Trofimovich
> > ---
> > bin/estrip | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > diff --git a/bin/estrip b/bin/estrip
> > index 7ef1ec35c..6cca0d04b 100755
> > --- a/bin/estrip
> > +++ b/bin/estrip
> > @@ -464,7 +464,10 @@ if [[ -s ${tmpdir}/debug.sources ]] && \
> > then
> > __vecho "installsources: rsyncing source files"
> > [[ -d ${D%/}/${prepstrip_sources_dir#/} ]] || mkdir -p
> > "${D%/}/${prepstrip_sources_dir#/}"
> > + # skip installation of ".../" (system headers? why inner slashes
> > are forbidden?)
> > + # skip syncing of ".../foo/" (complete directories)
> > grep -zv '/<[^/>]*>$' "${tmpdir}"/debug.sources | \
> > + grep -zv '/$' | \
> > (cd "${WORKDIR}"; LANG=C sort -z -u | \
> > rsync -tL0 --chmod=ugo-st,a+r,go-w,Da+x,Fa-x --files-from=-
> > "${WORKDIR}/" "${D%/}/${prepstrip_sources_dir#/}/" )
> >
> >
>
> Looks good. Merged with both grep calls combined via grep -e. Thanks!
>
> https://gitweb.gentoo.org/proj/portage.git/commit/?id=e083c8bf20d8488d329e3dccd643c28429e6fe30
TIL 'grep -e'! Thank you!
--
Sergei
pgprH8NkjP86o.pgp
Description: Цифровая подпись OpenPGP
[gentoo-dev] Package up for grabs: app-editors/retext (and dev-python/markups)
Hi all, I'm stepping down as the proxied maintainer of the graphical markdown editor app-editors/retext and it's dependency dev-python/markups because I didn't use it in a long period and have not enough time to test it thoroughly. Upstream releases are infrequent and retext has no open bugs and is stable. Future maintainers could e.g. support the python project with bumping markups and its deps and clean up the old retext stable version 7.1.0, keeping 7.2.1 (I was often not fast enough - kudos mgorny for speed-bumping without breackage!). Corresponding PR on github.com: https://github.com/gentoo/gentoo/pull/21701 Kind regards Nils signature.asc Description: PGP signature
Re: [gentoo-dev] My resignation from Gentoo
Thanks for you kind words. I hope i will find you all when i will come back :) Il Dom 18 Lug 2021, 14:16 Roy Bamford ha scritto: > On 2021.07.18 05:37, Marco Scardovi wrote: > > Hi everyone, > > > > while I'm writing these words I'm full of sadness because you all are > > an > > awesome family before being an incredible team. > > It's been a while I've been thinking about that but actually I've > > realized > > Gentoo is just something where I spending and "trash" the biggest part > > of > > my time (not only free time but actually all my time) and I can't > > continue > > like that. > > I don't know if I will come back again or not but actually I have to > > take a > > long pause for me and for people around me in my private life. > > @sam, @juippis: if you mind I'll leave my PRs open on github, > > otherwise > > tell me here or on irc. I really want to thank you for your patience > > (like > > other people here :D). > > > > You are all awesome and I won't thank you enough for all the thing you > > have done for me. > > > > /me hides. > > > > Marco Scardovi ( scardracs ) > > > > PS > > > > My resignation is for GURU, BGO and WIKI too: I will start today > > adding m-n > > to metadatas > > > > > Marco, > > Nobody ever leaves Gentoo, people just stray for a while. :) > > Its good that you recognise the signs of over doing it. > Have a break. Have a very long break. I'm confident that Gentoo will > be here when you decide to join in the fun again. Time permitting. > > My best wishes to you and and whatever you decide to do in > the future. > > -- > Regards, > > Roy Bamford > (Neddyseagoon) a member of > elections > gentoo-ops > forum-mods > arm64
Re: [gentoo-dev] My resignation from Gentoo
On 2021.07.18 05:37, Marco Scardovi wrote: > Hi everyone, > > while I'm writing these words I'm full of sadness because you all are > an > awesome family before being an incredible team. > It's been a while I've been thinking about that but actually I've > realized > Gentoo is just something where I spending and "trash" the biggest part > of > my time (not only free time but actually all my time) and I can't > continue > like that. > I don't know if I will come back again or not but actually I have to > take a > long pause for me and for people around me in my private life. > @sam, @juippis: if you mind I'll leave my PRs open on github, > otherwise > tell me here or on irc. I really want to thank you for your patience > (like > other people here :D). > > You are all awesome and I won't thank you enough for all the thing you > have done for me. > > /me hides. > > Marco Scardovi ( scardracs ) > > PS > > My resignation is for GURU, BGO and WIKI too: I will start today > adding m-n > to metadatas > Marco, Nobody ever leaves Gentoo, people just stray for a while. :) Its good that you recognise the signs of over doing it. Have a break. Have a very long break. I'm confident that Gentoo will be here when you decide to join in the fun again. Time permitting. My best wishes to you and and whatever you decide to do in the future. -- Regards, Roy Bamford (Neddyseagoon) a member of elections gentoo-ops forum-mods arm64 pgpKH46Xgqw84.pgp Description: PGP signature
Re: [gentoo-dev] My resignation from Gentoo
I hope so too ;) Il giorno dom 18 lug 2021 alle ore 10:20 Andrew Ammerlaan < andrewammerl...@gentoo.org> ha scritto: > Hi Marco, > > Thank you for all your work in Gentoo! > > I hope we'll maybe see you around again someday, > > Andrew > > On 18/07/2021 06:37, Marco Scardovi wrote: > > Hi everyone, > > > > while I'm writing these words I'm full of sadness because you all are an > > awesome family before being an incredible team. > > It's been a while I've been thinking about that but actually I've > > realized Gentoo is just something where I spending and "trash" the > > biggest part of my time (not only free time but actually all my time) > > and I can't continue like that. > > I don't know if I will come back again or not but actually I have to > > take a long pause for me and for people around me in my private life. > > @sam, @juippis: if you mind I'll leave my PRs open on github, otherwise > > tell me here or on irc. I really want to thank you for your patience > > (like other people here :D). > > > > You are all awesome and I won't thank you enough for all the thing you > > have done for me. > > > > /me hides. > > > > Marco Scardovi ( scardracs ) > > > > PS > > > > My resignation is for GURU, BGO and WIKI too: I will start today adding > > m-n to metadatas > > >
Re: [gentoo-dev] My resignation from Gentoo
Hi Marco, Thank you for all your work in Gentoo! I hope we'll maybe see you around again someday, Andrew On 18/07/2021 06:37, Marco Scardovi wrote: Hi everyone, while I'm writing these words I'm full of sadness because you all are an awesome family before being an incredible team. It's been a while I've been thinking about that but actually I've realized Gentoo is just something where I spending and "trash" the biggest part of my time (not only free time but actually all my time) and I can't continue like that. I don't know if I will come back again or not but actually I have to take a long pause for me and for people around me in my private life. @sam, @juippis: if you mind I'll leave my PRs open on github, otherwise tell me here or on irc. I really want to thank you for your patience (like other people here :D). You are all awesome and I won't thank you enough for all the thing you have done for me. /me hides. Marco Scardovi ( scardracs ) PS My resignation is for GURU, BGO and WIKI too: I will start today adding m-n to metadatas
[gentoo-dev] Last rites: dev-ruby/sfl
# Hans de Graaff (2021-07-18) # Compatibility package for ruby 1.8. No longer maintained upstream. # Last release in 2016, but current release in gentoo is from 2012. # No reverse dependencies. # Masked for removal in 30 days. dev-ruby/sfl signature.asc Description: This is a digitally signed message part
