Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
Dnia September 11, 2019 11:11:15 PM UTC, William Hubbs
napisał(a):
>On Wed, Sep 11, 2019 at 07:47:04PM +, Michał Górny wrote:
>> Dnia September 11, 2019 7:40:41 PM UTC, William Hubbs
> napisał(a):
>> >On Wed, Sep 11, 2019 at 08:31:16PM +0200, Michał Górny wrote:
>> >> On Wed, 2019-09-11 at 13:22 -0500, William Hubbs wrote:
>> >> > On Wed, Sep 11, 2019 at 07:38:17PM +0200, Michał Górny wrote:
>> >> > > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
>> >> > > > Copyright: Sony Interactive Entertainment Inc.
>> >> > > > Signed-off-by: William Hubbs
>> >> > > > ---
>> >> > > > eclass/go-module.eclass | 76
>> >+
>> >> > > > 1 file changed, 76 insertions(+)
>> >> > > > create mode 100644 eclass/go-module.eclass
>> >> > > >
>> >> > > > diff --git a/eclass/go-module.eclass
>b/eclass/go-module.eclass
>> >> > > > new file mode 100644
>> >> > > > index 000..7009fcd3beb
>> >> > > > --- /dev/null
>> >> > > > +++ b/eclass/go-module.eclass
>> >> > > > @@ -0,0 +1,76 @@
>> >> > > > +# Copyright 1999-2015 Gentoo Foundation
>> >> > >
>> >> > > You need to replace your calendar. And copyright holder.
>> >> >
>> >> > Sure, I thought I ffixed that.
>> >> >
>> >> > > > +# Distributed under the terms of the GNU General Public
>> >License v2
>> >> > > > +
>> >> > > > +# @ECLASS: go-module.eclass
>> >> > >
>> >> > > Any reason to change naming from golang-* to go-* now?
>> >> >
>> >> > Well, "lang" is sort of redundant, and there will be only one
>> >eclass, so
>> >> > I thought I would make things a bit more simple.
>> >> >
>> >> > > > +# @MAINTAINER:
>> >> > > > +# William Hubbs
>> >> > > > +# @SUPPORTED_EAPIS: 7
>> >> > > > +# @BLURB: basic eclass for building software written in the
>go
>> >> > > > +# programming language that uses go modules.
>> >> > > > +# @DESCRIPTION:
>> >> > > > +# This eclass provides a convenience src_prepare() phase
>and
>> >some basic
>> >> > > > +# settings needed for all software written in the go
>> >programming
>> >> > > > +# language that uses go modules.
>> >> > > > +#
>> >> > > > +# You will know the software you are packaging uses modules
>> >because
>> >> > > > +# it will have files named go.sum and go.mod in its
>top-level
>> >source
>> >> > > > +# directory. If it does not have these files, use the
>golang-*
>> >eclasses.
>> >> > > > +#
>> >> > > > +# If the software you are packaging uses modules, the next
>> >question is
>> >> > > > +# whether it has a directory named "vendor" at the
>top-level
>> >of the source tree.
>> >> > > > +#
>> >> > > > +# If it doesn't, you need to create a tarball of what would
>be
>> >in the
>> >> > > > +# vendor directory and mirror it locally. This is done with
>> >the
>> >> > > > +# following commands if upstream is using a git repository:
>> >> > > > +#
>> >> > > > +# @CODE:
>> >> > > > +#
>> >> > > > +# $ cd /my/clone/of/upstream
>> >> > > > +# $ git checkout
>> >> > > > +# $ go mod vendor
>> >> > > > +# $ tar cvf project-version-vendor.tar.gz vendor
>> >> > > > +#
>> >> > > > +# @CODE:
>> >> > > > +#
>> >> > > > +# Other than this, all you need to do is inherit this
>eclass
>> >then
>> >> > > > +# make sure the exported src_prepare function is run.
>> >> > > > +
>> >> > > > +case ${EAPI:-0} in
>> >> > > > + 7) ;;
>> >> > > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet
>established."
>> >> > > > +esac
>> >> > > > +
>> >> > > > +if [[ -z ${_GO_MODULE} ]]; then
>> >> > > > +
>> >> > > > +_GO_MODULE=1
>> >> > > > +
>> >> > > > +BDEPEND=">=dev-lang/go-1.12"
>> >> > > > +
>> >> > > > +# Do not download dependencies from the internet
>> >> > > > +# make build output verbose by default
>> >> > > > +export GOFLAGS="-mod=vendor -v -x"
>> >> > > > +
>> >> > > > +# Do not complain about CFLAGS etc since go projects do not
>> >use them.
>> >> > > > +QA_FLAGS_IGNORED='.*'
>> >> > > > +
>> >> > > > +# Upstream does not support stripping go packages
>> >> > > > +RESTRICT="strip"
>> >> > > > +
>> >> > > > +EXPORT_FUNCTIONS src_prepare
>> >> > >
>> >> > > Don't you need to inherit some other eclass to make it build?
>> >> >
>> >> > The primary reason for all of the golang-* eclasses was the
>GOPATH
>> >> > variable, which is not relevant when you are using modules.
>> >> >
>> >> > I can look at adding a src_compile to this eclass, but I haven't
>> >thought
>> >> > about what it would contain yet.
>> >> >
>> >> > > > +
>> >> > > > +# @FUNCTION: go-module_src_prepare
>> >> > > > +# @DESCRIPTION:
>> >> > > > +# Run a default src_prepare then move our provided vendor
>> >directory to
>> >> > > > +# the appropriate spot if upstream doesn't provide a vendor
>> >directory.
>> >> > > > +go-module_src_prepare() {
>> >> > > > + default
>> >> > > > + # Use the upstream provided vendor directory if it exists.
>> >> > > > + [[ -d vendor ]] && return
>> >> > > > + # If we are not providing a mirror of a vendor directory
>we
>> >created
>> >> > > > + # manually, return since there may be n
Re: [gentoo-dev] uid/gid request for net-misc/openntpd
On Wed, Sep 11, 2019 at 8:27 PM Paul B. Henson wrote: > > It was suggested to use uid/gid 321 for this purpose? Any objections to > this selection? > > If not, how do I get > > https://api.gentoo.org/uid-gid.txt > > updated to mark it as requested or reserved? Added. https://gitweb.gentoo.org/data/api.git/commit/?id=f0649d81bfda0605732db7036ff1328d838217ad
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, Sep 11, 2019 at 5:05 PM William Hubbs wrote:
> On Wed, Sep 11, 2019 at 04:31:00PM -0700, Alec Warner wrote:
> > On Wed, Sep 11, 2019 at 10:28 AM William Hubbs
> wrote:
> >
> > > Copyright: Sony Interactive Entertainment Inc.
> > > Signed-off-by: William Hubbs
> > > ---
> > > eclass/go-module.eclass | 76 +
> > > 1 file changed, 76 insertions(+)
> > > create mode 100644 eclass/go-module.eclass
> > >
> > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> > > new file mode 100644
> > > index 000..7009fcd3beb
> > > --- /dev/null
> > > +++ b/eclass/go-module.eclass
> > > @@ -0,0 +1,76 @@
> > > +# Copyright 1999-2015 Gentoo Foundation
> > > +# Distributed under the terms of the GNU General Public License v2
> > > +
> > > +# @ECLASS: go-module.eclass
> > > +# @MAINTAINER:
> > > +# William Hubbs
> > > +# @SUPPORTED_EAPIS: 7
> > > +# @BLURB: basic eclass for building software written in the go
> > > +# programming language that uses go modules.
> > > +# @DESCRIPTION:
> > > +# This eclass provides a convenience src_prepare() phase and some
> basic
> > > +# settings needed for all software written in the go programming
> > > +# language that uses go modules.
> > > +#
> > > +# You will know the software you are packaging uses modules because
> > > +# it will have files named go.sum and go.mod in its top-level source
> > > +# directory. If it does not have these files, use the golang-*
> eclasses.
> > > +#
> > > +# If the software you are packaging uses modules, the next question is
> > > +# whether it has a directory named "vendor" at the top-level of the
> > > source tree.
> > > +#
> > > +# If it doesn't, you need to create a tarball of what would be in the
> > > +# vendor directory and mirror it locally. This is done with the
> > > +# following commands if upstream is using a git repository:
> > > +#
> > > +# @CODE:
> > > +#
> > > +# $ cd /my/clone/of/upstream
> > > +# $ git checkout
> > > +# $ go mod vendor
> > > +# $ tar cvf project-version-vendor.tar.gz vendor
> > > +#
> > > +# @CODE:
> > > +#
> > > +# Other than this, all you need to do is inherit this eclass then
> > > +# make sure the exported src_prepare function is run.
> > > +
> > > +case ${EAPI:-0} in
> > > + 7) ;;
> > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> > > +esac
> > > +
> > > +if [[ -z ${_GO_MODULE} ]]; then
> > > +
> > > +_GO_MODULE=1
> > > +
> > > +BDEPEND=">=dev-lang/go-1.12"
> > > +
> > > +# Do not download dependencies from the internet
> > > +# make build output verbose by default
> > > +export GOFLAGS="-mod=vendor -v -x"
> > > +
> > > +# Do not complain about CFLAGS etc since go projects do not use them.
> > > +QA_FLAGS_IGNORED='.*'
> > > +
> > > +# Upstream does not support stripping go packages
> > > +RESTRICT="strip"
> > >
> >
> > https://golang.org/cmd/link/ implies you can pass -s -w to the compiler
> to
> > reduce binary size.
> >
> > Does that not work in portage by default, or does upstream just consider
> > that bad practice?
>
> I haven't tried it, but here are the definitions of -s and -w.
>
> -s Omit the symbol table and debug information.
> -w Omit the DWARF symbol table.
>
> These look like Go's equivalent of stripping the binaries, and I have my
> doubts as to whether we should force this.
>
I don't care if you strip or not (I'm not even sure portage knows how to do
it for go binaries) but I'm fairly sure the reason isn't because "upstream
does not support stripping go binaries" because they clearly do...unless
upstream is portage here...?
>
> William
>
>
Re: [gentoo-dev] uid/gid request for net-misc/openntpd
It was suggested to use uid/gid 321 for this purpose? Any objections to this selection? If not, how do I get https://api.gentoo.org/uid-gid.txt updated to mark it as requested or reserved? Thanks... On Mon, Sep 02, 2019 at 01:09:40PM -0700, Paul B. Henson wrote: > Per https://bugs.gentoo.org/show_bug.cgi?id=693050 openntpd is going to > switch to a dedicated openntpd user/group rather than sharing the ntp > user/group with net-misc/ntp. > > Could I please get a static uid/gid assigned for this? For now, I'm just > going to hardcode them in the ebuild, and transition it to the new > acct-user/acct-group mechanism at a later point.
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On Wed, Sep 11, 2019 at 4:48 PM William Hubbs wrote: > On Wed, Sep 11, 2019 at 04:34:27PM -0700, Alec Warner wrote: > > On Wed, Sep 11, 2019 at 10:39 AM Michael Orlitzky > wrote: > > > > > On 9/11/19 1:21 PM, William Hubbs wrote: > > > > +++ b/dev-vcs/hub/hub-2.12.3.ebuild > > > > ... > > > > > > > > LICENSE="MIT" > > > > > > This license is wrong, as it's pretty much guaranteed to be every time > > > you commit one of these packages. I find it pretty troubling that one > > > corporation is able to force this stuff through even though it's a > > > security and legal hazard for everyone else. > > > > > > > How is it wrong? > > > > https://github.com/github/hub/blob/master/LICENSE > > The argument is that because of the vendoring, LICENSE= needs to list > all licenses for the vendored dependencies that are different from MIT > as well. > I see, I tend to believe that argument in that case. > > Personally I don't have a comment about this, but that's what is being > pushed for. I'll let you guys debate this but it isn't really relevant > to the eclass. ;-) > I think it's difficult to put instructions in the eclass like: +# $ cd /my/clone/of/upstream +# $ git checkout +# $ go mod vendor +# $ tar cvf project-version-vendor.tar.gz vendor And then not mention this fairly easy trap (it's so easy to fall into you did it twice.) -A > William >
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, Sep 11, 2019 at 04:31:00PM -0700, Alec Warner wrote:
> On Wed, Sep 11, 2019 at 10:28 AM William Hubbs wrote:
>
> > Copyright: Sony Interactive Entertainment Inc.
> > Signed-off-by: William Hubbs
> > ---
> > eclass/go-module.eclass | 76 +
> > 1 file changed, 76 insertions(+)
> > create mode 100644 eclass/go-module.eclass
> >
> > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> > new file mode 100644
> > index 000..7009fcd3beb
> > --- /dev/null
> > +++ b/eclass/go-module.eclass
> > @@ -0,0 +1,76 @@
> > +# Copyright 1999-2015 Gentoo Foundation
> > +# Distributed under the terms of the GNU General Public License v2
> > +
> > +# @ECLASS: go-module.eclass
> > +# @MAINTAINER:
> > +# William Hubbs
> > +# @SUPPORTED_EAPIS: 7
> > +# @BLURB: basic eclass for building software written in the go
> > +# programming language that uses go modules.
> > +# @DESCRIPTION:
> > +# This eclass provides a convenience src_prepare() phase and some basic
> > +# settings needed for all software written in the go programming
> > +# language that uses go modules.
> > +#
> > +# You will know the software you are packaging uses modules because
> > +# it will have files named go.sum and go.mod in its top-level source
> > +# directory. If it does not have these files, use the golang-* eclasses.
> > +#
> > +# If the software you are packaging uses modules, the next question is
> > +# whether it has a directory named "vendor" at the top-level of the
> > source tree.
> > +#
> > +# If it doesn't, you need to create a tarball of what would be in the
> > +# vendor directory and mirror it locally. This is done with the
> > +# following commands if upstream is using a git repository:
> > +#
> > +# @CODE:
> > +#
> > +# $ cd /my/clone/of/upstream
> > +# $ git checkout
> > +# $ go mod vendor
> > +# $ tar cvf project-version-vendor.tar.gz vendor
> > +#
> > +# @CODE:
> > +#
> > +# Other than this, all you need to do is inherit this eclass then
> > +# make sure the exported src_prepare function is run.
> > +
> > +case ${EAPI:-0} in
> > + 7) ;;
> > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> > +esac
> > +
> > +if [[ -z ${_GO_MODULE} ]]; then
> > +
> > +_GO_MODULE=1
> > +
> > +BDEPEND=">=dev-lang/go-1.12"
> > +
> > +# Do not download dependencies from the internet
> > +# make build output verbose by default
> > +export GOFLAGS="-mod=vendor -v -x"
> > +
> > +# Do not complain about CFLAGS etc since go projects do not use them.
> > +QA_FLAGS_IGNORED='.*'
> > +
> > +# Upstream does not support stripping go packages
> > +RESTRICT="strip"
> >
>
> https://golang.org/cmd/link/ implies you can pass -s -w to the compiler to
> reduce binary size.
>
> Does that not work in portage by default, or does upstream just consider
> that bad practice?
I haven't tried it, but here are the definitions of -s and -w.
-s Omit the symbol table and debug information.
-w Omit the DWARF symbol table.
These look like Go's equivalent of stripping the binaries, and I have my
doubts as to whether we should force this.
William
signature.asc
Description: Digital signature
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On Wed, Sep 11, 2019 at 04:34:27PM -0700, Alec Warner wrote: > On Wed, Sep 11, 2019 at 10:39 AM Michael Orlitzky wrote: > > > On 9/11/19 1:21 PM, William Hubbs wrote: > > > +++ b/dev-vcs/hub/hub-2.12.3.ebuild > > > ... > > > > > > LICENSE="MIT" > > > > This license is wrong, as it's pretty much guaranteed to be every time > > you commit one of these packages. I find it pretty troubling that one > > corporation is able to force this stuff through even though it's a > > security and legal hazard for everyone else. > > > > How is it wrong? > > https://github.com/github/hub/blob/master/LICENSE The argument is that because of the vendoring, LICENSE= needs to list all licenses for the vendored dependencies that are different from MIT as well. Personally I don't have a comment about this, but that's what is being pushed for. I'll let you guys debate this but it isn't really relevant to the eclass. ;-) William signature.asc Description: Digital signature
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On Wed, Sep 11, 2019 at 10:39 AM Michael Orlitzky wrote: > On 9/11/19 1:21 PM, William Hubbs wrote: > > +++ b/dev-vcs/hub/hub-2.12.3.ebuild > > ... > > > > LICENSE="MIT" > > This license is wrong, as it's pretty much guaranteed to be every time > you commit one of these packages. I find it pretty troubling that one > corporation is able to force this stuff through even though it's a > security and legal hazard for everyone else. > How is it wrong? https://github.com/github/hub/blob/master/LICENSE -A
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, Sep 11, 2019 at 10:28 AM William Hubbs wrote:
> Copyright: Sony Interactive Entertainment Inc.
> Signed-off-by: William Hubbs
> ---
> eclass/go-module.eclass | 76 +
> 1 file changed, 76 insertions(+)
> create mode 100644 eclass/go-module.eclass
>
> diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> new file mode 100644
> index 000..7009fcd3beb
> --- /dev/null
> +++ b/eclass/go-module.eclass
> @@ -0,0 +1,76 @@
> +# Copyright 1999-2015 Gentoo Foundation
> +# Distributed under the terms of the GNU General Public License v2
> +
> +# @ECLASS: go-module.eclass
> +# @MAINTAINER:
> +# William Hubbs
> +# @SUPPORTED_EAPIS: 7
> +# @BLURB: basic eclass for building software written in the go
> +# programming language that uses go modules.
> +# @DESCRIPTION:
> +# This eclass provides a convenience src_prepare() phase and some basic
> +# settings needed for all software written in the go programming
> +# language that uses go modules.
> +#
> +# You will know the software you are packaging uses modules because
> +# it will have files named go.sum and go.mod in its top-level source
> +# directory. If it does not have these files, use the golang-* eclasses.
> +#
> +# If the software you are packaging uses modules, the next question is
> +# whether it has a directory named "vendor" at the top-level of the
> source tree.
> +#
> +# If it doesn't, you need to create a tarball of what would be in the
> +# vendor directory and mirror it locally. This is done with the
> +# following commands if upstream is using a git repository:
> +#
> +# @CODE:
> +#
> +# $ cd /my/clone/of/upstream
> +# $ git checkout
> +# $ go mod vendor
> +# $ tar cvf project-version-vendor.tar.gz vendor
> +#
> +# @CODE:
> +#
> +# Other than this, all you need to do is inherit this eclass then
> +# make sure the exported src_prepare function is run.
> +
> +case ${EAPI:-0} in
> + 7) ;;
> + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> +esac
> +
> +if [[ -z ${_GO_MODULE} ]]; then
> +
> +_GO_MODULE=1
> +
> +BDEPEND=">=dev-lang/go-1.12"
> +
> +# Do not download dependencies from the internet
> +# make build output verbose by default
> +export GOFLAGS="-mod=vendor -v -x"
> +
> +# Do not complain about CFLAGS etc since go projects do not use them.
> +QA_FLAGS_IGNORED='.*'
> +
> +# Upstream does not support stripping go packages
> +RESTRICT="strip"
>
https://golang.org/cmd/link/ implies you can pass -s -w to the compiler to
reduce binary size.
Does that not work in portage by default, or does upstream just consider
that bad practice?
-A
> +
> +EXPORT_FUNCTIONS src_prepare
> +
> +# @FUNCTION: go-module_src_prepare
> +# @DESCRIPTION:
> +# Run a default src_prepare then move our provided vendor directory to
> +# the appropriate spot if upstream doesn't provide a vendor directory.
> +go-module_src_prepare() {
> + default
> + # Use the upstream provided vendor directory if it exists.
> + [[ -d vendor ]] && return
> + # If we are not providing a mirror of a vendor directory we created
> + # manually, return since there may be nothing to vendor.
> + [[ ! -d ../vendor ]] && return
> + # At this point, we know we are providing a vendor mirror.
> + mv ../vendor . || die "Unable to move ../vendor directory"
> +}
> +
> +fi
> --
> 2.21.0
>
>
>
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, Sep 11, 2019 at 07:47:04PM +, Michał Górny wrote:
> Dnia September 11, 2019 7:40:41 PM UTC, William Hubbs
> napisał(a):
> >On Wed, Sep 11, 2019 at 08:31:16PM +0200, Michał Górny wrote:
> >> On Wed, 2019-09-11 at 13:22 -0500, William Hubbs wrote:
> >> > On Wed, Sep 11, 2019 at 07:38:17PM +0200, Michał Górny wrote:
> >> > > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
> >> > > > Copyright: Sony Interactive Entertainment Inc.
> >> > > > Signed-off-by: William Hubbs
> >> > > > ---
> >> > > > eclass/go-module.eclass | 76
> >+
> >> > > > 1 file changed, 76 insertions(+)
> >> > > > create mode 100644 eclass/go-module.eclass
> >> > > >
> >> > > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> >> > > > new file mode 100644
> >> > > > index 000..7009fcd3beb
> >> > > > --- /dev/null
> >> > > > +++ b/eclass/go-module.eclass
> >> > > > @@ -0,0 +1,76 @@
> >> > > > +# Copyright 1999-2015 Gentoo Foundation
> >> > >
> >> > > You need to replace your calendar. And copyright holder.
> >> >
> >> > Sure, I thought I ffixed that.
> >> >
> >> > > > +# Distributed under the terms of the GNU General Public
> >License v2
> >> > > > +
> >> > > > +# @ECLASS: go-module.eclass
> >> > >
> >> > > Any reason to change naming from golang-* to go-* now?
> >> >
> >> > Well, "lang" is sort of redundant, and there will be only one
> >eclass, so
> >> > I thought I would make things a bit more simple.
> >> >
> >> > > > +# @MAINTAINER:
> >> > > > +# William Hubbs
> >> > > > +# @SUPPORTED_EAPIS: 7
> >> > > > +# @BLURB: basic eclass for building software written in the go
> >> > > > +# programming language that uses go modules.
> >> > > > +# @DESCRIPTION:
> >> > > > +# This eclass provides a convenience src_prepare() phase and
> >some basic
> >> > > > +# settings needed for all software written in the go
> >programming
> >> > > > +# language that uses go modules.
> >> > > > +#
> >> > > > +# You will know the software you are packaging uses modules
> >because
> >> > > > +# it will have files named go.sum and go.mod in its top-level
> >source
> >> > > > +# directory. If it does not have these files, use the golang-*
> >eclasses.
> >> > > > +#
> >> > > > +# If the software you are packaging uses modules, the next
> >question is
> >> > > > +# whether it has a directory named "vendor" at the top-level
> >of the source tree.
> >> > > > +#
> >> > > > +# If it doesn't, you need to create a tarball of what would be
> >in the
> >> > > > +# vendor directory and mirror it locally. This is done with
> >the
> >> > > > +# following commands if upstream is using a git repository:
> >> > > > +#
> >> > > > +# @CODE:
> >> > > > +#
> >> > > > +# $ cd /my/clone/of/upstream
> >> > > > +# $ git checkout
> >> > > > +# $ go mod vendor
> >> > > > +# $ tar cvf project-version-vendor.tar.gz vendor
> >> > > > +#
> >> > > > +# @CODE:
> >> > > > +#
> >> > > > +# Other than this, all you need to do is inherit this eclass
> >then
> >> > > > +# make sure the exported src_prepare function is run.
> >> > > > +
> >> > > > +case ${EAPI:-0} in
> >> > > > +7) ;;
> >> > > > +*) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> >> > > > +esac
> >> > > > +
> >> > > > +if [[ -z ${_GO_MODULE} ]]; then
> >> > > > +
> >> > > > +_GO_MODULE=1
> >> > > > +
> >> > > > +BDEPEND=">=dev-lang/go-1.12"
> >> > > > +
> >> > > > +# Do not download dependencies from the internet
> >> > > > +# make build output verbose by default
> >> > > > +export GOFLAGS="-mod=vendor -v -x"
> >> > > > +
> >> > > > +# Do not complain about CFLAGS etc since go projects do not
> >use them.
> >> > > > +QA_FLAGS_IGNORED='.*'
> >> > > > +
> >> > > > +# Upstream does not support stripping go packages
> >> > > > +RESTRICT="strip"
> >> > > > +
> >> > > > +EXPORT_FUNCTIONS src_prepare
> >> > >
> >> > > Don't you need to inherit some other eclass to make it build?
> >> >
> >> > The primary reason for all of the golang-* eclasses was the GOPATH
> >> > variable, which is not relevant when you are using modules.
> >> >
> >> > I can look at adding a src_compile to this eclass, but I haven't
> >thought
> >> > about what it would contain yet.
> >> >
> >> > > > +
> >> > > > +# @FUNCTION: go-module_src_prepare
> >> > > > +# @DESCRIPTION:
> >> > > > +# Run a default src_prepare then move our provided vendor
> >directory to
> >> > > > +# the appropriate spot if upstream doesn't provide a vendor
> >directory.
> >> > > > +go-module_src_prepare() {
> >> > > > +default
> >> > > > +# Use the upstream provided vendor directory if it exists.
> >> > > > +[[ -d vendor ]] && return
> >> > > > +# If we are not providing a mirror of a vendor directory we
> >created
> >> > > > +# manually, return since there may be nothing to vendor.
> >> > > > +[[ ! -d ../vendor ]] && return
> >> > > > +# At this point, we know we are providing a vendor mirror.
> >> > > > +mv ../vendor . || die "Unable to move ../v
Re: [gentoo-dev] Need ARM/AArch64 test data for cpuid2cpuflags
On Wed, 2019-09-11 at 21:19 +0100, James Le Cuirot wrote: > On Tue, 10 Sep 2019 22:44:54 +0200 > Michał Górny wrote: > > > Hi, everyone. > > > > I've recently (finally!) started adding tests to cpuid2cpuflags. Tests > > are based on mocked syscalls that return arch-specific data read from > > text files. So far I've got x86 and ppc covered, and now I'd like to > > add tests for various arm hardware. Since ARM covers a pretty broad > > range of hardware, I'd use as much data as possible, especially from > > different ARM generations. > > > > If you have an ARM board and would like to help, please: > > From my CompuLab Utilite Pro: > > $ ./hwcap-dump > hwcap:0008b0d6 > hwcap2: > > $ ./cpuid2cpuflags > CPU_FLAGS_ARM: edsp neon thumb vfp vfpv3 vfp-d32 v4 v5 v6 v7 thumb2 > > $ uname -a > Linux utilite 5.2.7-7-g4559111aee7b #100 SMP PREEMPT Wed Aug 7 23:24:36 > BST 2019 armv7l ARMv7 Processor rev 10 (v7l) Freescale i.MX6 Quad/DualLite > (Device Tree) GNU/Linux Thanks, added. > > $ cat /proc/cpuinfo > ... > > processor : 3 > model name: ARMv7 Processor rev 10 (v7l) > BogoMIPS : 6.00 > Features : half thumb fastmult vfp edsp neon vfpv3 tls vfpd32 > CPU implementer : 0x41 > CPU architecture: 7 > CPU variant : 0x2 > CPU part : 0xc09 > CPU revision : 10 > > Hardware : Freescale i.MX6 Quad/DualLite (Device Tree) > Revision : > Serial: > -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Need ARM/AArch64 test data for cpuid2cpuflags
On Tue, 10 Sep 2019 22:44:54 +0200 Michał Górny wrote: > Hi, everyone. > > I've recently (finally!) started adding tests to cpuid2cpuflags. Tests > are based on mocked syscalls that return arch-specific data read from > text files. So far I've got x86 and ppc covered, and now I'd like to > add tests for various arm hardware. Since ARM covers a pretty broad > range of hardware, I'd use as much data as possible, especially from > different ARM generations. > > If you have an ARM board and would like to help, please: From my CompuLab Utilite Pro: $ ./hwcap-dump hwcap:0008b0d6 hwcap2: $ ./cpuid2cpuflags CPU_FLAGS_ARM: edsp neon thumb vfp vfpv3 vfp-d32 v4 v5 v6 v7 thumb2 $ uname -a Linux utilite 5.2.7-7-g4559111aee7b #100 SMP PREEMPT Wed Aug 7 23:24:36 BST 2019 armv7l ARMv7 Processor rev 10 (v7l) Freescale i.MX6 Quad/DualLite (Device Tree) GNU/Linux $ cat /proc/cpuinfo ... processor : 3 model name : ARMv7 Processor rev 10 (v7l) BogoMIPS: 6.00 Features: half thumb fastmult vfp edsp neon vfpv3 tls vfpd32 CPU implementer : 0x41 CPU architecture: 7 CPU variant : 0x2 CPU part: 0xc09 CPU revision: 10 Hardware: Freescale i.MX6 Quad/DualLite (Device Tree) Revision: Serial : -- James Le Cuirot (chewi) Gentoo Linux Developer pgpA6ft58l2jh.pgp Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
Dnia September 11, 2019 7:40:41 PM UTC, William Hubbs
napisał(a):
>On Wed, Sep 11, 2019 at 08:31:16PM +0200, Michał Górny wrote:
>> On Wed, 2019-09-11 at 13:22 -0500, William Hubbs wrote:
>> > On Wed, Sep 11, 2019 at 07:38:17PM +0200, Michał Górny wrote:
>> > > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
>> > > > Copyright: Sony Interactive Entertainment Inc.
>> > > > Signed-off-by: William Hubbs
>> > > > ---
>> > > > eclass/go-module.eclass | 76
>+
>> > > > 1 file changed, 76 insertions(+)
>> > > > create mode 100644 eclass/go-module.eclass
>> > > >
>> > > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
>> > > > new file mode 100644
>> > > > index 000..7009fcd3beb
>> > > > --- /dev/null
>> > > > +++ b/eclass/go-module.eclass
>> > > > @@ -0,0 +1,76 @@
>> > > > +# Copyright 1999-2015 Gentoo Foundation
>> > >
>> > > You need to replace your calendar. And copyright holder.
>> >
>> > Sure, I thought I ffixed that.
>> >
>> > > > +# Distributed under the terms of the GNU General Public
>License v2
>> > > > +
>> > > > +# @ECLASS: go-module.eclass
>> > >
>> > > Any reason to change naming from golang-* to go-* now?
>> >
>> > Well, "lang" is sort of redundant, and there will be only one
>eclass, so
>> > I thought I would make things a bit more simple.
>> >
>> > > > +# @MAINTAINER:
>> > > > +# William Hubbs
>> > > > +# @SUPPORTED_EAPIS: 7
>> > > > +# @BLURB: basic eclass for building software written in the go
>> > > > +# programming language that uses go modules.
>> > > > +# @DESCRIPTION:
>> > > > +# This eclass provides a convenience src_prepare() phase and
>some basic
>> > > > +# settings needed for all software written in the go
>programming
>> > > > +# language that uses go modules.
>> > > > +#
>> > > > +# You will know the software you are packaging uses modules
>because
>> > > > +# it will have files named go.sum and go.mod in its top-level
>source
>> > > > +# directory. If it does not have these files, use the golang-*
>eclasses.
>> > > > +#
>> > > > +# If the software you are packaging uses modules, the next
>question is
>> > > > +# whether it has a directory named "vendor" at the top-level
>of the source tree.
>> > > > +#
>> > > > +# If it doesn't, you need to create a tarball of what would be
>in the
>> > > > +# vendor directory and mirror it locally. This is done with
>the
>> > > > +# following commands if upstream is using a git repository:
>> > > > +#
>> > > > +# @CODE:
>> > > > +#
>> > > > +# $ cd /my/clone/of/upstream
>> > > > +# $ git checkout
>> > > > +# $ go mod vendor
>> > > > +# $ tar cvf project-version-vendor.tar.gz vendor
>> > > > +#
>> > > > +# @CODE:
>> > > > +#
>> > > > +# Other than this, all you need to do is inherit this eclass
>then
>> > > > +# make sure the exported src_prepare function is run.
>> > > > +
>> > > > +case ${EAPI:-0} in
>> > > > + 7) ;;
>> > > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
>> > > > +esac
>> > > > +
>> > > > +if [[ -z ${_GO_MODULE} ]]; then
>> > > > +
>> > > > +_GO_MODULE=1
>> > > > +
>> > > > +BDEPEND=">=dev-lang/go-1.12"
>> > > > +
>> > > > +# Do not download dependencies from the internet
>> > > > +# make build output verbose by default
>> > > > +export GOFLAGS="-mod=vendor -v -x"
>> > > > +
>> > > > +# Do not complain about CFLAGS etc since go projects do not
>use them.
>> > > > +QA_FLAGS_IGNORED='.*'
>> > > > +
>> > > > +# Upstream does not support stripping go packages
>> > > > +RESTRICT="strip"
>> > > > +
>> > > > +EXPORT_FUNCTIONS src_prepare
>> > >
>> > > Don't you need to inherit some other eclass to make it build?
>> >
>> > The primary reason for all of the golang-* eclasses was the GOPATH
>> > variable, which is not relevant when you are using modules.
>> >
>> > I can look at adding a src_compile to this eclass, but I haven't
>thought
>> > about what it would contain yet.
>> >
>> > > > +
>> > > > +# @FUNCTION: go-module_src_prepare
>> > > > +# @DESCRIPTION:
>> > > > +# Run a default src_prepare then move our provided vendor
>directory to
>> > > > +# the appropriate spot if upstream doesn't provide a vendor
>directory.
>> > > > +go-module_src_prepare() {
>> > > > + default
>> > > > + # Use the upstream provided vendor directory if it exists.
>> > > > + [[ -d vendor ]] && return
>> > > > + # If we are not providing a mirror of a vendor directory we
>created
>> > > > + # manually, return since there may be nothing to vendor.
>> > > > + [[ ! -d ../vendor ]] && return
>> > > > + # At this point, we know we are providing a vendor mirror.
>> > > > + mv ../vendor . || die "Unable to move ../vendor directory"
>> > >
>> > > Wouldn't it be much simpler to create appropriate directory
>structure
>> > > in the tarball? Then you wouldn't need a new eclass at all.
>> >
>> > You would definitely need an eclass (see the settings and
>dependencies).
>> >
>> > Take a look at the differences in t
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, Sep 11, 2019 at 08:31:16PM +0200, Michał Górny wrote:
> On Wed, 2019-09-11 at 13:22 -0500, William Hubbs wrote:
> > On Wed, Sep 11, 2019 at 07:38:17PM +0200, Michał Górny wrote:
> > > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
> > > > Copyright: Sony Interactive Entertainment Inc.
> > > > Signed-off-by: William Hubbs
> > > > ---
> > > > eclass/go-module.eclass | 76 +
> > > > 1 file changed, 76 insertions(+)
> > > > create mode 100644 eclass/go-module.eclass
> > > >
> > > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> > > > new file mode 100644
> > > > index 000..7009fcd3beb
> > > > --- /dev/null
> > > > +++ b/eclass/go-module.eclass
> > > > @@ -0,0 +1,76 @@
> > > > +# Copyright 1999-2015 Gentoo Foundation
> > >
> > > You need to replace your calendar. And copyright holder.
> >
> > Sure, I thought I ffixed that.
> >
> > > > +# Distributed under the terms of the GNU General Public License v2
> > > > +
> > > > +# @ECLASS: go-module.eclass
> > >
> > > Any reason to change naming from golang-* to go-* now?
> >
> > Well, "lang" is sort of redundant, and there will be only one eclass, so
> > I thought I would make things a bit more simple.
> >
> > > > +# @MAINTAINER:
> > > > +# William Hubbs
> > > > +# @SUPPORTED_EAPIS: 7
> > > > +# @BLURB: basic eclass for building software written in the go
> > > > +# programming language that uses go modules.
> > > > +# @DESCRIPTION:
> > > > +# This eclass provides a convenience src_prepare() phase and some basic
> > > > +# settings needed for all software written in the go programming
> > > > +# language that uses go modules.
> > > > +#
> > > > +# You will know the software you are packaging uses modules because
> > > > +# it will have files named go.sum and go.mod in its top-level source
> > > > +# directory. If it does not have these files, use the golang-*
> > > > eclasses.
> > > > +#
> > > > +# If the software you are packaging uses modules, the next question is
> > > > +# whether it has a directory named "vendor" at the top-level of the
> > > > source tree.
> > > > +#
> > > > +# If it doesn't, you need to create a tarball of what would be in the
> > > > +# vendor directory and mirror it locally. This is done with the
> > > > +# following commands if upstream is using a git repository:
> > > > +#
> > > > +# @CODE:
> > > > +#
> > > > +# $ cd /my/clone/of/upstream
> > > > +# $ git checkout
> > > > +# $ go mod vendor
> > > > +# $ tar cvf project-version-vendor.tar.gz vendor
> > > > +#
> > > > +# @CODE:
> > > > +#
> > > > +# Other than this, all you need to do is inherit this eclass then
> > > > +# make sure the exported src_prepare function is run.
> > > > +
> > > > +case ${EAPI:-0} in
> > > > + 7) ;;
> > > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> > > > +esac
> > > > +
> > > > +if [[ -z ${_GO_MODULE} ]]; then
> > > > +
> > > > +_GO_MODULE=1
> > > > +
> > > > +BDEPEND=">=dev-lang/go-1.12"
> > > > +
> > > > +# Do not download dependencies from the internet
> > > > +# make build output verbose by default
> > > > +export GOFLAGS="-mod=vendor -v -x"
> > > > +
> > > > +# Do not complain about CFLAGS etc since go projects do not use them.
> > > > +QA_FLAGS_IGNORED='.*'
> > > > +
> > > > +# Upstream does not support stripping go packages
> > > > +RESTRICT="strip"
> > > > +
> > > > +EXPORT_FUNCTIONS src_prepare
> > >
> > > Don't you need to inherit some other eclass to make it build?
> >
> > The primary reason for all of the golang-* eclasses was the GOPATH
> > variable, which is not relevant when you are using modules.
> >
> > I can look at adding a src_compile to this eclass, but I haven't thought
> > about what it would contain yet.
> >
> > > > +
> > > > +# @FUNCTION: go-module_src_prepare
> > > > +# @DESCRIPTION:
> > > > +# Run a default src_prepare then move our provided vendor directory to
> > > > +# the appropriate spot if upstream doesn't provide a vendor directory.
> > > > +go-module_src_prepare() {
> > > > + default
> > > > + # Use the upstream provided vendor directory if it exists.
> > > > + [[ -d vendor ]] && return
> > > > + # If we are not providing a mirror of a vendor directory we
> > > > created
> > > > + # manually, return since there may be nothing to vendor.
> > > > + [[ ! -d ../vendor ]] && return
> > > > + # At this point, we know we are providing a vendor mirror.
> > > > + mv ../vendor . || die "Unable to move ../vendor directory"
> > >
> > > Wouldn't it be much simpler to create appropriate directory structure
> > > in the tarball? Then you wouldn't need a new eclass at all.
> >
> > You would definitely need an eclass (see the settings and dependencies).
> >
> > Take a look at the differences in the spire and hub ebuilds in this
> > series. I'm not sure what you mean by adding the directory structure to
> > the tarball? I guess you could add something to the ven
[gentoo-dev] [PATCH] 2019-09-11-cpu_flags_ppc-introduction: new item
Signed-off-by: Georgy Yakovlev --- ...19-09-11-cpu_flags_ppc-introduction.en.txt | 38 +++ 1 file changed, 38 insertions(+) create mode 100644 2019-09-11-cpu_flags_ppc-introduction/2019-09-11-cpu_flags_ppc-introduction.en.txt diff --git a/2019-09-11-cpu_flags_ppc-introduction/2019-09-11-cpu_flags_ppc-introduction.en.txt b/2019-09-11-cpu_flags_ppc-introduction/2019-09-11-cpu_flags_ppc-introduction.en.txt new file mode 100644 index 000..a4a4ee5 --- /dev/null +++ b/2019-09-11-cpu_flags_ppc-introduction/2019-09-11-cpu_flags_ppc-introduction.en.txt @@ -0,0 +1,38 @@ +Title: new CPU_FLAGS_PPC USE_EXPAND +Author: Georgy Yakovlev +Posted: 2019-09-11 +Revision: 1 +News-Item-Format: 2.0 +Display-If-Keyword: ~ppc +Display-If-Keyword: ~ppc64 +Display-If-Keyword: ppc +Display-If-Keyword: ppc64 + + +A new set of CPU_FLAGS_PPC USE_EXPAND flags has been added. +The flags are: + + altivec - Use the AltiVec/VMX instruction set + vsx - Use the Vector Scalar Extension instruction set + vsx3 - Use the Vector Scalar Extension v.3 instruction set + +Note that CPU_FLAGS_PPC variable is used on ppc and ppc64 architectures. + +In order to transition to new set of flags, if the following flag was +was present: + + USE="altivec" + +This flag needs to be set as: + + CPU_FLAGS_PPC="altivec" + +It's advised to keep 'altivec' USE flag enabled to ensure safe +migration and compatibility with external repositories. +'vsx' and 'vsx3' are new flags and no migration necessary. + +To help users enable the correct USE_EXPAND flags PPC support has been +added to app-portage/cpuid2cpuflags package: + + # emerge -1v >=app-portage/cpuid2cpuflags-7 + $ cpuid2cpuflags -- 2.23.0
[gentoo-dev] [RFC] A canonical source for QA Policies
Currently, to the best of my understanding, QA policies are spelt out scattered amongst the devmanual. This makes it very hard to: - Know what policies are in place - Know how to conform to each policy - Cite a given policy - Interpret a given policy unambiguously. Most of the dev-manual is written in the context of "If problem/task X -> do Y" But that doesn't really help for policy documentation. For policies to be effective, I feel we need something more like a list of policies, with numerical identifiers, with a short description of the policy (Similar to a GLEP title), which links to a document outlining what that policy means in detail. ie: [P-0001] Non-maintainer commits [P-0002] Maintainer assignment etc. Policies that are no longer "current" could be retained, but marked "inactive" ( meaning that the policy is no longer in effect, with the potential for a policy to be reinstated ), or policies could be marked as "tentative", where they're in semi-draft status and are trending towards enforcement. The hope here is that when a policy is violated, a clear citation can be made for which policy was violated. As it stands, it seems to be more like "read the whole dev manual again", "try googling the dev manual and get lucky", and sometimes "wring your hands over what the dev manual might say", or "ask QA to tell you what the policies are". None of these are ideal. pgptfIJ7ohrsM.pgp Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On Thu, Sep 12, 2019 at 07:15:28AM +1200, Kent Fredric wrote: > On Wed, 11 Sep 2019 12:47:20 -0500 > William Hubbs wrote: > > > Sorry, That train already left the station with the golang-* eclasses > > and there is nothing we can do about it. > > Saying "this creates a legal problem" followed by "eh, nothing we can > do about it, carry on" really doesn't work in reality, as far as I'm > aware. > > Usually if you find yourself rationalizing around a legal problem, you > end up getting bitten by said legal problem. After chatting a bit more about this on IRC, let me clarify. This is an issue that is not related to the eclass, but an example package (patch 3 isn't the eclass, it is just an example of how to use it). There is no LICENSE setting in the eclass, so it doesn't affect the eclass. What I was advised is that we are all supposed to audit our packages and make sure LICENSE= is correct. William signature.asc Description: Digital signature
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On Wed, 11 Sep 2019 12:47:20 -0500 William Hubbs wrote: > Sorry, That train already left the station with the golang-* eclasses > and there is nothing we can do about it. Saying "this creates a legal problem" followed by "eh, nothing we can do about it, carry on" really doesn't work in reality, as far as I'm aware. Usually if you find yourself rationalizing around a legal problem, you end up getting bitten by said legal problem. pgpfm1VrnyFIu.pgp Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, 2019-09-11 at 13:22 -0500, William Hubbs wrote:
> On Wed, Sep 11, 2019 at 07:38:17PM +0200, Michał Górny wrote:
> > On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
> > > Copyright: Sony Interactive Entertainment Inc.
> > > Signed-off-by: William Hubbs
> > > ---
> > > eclass/go-module.eclass | 76 +
> > > 1 file changed, 76 insertions(+)
> > > create mode 100644 eclass/go-module.eclass
> > >
> > > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> > > new file mode 100644
> > > index 000..7009fcd3beb
> > > --- /dev/null
> > > +++ b/eclass/go-module.eclass
> > > @@ -0,0 +1,76 @@
> > > +# Copyright 1999-2015 Gentoo Foundation
> >
> > You need to replace your calendar. And copyright holder.
>
> Sure, I thought I ffixed that.
>
> > > +# Distributed under the terms of the GNU General Public License v2
> > > +
> > > +# @ECLASS: go-module.eclass
> >
> > Any reason to change naming from golang-* to go-* now?
>
> Well, "lang" is sort of redundant, and there will be only one eclass, so
> I thought I would make things a bit more simple.
>
> > > +# @MAINTAINER:
> > > +# William Hubbs
> > > +# @SUPPORTED_EAPIS: 7
> > > +# @BLURB: basic eclass for building software written in the go
> > > +# programming language that uses go modules.
> > > +# @DESCRIPTION:
> > > +# This eclass provides a convenience src_prepare() phase and some basic
> > > +# settings needed for all software written in the go programming
> > > +# language that uses go modules.
> > > +#
> > > +# You will know the software you are packaging uses modules because
> > > +# it will have files named go.sum and go.mod in its top-level source
> > > +# directory. If it does not have these files, use the golang-* eclasses.
> > > +#
> > > +# If the software you are packaging uses modules, the next question is
> > > +# whether it has a directory named "vendor" at the top-level of the
> > > source tree.
> > > +#
> > > +# If it doesn't, you need to create a tarball of what would be in the
> > > +# vendor directory and mirror it locally. This is done with the
> > > +# following commands if upstream is using a git repository:
> > > +#
> > > +# @CODE:
> > > +#
> > > +# $ cd /my/clone/of/upstream
> > > +# $ git checkout
> > > +# $ go mod vendor
> > > +# $ tar cvf project-version-vendor.tar.gz vendor
> > > +#
> > > +# @CODE:
> > > +#
> > > +# Other than this, all you need to do is inherit this eclass then
> > > +# make sure the exported src_prepare function is run.
> > > +
> > > +case ${EAPI:-0} in
> > > + 7) ;;
> > > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> > > +esac
> > > +
> > > +if [[ -z ${_GO_MODULE} ]]; then
> > > +
> > > +_GO_MODULE=1
> > > +
> > > +BDEPEND=">=dev-lang/go-1.12"
> > > +
> > > +# Do not download dependencies from the internet
> > > +# make build output verbose by default
> > > +export GOFLAGS="-mod=vendor -v -x"
> > > +
> > > +# Do not complain about CFLAGS etc since go projects do not use them.
> > > +QA_FLAGS_IGNORED='.*'
> > > +
> > > +# Upstream does not support stripping go packages
> > > +RESTRICT="strip"
> > > +
> > > +EXPORT_FUNCTIONS src_prepare
> >
> > Don't you need to inherit some other eclass to make it build?
>
> The primary reason for all of the golang-* eclasses was the GOPATH
> variable, which is not relevant when you are using modules.
>
> I can look at adding a src_compile to this eclass, but I haven't thought
> about what it would contain yet.
>
> > > +
> > > +# @FUNCTION: go-module_src_prepare
> > > +# @DESCRIPTION:
> > > +# Run a default src_prepare then move our provided vendor directory to
> > > +# the appropriate spot if upstream doesn't provide a vendor directory.
> > > +go-module_src_prepare() {
> > > + default
> > > + # Use the upstream provided vendor directory if it exists.
> > > + [[ -d vendor ]] && return
> > > + # If we are not providing a mirror of a vendor directory we created
> > > + # manually, return since there may be nothing to vendor.
> > > + [[ ! -d ../vendor ]] && return
> > > + # At this point, we know we are providing a vendor mirror.
> > > + mv ../vendor . || die "Unable to move ../vendor directory"
> >
> > Wouldn't it be much simpler to create appropriate directory structure
> > in the tarball? Then you wouldn't need a new eclass at all.
>
> You would definitely need an eclass (see the settings and dependencies).
>
> Take a look at the differences in the spire and hub ebuilds in this
> series. I'm not sure what you mean by adding the directory structure to
> the tarball? I guess you could add something to the vendor tarball when
> you create it.
I mean packing it as 'spire-1.2.3/vendor' or whatever the package
directory is, so that it extracts correctly instead of making a tarball
that needs to be moved afterwards.
>
> What I tried to avoid was stomping on the vendor directory if it is
> included upstream.
You do that anyway by moving files.
>
> William
> > > +}
> > > +
> > > +
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, Sep 11, 2019 at 07:38:17PM +0200, Michał Górny wrote:
> On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
> > Copyright: Sony Interactive Entertainment Inc.
> > Signed-off-by: William Hubbs
> > ---
> > eclass/go-module.eclass | 76 +
> > 1 file changed, 76 insertions(+)
> > create mode 100644 eclass/go-module.eclass
> >
> > diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> > new file mode 100644
> > index 000..7009fcd3beb
> > --- /dev/null
> > +++ b/eclass/go-module.eclass
> > @@ -0,0 +1,76 @@
> > +# Copyright 1999-2015 Gentoo Foundation
>
> You need to replace your calendar. And copyright holder.
Sure, I thought I ffixed that.
> > +# Distributed under the terms of the GNU General Public License v2
> > +
> > +# @ECLASS: go-module.eclass
>
> Any reason to change naming from golang-* to go-* now?
Well, "lang" is sort of redundant, and there will be only one eclass, so
I thought I would make things a bit more simple.
>
> > +# @MAINTAINER:
> > +# William Hubbs
> > +# @SUPPORTED_EAPIS: 7
> > +# @BLURB: basic eclass for building software written in the go
> > +# programming language that uses go modules.
> > +# @DESCRIPTION:
> > +# This eclass provides a convenience src_prepare() phase and some basic
> > +# settings needed for all software written in the go programming
> > +# language that uses go modules.
> > +#
> > +# You will know the software you are packaging uses modules because
> > +# it will have files named go.sum and go.mod in its top-level source
> > +# directory. If it does not have these files, use the golang-* eclasses.
> > +#
> > +# If the software you are packaging uses modules, the next question is
> > +# whether it has a directory named "vendor" at the top-level of the source
> > tree.
> > +#
> > +# If it doesn't, you need to create a tarball of what would be in the
> > +# vendor directory and mirror it locally. This is done with the
> > +# following commands if upstream is using a git repository:
> > +#
> > +# @CODE:
> > +#
> > +# $ cd /my/clone/of/upstream
> > +# $ git checkout
> > +# $ go mod vendor
> > +# $ tar cvf project-version-vendor.tar.gz vendor
> > +#
> > +# @CODE:
> > +#
> > +# Other than this, all you need to do is inherit this eclass then
> > +# make sure the exported src_prepare function is run.
> > +
> > +case ${EAPI:-0} in
> > + 7) ;;
> > + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> > +esac
> > +
> > +if [[ -z ${_GO_MODULE} ]]; then
> > +
> > +_GO_MODULE=1
> > +
> > +BDEPEND=">=dev-lang/go-1.12"
> > +
> > +# Do not download dependencies from the internet
> > +# make build output verbose by default
> > +export GOFLAGS="-mod=vendor -v -x"
> > +
> > +# Do not complain about CFLAGS etc since go projects do not use them.
> > +QA_FLAGS_IGNORED='.*'
> > +
> > +# Upstream does not support stripping go packages
> > +RESTRICT="strip"
> > +
> > +EXPORT_FUNCTIONS src_prepare
>
> Don't you need to inherit some other eclass to make it build?
The primary reason for all of the golang-* eclasses was the GOPATH
variable, which is not relevant when you are using modules.
I can look at adding a src_compile to this eclass, but I haven't thought
about what it would contain yet.
> > +
> > +# @FUNCTION: go-module_src_prepare
> > +# @DESCRIPTION:
> > +# Run a default src_prepare then move our provided vendor directory to
> > +# the appropriate spot if upstream doesn't provide a vendor directory.
> > +go-module_src_prepare() {
> > + default
> > + # Use the upstream provided vendor directory if it exists.
> > + [[ -d vendor ]] && return
> > + # If we are not providing a mirror of a vendor directory we created
> > + # manually, return since there may be nothing to vendor.
> > + [[ ! -d ../vendor ]] && return
> > + # At this point, we know we are providing a vendor mirror.
> > + mv ../vendor . || die "Unable to move ../vendor directory"
>
> Wouldn't it be much simpler to create appropriate directory structure
> in the tarball? Then you wouldn't need a new eclass at all.
You would definitely need an eclass (see the settings and dependencies).
Take a look at the differences in the spire and hub ebuilds in this
series. I'm not sure what you mean by adding the directory structure to
the tarball? I guess you could add something to the vendor tarball when
you create it.
What I tried to avoid was stomping on the vendor directory if it is
included upstream.
William
> > +}
> > +
> > +fi
>
> --
> Best regards,
> Michał Górny
>
signature.asc
Description: Digital signature
Re: [gentoo-dev] Need ARM/AArch64 test data for cpuid2cpuflags
On Wed, 2019-09-11 at 11:02 -0700, Matt Turner wrote: > From my original generation SolidRun Cubox: > > $ ./hwcap-dump > hwcap:0004ead6 > hwcap2: > mattst88@cubox ~/cpuid2cpuflags-7-dev $ uname -a > Linux cubox 5.2.7 #11 Wed Aug 7 17:50:03 PDT 2019 armv7l ARMv7 > Processor rev 5 (v7l) Marvell Dove GNU/Linux > > cpuid2cflags says > CPU_FLAGS_ARM: edsp iwmmxt thumb vfp vfpv3 v4 v5 v6 v7 thumb2 > > /proc/cpuinfo: > > processor : 0 > model name : ARMv7 Processor rev 5 (v7l) > BogoMIPS: 333.33 > Features: half thumb fastmult vfp edsp iwmmxt thumbee vfpv3 > vfpv3d16 tls idivt > CPU implementer : 0x56 > CPU architecture: 7 > CPU variant : 0x0 > CPU part: 0x581 > CPU revision: 5 > > Hardware: Marvell Dove > Revision: > Serial : Thanks. > > I've got an "iwmmxt2" flag on x11-libs/pixman, but I don't think > there's a hwcap bit for it. At least not that I see in > arch/arm/include/uapi/asm/hwcap.h Maybe there's some other way of inferring it. For example, 'thumb2' we're basing on ARM version. > > That's just as well. It's only a very small optimization over iwmmxt. > -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Need ARM/AArch64 test data for cpuid2cpuflags
>From my original generation SolidRun Cubox: $ ./hwcap-dump hwcap:0004ead6 hwcap2: mattst88@cubox ~/cpuid2cpuflags-7-dev $ uname -a Linux cubox 5.2.7 #11 Wed Aug 7 17:50:03 PDT 2019 armv7l ARMv7 Processor rev 5 (v7l) Marvell Dove GNU/Linux cpuid2cflags says CPU_FLAGS_ARM: edsp iwmmxt thumb vfp vfpv3 v4 v5 v6 v7 thumb2 /proc/cpuinfo: processor : 0 model name : ARMv7 Processor rev 5 (v7l) BogoMIPS: 333.33 Features: half thumb fastmult vfp edsp iwmmxt thumbee vfpv3 vfpv3d16 tls idivt CPU implementer : 0x56 CPU architecture: 7 CPU variant : 0x0 CPU part: 0x581 CPU revision: 5 Hardware: Marvell Dove Revision: Serial : I've got an "iwmmxt2" flag on x11-libs/pixman, but I don't think there's a hwcap bit for it. At least not that I see in arch/arm/include/uapi/asm/hwcap.h That's just as well. It's only a very small optimization over iwmmxt.
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On 9/11/19 1:47 PM, William Hubbs wrote: > On Wed, Sep 11, 2019 at 01:39:32PM -0400, Michael Orlitzky wrote: >> On 9/11/19 1:21 PM, William Hubbs wrote: >>> +++ b/dev-vcs/hub/hub-2.12.3.ebuild >>> ... >>> >>> LICENSE="MIT" >> >> This license is wrong, as it's pretty much guaranteed to be every time >> you commit one of these packages. I find it pretty troubling that one >> corporation is able to force this stuff through even though it's a >> security and legal hazard for everyone else. > > Sorry, That train already left the station with the golang-* eclasses > and there is nothing we can do about it. > "We" could just stop.
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On Wed, Sep 11, 2019 at 01:39:32PM -0400, Michael Orlitzky wrote: > On 9/11/19 1:21 PM, William Hubbs wrote: > > +++ b/dev-vcs/hub/hub-2.12.3.ebuild > > ... > > > > LICENSE="MIT" > > This license is wrong, as it's pretty much guaranteed to be every time > you commit one of these packages. I find it pretty troubling that one > corporation is able to force this stuff through even though it's a > security and legal hazard for everyone else. Sorry, That train already left the station with the golang-* eclasses and there is nothing we can do about it. Thanks, William signature.asc Description: Digital signature
Re: [gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
On 9/11/19 1:21 PM, William Hubbs wrote: > +++ b/dev-vcs/hub/hub-2.12.3.ebuild > ... > > LICENSE="MIT" This license is wrong, as it's pretty much guaranteed to be every time you commit one of these packages. I find it pretty troubling that one corporation is able to force this stuff through even though it's a security and legal hazard for everyone else.
Re: [gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
On Wed, 2019-09-11 at 12:21 -0500, William Hubbs wrote:
> Copyright: Sony Interactive Entertainment Inc.
> Signed-off-by: William Hubbs
> ---
> eclass/go-module.eclass | 76 +
> 1 file changed, 76 insertions(+)
> create mode 100644 eclass/go-module.eclass
>
> diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
> new file mode 100644
> index 000..7009fcd3beb
> --- /dev/null
> +++ b/eclass/go-module.eclass
> @@ -0,0 +1,76 @@
> +# Copyright 1999-2015 Gentoo Foundation
You need to replace your calendar. And copyright holder.
> +# Distributed under the terms of the GNU General Public License v2
> +
> +# @ECLASS: go-module.eclass
Any reason to change naming from golang-* to go-* now?
> +# @MAINTAINER:
> +# William Hubbs
> +# @SUPPORTED_EAPIS: 7
> +# @BLURB: basic eclass for building software written in the go
> +# programming language that uses go modules.
> +# @DESCRIPTION:
> +# This eclass provides a convenience src_prepare() phase and some basic
> +# settings needed for all software written in the go programming
> +# language that uses go modules.
> +#
> +# You will know the software you are packaging uses modules because
> +# it will have files named go.sum and go.mod in its top-level source
> +# directory. If it does not have these files, use the golang-* eclasses.
> +#
> +# If the software you are packaging uses modules, the next question is
> +# whether it has a directory named "vendor" at the top-level of the source
> tree.
> +#
> +# If it doesn't, you need to create a tarball of what would be in the
> +# vendor directory and mirror it locally. This is done with the
> +# following commands if upstream is using a git repository:
> +#
> +# @CODE:
> +#
> +# $ cd /my/clone/of/upstream
> +# $ git checkout
> +# $ go mod vendor
> +# $ tar cvf project-version-vendor.tar.gz vendor
> +#
> +# @CODE:
> +#
> +# Other than this, all you need to do is inherit this eclass then
> +# make sure the exported src_prepare function is run.
> +
> +case ${EAPI:-0} in
> + 7) ;;
> + *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
> +esac
> +
> +if [[ -z ${_GO_MODULE} ]]; then
> +
> +_GO_MODULE=1
> +
> +BDEPEND=">=dev-lang/go-1.12"
> +
> +# Do not download dependencies from the internet
> +# make build output verbose by default
> +export GOFLAGS="-mod=vendor -v -x"
> +
> +# Do not complain about CFLAGS etc since go projects do not use them.
> +QA_FLAGS_IGNORED='.*'
> +
> +# Upstream does not support stripping go packages
> +RESTRICT="strip"
> +
> +EXPORT_FUNCTIONS src_prepare
Don't you need to inherit some other eclass to make it build?
> +
> +# @FUNCTION: go-module_src_prepare
> +# @DESCRIPTION:
> +# Run a default src_prepare then move our provided vendor directory to
> +# the appropriate spot if upstream doesn't provide a vendor directory.
> +go-module_src_prepare() {
> + default
> + # Use the upstream provided vendor directory if it exists.
> + [[ -d vendor ]] && return
> + # If we are not providing a mirror of a vendor directory we created
> + # manually, return since there may be nothing to vendor.
> + [[ ! -d ../vendor ]] && return
> + # At this point, we know we are providing a vendor mirror.
> + mv ../vendor . || die "Unable to move ../vendor directory"
Wouldn't it be much simpler to create appropriate directory structure
in the tarball? Then you wouldn't need a new eclass at all.
> +}
> +
> +fi
--
Best regards,
Michał Górny
signature.asc
Description: This is a digitally signed message part
Re: [gentoo-dev] Need ARM/AArch64 test data for cpuid2cpuflags
On Wed, 2019-09-11 at 10:09 -0700, Georgy Yakovlev wrote: > On 9/10/19 12:44 PM, Michał Górny wrote: > > Hi, everyone. > > > > I've recently (finally!) started adding tests to cpuid2cpuflags. Tests > > are based on mocked syscalls that return arch-specific data read from > > text files. So far I've got x86 and ppc covered, and now I'd like to > > add tests for various arm hardware. Since ARM covers a pretty broad > > range of hardware, I'd use as much data as possible, especially from > > different ARM generations. > > > > If you have an ARM board and would like to help, please: > > > > wget https://dev.gentoo.org/~mgorny/dist/cpuid2cpuflags-7-dev.tar.bz2 > > tar -xf cpuid2cpuflags-7-dev.tar.bz2 > > cd cpuid2cpuflags-7-dev > > ./configure > > make hwcap-dump > > ./hwcap-dump > > > > and send me the output along with 'uname -m'. TIA! > > > > couple of boards here > > > == rockpro64 > Rockchip RK3399 Hexa-Core (dual ARM Cortex A72 and quad ARM Cortex A53) > > $ uname -m > aarch64 > > $ ./hwcap-dump > hwcap:08ff > hwcap2: This one's same as aws a1. > > ./cpuid2cpuflags > CPU_FLAGS_ARM: edsp neon thumb vfp vfpv3 vfpv4 vfp-d32 aes sha1 sha2 > crc32 v4 v5 v6 v7 v8 thumb2 > > > cpuinfo > processor : 0 > BogoMIPS : 48.00 > Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid > CPU implementer : 0x41 > CPU architecture: 8 > CPU variant : 0x0 > CPU part : 0xd03 > CPU revision : 4 > > > diff -U0 <(./cpuid2cpuflags | tr ' ' '\n' | sed 1d |sort) <(grep -m1 > Features /proc/cpuinfo | tr ' ' '\n' | sed 1d | grep '.' |sort) > --- /dev/fd/632019-09-11 09:57:36.360796732 -0700 > +++ /dev/fd/622019-09-11 09:57:36.364130054 -0700 > @@ -1,0 +2,2 @@ > +asimd > +cpuid > @@ -3,2 +5,3 @@ > -edsp > -neon > +evtstrm > +fp > +pmull > @@ -7,11 +9,0 @@ > -thumb > -thumb2 > -v4 > -v5 > -v6 > -v7 > -v8 > -vfp > -vfp-d32 > -vfpv3 > -vfpv4 > > > > > > == Odroid N2 > Amlogic S922X (4x Cortex-A73 @ 1.8GHz, 2x Cortex-A53 @ 1.9GHz) > > $ uname -m > aarch64 > > $ ./hwcap-dump > hwcap:00ff > hwcap2: > > CPU_FLAGS_ARM: edsp neon thumb vfp vfpv3 vfpv4 vfp-d32 aes sha1 sha2 > crc32 v4 v5 v6 v7 v8 thumb2 Thanks, added. > > cpuinfo > processor : 0 > BogoMIPS : 48.00 > Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 > CPU implementer : 0x41 > CPU architecture: 8 > CPU variant : 0x0 > CPU part : 0xd03 > CPU revision : 4 > > CPU info : 290a41200e01313254524d50 > Serial: . > Hardware : Hardkernel ODROID-N2 > Revision : 0400 > > > diff -U0 <(./cpuid2cpuflags | tr ' ' '\n' | sed 1d |sort) <(grep -m1 > Features /proc/cpuinfo | tr ' ' '\n' | sed 1d | grep '.' |sort) > --- /dev/fd/632019-09-11 09:59:59.616633443 -0700 > +++ /dev/fd/622019-09-11 09:59:59.616633443 -0700 > @@ -1,0 +2 @@ > +asimd > @@ -3,2 +4,3 @@ > -edsp > -neon > +evtstrm > +fp > +pmull > @@ -7,11 +8,0 @@ > -thumb > -thumb2 > -v4 > -v5 > -v6 > -v7 > -v8 > -vfp > -vfp-d32 > -vfpv3 > -vfpv4 > > -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-libs/gecode
# Michał Górny (2019-09-11) # Unmaintained. Last bumped in 2016, many versions behind now. # Has test failures reported. No reverse dependencies. # Removal in 30 days. Bug #694056. dev-libs/gecode -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH 3/3] dev-vcs/hub: migrate to go-module.eclass
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: William Hubbs
---
dev-vcs/hub/hub-2.12.3.ebuild | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/dev-vcs/hub/hub-2.12.3.ebuild b/dev-vcs/hub/hub-2.12.3.ebuild
index 5191e3388ce..652cf977598 100644
--- a/dev-vcs/hub/hub-2.12.3.ebuild
+++ b/dev-vcs/hub/hub-2.12.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit bash-completion-r1
+inherit bash-completion-r1 go-module
DESCRIPTION="Command-line wrapper for git that makes you better at GitHub"
HOMEPAGE="https://github.com/github/hub";
@@ -13,12 +13,8 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-DEPEND=">=dev-lang/go-1.5.1:="
RDEPEND=">=dev-vcs/git-1.7.3"
-QA_FLAGS_IGNORED=".*"
-RESTRICT="strip"
-
src_compile() {
emake bin/hub man-pages
}
--
2.21.0
[gentoo-dev] [PATCH 1/3] go-module.eclass: introduce new eclass to handle go modules
Copyright: Sony Interactive Entertainment Inc.
Signed-off-by: William Hubbs
---
eclass/go-module.eclass | 76 +
1 file changed, 76 insertions(+)
create mode 100644 eclass/go-module.eclass
diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass
new file mode 100644
index 000..7009fcd3beb
--- /dev/null
+++ b/eclass/go-module.eclass
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: go-module.eclass
+# @MAINTAINER:
+# William Hubbs
+# @SUPPORTED_EAPIS: 7
+# @BLURB: basic eclass for building software written in the go
+# programming language that uses go modules.
+# @DESCRIPTION:
+# This eclass provides a convenience src_prepare() phase and some basic
+# settings needed for all software written in the go programming
+# language that uses go modules.
+#
+# You will know the software you are packaging uses modules because
+# it will have files named go.sum and go.mod in its top-level source
+# directory. If it does not have these files, use the golang-* eclasses.
+#
+# If the software you are packaging uses modules, the next question is
+# whether it has a directory named "vendor" at the top-level of the source
tree.
+#
+# If it doesn't, you need to create a tarball of what would be in the
+# vendor directory and mirror it locally. This is done with the
+# following commands if upstream is using a git repository:
+#
+# @CODE:
+#
+# $ cd /my/clone/of/upstream
+# $ git checkout
+# $ go mod vendor
+# $ tar cvf project-version-vendor.tar.gz vendor
+#
+# @CODE:
+#
+# Other than this, all you need to do is inherit this eclass then
+# make sure the exported src_prepare function is run.
+
+case ${EAPI:-0} in
+ 7) ;;
+ *) die "${ECLASS} API in EAPI ${EAPI} not yet established."
+esac
+
+if [[ -z ${_GO_MODULE} ]]; then
+
+_GO_MODULE=1
+
+BDEPEND=">=dev-lang/go-1.12"
+
+# Do not download dependencies from the internet
+# make build output verbose by default
+export GOFLAGS="-mod=vendor -v -x"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+# Upstream does not support stripping go packages
+RESTRICT="strip"
+
+EXPORT_FUNCTIONS src_prepare
+
+# @FUNCTION: go-module_src_prepare
+# @DESCRIPTION:
+# Run a default src_prepare then move our provided vendor directory to
+# the appropriate spot if upstream doesn't provide a vendor directory.
+go-module_src_prepare() {
+ default
+ # Use the upstream provided vendor directory if it exists.
+ [[ -d vendor ]] && return
+ # If we are not providing a mirror of a vendor directory we created
+ # manually, return since there may be nothing to vendor.
+ [[ ! -d ../vendor ]] && return
+ # At this point, we know we are providing a vendor mirror.
+ mv ../vendor . || die "Unable to move ../vendor directory"
+}
+
+fi
--
2.21.0
[gentoo-dev] [PATCH 0/3] add eclass to handle go modules
This patch series adds an eclass to build software written in Go which uses go modules. Also, it converts a couple of packages I maintain to this system so that you can see how ebuilds might look that use it. William Hubbs (3): go-module.eclass: introduce new eclass to handle go modules app-misc/spire: migrate to go-module.eclass dev-vcs/hub: migrate to go-module.eclass app-misc/spire/spire-0.8.1.ebuild | 14 ++ dev-vcs/hub/hub-2.12.3.ebuild | 6 +-- eclass/go-module.eclass | 76 +++ 3 files changed, 80 insertions(+), 16 deletions(-) create mode 100644 eclass/go-module.eclass -- 2.21.0
[gentoo-dev] [PATCH 2/3] app-misc/spire: migrate to go-module.eclass
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: William Hubbs
---
app-misc/spire/spire-0.8.1.ebuild | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/app-misc/spire/spire-0.8.1.ebuild
b/app-misc/spire/spire-0.8.1.ebuild
index 552104b1bd8..5a72e6e1528 100644
--- a/app-misc/spire/spire-0.8.1.ebuild
+++ b/app-misc/spire/spire-0.8.1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz";
+inherit go-module
DESCRIPTION="the spiffe runtime environment"
HOMEPAGE="https://github.com/spiffe/spire";
SRC_URI="https://github.com/spiffe/spire/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${VENDOR_URI}"
+ https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
@@ -16,17 +16,9 @@ IUSE=""
COMMON_DEPEND="acct-group/spire
acct-user/spire"
-DEPEND="${COMMON_DEPEND}
- dev-lang/go"
+DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}"
-RESTRICT="strip"
-
-src_prepare() {
- default
- mv ../vendor . || die "Unable to move ../vendor directory"
-}
-
do_cmd() {
if [[ -z "$@" ]]; then
die "No arguments passed to do_cmd"
--
2.21.0
[gentoo-dev] Last rites: dev-ruby/dep_selector
# Michał Górny (2019-09-11) # Ruby 2.4-only. Requires old version of dev-libs/gecode. No reverse # dependencies. # Removal in 30 days. Bug #694040. dev-ruby/dep_selector -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Need ARM/AArch64 test data for cpuid2cpuflags
On 9/10/19 12:44 PM, Michał Górny wrote: > Hi, everyone. > > I've recently (finally!) started adding tests to cpuid2cpuflags. Tests > are based on mocked syscalls that return arch-specific data read from > text files. So far I've got x86 and ppc covered, and now I'd like to > add tests for various arm hardware. Since ARM covers a pretty broad > range of hardware, I'd use as much data as possible, especially from > different ARM generations. > > If you have an ARM board and would like to help, please: > > wget https://dev.gentoo.org/~mgorny/dist/cpuid2cpuflags-7-dev.tar.bz2 > tar -xf cpuid2cpuflags-7-dev.tar.bz2 > cd cpuid2cpuflags-7-dev > ./configure > make hwcap-dump > ./hwcap-dump > > and send me the output along with 'uname -m'. TIA! > couple of boards here == rockpro64 Rockchip RK3399 Hexa-Core (dual ARM Cortex A72 and quad ARM Cortex A53) $ uname -m aarch64 $ ./hwcap-dump hwcap:08ff hwcap2: ./cpuid2cpuflags CPU_FLAGS_ARM: edsp neon thumb vfp vfpv3 vfpv4 vfp-d32 aes sha1 sha2 crc32 v4 v5 v6 v7 v8 thumb2 cpuinfo processor : 0 BogoMIPS: 48.00 Features: fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part: 0xd03 CPU revision: 4 diff -U0 <(./cpuid2cpuflags | tr ' ' '\n' | sed 1d |sort) <(grep -m1 Features /proc/cpuinfo | tr ' ' '\n' | sed 1d | grep '.' |sort) --- /dev/fd/63 2019-09-11 09:57:36.360796732 -0700 +++ /dev/fd/62 2019-09-11 09:57:36.364130054 -0700 @@ -1,0 +2,2 @@ +asimd +cpuid @@ -3,2 +5,3 @@ -edsp -neon +evtstrm +fp +pmull @@ -7,11 +9,0 @@ -thumb -thumb2 -v4 -v5 -v6 -v7 -v8 -vfp -vfp-d32 -vfpv3 -vfpv4 == Odroid N2 Amlogic S922X (4x Cortex-A73 @ 1.8GHz, 2x Cortex-A53 @ 1.9GHz) $ uname -m aarch64 $ ./hwcap-dump hwcap:00ff hwcap2: CPU_FLAGS_ARM: edsp neon thumb vfp vfpv3 vfpv4 vfp-d32 aes sha1 sha2 crc32 v4 v5 v6 v7 v8 thumb2 cpuinfo processor : 0 BogoMIPS: 48.00 Features: fp asimd evtstrm aes pmull sha1 sha2 crc32 CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part: 0xd03 CPU revision: 4 CPU info: 290a41200e01313254524d50 Serial : . Hardware: Hardkernel ODROID-N2 Revision: 0400 diff -U0 <(./cpuid2cpuflags | tr ' ' '\n' | sed 1d |sort) <(grep -m1 Features /proc/cpuinfo | tr ' ' '\n' | sed 1d | grep '.' |sort) --- /dev/fd/63 2019-09-11 09:59:59.616633443 -0700 +++ /dev/fd/62 2019-09-11 09:59:59.616633443 -0700 @@ -1,0 +2 @@ +asimd @@ -3,2 +4,3 @@ -edsp -neon +evtstrm +fp +pmull @@ -7,11 +8,0 @@ -thumb -thumb2 -v4 -v5 -v6 -v7 -v8 -vfp -vfp-d32 -vfpv3 -vfpv4 signature.asc Description: OpenPGP digital signature
[gentoo-dev] Last rites: dev-haskell/language-docker, dev-util/hadolint
# Michał Górny (2019-09-11) # Both packages are unmaintained, and are many releases behind. # hadolint is reported to fail to build, and requires old version # of language-docker. Newer versions of language-docker have # no revdeps. # Removal in 30 days. Bug #674660. dev-haskell/language-docker dev-util/hadolint -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
Re: [gentoo-dev] Last rites: sys-process/vixie-cron
* Michał Górny: > Unmaintained. Ancient. First release of vixie-cron: 1987. Cronie: 2007. Damn, this makes me feel old. :-/ -Ralph
[gentoo-dev] Last rites: sys-freebsd/*
# Michał Górny (2019-09-11) # Gentoo/FreeBSD project is effectively dead. The core packages are # outdated and vulnerable. We do not have a fully working install, # and I have not been able to find anyone knowing how to create one. # Leaf packages are failing to build more and more frequently, some # simply because of our outdated base system. The profiles were marked # exp two months ago not to stall other developers, core packages are # masked for at least two months, and nowadays they have unsatisfied # dependencies already. # # If anyone wishes to take the effort over, please consider it urgent. # If not, I will slowly start removing remaining parts of FreeBSD # after this batch, and checking which packages can be salvaged. # # Removal in 30 days. Bug #683284. sys-freebsd/boot0 sys-freebsd/freebsd-bin sys-freebsd/freebsd-cddl sys-freebsd/freebsd-lib sys-freebsd/freebsd-libexec sys-freebsd/freebsd-mk-defs sys-freebsd/freebsd-pam-modules sys-freebsd/freebsd-pf sys-freebsd/freebsd-rescue sys-freebsd/freebsd-sbin sys-freebsd/freebsd-share sys-freebsd/freebsd-sources sys-freebsd/freebsd-ubin sys-freebsd/freebsd-usbin sys-freebsd/ubin-wrappers -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: sys-process/vixie-cron
# Michał Górny (2019-09-11) # Unmaintained. Ancient. Carries a lot of patches, and has even more # bugs reported. Last rites were cancelled due to Gentoo/FreeBSD 1 year # ago but that project is dead nowadays. Many alternatives exist, # sys-process/cronie is probably the closest one (it's a fork). # Removal in 30 days. Bug #693946. sys-process/vixie-cron -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] Last rites: dev-util/pkgconfig-openbsd
# Michał Górny (2019-09-11) # Unmaintained. Last bumped in 2013. No apparent advantage over # the two other implementations in Gentoo (dev-util/pkgconfig, # dev-util/pkgconf). # Removal in 30 days. Bug #694034. dev-util/pkgconfig-openbsd -- Best regards, Michał Górny signature.asc Description: This is a digitally signed message part
[gentoo-dev] [PATCH 21/25] www-misc/monitorix: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
www-misc/monitorix/monitorix-3.10.0-r1.ebuild | 2 +-
www-misc/monitorix/monitorix-3.10.1.ebuild| 2 +-
www-misc/monitorix/monitorix-3.11.0.ebuild| 2 +-
www-misc/monitorix/monitorix-3.9.0.ebuild | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
index 65bcc53b45f2..7181ae3d0cc1 100644
--- a/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.0-r1.ebuild
@@ -93,7 +93,7 @@ pkg_postinst() {
elog " app-admin/hddtemp (disk drive temperatures and health)"
elog " mail-mta/postfix(email reports/statics)"
elog " mail-mta/sendmail (email reports/statics)"
- elog " sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+ elog " sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
elog " sys-power/apcupsd (APC UPS statistics)"
elog " sys-power/nut (Network UPS Tools statistics)"
elog
diff --git a/www-misc/monitorix/monitorix-3.10.1.ebuild
b/www-misc/monitorix/monitorix-3.10.1.ebuild
index 3e6b4c2569d7..6cfe49a36664 100644
--- a/www-misc/monitorix/monitorix-3.10.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.10.1.ebuild
@@ -92,7 +92,7 @@ pkg_postinst() {
elog " app-admin/hddtemp (disk drive temperatures and health)"
elog " mail-mta/postfix(email reports/statics)"
elog " mail-mta/sendmail (email reports/statics)"
- elog " sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+ elog " sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
elog " sys-power/apcupsd (APC UPS statistics)"
elog " sys-power/nut (Network UPS Tools statistics)"
elog
diff --git a/www-misc/monitorix/monitorix-3.11.0.ebuild
b/www-misc/monitorix/monitorix-3.11.0.ebuild
index efb99c9012a7..7b47c6db0dce 100644
--- a/www-misc/monitorix/monitorix-3.11.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.11.0.ebuild
@@ -94,7 +94,7 @@ pkg_postinst() {
elog " app-admin/hddtemp (disk drive temperatures and health)"
elog " mail-mta/postfix(email reports/statics)"
elog " mail-mta/sendmail (email reports/statics)"
- elog " sys-apps/lm_sensors (lm_sensors and GPU temperatures)"
+ elog " sys-apps/lm-sensors (lm-sensors and GPU temperatures)"
elog " sys-power/apcupsd (APC UPS statistics)"
elog " sys-power/nut (Network UPS Tools statistics)"
elog
diff --git a/www-misc/monitorix/monitorix-3.9.0.ebuild
b/www-misc/monitorix/monitorix-3.9.0.ebuild
index d56a7fd63984..75df0a787d66 100644
--- a/www-misc/monitorix/monitorix-3.9.0.ebuild
+++ b/www-misc/monitorix/monitorix-3.9.0.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/mikaku/Monitorix/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="apcupsd hddtemp httpd lm_sensors postfix"
+IUSE="apcupsd hddtemp httpd lm-sensors postfix"
S="${WORKDIR}/Monitorix-${PV}"
RDEPEND="dev-perl/Config-General
@@ -27,7 +27,7 @@ RDEPEND="dev-perl/Config-General
apcupsd? ( sys-power/apcupsd )
hddtemp? ( app-admin/hddtemp )
httpd? ( virtual/httpd-cgi )
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
postfix? ( net-mail/pflogsumm dev-perl/MailTools )"
pkg_setup() {
--
2.23.0
[gentoo-dev] [PATCH 23/25] x11-misc/xsensors: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
x11-misc/xsensors/xsensors-0.70-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
index 344c180cf8e6..bcca5da249e8 100644
--- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
+++ b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="x11-libs/gtk+:2
- >=sys-apps/lm_sensors-3"
+ >=sys-apps/lm-sensors-3"
DEPEND="${RDEPEND}
virtual/pkgconfig"
--
2.23.0
[gentoo-dev] [PATCH 20/25] www-apps/phpsysinfo: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
b/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
index c7e5df2476a8..6fd10066cbec 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
@@ -40,7 +40,7 @@ pkg_postinst() {
optfeature "showing iptables rules." net-firewall/iptables
optfeature "showing ipmi sensors." sys-apps/ipmitool
optfeature "showing ipmi sensors." sys-apps/ipmiutil
- optfeature "showing system sensors." sys-apps/lm_sensors
+ optfeature "showing system sensors." sys-apps/lm-sensors
optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
optfeature "showing lsi raid controller health." sys-block/megactl
optfeature "showing fake raid statistics." sys-fs/dmraid
--
2.23.0
[gentoo-dev] [PATCH 24/25] x11-plugins/wmgtemp: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
x11-plugins/wmgtemp/metadata.xml | 2 +-
x11-plugins/wmgtemp/wmgtemp-1.2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-plugins/wmgtemp/metadata.xml b/x11-plugins/wmgtemp/metadata.xml
index 6573fee387af..f8e691047dac 100644
--- a/x11-plugins/wmgtemp/metadata.xml
+++ b/x11-plugins/wmgtemp/metadata.xml
@@ -8,7 +8,7 @@
wmgtemp is a dock-app for Window Maker that graphically displays the CPU and
-System temperatures using the lm_sensors package. It was originally intended
to
+System temperatures using the lm-sensors package. It was originally intended
to
work with the VIA686A chipset although it can dynamically detect chipset
features to work with other sensors. It displays the CPU and System
temperature
values, a scaling graph of temperature history, and high-temperature warning
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
index f857b6e048f1..5040d25087d5 100644
--- a/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
+++ b/x11-plugins/wmgtemp/wmgtemp-1.2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="sys-apps/lm_sensors:=
+DEPEND="sys-apps/lm-sensors:=
>=x11-libs/libdockapp-0.7:=
x11-libs/libX11"
RDEPEND="${DEPEND}"
--
2.23.0
[gentoo-dev] [PATCH 22/25] x11-misc/i3blocks: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny --- x11-misc/i3blocks/i3blocks-1.4-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild index e481e6cfda3b..165a389c483e 100644 --- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild +++ b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild @@ -21,7 +21,7 @@ LICENSE="GPL-3" RDEPEND="app-admin/sysstat media-sound/playerctl - sys-apps/lm_sensors + sys-apps/lm-sensors sys-power/acpi || ( x11-wm/i3 x11-wm/i3-gaps )" -- 2.23.0
[gentoo-dev] [PATCH 25/25] xfce-extra/xfce4-sensors-plugin: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
.../xfce4-sensors-plugin-1.3.0-r1.ebuild | 10 +-
.../xfce4-sensors-plugin-1.3.92-r1.ebuild | 10 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
index b34896e279f6..9d8815f02a92 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
@@ -5,16 +5,16 @@ EAPI=6
inherit gnome2-utils
-DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
+DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin";
SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
+IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
RDEPEND=">=x11-libs/gtk+-3.20:3=
>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
)
)
libnotify? ( >=x11-libs/libnotify-0.7:= )
- lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
+ lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@ DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
src_configure() {
local myconf=(
--libexecdir="${EPREFIX}"/usr/$(get_libdir)
- $(use_enable lm_sensors libsensors)
+ $(use_enable lm-sensors libsensors)
$(use_enable hddtemp)
$(use_enable hddtemp netcat)
$(use_enable acpi procacpi)
diff --git
a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
index e0f3cbc46371..16b568dc0ee5 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
@@ -5,16 +5,16 @@ EAPI=6
inherit gnome2-utils
-DESCRIPTION="A panel plug-in for acpi, lm_sensors and hddtemp sensors"
+DESCRIPTION="A panel plug-in for acpi, lm-sensors and hddtemp sensors"
HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin";
SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2";
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+acpi hddtemp libnotify lm_sensors video_cards_nvidia"
+IUSE="+acpi hddtemp libnotify lm-sensors video_cards_nvidia"
-REQUIRED_USE="|| ( hddtemp lm_sensors acpi )"
+REQUIRED_USE="|| ( hddtemp lm-sensors acpi )"
RDEPEND=">=x11-libs/gtk+-3.20:3=
>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/gtk+-3.20:3=
)
)
libnotify? ( >=x11-libs/libnotify-0.7:= )
- lm_sensors? ( >=sys-apps/lm_sensors-3.1.0:= )
+ lm-sensors? ( >=sys-apps/lm-sensors-3.1.0:= )
video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )"
DEPEND="${RDEPEND}
@@ -40,7 +40,7 @@ DOCS=( AUTHORS ChangeLog NEWS NOTES README TODO )
src_configure() {
local myconf=(
--libexecdir="${EPREFIX}"/usr/$(get_libdir)
- $(use_enable lm_sensors libsensors)
+ $(use_enable lm-sensors libsensors)
$(use_enable hddtemp)
$(use_enable hddtemp netcat)
$(use_enable acpi procacpi)
--
2.23.0
[gentoo-dev] [PATCH 19/25] sys-apps/i2c-tools: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
sys-apps/i2c-tools/i2c-tools-4.0.ebuild| 2 +-
sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
index a8b6cc72dece..209116293998 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="!
[gentoo-dev] [PATCH 18/25] net-wireless/kismet: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
net-wireless/kismet/kismet-2019.09.1.ebuild | 6 +++---
net-wireless/kismet/kismet-.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-wireless/kismet/kismet-2019.09.1.ebuild
b/net-wireless/kismet/kismet-2019.09.1.ebuild
index f6b223f22b1e..491e99e9a65b 100644
--- a/net-wireless/kismet/kismet-2019.09.1.ebuild
+++ b/net-wireless/kismet/kismet-2019.09.1.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net";
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
CDEPEND="
@@ -53,7 +53,7 @@ CDEPEND="
dev-libs/protobuf:=
dev-python/protobuf-python[${PYTHON_USEDEP}]
sys-libs/ncurses:=
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
"
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
econf \
$(use_enable pcre) \
- $(use_enable lm_sensors lmsensors) \
+ $(use_enable lm-sensors lmsensors) \
$(use_enable mousejack libusb) \
$(use_enable networkmanager libnm) \
--sysconfdir=/etc/kismet \
diff --git a/net-wireless/kismet/kismet-.ebuild
b/net-wireless/kismet/kismet-.ebuild
index f6b223f22b1e..491e99e9a65b 100644
--- a/net-wireless/kismet/kismet-.ebuild
+++ b/net-wireless/kismet/kismet-.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="https://www.kismetwireless.net";
LICENSE="GPL-2"
SLOT="0/${PV}"
-IUSE="lm_sensors mousejack networkmanager +pcre selinux +suid"
+IUSE="lm-sensors mousejack networkmanager +pcre selinux +suid"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
CDEPEND="
@@ -53,7 +53,7 @@ CDEPEND="
dev-libs/protobuf:=
dev-python/protobuf-python[${PYTHON_USEDEP}]
sys-libs/ncurses:=
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
pcre? ( dev-libs/libpcre )
suid? ( sys-libs/libcap )
"
@@ -89,7 +89,7 @@ src_prepare() {
src_configure() {
econf \
$(use_enable pcre) \
- $(use_enable lm_sensors lmsensors) \
+ $(use_enable lm-sensors lmsensors) \
$(use_enable mousejack libusb) \
$(use_enable networkmanager libnm) \
--sysconfdir=/etc/kismet \
--
2.23.0
[gentoo-dev] [PATCH 16/25] net-analyzer/net-snmp: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild | 6 +++---
net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild | 6 +++---
net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild | 6 +++---
net-analyzer/net-snmp/net-snmp-.ebuild | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
index 32697e5f3148..99e0bd51b933 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.}
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql
netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
COMMON_DEPEND="
ssl? (
@@ -44,7 +44,7 @@ COMMON_DEPEND="
${PYTHON_DEPS}
)
pci? ( sys-apps/pciutils )
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
netlink? ( dev-libs/libnl:3 )
mysql? ( dev-db/mysql-connector-c:0= )
perl? ( dev-lang/perl:= )
@@ -93,7 +93,7 @@ src_prepare() {
src_configure() {
# keep this in the same line, configure.ac arguments are passed down to
config.h
local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible
mibII/mta_sendmail etherlike-mib/dot3StatsTable"
- use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+ use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
use smux && mibs="${mibs} smux"
# Assume /etc/mtab is not present with a recent baselayout/openrc (bug
#565136)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
index 2452860409a7..119ec81687a2 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild
@@ -24,7 +24,7 @@ S=${WORKDIR}/${P/_/.}
LICENSE="HPND BSD GPL-2"
SLOT="0/35"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
-IUSE="X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql
netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
+IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib"
COMMON_DEPEND="
ssl? (
@@ -44,7 +44,7 @@ COMMON_DEPEND="
${PYTHON_DEPS}
)
pci? ( sys-apps/pciutils )
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
netlink? ( dev-libs/libnl:3 )
mysql? ( dev-db/mysql-connector-c:0= )
perl? ( dev-lang/perl:= )
@@ -94,7 +94,7 @@ src_prepare() {
src_configure() {
# keep this in the same line, configure.ac arguments are passed down to
config.h
local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible
mibII/mta_sendmail etherlike-mib/dot3StatsTable"
- use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+ use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
use smux && mibs="${mibs} smux"
# Assume /etc/mtab is not present with a recent baselayout/openrc (bug
#565136)
diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
index b3a807cc5e2a..a7359956604a 100644
--- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild
@@ -25,14 +25,14 @@ LICENSE="HPND BSD GPL-2"
SLOT="0/35"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
IUSE="
- X bzip2 doc elf kmem ipv6 libressl lm_sensors mfd-rewrites minimal mysql
+ X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql
netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib
"
COMMON_DEPEND="
bzip2? ( app-arch/bzip2 )
elf? ( dev-libs/elfutils )
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
mysql? ( dev-db/mysql-connector-c:0= )
netlink? ( dev-libs/libnl:3 )
pcap? ( net-libs/libpcap )
@@ -100,7 +100,7 @@ src_prepare() {
src_configure() {
# keep this in the same line, configure.ac arguments are passed down to
config.h
local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible
mibII/mta_sendmail etherlike-mib/dot3StatsTable"
- use lm_sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
+ use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib"
use smux && mibs="${mibs} smux"
# Assume /etc/mtab is not present with a recent baselayout/openrc (bug
#565136)
diff --git a/net-analyzer/net-snmp
[gentoo-dev] [PATCH 17/25] net-misc/bfgminer: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
net-misc/bfgminer/bfgminer-5.4.2.ebuild | 10 +-
net-misc/bfgminer/bfgminer-5.5.0.ebuild | 10 +-
profiles/arch/arm/package.use.mask | 2 +-
profiles/arch/mips/package.use.mask | 2 +-
profiles/arch/powerpc/package.use.mask | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
index bb70a2cd1ca7..93d5146abac5 100644
--- a/net-misc/bfgminer/bfgminer-5.4.2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.4.2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
# TODO: knc (needs i2c-tools header)
# TODO: kncasic & titan (need systemwide knc-asic install)
# TODO: minergate (needs actual miner_gate)
-IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury
cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster
hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury
lm_sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork
proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules
unicode x6500 zeusminer ztex"
+IUSE="adl antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury
cointerra cpumining drillbit dualminer examples gridseed hardened hashbuster
hashbuster2 hashfast icarus jingtian keccak klondike +libusb littlefury
lm-sensors metabank minion modminer nanofury ncurses opencl proxy proxy_getwork
proxy_stratum rockminer screen scrypt +sha256d twinfury +udev udev-broad-rules
unicode x6500 zeusminer ztex"
REQUIRED_USE='
|| ( keccak scrypt sha256d )
|| ( antminer avalon avalonmm bfsb bfx bifury bigpic bitforce bitfury
cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2 hashfast
icarus klondike littlefury metabank modminer nanofury opencl proxy twinfury
x6500 zeusminer ztex )
@@ -42,7 +42,7 @@ REQUIRED_USE='
keccak? ( || ( cpumining opencl proxy ) )
klondike? ( sha256d libusb )
littlefury? ( sha256d bitfury )
- lm_sensors? ( opencl )
+ lm-sensors? ( opencl )
metabank? ( sha256d bitfury )
minion? ( sha256d )
modminer? ( sha256d )
@@ -78,8 +78,8 @@ DEPEND='
libusb? (
virtual/libusb:1
)
- lm_sensors? (
- sys-apps/lm_sensors
+ lm-sensors? (
+ sys-apps/lm-sensors
)
nanofury? (
dev-libs/hidapi
@@ -175,7 +175,7 @@ src_configure() {
$with_curses \
$(use_with udev libudev) \
$(use_enable udev-broad-rules broad-udevrules) \
- $(use_with lm_sensors sensors) \
+ $(use_with lm-sensors sensors) \
$(use_with proxy_getwork libmicrohttpd) \
$(use_with proxy_stratum libevent) \
$(use_enable x6500) \
diff --git a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
index b2dd3f03b1bc..6d7f7cea5ea7 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
# TODO: knc (needs i2c-tools header)
# TODO: kncasic & titan (need systemwide knc-asic install)
# TODO: minergate (needs actual miner_gate)
-IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce
bitfury cointerra cpumining drillbit dualminer examples gridseed hardened
hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb
littlefury lm_sensors metabank minion modminer nanofury ncurses opencl proxy
proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev
udev-broad-rules unicode x6500 zeusminer ztex"
+IUSE="adl alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce
bitfury cointerra cpumining drillbit dualminer examples gridseed hardened
hashbuster hashbuster2 hashfast icarus jingtian keccak klondike +libusb
littlefury lm-sensors metabank minion modminer nanofury ncurses opencl proxy
proxy_getwork proxy_stratum rockminer screen scrypt +sha256d twinfury +udev
udev-broad-rules unicode x6500 zeusminer ztex"
REQUIRED_USE='
|| ( keccak scrypt sha256d )
|| ( alchemist avalon avalonmm bitmain bfsb bfx bifury bigpic bitforce
bitfury cointerra cpumining drillbit dualminer gridseed hashbuster hashbuster2
hashfast icarus klondike littlefury metabank modminer nanofury opencl proxy
twinfury x6500 zeusminer ztex )
@@ -43,7 +43,7 @@ REQUIRED_USE='
keccak? ( || ( cpumining opencl proxy ) )
klondike? ( sha256d libusb )
littlefury? ( sha256d bitfury )
- lm_sensors? ( opencl )
+ lm-sensors? ( opencl )
metabank? ( sha256d bitfury )
minion? ( sha256d )
modminer? ( sha256d )
@@ -78,8 +78,8 @@ DEPEND='
libusb? (
virtual/libusb:1
)
- lm_sensors? (
- sys-apps/lm_sen
[gentoo-dev] [PATCH 15/25] media-plugins/vdr-systeminfo: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild | 2 +-
media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild | 2 +-
media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
index 66943d969fcb..1932274f9e33 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
DEPEND=">=media-video/vdr-1.4.7"
-RDEPEND="sys-apps/lm_sensors
+RDEPEND="sys-apps/lm-sensors
app-admin/hddtemp"
src_install() {
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
index 191ef0061a3e..1380ceb13006 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild
@@ -16,7 +16,7 @@ IUSE=""
DEPEND=">=media-video/vdr-1.4.7"
-RDEPEND="sys-apps/lm_sensors
+RDEPEND="sys-apps/lm-sensors
app-admin/hddtemp"
src_prepare() {
diff --git a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
index f7811e2baa28..d09299bc8a3d 100644
--- a/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
+++ b/media-plugins/vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild
@@ -16,7 +16,7 @@ IUSE=""
DEPEND=">=media-video/vdr-2"
-RDEPEND="sys-apps/lm_sensors
+RDEPEND="sys-apps/lm-sensors
app-admin/hddtemp"
src_prepare() {
--
2.23.0
[gentoo-dev] [PATCH 14/25] media-libs/mesa: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
media-libs/mesa/mesa-19.0.8.ebuild | 8
media-libs/mesa/mesa-19.1.3.ebuild | 8
media-libs/mesa/mesa-19.1.4.ebuild | 8
media-libs/mesa/mesa-19.1.5.ebuild | 8
media-libs/mesa/mesa-19.1.6.ebuild | 8
media-libs/mesa/mesa-19.2.0_rc1.ebuild | 8
media-libs/mesa/mesa-19.2.0_rc2.ebuild | 8
media-libs/mesa/mesa-.ebuild | 8
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/media-libs/mesa/mesa-19.0.8.ebuild
b/media-libs/mesa/mesa-19.0.8.ebuild
index f6cc92985b5b..67340d9d392b 100644
--- a/media-libs/mesa/mesa-19.0.8.ebuild
+++ b/media-libs/mesa/mesa-19.0.8.ebuild
@@ -37,7 +37,7 @@ done
IUSE="${IUSE_VIDEO_CARDS}
+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd
+llvm
- lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
+ lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
vdpau vulkan wayland xa xvmc"
REQUIRED_USE="
@@ -99,7 +99,7 @@ RDEPEND="
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
)
- lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
opencl? (
dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
dev-libs/libclc
@@ -288,7 +288,7 @@ pkg_pretend() {
fi
if ! use gallium; then
- use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does
not contain gallium"
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does
not contain gallium"
use llvm && ewarn "Ignoring USE=llvm since USE does
not contain gallium"
use opencl && ewarn "Ignoring USE=opencl since USE does
not contain gallium"
use vaapi && ewarn "Ignoring USE=vaapi since USE does
not contain gallium"
@@ -349,7 +349,7 @@ multilib_src_configure() {
if use gallium; then
emesonargs+=(
$(meson_use llvm)
- $(meson_use lm_sensors lmsensors)
+ $(meson_use lm-sensors lmsensors)
$(meson_use unwind libunwind)
)
diff --git a/media-libs/mesa/mesa-19.1.3.ebuild
b/media-libs/mesa/mesa-19.1.3.ebuild
index 0fd4ae716a5f..b5c1ff6540fc 100644
--- a/media-libs/mesa/mesa-19.1.3.ebuild
+++ b/media-libs/mesa/mesa-19.1.3.ebuild
@@ -37,7 +37,7 @@ done
IUSE="${IUSE_VIDEO_CARDS}
+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd
+llvm
- lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
+ lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
vdpau vulkan vulkan-overlay wayland xa xvmc"
REQUIRED_USE="
@@ -100,7 +100,7 @@ RDEPEND="
virtual/libelf:0=[${MULTILIB_USEDEP}]
)
)
- lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
opencl? (
dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
dev-libs/libclc
@@ -293,7 +293,7 @@ pkg_pretend() {
fi
if ! use gallium; then
- use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does
not contain gallium"
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does
not contain gallium"
use llvm && ewarn "Ignoring USE=llvm since USE does
not contain gallium"
use opencl && ewarn "Ignoring USE=opencl since USE does
not contain gallium"
use vaapi && ewarn "Ignoring USE=vaapi since USE does
not contain gallium"
@@ -354,7 +354,7 @@ multilib_src_configure() {
if use gallium; then
emesonargs+=(
$(meson_use llvm)
- $(meson_use lm_sensors lmsensors)
+ $(meson_use lm-sensors lmsensors)
$(meson_use unwind libunwind)
)
diff --git a/media-libs/mesa/mesa-19.1.4.ebuild
b/media-libs/mesa/mesa-19.1.4.ebuild
index 0fd4ae716a5f..b5c1ff6540fc 100644
--- a/media-libs/mesa/mesa-19.1.4.ebuild
+++ b/media-libs/mesa/mesa-19.1.4.ebuild
@@ -37,7 +37,7 @@ done
IUSE="${IUSE_VIDEO_CARDS}
+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd
+llvm
- lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
+ lm-sensors opencl osmesa pax_kernel pic selinux test unwind vaapi
valgrind
vdpau vulkan vulkan-overlay way
[gentoo-dev] [PATCH 12/25] lxqt-base/lxqt-panel: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny --- lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild index 62348072a92e..7be8a5fd4e4b 100644 --- a/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild +++ b/lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild @@ -54,7 +54,7 @@ DEPEND=" kbindicator? ( x11-libs/libxkbcommon ) mount? ( kde-frameworks/solid:5 ) networkmonitor? ( sys-libs/libstatgrab ) - sensors? ( sys-apps/lm_sensors ) + sensors? ( sys-apps/lm-sensors ) statusnotifier? ( dev-libs/libdbusmenu-qt[qt5(+)] ) sysstat? ( >=lxqt-base/libsysstat-0.4.1 ) tray? ( -- 2.23.0
[gentoo-dev] [PATCH 13/25] mate-extra/mate-sensors-applet: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
.../mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
index 7df62276db70..1d46b635f650 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="MATE panel applet to display readings from
hardware sensors"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
+IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
COMMON_DEPEND=">=dev-libs/glib-2.50:2
>=mate-base/mate-panel-1.17.0
@@ -25,7 +25,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.50:2
virtual/libintl
hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
libnotify? ( >=x11-libs/libnotify-0.7 )
- lm_sensors? ( sys-apps/lm_sensors )
+ lm-sensors? ( sys-apps/lm-sensors )
video_cards_nvidia? ( || (
>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
) )"
@@ -56,7 +56,7 @@ src_configure() {
--disable-static \
--without-aticonfig \
$(use_enable libnotify) \
- $(use_with lm_sensors libsensors) \
+ $(use_with lm-sensors libsensors) \
$(use_with video_cards_nvidia nvidia) \
${udisks}
}
--
2.23.0
[gentoo-dev] [PATCH 11/25] kde-plasma/ksysguard: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
kde-plasma/ksysguard/ksysguard-5.15.5.ebuild | 6 +++---
kde-plasma/ksysguard/ksysguard-5.16.5.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
index e8a0d00137e7..0a4f54edf90f 100644
--- a/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Network-enabled task manager and system monitor"
LICENSE="GPL-2+"
KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="lm_sensors"
+IUSE="lm-sensors"
DEPEND="
$(add_frameworks_dep kcompletion)
@@ -32,13 +32,13 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package lm_sensors Sensors)
+ $(cmake-utils_use_find_package lm-sensors Sensors)
)
kde5_src_configure
diff --git a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
index dc21acd63e69..b85ffb962120 100644
--- a/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
+++ b/kde-plasma/ksysguard/ksysguard-5.16.5.ebuild
@@ -9,7 +9,7 @@ inherit kde5
DESCRIPTION="Network-enabled task manager and system monitor"
LICENSE="GPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="lm_sensors"
+IUSE="lm-sensors"
DEPEND="
$(add_frameworks_dep kcompletion)
@@ -32,13 +32,13 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package lm_sensors Sensors)
+ $(cmake-utils_use_find_package lm-sensors Sensors)
)
kde5_src_configure
--
2.23.0
[gentoo-dev] [PATCH 10/25] dev-python/PySensors: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
dev-python/PySensors/PySensors-0.0.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/PySensors/PySensors-0.0.3.ebuild
b/dev-python/PySensors/PySensors-0.0.3.ebuild
index a2de3813d903..4e6a9118e291 100644
--- a/dev-python/PySensors/PySensors-0.0.3.ebuild
+++ b/dev-python/PySensors/PySensors-0.0.3.ebuild
@@ -17,4 +17,4 @@ KEYWORDS="~amd64"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=sys-apps/lm_sensors-3"
+RDEPEND=">=sys-apps/lm-sensors-3"
--
2.23.0
[gentoo-dev] [PATCH 08/25] app-leechcraft/lc-hotsensors: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
app-leechcraft/lc-hotsensors/lc-hotsensors-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-leechcraft/lc-hotsensors/lc-hotsensors-.ebuild
b/app-leechcraft/lc-hotsensors/lc-hotsensors-.ebuild
index 4e5347d717f2..d693a30b7e1b 100644
--- a/app-leechcraft/lc-hotsensors/lc-hotsensors-.ebuild
+++ b/app-leechcraft/lc-hotsensors/lc-hotsensors-.ebuild
@@ -14,7 +14,7 @@ KEYWORDS=""
IUSE="debug"
DEPEND="~app-leechcraft/lc-core-${PV}[qwt]
- sys-apps/lm_sensors
+ sys-apps/lm-sensors
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
dev-qt/qtdeclarative:5[widgets]
--
2.23.0
[gentoo-dev] [PATCH 09/25] app-metrics/collectd: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny --- app-metrics/collectd/collectd-5.8.1-r1.ebuild | 2 +- app-metrics/collectd/collectd-5.9.1-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-metrics/collectd/collectd-5.8.1-r1.ebuild b/app-metrics/collectd/collectd-5.8.1-r1.ebuild index ce224b6f9195..5ab2828b9777 100644 --- a/app-metrics/collectd/collectd-5.8.1-r1.ebuild +++ b/app-metrics/collectd/collectd-5.8.1-r1.ebuild @@ -119,7 +119,7 @@ COMMON_DEPEND=" collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( net-analyzer/rrdtool:= ) collectd_plugins_rrdtool? ( net-analyzer/rrdtool:= ) - collectd_plugins_sensors? ( sys-apps/lm_sensors:= ) + collectd_plugins_sensors? ( sys-apps/lm-sensors:= ) collectd_plugins_sigrok?(
[gentoo-dev] [PATCH 06/25] app-admin/gkrellm: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild | 8
app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild | 8
app-admin/gkrellm/gkrellm-2.3.11.ebuild| 8
app-admin/gkrellm/gkrellm-.ebuild | 8
app-admin/gkrellm/metadata.xml | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index 2a8dc60efddd..6deb89dbedcc 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2";
LICENSE="GPL-3"
SLOT="2"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
dev-libs/glib:2
@@ -26,7 +26,7 @@ RDEPEND="
libressl? ( dev-libs/libressl:0= )
)
)
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
nls? ( virtual/libintl )
ntlm? ( net-libs/libntlm )
X? (
@@ -89,7 +89,7 @@ src_compile() {
INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
LOCALEDIR="${EPREFIX}/usr/share/locale" \
$(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex lm-sensors "" "without-libsensors=yes") \
$(usex ntlm "" "without-ntlm=yes") \
$(usex ssl $(usex gnutls 'without-ssl=yes'
'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
else
@@ -100,7 +100,7 @@ src_compile() {
LINK_FLAGS="$LDFLAGS -Wl,-E" \
STRIP="" \
$(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes")
+ $(usex lm-sensors "" "without-libsensors=yes")
fi
}
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index c54518d26368..42065f550af0 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -18,7 +18,7 @@ else
fi
LICENSE="GPL-3"
SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
acct-group/gkrellmd
@@ -32,7 +32,7 @@ RDEPEND="
libressl? ( dev-libs/libressl:0= )
)
)
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
nls? ( virtual/libintl )
ntlm? ( net-libs/libntlm )
X? (
@@ -95,7 +95,7 @@ src_compile() {
INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
LOCALEDIR="${EPREFIX}/usr/share/locale" \
$(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex lm-sensors "" "without-libsensors=yes") \
$(usex ntlm "" "without-ntlm=yes") \
$(usex ssl $(usex gnutls 'without-ssl=yes'
'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
else
@@ -106,7 +106,7 @@ src_compile() {
LINK_FLAGS="$LDFLAGS -Wl,-E" \
STRIP="" \
$(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes")
+ $(usex lm-sensors "" "without-libsensors=yes")
fi
}
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
index d205ffcda8a5..c129a3783e30 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
@@ -18,7 +18,7 @@ else
fi
LICENSE="GPL-3"
SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
dev-libs/glib:2
@@ -30,7 +30,7 @@ RDEPEND="
libressl? ( dev-libs/libressl:0= )
)
)
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
nls? ( virtual/libintl )
ntlm? ( net-libs/libntlm )
X? (
@@ -93,7 +93,7 @@ src_compile() {
INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
LOCALEDIR="${EPREFIX}/usr/share/locale" \
$(usex nls "" "enable_nls=0") \
- $(usex lm_sensors "" "without-libsensors=yes") \
+ $(usex lm-sensors "" "without-libsensors=ye
[gentoo-dev] [PATCH 07/25] app-admin/sysstat: Update for lm_sensors → lm-sensors
Signed-off-by: Michał Górny
---
app-admin/sysstat/sysstat-12.0.5.ebuild | 6 +++---
app-admin/sysstat/sysstat-12.0.6.ebuild | 6 +++---
app-admin/sysstat/sysstat-12.1.5.ebuild | 6 +++---
app-admin/sysstat/sysstat-12.1.6.ebuild | 6 +++---
app-admin/sysstat/sysstat-99.ebuild | 6 +++---
profiles/arch/riscv/package.use.mask| 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild
b/app-admin/sysstat/sysstat-12.0.5.ebuild
index d28c04c0297c..bad60fba75ea 100644
--- a/app-admin/sysstat/sysstat-12.0.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -11,11 +11,11 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
CDEPEND="
nls? ( virtual/libintl )
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
"
DEPEND="
${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
conf_dir=/etc \
econf \
$(use_enable debug debuginfo) \
- $(use_enable lm_sensors sensors) \
+ $(use_enable lm-sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.0.6.ebuild
b/app-admin/sysstat/sysstat-12.0.6.ebuild
index db640d7d5f9e..a0e5561580a3 100644
--- a/app-admin/sysstat/sysstat-12.0.6.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.6.ebuild
@@ -11,11 +11,11 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
CDEPEND="
nls? ( virtual/libintl )
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
"
DEPEND="
${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
conf_dir=/etc \
econf \
$(use_enable debug debuginfo) \
- $(use_enable lm_sensors sensors) \
+ $(use_enable lm-sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild
b/app-admin/sysstat/sysstat-12.1.5.ebuild
index 88dd13ade1dd..2938a1a2fe44 100644
--- a/app-admin/sysstat/sysstat-12.1.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.5.ebuild
@@ -11,11 +11,11 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390
~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
CDEPEND="
nls? ( virtual/libintl )
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
"
DEPEND="
${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
conf_dir=/etc \
econf \
$(use_enable debug debuginfo) \
- $(use_enable lm_sensors sensors) \
+ $(use_enable lm-sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild
b/app-admin/sysstat/sysstat-12.1.6.ebuild
index fd3a1dd527e7..79183431381f 100644
--- a/app-admin/sysstat/sysstat-12.1.6.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.6.ebuild
@@ -11,11 +11,11 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390
~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
CDEPEND="
nls? ( virtual/libintl )
- lm_sensors? ( sys-apps/lm_sensors:= )
+ lm-sensors? ( sys-apps/lm-sensors:= )
"
DEPEND="
${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
conf_dir=/etc \
econf \
$(use_enable debug debuginfo) \
- $(use_enable lm_sensors sensors) \
+ $(use_enable lm-sensors sensors) \
$(use_enable nls) \
--enable-copy-only \
--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-99.ebuild
b/app-admin/sysstat/sysstat-99.ebuild
index 62f6cc193b2b..fcefb54fdf3c 100644
--- a/app-admin/sysstat/sysstat-999
[gentoo-dev] [PATCH 05/25] profiles: Update USE={lm_sensors → lm-sensors}
Signed-off-by: Michał Górny --- profiles/arch/arm/use.mask | 2 +- profiles/arch/arm64/use.mask | 2 +- profiles/arch/hppa/use.mask| 4 ++-- profiles/arch/ia64/use.mask| 2 +- profiles/arch/powerpc/use.mask | 2 +- profiles/arch/s390/use.mask| 2 +- profiles/arch/sh/use.mask | 2 +- profiles/arch/sparc/use.mask | 2 +- profiles/default/bsd/use.mask | 2 +- profiles/prefix/windows/winnt/use.mask | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask index 7433f4959664..0a7dd7192d0f 100644 --- a/profiles/arch/arm/use.mask +++ b/profiles/arch/arm/use.mask @@ -77,7 +77,7 @@ gphoto2 afs mono lirc -lm_sensors +lm-sensors xemacs scanner sid diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask index d525c9227459..635bbebfaa23 100644 --- a/profiles/arch/arm64/use.mask +++ b/profiles/arch/arm64/use.mask @@ -98,7 +98,7 @@ libproxy darcs afs lirc -lm_sensors +lm-sensors scanner zvbi fluidsynth diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask index 3c99ab4cf5d1..80843a07ff3e 100644 --- a/profiles/arch/hppa/use.mask +++ b/profiles/arch/hppa/use.mask @@ -244,8 +244,8 @@ video_cards_radeon video_cards_radeonsi # Guy Martin (2005-07-25) -# lm_sensors not supported on hppa and ieee1394 not tested -lm_sensors +# lm-sensors not supported on hppa and ieee1394 not tested +lm-sensors iec61883 ieee1394 diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask index f8db01005e76..d7582f8ecadf 100644 --- a/profiles/arch/ia64/use.mask +++ b/profiles/arch/ia64/use.mask @@ -46,7 +46,7 @@ wifi # Hardware not available on ia64 apm battery -lm_sensors +lm-sensors pm-utils # Stuff that doesn't work on ia64, or not tested diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask index 911a017daa97..2fe615c7a405 100644 --- a/profiles/arch/powerpc/use.mask +++ b/profiles/arch/powerpc/use.mask @@ -69,7 +69,7 @@ klibc # 3dfx acpi -lm_sensors +lm-sensors rar hdf xvmc diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask index 491c1dee8a5c..3d59fcf9f378 100644 --- a/profiles/arch/s390/use.mask +++ b/profiles/arch/s390/use.mask @@ -86,7 +86,7 @@ motif mono ocaml sdl -lm_sensors +lm-sensors wxwidgets # Many X drivers make no sense on this platform. diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask index ed8deae11c86..7558145e0151 100644 --- a/profiles/arch/sh/use.mask +++ b/profiles/arch/sh/use.mask @@ -53,7 +53,7 @@ diet lirc afs mono -lm_sensors +lm-sensors qdbm fftw eds diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask index a5963370adbb..c93dc99abd0c 100644 --- a/profiles/arch/sparc/use.mask +++ b/profiles/arch/sparc/use.mask @@ -148,7 +148,7 @@ zmq ifp chipcard hbci -lm_sensors +lm-sensors openct bluetooth dmraid diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask index 6629ace9a073..76347096232a 100644 --- a/profiles/default/bsd/use.mask +++ b/profiles/default/bsd/use.mask @@ -18,7 +18,7 @@ fbcon gpm lirc multilib -lm_sensors +lm-sensors caps filecaps vidix diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask index 727eb842a440..7c916bb3e37c 100644 --- a/profiles/prefix/windows/winnt/use.mask +++ b/profiles/prefix/windows/winnt/use.mask @@ -35,7 +35,7 @@ ibm ieee1394 ipod ipv6 -lm_sensors +lm-sensors ncurses opengl oss -- 2.23.0
[gentoo-dev] [PATCH 04/25] use.desc: Rename lm_sensors → lm-sensors
Signed-off-by: Michał Górny --- profiles/use.desc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/use.desc b/profiles/use.desc index 0ca431225e04..136d86900685 100644 --- a/profiles/use.desc +++ b/profiles/use.desc @@ -178,7 +178,7 @@ libsamplerate - Build with support for converting sample rates using libsamplera libwww - Add libwww support (General purpose WEB API) lirc - Add support for lirc (Linux's Infra-Red Remote Control) livecd - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used during livecd building -lm_sensors - Add linux lm_sensors (hardware sensors) support +lm-sensors - Add linux lm-sensors (hardware sensors) support lua - Enable Lua scripting support luajit - Use dev-lang/luajit instead of dev-lang/lua (ineffective with USE=-lua) lzma - Support for LZMA (de)compression algorithm -- 2.23.0
[gentoo-dev] [PATCH 03/25] sys-apps/lm-sensors: Remove obsolete PN rewrite
Signed-off-by: Michał Górny
---
sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
index f84df9880d5c..e2d8209c6ad9 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0_p20190505.ebuild
@@ -8,15 +8,13 @@ inherit linux-info systemd toolchain-funcs multilib-minimal
DESCRIPTION="Hardware Monitoring user-space utilities"
HOMEPAGE="https://hwmon.wiki.kernel.org/
https://github.com/lm-sensors/lm-sensors";
-MY_PN="${PN/_/-}"
-
if [[ "${PV}" =~ .*_p[[:digit:]]{8}.* ]] ; then
COMMIT="2c8cca3d6cd60121b401734c1a24cfec7daed4fc"
-
SRC_URI="https://github.com/lm-sensors/${MY_PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${MY_PN}-${COMMIT}"
+ SRC_URI="https://github.com/lm-sensors/${PN}/archive/${COMMIT}.tar.gz
-> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT}"
else
SRC_URI="https://github.com/lm-sensors/lm-sensors/archive/V$(ver_rs 1-
-).tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN/_/-}-$(ver_rs 1- -)"
+ S="${WORKDIR}/${PN}-$(ver_rs 1- -)"
fi
LICENSE="GPL-2+ LGPL-2.1"
--
2.23.0
[gentoo-dev] [PATCH 02/25] Rename sys-apps/{lm_sensors → lm-sensors}, to match upstream
Signed-off-by: Michał Górny
---
profiles/updates/3Q-2019 | 1 +
sys-apps/{lm_sensors => lm-sensors}/Manifest | 4 ++--
sys-apps/{lm_sensors => lm-sensors}/files/fancontrol.confd| 0
sys-apps/{lm_sensors => lm-sensors}/files/fancontrol.initd| 0
.../{lm_sensors => lm-sensors}/files/fancontrol.service-r1| 0
.../files/lm-sensors-3.4.0-sensors-detect-gentoo.patch} | 0
.../files/lm-sensors-3.5.0-sensors-detect-gentoo.patch} | 0
sys-apps/{lm_sensors => lm-sensors}/files/lm_sensors.confd| 0
sys-apps/{lm_sensors => lm-sensors}/files/lm_sensors.initd| 0
sys-apps/{lm_sensors => lm-sensors}/files/sensord.confd | 0
sys-apps/{lm_sensors => lm-sensors}/files/sensord.initd | 0
sys-apps/{lm_sensors => lm-sensors}/files/sensord.service-r1 | 0
.../lm-sensors-3.5.0.ebuild} | 0
.../lm-sensors-3.5.0_p20190505.ebuild}| 0
sys-apps/{lm_sensors => lm-sensors}/metadata.xml | 0
15 files changed, 3 insertions(+), 2 deletions(-)
rename sys-apps/{lm_sensors => lm-sensors}/Manifest (79%)
rename sys-apps/{lm_sensors => lm-sensors}/files/fancontrol.confd (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/fancontrol.initd (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/fancontrol.service-r1 (100%)
rename sys-apps/{lm_sensors/files/lm_sensors-3.4.0-sensors-detect-gentoo.patch
=> lm-sensors/files/lm-sensors-3.4.0-sensors-detect-gentoo.patch} (100%)
rename sys-apps/{lm_sensors/files/lm_sensors-3.5.0-sensors-detect-gentoo.patch
=> lm-sensors/files/lm-sensors-3.5.0-sensors-detect-gentoo.patch} (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/lm_sensors.confd (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/lm_sensors.initd (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/sensord.confd (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/sensord.initd (100%)
rename sys-apps/{lm_sensors => lm-sensors}/files/sensord.service-r1 (100%)
rename sys-apps/{lm_sensors/lm_sensors-3.5.0.ebuild =>
lm-sensors/lm-sensors-3.5.0.ebuild} (100%)
rename sys-apps/{lm_sensors/lm_sensors-3.5.0_p20190505.ebuild =>
lm-sensors/lm-sensors-3.5.0_p20190505.ebuild} (100%)
rename sys-apps/{lm_sensors => lm-sensors}/metadata.xml (100%)
diff --git a/profiles/updates/3Q-2019 b/profiles/updates/3Q-2019
index ae1058e25a1c..e0d0ea611df2 100644
--- a/profiles/updates/3Q-2019
+++ b/profiles/updates/3Q-2019
@@ -3,3 +3,4 @@ move media-plugins/kipi-plugins kde-apps/kipi-plugins
move kde-misc/yakuake kde-apps/yakuake
move kde-apps/kjots app-text/kjots
move app-arch/upx-ucl app-arch/upx
+move sys-apps/lm_sensors sys-apps/lm-sensors
diff --git a/sys-apps/lm_sensors/Manifest b/sys-apps/lm-sensors/Manifest
similarity index 79%
rename from sys-apps/lm_sensors/Manifest
rename to sys-apps/lm-sensors/Manifest
index 727cc20c9292..1e5c83b45168 100644
--- a/sys-apps/lm_sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -1,2 +1,2 @@
-DIST lm_sensors-3.5.0.tar.gz 267133 BLAKE2B
f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e
SHA512
bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
-DIST lm_sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B
6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2
SHA512
15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
+DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B
f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e
SHA512
bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
+DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B
6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2
SHA512
15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
diff --git a/sys-apps/lm_sensors/files/fancontrol.confd
b/sys-apps/lm-sensors/files/fancontrol.confd
similarity index 100%
rename from sys-apps/lm_sensors/files/fancontrol.confd
rename to sys-apps/lm-sensors/files/fancontrol.confd
diff --git a/sys-apps/lm_sensors/files/fancontrol.initd
b/sys-apps/lm-sensors/files/fancontrol.initd
similarity index 100%
rename from sys-apps/lm_sensors/files/fancontrol.initd
rename to sys-apps/lm-sensors/files/fancontrol.initd
diff --git a/sys-apps/lm_sensors/files/fancontrol.service-r1
b/sys-apps/lm-sensors/files/fancontrol.service-r1
similarity index 100%
rename from sys-apps/lm_sensors/files/fancontrol.service-r1
rename to sys-apps/lm-sensors/fil
[gentoo-dev] [PATCH 01/25] sys-apps/lm_sensors: Inline PN as appropriate before renaming
Signed-off-by: Michał Górny
---
sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild | 8
sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild | 8
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
b/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
index f5c4e1a4e7f1..5a11eb1e7cf8 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.5.0.ebuild
@@ -146,8 +146,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+ newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
systemd_dounit prog/init/lm_sensors.service
newinitd "${FILESDIR}"/fancontrol.initd fancontrol
@@ -166,7 +166,7 @@ multilib_src_install_all() {
dodoc doc/developers/applications
if use contrib; then
- insinto /usr/share/${PN}
+ insinto /usr/share/lm_sensors
doins -r "${S}"/configs
fi
}
@@ -208,7 +208,7 @@ pkg_postinst() {
elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
elog "\"/etc/modules-load.d/lm_sensors.conf\"."
elog ""
- elog "You might want to add ${PN} to your default runlevel to
make"
+ elog "You might want to add lm_sensors to your default runlevel
to make"
elog "sure the sensors get initialized on the next startup."
elog ""
elog "Be warned, the probing of hardware in your system
performed by"
diff --git a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
b/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
index c63ff098149b..f84df9880d5c 100644
--- a/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
+++ b/sys-apps/lm_sensors/lm_sensors-3.5.0_p20190505.ebuild
@@ -146,8 +146,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/lm_sensors.initd lm_sensors
+ newconfd "${FILESDIR}"/lm_sensors.confd lm_sensors
systemd_dounit prog/init/lm_sensors.service
newinitd "${FILESDIR}"/fancontrol.initd fancontrol
@@ -166,7 +166,7 @@ multilib_src_install_all() {
dodoc doc/developers/applications
if use contrib; then
- insinto /usr/share/${PN}
+ insinto /usr/share/lm_sensors
doins -r "${S}"/configs
fi
}
@@ -208,7 +208,7 @@ pkg_postinst() {
elog "Please run \`/usr/sbin/sensors-detect' in order to setup"
elog "\"/etc/modules-load.d/lm_sensors.conf\"."
elog ""
- elog "You might want to add ${PN} to your default runlevel to
make"
+ elog "You might want to add lm_sensors to your default runlevel
to make"
elog "sure the sensors get initialized on the next startup."
elog ""
elog "Be warned, the probing of hardware in your system
performed by"
--
2.23.0
[gentoo-dev] [PATCH 00/25] pkgmove + USE rename: lm_sensors → lm-sensors
Hi,
Here's a patch series that rename both package and USE flag
from 'lm_sensors' to 'lm-sensors'. The rename is done to match
upstream naming, as well as to fix use of reserved underscore
character in flag name. Both are done at once because that made
sedding much easier.
PR: https://github.com/gentoo/gentoo/pull/12903
--
Best regards,
Michał Górny
Michał Górny (25):
sys-apps/lm_sensors: Inline PN as appropriate before renaming
Rename sys-apps/{lm_sensors → lm-sensors}, to match upstream
sys-apps/lm-sensors: Remove obsolete PN rewrite
use.desc: Rename lm_sensors → lm-sensors
profiles: Update USE={lm_sensors → lm-sensors}
app-admin/gkrellm: Update for lm_sensors → lm-sensors
app-admin/sysstat: Update for lm_sensors → lm-sensors
app-leechcraft/lc-hotsensors: Update for lm_sensors → lm-sensors
app-metrics/collectd: Update for lm_sensors → lm-sensors
dev-python/PySensors: Update for lm_sensors → lm-sensors
kde-plasma/ksysguard: Update for lm_sensors → lm-sensors
lxqt-base/lxqt-panel: Update for lm_sensors → lm-sensors
mate-extra/mate-sensors-applet: Update for lm_sensors → lm-sensors
media-libs/mesa: Update for lm_sensors → lm-sensors
media-plugins/vdr-systeminfo: Update for lm_sensors → lm-sensors
net-analyzer/net-snmp: Update for lm_sensors → lm-sensors
net-misc/bfgminer: Update for lm_sensors → lm-sensors
net-wireless/kismet: Update for lm_sensors → lm-sensors
sys-apps/i2c-tools: Update for lm_sensors → lm-sensors
www-apps/phpsysinfo: Update for lm_sensors → lm-sensors
www-misc/monitorix: Update for lm_sensors → lm-sensors
x11-misc/i3blocks: Update for lm_sensors → lm-sensors
x11-misc/xsensors: Update for lm_sensors → lm-sensors
x11-plugins/wmgtemp: Update for lm_sensors → lm-sensors
xfce-extra/xfce4-sensors-plugin: Update for lm_sensors → lm-sensors
app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild | 8
app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild | 8
app-admin/gkrellm/gkrellm-2.3.11.ebuild | 8
app-admin/gkrellm/gkrellm-.ebuild| 8
app-admin/gkrellm/metadata.xml | 2 +-
app-admin/sysstat/sysstat-12.0.5.ebuild | 6 +++---
app-admin/sysstat/sysstat-12.0.6.ebuild | 6 +++---
app-admin/sysstat/sysstat-12.1.5.ebuild | 6 +++---
app-admin/sysstat/sysstat-12.1.6.ebuild | 6 +++---
app-admin/sysstat/sysstat-99.ebuild | 6 +++---
.../lc-hotsensors/lc-hotsensors-.ebuild | 2 +-
app-metrics/collectd/collectd-5.8.1-r1.ebuild| 2 +-
app-metrics/collectd/collectd-5.9.1-r2.ebuild| 2 +-
dev-python/PySensors/PySensors-0.0.3.ebuild | 2 +-
kde-plasma/ksysguard/ksysguard-5.15.5.ebuild | 6 +++---
kde-plasma/ksysguard/ksysguard-5.16.5.ebuild | 6 +++---
lxqt-base/lxqt-panel/lxqt-panel-0.14.1.ebuild| 2 +-
.../mate-sensors-applet-1.22.1.ebuild| 6 +++---
media-libs/mesa/mesa-19.0.8.ebuild | 8
media-libs/mesa/mesa-19.1.3.ebuild | 8
media-libs/mesa/mesa-19.1.4.ebuild | 8
media-libs/mesa/mesa-19.1.5.ebuild | 8
media-libs/mesa/mesa-19.1.6.ebuild | 8
media-libs/mesa/mesa-19.2.0_rc1.ebuild | 8
media-libs/mesa/mesa-19.2.0_rc2.ebuild | 8
media-libs/mesa/mesa-.ebuild | 8
.../vdr-systeminfo/vdr-systeminfo-0.1.1.ebuild | 2 +-
.../vdr-systeminfo/vdr-systeminfo-0.1.3.ebuild | 2 +-
.../vdr-systeminfo/vdr-systeminfo-0.1.4.ebuild | 2 +-
net-analyzer/net-snmp/net-snmp-5.8-r1.ebuild | 6 +++---
net-analyzer/net-snmp/net-snmp-5.8-r2.ebuild | 6 +++---
net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild | 6 +++---
net-analyzer/net-snmp/net-snmp-.ebuild | 6 +++---
net-misc/bfgminer/bfgminer-5.4.2.ebuild | 10 +-
net-misc/bfgminer/bfgminer-5.5.0.ebuild | 10 +-
net-wireless/kismet/kismet-2019.09.1.ebuild | 6 +++---
net-wireless/kismet/kismet-.ebuild | 6 +++---
profiles/arch/arm/package.use.mask | 2 +-
profiles/arch/arm/use.mask | 2 +-
profiles/arch/arm64/use.mask | 2 +-
profiles/arch/hppa/use.mask | 4 ++--
profiles/arch/ia64/use.mask | 2 +-
profiles/arch/mips/package.use.mask | 2 +-
profiles/arch/powerpc/package.use.mask | 2 +-
profiles/arch/powerpc/use.mask | 2 +-
profiles/arch/riscv/package.use.mask | 2 +-
profiles/arch/s390/use.mask | 2 +-
profiles/arch/sh/use.mask| 2 +-
profiles/arch/sparc/use.mask | 2 +-
profiles/default/bsd/use.mask| 2 +-
profiles/prefix/windows/winnt/use.mask | 2 +-
profiles/updates/3Q-2019 | 1 +
