[gentoo-dev] Dropped EAPI 2/3 support in virtualx.eclass
Hi all As there are no consumers [1] of the virtualx.eclass using ancient EAPIs I dropped support for EAPI=2/3 Best, Justin 1) https://qa-reports.gentoo.org/output/eapi-per-eclass/virtualx.eclass/ diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index d66149b70ba..38e629eef4f 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @ECLASS: virtualx.eclass @@ -11,17 +11,17 @@ if [[ ! ${_VIRTUAL_X} ]]; then case "${EAPI:-0}" in - 0|1) + 0|1|2|3) die "virtualx.eclass: EAPI ${EAPI} is too old." ;; - 2|3|4|5|6) + 4|5|6) ;; *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." ;; esac -[[ ${EAPI} == [2345] ]] && inherit eutils +[[ ${EAPI} == [45] ]] && inherit eutils # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: @@ -57,7 +57,7 @@ case ${VIRTUALX_REQUIRED} in RDEPEND="" ;; optional|tests) - [[ ${EAPI} == [2345] ]] \ + [[ ${EAPI} == [45] ]] \ || die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5' # deprecated section YAY. eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." @@ -90,12 +90,12 @@ esac virtualmake() { debug-print-function ${FUNCNAME} "$@" - [[ ${EAPI} == [2345] ]] \ + [[ ${EAPI} == [45] ]] \ || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx" # backcompat for maketype if [[ -n ${maketype} ]]; then - [[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5" + [[ ${EAPI} == [45] ]] || die "maketype is banned in EAPI > 5" eqawarn "ebuild is exporting \$maketype=${maketype}" eqawarn "Ebuild should be migrated to use 'virtx command' instead." VIRTUALX_COMMAND=${maketype} @@ -205,13 +205,8 @@ virtx() { # Do not break on error, but setup $retval, as we need # to kill Xvfb debug-print "${FUNCNAME}: $@" - if has "${EAPI}" 2 3; then - "$@" - retval=$? - else - nonfatal "$@" - retval=$? - fi + nonfatal "$@" + retval=$? # Now kill Xvfb kill $(cat /tmp/.X${XDISPLAY}-lock) @@ -229,7 +224,7 @@ virtx() { Xmake() { debug-print-function ${FUNCNAME} "$@" - [[ ${EAPI} == [2345] ]] \ + [[ ${EAPI} == [45] ]] \ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 '" eqawarn "you should not execute make directly" @@ -243,7 +238,7 @@ Xmake() { Xemake() { debug-print-function ${FUNCNAME} "$@" - [[ ${EAPI} == [2345] ]] \ + [[ ${EAPI} == [45] ]] \ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake '" VIRTUALX_COMMAND="emake" virtualmake "$@" @@ -255,7 +250,7 @@ Xemake() { Xeconf() { debug-print-function ${FUNCNAME} "$@" - [[ ${EAPI} == [2345] ]] \ + [[ ${EAPI} == [45] ]] \ || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf '" VIRTUALX_COMMAND="econf" virtualmake "$@" signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] amd64 17.1 profiles ready for testing
On 10/12/2017 11:45, Michał Górny wrote: > Indeed it seems to dislike lib32 symlink. I'll try to fix that. > In the meantime, you can skip baselayout for now and return to it once > all multilib packages are rebuilt (and lib32 is gone). > The rest worked fine. At the end also baselayout behave well once the symlink is gone. Thanks for the work. Justin signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] amd64 17.1 profiles ready for testing
Hi Is the baselayout ready for this? I get following error * You need to merge /lib32 into /lib * ERROR: sys-apps/baselayout-2.4.1-r2::gentoo failed (setup phase): * non-empty dir found where there should be none: /lib32 Which hints that the baselayout might not be happy with this setup? What are you thoughts? Justin signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] RFC: global USE c++11
On 03/01/2017 08:51, Kristian Fiskerstrand wrote: > On 01/02/2017 10:34 PM, Justin wrote: >> >> Seems to be very consistent in usage. > > But I'm not convinced it is a correct approach to have use flag changing > this. First thing that springs to mind is if introducing something like > that it should be done consistently across Gentoo, so a GLEP. But > presumably a lot of packages are already built using C++11 without a use > flag given Qt5.7 requiring it etc. > > If using C++11 enables different features the feature should be the use > flag rather than C++11. Couldn't this just be determined using Autotools > etc? What is the gain of the use flag? Immediately it sounds like it > adds complexity without much gain. > I tried to find some example usages from upstream. Two things I found * Most upstreams dropped the flag in recent versions * If present, it is used to append -std=c++11 Probably we should keep it local and wait until it is gone everywhere upstream. Justin signature.asc Description: OpenPGP digital signature
[gentoo-dev] RFC: Global USE cuda
Hi all How about making USE=cuda a global USE? Description: Enable support for nVidia CUDA Current Situation: dev-lang/pgi: Install PGI's CUDA components (e.g. for OpenACC) dev-libs/libflatarray: Enables plugins for NVIDIA GPUs (e.g. dev-util/VampirTrace: Enable tracing of CUDA calls and GPU kernels. sci-chemistry/ball: Include cuda support sci-chemistry/nwchem: Enable CUDA GPU support for the Tensor sci-libs/arrayfire: Build CUDA backend. sci-libs/bigdft-abi: Enable support for nVidia CUDA sci-libs/libgeodecomp: Enables plugins for NVIDIA GPUs (e.g. sci-libs/trilinos: Add support for cuda (dev-util/nvidia-cuda-toolkit) sci-misc/kaldi: Build with CUDA support. sci-physics/abinit: Enable support for nVidia CUDA sci-physics/bigdft: Enable support for nVidia CUDA GPU acceleration sys-cluster/openmpi: Add GPU direct support app-crypt/johntheripper: Use nvidia cuda toolkit for speeding up dev-libs/libdynd: Enable NVIDIA CUDA toolkit support dev-libs/libflatarray: Enables plugins for NVIDIA GPUs (e.g. dev-libs/starpu: Enable NVIDIA CUDA toolkit support dev-util/nvidia-cuda-sdk: Build CUDA binaries. media-gfx/blender: Build cycles renderer with nVidia CUDA support. media-gfx/k3d: Use nvidia cuda toolkit for speeding up computations media-gfx/nvidia-texture-tools: Enable NVIDIA CUDA toolkit support media-libs/opencv: Enable NVIDIA Cuda computations support media-libs/opensubdiv: Enable NVIDIA CUDA Toolkit support through net-analyzer/suricata: Enable NVIDIA Cuda computations support net-wireless/pyrit: Enable CUDA support via net-wireless/cpyrit-cuda sci-chemistry/ball: Include cuda support sci-chemistry/gromacs: Enable cuda non-bonded kernels sci-chemistry/vmd: Use nvidia cuda toolkit for speeding up sci-libs/cholmod: Use nvidia cuda toolkit for speeding up computations sci-libs/flann: Enable support for nVidia CUDA sci-libs/pcl: Adds support for NVIDIA CUDA. sci-libs/suitesparse: Enable nvidia cuda toolkit for speeding up sci-misc/boinc: Use nvidia cuda toolkit for speeding up computations. sci-physics/espresso: Enable cuda support sci-physics/hoomd-blue: Enable cuda non-bonded kernels sys-apps/hwloc: Enable CUDA device discovery sys-cluster/openmpi: Add GPU direct support More or less consistent in enabling CUDA support. Best, Justin signature.asc Description: OpenPGP digital signature
[gentoo-dev] RFC: global USE c++11
Hi all How about making USE="c++11" a global USE? Description: Build using the C++11 standard. Current situation: sci-libs/dealii: Compile the library with -std=c++11 sci-physics/herwig++: Build Herwig++ using the C++11 standard. sci-astronomy/casacore: Build casacore using the C++11 standard sci-libs/ceres-solver: Build ceres-solver using the C++11 standard sci-physics/herwig++: Build Herwig++ using the C++11 standard. sci-physics/root: Build ROOT using the C++11 standard sci-physics/thepeg: Build ThePEG using the C++11 standard. sci-physics/yoda: Build using the C++11 standard Seems to be very consistent in usage. Best, Justin signature.asc Description: OpenPGP digital signature
[gentoo-dev] Re: Packages up for grabs
On 02/06/16 10:42 -0500, james wrote: > On 06/01/2016 06:20 PM, Justin Bronder wrote: > > Due to a lack of time and the fact I don't use any of these packages > > anymore, they are all up for grabs. > > > > - media-gfx/openmesh [no project] > > - sys-cluster/ganglia [cluster] > > - sys-cluster/ganglia-web [cluster] > > - sys-cluster/torque [cluster] > > - sys-cluster/munge [cluster] dependency of sys-cluster/torque > > - sys-cluster/mpe2 [cluster] > > > > Also, if there's anyone out there using the science overlay and empi > > who's feeling motivated, that work still needs a champion to get it > > into the main tree. If not, I'll probably drop it in a few months > > and open openmpi and mpich2 to project maintenance as well. I > > haven't been involved in HPC for over a decade now, it's time to > > pass the torch. > > > Hello Justin, > > I've been working on cluster ebuilds for a while (Apache Mesos, spark, > etc). I'm willing to proxy maintain these except torque. Assuming there > are no users of torque on gentoo (bgo seems inactive...it's dead; how > would I know?). Looks like Ian got torque already, but he may appreciate some help. For the other packages, I'm more then happy to proxy maintain them for you. Just send any patches my way (including a first one to add you as a maintainer :) > > My focus is building gentoo centric HPC clusters that do not require > systemd as a component, with deployment emphasis on bare-metal and > minimized gentoo systems where only the codes absolutely necessary to > support the necessary frameworks are dynamically installed. Many of the > 'retro' tools in this cluster space, are quite useful for my work. > > The guidexml page for empi is old, so where do I read up on it's > projected usage (just not familiar with that empi project/package). The empi documentation did get moved over to the wiki [1]. However, it's pretty much the exact same thing you're seeing in the guidexml page. I know there were some HPC sites using it in the past, but I haven't heard from anyone lately. That could mean no one is using it, or that everything is working as expected. 1. https://wiki.gentoo.org/wiki/Empi -- Justin Bronder signature.asc Description: Digital signature
[gentoo-dev] Packages up for grabs
Due to a lack of time and the fact I don't use any of these packages anymore, they are all up for grabs. - media-gfx/openmesh [no project] - sys-cluster/ganglia [cluster] - sys-cluster/ganglia-web [cluster] - sys-cluster/torque [cluster] - sys-cluster/munge [cluster] dependency of sys-cluster/torque - sys-cluster/mpe2 [cluster] Also, if there's anyone out there using the science overlay and empi who's feeling motivated, that work still needs a champion to get it into the main tree. If not, I'll probably drop it in a few months and open openmpi and mpich2 to project maintenance as well. I haven't been involved in HPC for over a decade now, it's time to pass the torch. Thanks, -- Justin Bronder signature.asc Description: Digital signature
Re: [gentoo-dev] New gen-b0rk repository specifically for Q/A tools testing
On 02/05/2016 12:57 am, M. J. Everitt wrote: > On 02/05/16 00:53, Brian Dolbec wrote: >> In order to further improve the chances of Q/A tools catching >> errors. I have created a new repo (overlay) which will contain minimal >> test case ebuilds. The idea is to have test case ebuilds to run >> repoman code against. The outcome of these runs should be comparable >> to pre-recorded output. In that way as more code changes are applied >> as part of the stage3 re-write as well as new test cases and checks to >> be added to it's capabilities. It should minimize the bugs introduced >> in releases. >> >> Repoman does have some unit tests, but it is far from 100% coverage. >> Also with the major structural changes that the code has been >> undergoing, it is not always possible for the unit tests to be >> compatible with the new code. >> >> This new repository is open to all Gentoo developers to contribute to. >> All we ask is that you follow some simple common sense rules for adding >> additional test ebuilds. >> >> The repo is located at: >> >> https://gitweb.gentoo.org/repo/proj/gen-b0rk.git/ >> >> Here is the README included in the base directory. >> >> This repository is for the primary purpose of testing Q/A tools like repoman. >> >> The ebuilds it contains are for testing specific areas of tests that are >> performed as part of the normal operation of that Q/A tool. >> >> This repository is open to all Gentoo developers under the following rules: >> >> 1) The master branch is to remain the stable Q/A testing branch. >> >> 2) All ebuilds are to be minimal test cases. >> >> 3) All ebuilds in it are to have no more than 3 or 4 flaws to detect. >>This makes it easier to spot errors during code development. Simply >> running >>repoman in a category should be enough to test everything the module >> tests. >>This excludes some commit only checks which can be run in a local only >> branch. >> >> 4) All category names are to represent the Q/A category being tested. >> ie: >> ebuild-test - tests various aspects of the ebuild repoman module >> eclass-test - various eclass module tests >> ... >> >> 5) like the category naming, the package naming will follow the test >>being performed. >>ie: >>eclass-test/live-keywords - test the eclass module >> LiveEclassChecks >>keywords check >>ebuild-test/invalid - test for invalid package name detection >> >> 6) Profiles ... Not sure about this one, but probaly will have masters=gentoo >>That should ensure it maintains co-ordination with the main gentoo repo. >>All new or modified eclasses that affect pkg metadata should be validated >> in >>a branch. >> >> 7) New module development and test ebuilds will be done in a branch or >> personal >>repo and submitted to the gentoo-portage-dev email list for review and >>approval to merge into master. >>NOTE: This rule is lifted for the initial creation and population of >> test ebuilds to use to test out the repoman code. An anouncemnt to >> the gentoo-project email list will be made when this initial >> population >> period is being ended. >> >> 8) Signed commits only, also signed-pushes are mandatory >> >> 9) The metadata category will get files of validated output that can be used >>to verify code changes in the various categories and repo wide runs. >>Diffing the output, should help to verify code changes did not break >> anything. >> >> 10) See rules 1-9 :-) >> > +1 be good to have somewhere central for this stuff :] > We can also run this on our new recruits. :) signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] XML Schema files for metadata.xml, projects.xml and repositories.xml, for review and testing
On 06/03/16 20:49, Michał Górny wrote: > On Sun, 6 Mar 2016 20:22:18 + > "Justin " <j...@gentoo.org> wrote: > >> On 06/03/16 19:28, Ulrich Mueller wrote: >>>>>>>> On Sun, 6 Mar 2016, Michał Górny wrote: >>> >>>> On Sun, 6 Mar 2016 19:26:15 +0100 >>>> Davide Pesavento <p...@gentoo.org> wrote: >>> >>>>> So I guess we could use the following form when SLOTs are needed: >>>>> media-libs/gstreamer:1.0 >>>>> ? >>> >>>> Prolly. >>> >>>> Just to be clear, I have no clue what the original use of >>>> was and what the final outcome of this will be. This thread was >>>> established mostly in order to determine that. I'd wait for ulm to >>>> turn up and have some suggestions ;-). >>> >>> :) >>> >>> No idea what the original purpose was, but and are >>> specified in GLEP 56 [1]: >>> >>>- Each XML tag allows 0 or more nested XML tags whose >>> character data is a valid CP or CPV as defined by the Gentoo >>> Development Manual - Ebuild File Format [2]. >> >> Michał, your current syntax breaks with multiple pkg >> >> (sci-libs/metis or sci-libs/parmetis) >> >> results in >> >> metadata.xml:21: element pkg: Schemas validity error : Element 'pkg': >> [facet 'pattern'] The value '' is not accepted by the pattern >> '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. >> metadata.xml:21: element pkg: Schemas validity error : Element 'pkg': '' >> is not a valid value of the atomic type 'pkgType'. >> metadata.xml:24: element pkg: Schemas validity error : Element 'pkg': >> [facet 'pattern'] The value '' is not accepted by the pattern >> '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. >> metadata.xml:24: element pkg: Schemas validity error : Element 'pkg': '' >> is not a valid value of the atomic type 'pkgType'. > > Are you sure about this? > > $ xmllint --noout --schema metadata.xsd > /var/db/repos/gentoo/sci-libs/spqr/metadata.xml > /var/db/repos/gentoo/sci-libs/spqr/metadata.xml validates > > What validator do you use for this? > I was wrong, the output actually meant another line which contains a . Sorry for the noise.
Re: [gentoo-dev] XML Schema files for metadata.xml, projects.xml and repositories.xml, for review and testing
On 06/03/16 19:28, Ulrich Mueller wrote: >>>>>> On Sun, 6 Mar 2016, Michał Górny wrote: > >> On Sun, 6 Mar 2016 19:26:15 +0100 >> Davide Pesavento <p...@gentoo.org> wrote: > >>> So I guess we could use the following form when SLOTs are needed: >>> media-libs/gstreamer:1.0 >>> ? > >> Prolly. > >> Just to be clear, I have no clue what the original use of >> was and what the final outcome of this will be. This thread was >> established mostly in order to determine that. I'd wait for ulm to >> turn up and have some suggestions ;-). > > :) > > No idea what the original purpose was, but and are > specified in GLEP 56 [1]: > >- Each XML tag allows 0 or more nested XML tags whose > character data is a valid CP or CPV as defined by the Gentoo > Development Manual - Ebuild File Format [2]. Michał, your current syntax breaks with multiple pkg (sci-libs/metis or sci-libs/parmetis) results in metadata.xml:21: element pkg: Schemas validity error : Element 'pkg': [facet 'pattern'] The value '' is not accepted by the pattern '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. metadata.xml:21: element pkg: Schemas validity error : Element 'pkg': '' is not a valid value of the atomic type 'pkgType'. metadata.xml:24: element pkg: Schemas validity error : Element 'pkg': [facet 'pattern'] The value '' is not accepted by the pattern '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. metadata.xml:24: element pkg: Schemas validity error : Element 'pkg': '' is not a valid value of the atomic type 'pkgType'. Justin
Re: [gentoo-dev] XML Schema files for metadata.xml, projects.xml and repositories.xml, for review and testing
On 06/03/16 18:18, Michał Górny wrote: >> We should definitely include SLOTs in the allowed syntax. > > Why? What's their use? In fact, does have any use? Because as I > see it, it's just some fancy feature that could turn package name into > link to packages.gentoo.org and nothing more... > Using SLOTs you have more precision in what you are writing. There are quite a number of packages where SLOTs differ a lot, e.g. grub. So clearly specifying a SLOT make sense to me. Take this example Install theme for sys-boot/grub:2 Dropping the SLOT here doesn't make sense, as the content of the package with USE=grub2 won't work for grub-1. I can assume there are a number of packages where file formats or such changed between SLOTs, so it makes sense to specify it.
Re: [gentoo-dev] XML Schema files for metadata.xml, projects.xml and repositories.xml, for review and testing
On 06/03/16 12:24, Davide Pesavento wrote: > On Sun, Mar 6, 2016 at 12:04 PM, Michał Górnywrote: >> On Sun, 6 Mar 2016 12:01:19 +0100 >> Michał Górny wrote: >> >>> Please test and review. I'm going to reply to this mail with the list >>> of current metadata.xml validation failures (it's quite long). >> >> And here's the list: >> > ... >> /var/db/repos/gentoo/dev-qt/qtmultimedia/metadata.xml:12: element pkg: >> Schemas validity error : Element 'pkg': [facet 'pattern'] The value >> 'media-libs/gstreamer:1.0' is not accepted by the pattern >> '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. >> /var/db/repos/gentoo/dev-qt/qtmultimedia/metadata.xml:12: element pkg: >> Schemas validity error : Element 'pkg': 'media-libs/gstreamer:1.0' is not a >> valid value of the atomic type 'pkgType'. >> /var/db/repos/gentoo/dev-qt/qtmultimedia/metadata.xml:13: element pkg: >> Schemas validity error : Element 'pkg': [facet 'pattern'] The value >> 'media-libs/gstreamer:0.10' is not accepted by the pattern >> '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. >> /var/db/repos/gentoo/dev-qt/qtmultimedia/metadata.xml:13: element pkg: >> Schemas validity error : Element 'pkg': 'media-libs/gstreamer:0.10' is not a >> valid value of the atomic type 'pkgType'. >> /var/db/repos/gentoo/dev-qt/qtmultimedia/metadata.xml fails to validate >> >> /var/db/repos/gentoo/dev-qt/qtwebkit/metadata.xml:12: element pkg: Schemas >> validity error : Element 'pkg': [facet 'pattern'] The value >> 'media-libs/gstreamer:1.0' is not accepted by the pattern >> '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. >> /var/db/repos/gentoo/dev-qt/qtwebkit/metadata.xml:12: element pkg: Schemas >> validity error : Element 'pkg': 'media-libs/gstreamer:1.0' is not a valid >> value of the atomic type 'pkgType'. >> /var/db/repos/gentoo/dev-qt/qtwebkit/metadata.xml:13: element pkg: Schemas >> validity error : Element 'pkg': [facet 'pattern'] The value >> 'media-libs/gstreamer:0.10' is not accepted by the pattern >> '[A-Za-z0-9_][A-Za-z0-9+_.-]*/[A-Za-z0-9_][A-Za-z0-9+_-]*'. >> /var/db/repos/gentoo/dev-qt/qtwebkit/metadata.xml:13: element pkg: Schemas >> validity error : Element 'pkg': 'media-libs/gstreamer:0.10' is not a valid >> value of the atomic type 'pkgType'. >> /var/db/repos/gentoo/dev-qt/qtwebkit/metadata.xml fails to validate >> > > Slots are not accepted in elements? Is that intentional? If so, > is there something else we can use? > We should definitely include SLOTs in the allowed syntax.
[gentoo-dev] BOINC needs maintainer
Hi, currently BOINC supposed to be maintained by the science team, but we are not really carrying about it. Is there anyone around whole likes to take this over? Thanks for your help, Justin signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] RFC: intel-sdp-r1.eclass
On 15/02/16 15:35, Michał Górny wrote: > On Mon, 15 Feb 2016 14:37:41 +0100 > "Justin Lecher (jlec)" <j...@gentoo.org> wrote: > >> On 15/02/16 13:59, Michał Górny wrote: >>> On Mon, 15 Feb 2016 09:16:53 +0100 >>> "Justin Lecher (jlec)" <j...@gentoo.org> wrote: >>> >>>> # @ECLASS-VARIABLE: INTEL_SUBDIR >>>> # @DEFAULT_UNSET >>>> # @DESCRIPTION: >>>> # The package sub-directory where it will end-up in /opt/intel >>>> # To find out its value, you have to do a raw install from the Intel tar >>>> ball >>> >>> To be honest, I find this kinda terrible. There's a huge block of docs >>> which makes me feel small and confused. Maybe it'd useful to give some >>> semi-complete example on top (in global doc)? >> >> That makes definitely make sense. We will add one. >> >> Although nobody other then the maintainer of this eclass will ever use it. > > Remember that maintainers can change. It's better to have good then > have new maintainers figure out all stuff over again. > >>>> # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli >>>> : ${INTEL_BIN_RPMS:=()} >>> >>> $ : ${foo:=()} >>> $ declare -p foo >>> declare -- foo="()" >>> >>> In other words, it doesn't work the way you expect it to. >> >> I already wondered about this. Is there any way to force a variable to >> be an array in bash? Or define it as an empty array? > > Look at e.g. python-utils-r1. > > To check for array: > > if [[ $(declare -p foo) != "declare -a"* ]]; then > ... > fi > > To default to empty, simple (yet a bit imperfect) way: > > [[ ${foo[@]} }] || foo=() And what about the default assignment for the man page? > >>>> # @ECLASS-VARIABLE: INTEL_SINGLE_ARCH >>>> # @DESCRIPTION: >>>> # Unset, if only the multilib package will be provided by intel >>>> : ${INTEL_SINGLE_ARCH:=true} >>> >>> This is really weird. It sounds like I'm supposed to do: >>> >>> inherit intel-sdp-r1 >>> unset INTEL_SINGLE_ARCH >>> >>> I suggest you used positive logic instead. >> >> The wording is wrong. Setting it to anything but "true" like >> "INTEL_SINGLE_ARCH=false" works. We will fix the wording. > > I still think positive logic is better. That is, a variable which > defaults to, say, unset, and changes behavior if it becomes set to > non-empty value. we will look into that. > >>>> _isdp_big-warning() { >>>>debug-print-function ${FUNCNAME} "${@}" >>>> >>>>case ${1} in >>>>pre-check ) >>>>echo "" >>> >>> Don't mix echo with ewarn. >> >> Why? > > Because they won't go through the same output channels. > >>>> >>>> comp_full="${ED}/${INTEL_SDP_DIR}/linux/bin/${arch}/${comp}" >>> >>> Double slash imminent (ED has one). >> >> Always? Per definition? > > Yes, sadly. i wanted to change this but it's unlikely to go since it > makes EAPI migration hard. If you really want to cover both cases, you > can always do ${foo%/}/bar. > >>>> # @CODE >>> >>> Err, this is not code, you know. >> >> This is needed for nice formatting. Otherwise there is no line break > > Add an empty line between the two. That should do it correctly, without > code blocks in devmanual. That will introduce an empty line between the two points. > >>>>#maybe use nullglob or [[ $(echo ${dir/*lic) != >>>> "${dir}/*lic" ]] >>>>[[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$? >>> >>> Maybe you should use something sane indeed. > > Maybe file_exists from eutils could help here btw. > >>> Wouldn't you be able to collapse that into one loop? >> >> no, because the first has ${INTEL_X86}.rpm as suffeix and the later has >> ${INTEL_X86}.rpm. > > Er... am I reading wrong, or did you just type the same thing twice? right, it should be ${INTEL_X86}.rpm vs noarch.rpm > >>>>einfo "Unpacking ${rb}" >>>>rpm2tar -O ${r} | tar xvf - | sed -e \ >>>>"s:^\.:${EROOT#/}:g" > /dev/null; assert >>>> "unpacki
Re: [gentoo-dev] RFC: intel-sdp-r1.eclass
On 15/02/16 13:59, Michał Górny wrote: > On Mon, 15 Feb 2016 09:16:53 +0100 > "Justin Lecher (jlec)" <j...@gentoo.org> wrote: > >> # Copyright 1999-2016 Gentoo Foundation >> # Distributed under the terms of the GNU General Public License v2 >> # $Id$ >> >> # @ECLASS: intel-sdp-r1.eclass >> # @MAINTAINER: >> # Justin Lecher <j...@gentoo.org> >> # David Seifert <s...@gentoo.org> >> # Sci Team <s...@gentoo.org> >> # @BLURB: Handling of Intel's Software Development Products package >> management >> >> if [[ ! ${_INTEL_SDP_R1_ECLASS_} ]]; then >> >> case "${EAPI:-0}" in > > :-0 is meaningless here. > >> 6) ;; >> *) die "EAPI=${EAPI} is not supported" ;; > > If at all, it could be helpful here. We had that before, will fix it. > >> esac >> >> # @ECLASS-VARIABLE: INTEL_DID >> # @DEFAULT_UNSET >> # @DESCRIPTION: >> # The package download ID from Intel. >> # To find out its value, see the links to download in >> # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx >> # >> # e.g. 8365 >> # >> # Must be defined before inheriting the eclass >> >> # @ECLASS-VARIABLE: INTEL_DPN >> # @DEFAULT_UNSET >> # @DESCRIPTION: >> # The package name to download from Intel. >> # To find out its value, see the links to download in >> # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx >> # >> # e.g. parallel_studio_xe >> # >> # Must be defined before inheriting the eclass >> >> # @ECLASS-VARIABLE: INTEL_DPV >> # @DEFAULT_UNSET >> # @DESCRIPTION: >> # The package download version from Intel. >> # To find out its value, see the links to download in >> # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx >> # >> # e.g. 2016_update1 >> # >> # Must be defined before inheriting the eclass >> >> # @ECLASS-VARIABLE: INTEL_TARX >> # @DESCRIPTION: >> # The package extention. > > Extension. Or if you're not on Windows, then 'suffix'. Fair enough. > >> # To find out its value, see the links to download in >> # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx >> # >> # e.g. tar.gz >> # >> # Must be defined before inheriting the eclass >> : ${INTEL_TARX:=tgz} >> >> # @ECLASS-VARIABLE: INTEL_SUBDIR >> # @DEFAULT_UNSET >> # @DESCRIPTION: >> # The package sub-directory where it will end-up in /opt/intel >> # To find out its value, you have to do a raw install from the Intel tar ball > > To be honest, I find this kinda terrible. There's a huge block of docs > which makes me feel small and confused. Maybe it'd useful to give some > semi-complete example on top (in global doc)? That makes definitely make sense. We will add one. Although nobody other then the maintainer of this eclass will ever use it. > >> # @ECLASS-VARIABLE: INTEL_SKIP_LICENSE >> # @DEFAULT_UNSET >> # @DESCRIPTION: >> # Possibility to skip the mandatory check for licenses. Only set this if >> there >> # is really no fix. >> >> # @ECLASS-VARIABLE: INTEL_RPMS_DIR >> # @DESCRIPTION: >> # Main subdirectory which contains the rpms to extract. >> : ${INTEL_RPMS_DIR:=rpm} >> >> # @ECLASS-VARIABLE: INTEL_X86 >> # @DESCRIPTION: >> # 32bit arch in rpm names >> # >> # e.g. i486 >> : ${INTEL_X86:=i486} >> >> # @ECLASS-VARIABLE: INTEL_BIN_RPMS >> # @DESCRIPTION: >> # Functional name of rpm without any version/arch tag >> # Has to be a bash array >> # >> # e.g. ("icc-l-all-devel") >> # >> # if the rpm is located in a directory other than INTEL_RPMS_DIR you can >> # specify the full path >> # >> # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli >> : ${INTEL_BIN_RPMS:=()} > > $ : ${foo:=()} > $ declare -p foo > declare -- foo="()" > > In other words, it doesn't work the way you expect it to. I already wondered about this. Is there any way to force a variable to be an array in bash? Or define it as an empty array? > >> # @ECLASS-VARIABLE: INTEL_AMD64_RPMS >> # @DESCRIPTION: >> # AMD64 single arch rpms. Same syntax as INTEL_BIN_RPMS >> # Has to be a bash array >> : ${INTEL_AMD64_RPMS:=()} >> >> # @ECLASS-VARIABLE: INTEL_X86_RPMS >> # @DESCRIPTION: >> # X86 single arch rpms. Same syntax as INTEL_BIN_RPMS >> # Has to be a bash array >> : ${INTEL_X86_RPMS:=()} >> >> # @ECLASS-VARIABLE: INTEL_DAT_RPMS >>
[gentoo-dev] RFC: intel-sdp-r1.eclass
Hi everyone, We (actually mostly soap) rewrote parts of the intel-sdp.eclass and decided to revbump it. Please review our changes. Changes are: * Move from EAPI=5 to 6 * Adopt to changed packaging layout * Use ABI_ instead of multilib * Drop eclipse support * Require all RPM lists to be arrays * Don't record in installation db Thanks, Justin # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # @ECLASS: intel-sdp-r1.eclass # @MAINTAINER: # Justin Lecher <j...@gentoo.org> # David Seifert <s...@gentoo.org> # Sci Team <s...@gentoo.org> # @BLURB: Handling of Intel's Software Development Products package management if [[ ! ${_INTEL_SDP_R1_ECLASS_} ]]; then case "${EAPI:-0}" in 6) ;; *) die "EAPI=${EAPI} is not supported" ;; esac # @ECLASS-VARIABLE: INTEL_DID # @DEFAULT_UNSET # @DESCRIPTION: # The package download ID from Intel. # To find out its value, see the links to download in # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx # # e.g. 8365 # # Must be defined before inheriting the eclass # @ECLASS-VARIABLE: INTEL_DPN # @DEFAULT_UNSET # @DESCRIPTION: # The package name to download from Intel. # To find out its value, see the links to download in # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx # # e.g. parallel_studio_xe # # Must be defined before inheriting the eclass # @ECLASS-VARIABLE: INTEL_DPV # @DEFAULT_UNSET # @DESCRIPTION: # The package download version from Intel. # To find out its value, see the links to download in # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx # # e.g. 2016_update1 # # Must be defined before inheriting the eclass # @ECLASS-VARIABLE: INTEL_TARX # @DESCRIPTION: # The package extention. # To find out its value, see the links to download in # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx # # e.g. tar.gz # # Must be defined before inheriting the eclass : ${INTEL_TARX:=tgz} # @ECLASS-VARIABLE: INTEL_SUBDIR # @DEFAULT_UNSET # @DESCRIPTION: # The package sub-directory where it will end-up in /opt/intel # To find out its value, you have to do a raw install from the Intel tar ball # @ECLASS-VARIABLE: INTEL_SKIP_LICENSE # @DEFAULT_UNSET # @DESCRIPTION: # Possibility to skip the mandatory check for licenses. Only set this if there # is really no fix. # @ECLASS-VARIABLE: INTEL_RPMS_DIR # @DESCRIPTION: # Main subdirectory which contains the rpms to extract. : ${INTEL_RPMS_DIR:=rpm} # @ECLASS-VARIABLE: INTEL_X86 # @DESCRIPTION: # 32bit arch in rpm names # # e.g. i486 : ${INTEL_X86:=i486} # @ECLASS-VARIABLE: INTEL_BIN_RPMS # @DESCRIPTION: # Functional name of rpm without any version/arch tag # Has to be a bash array # # e.g. ("icc-l-all-devel") # # if the rpm is located in a directory other than INTEL_RPMS_DIR you can # specify the full path # # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli : ${INTEL_BIN_RPMS:=()} # @ECLASS-VARIABLE: INTEL_AMD64_RPMS # @DESCRIPTION: # AMD64 single arch rpms. Same syntax as INTEL_BIN_RPMS # Has to be a bash array : ${INTEL_AMD64_RPMS:=()} # @ECLASS-VARIABLE: INTEL_X86_RPMS # @DESCRIPTION: # X86 single arch rpms. Same syntax as INTEL_BIN_RPMS # Has to be a bash array : ${INTEL_X86_RPMS:=()} # @ECLASS-VARIABLE: INTEL_DAT_RPMS # @DESCRIPTION: # Functional name of rpm of common data which are arch free # without any version tag # Has to be a bash array # # e.g. ("openmp-l-all-devel") # # if the rpm is located in a directory different to INTEL_RPMS_DIR you can # specify the full path # # e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common : ${INTEL_DAT_RPMS:=()} # @ECLASS-VARIABLE: INTEL_SINGLE_ARCH # @DESCRIPTION: # Unset, if only the multilib package will be provided by intel : ${INTEL_SINGLE_ARCH:=true} MULTILIB_COMPAT=( abi_x86_{32,64} ) inherit check-reqs eutils multilib-build versionator _INTEL_PV1=$(get_version_component_range 1) _INTEL_PV2=$(get_version_component_range 2) _INTEL_PV3=$(get_version_component_range 3) _INTEL_PV4=$(get_version_component_range 4) _INTEL_PV="" [[ -n ${_INTEL_PV4} ]] && _INTEL_PV+="${_INTEL_PV4}-" [[ -n ${_INTEL_PV1} ]] && _INTEL_PV+="${_INTEL_PV1}" [[ -n ${_INTEL_PV2} ]] && _INTEL_PV+=".${_INTEL_PV2}" [[ -n ${_INTEL_PV3} ]] && _INTEL_PV+=".${_INTEL_PV3}" [[ -n ${_INTEL_PV4} ]] && _INTEL_PV+="-${_INTEL_PV4}" _INTEL_URI="http://registrationcenter-download.intel.com/akdlm/irc_nas/${INTEL_DID}/${INTEL_DPN}; if [ ${INTEL_SINGLE_ARCH} == true ]; then SRC_URI=" abi_x86_32? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} ) abi_x86_64? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} )" else SRC_URI="${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX}" fi LICENSE="Intel-SDP" # Future work, #394411 #SLOT="${_INTEL_PV1}.${_INTEL_
[gentoo-dev] Re: [gentoo-project] Call for Agenda Items -- Council Meeting 2016-02-14
On 03/02/16 21:46, Dirkjan Ochtman wrote: > On Tue, Feb 2, 2016 at 3:18 PM, Justin Lecher (jlec) <j...@gentoo.org> wrote: >> Could you please sum up the thread and come up with some precise >> question we should discuss or vote on. > > The question is: what language should we use for XML validation in the future? > > There are two main contenders: RELAX NG (with a compact and an XML > serialization) and XML Schema. Of course conversion between these > schema formats is possible, but the question is what the canonical > language should be and what other formats would be provided (and how). > > Summary: > > - I contended that RELAX NG compact serialization is more readable, > and that DTD and RELAX NG validation are equally fast. I don't have > much experience with XML Schema, but I do have a conversion tool for > RNC (compact RELAX NG) -> RNG (RELAX NG XML syntax). > - Michał has used both RELAX NG and XML Schema, and prefers the > latter. It's more popular, and it seems that cross-referencing things > is not supported (trivially) in RELAX NG, whereas it should be in XML > Schema. > - Robin prefers XML Schema, but can live with both. > - trang seems to be a pretty decent tool for schema conversion, but it > doesn't handle XML Schema as an input language (likely because of the > complexity of XML Schema). > - There is a standard for referring to RELAX NG or XML Schema schemas > from XML documents, which would be useful for tool authors. > - emacs nXML mode works only with RNC schema, which is a reason for > Ulrich to prefer it. > - Brian seems to like RNC for readability/flexibility reasons. > > I hope other will jump in if they feel I missed > something/misrepresented their opinions. > > Cheers, > > Dirkjan > Thanks Dirkjan for the summary. Justin signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] Re: [PATCH 0/5] RFC: Patches for wxwidgets.eclass
On 02/02/16 23:36, Ryan Hill wrote: > On Mon, 1 Feb 2016 12:08:28 +0100 > Justin Lecher <j...@gentoo.org> wrote: > >> while tracking down the following error when running "egencache" >> >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found >> >> I found that the global scope get_libdir() usage of the wxwidgets.eclass >> doens't work on EAPI=6. The following patches correct some minor things >> and block EAPI=6 for now until the eclass is ready. >> >> Justin Lecher (5): >> wxwidgets.eclass: Update Copyright year >> wxwidgets.eclass: Fix whitespaces >> wxwidgets.eclass: unset unneeded variables in global scope after usage >> wxwidgets.eclass: Only inherit eclass ones >> wxwidgets.eclass: Add EAPI support >> >> eclass/wxwidgets.eclass | 33 - >> 1 file changed, 24 insertions(+), 9 deletions(-) >> > > 1. I don't think most of this is necessary but go ahead I guess. Most of them are trivial, but excluding EAPI=6 from supported EAPIs is essential. The usage of get_libdir needs to be moved to a phase function. Which should perhaps be coupled with an env variable which is checked in the later function to ensure the phase function has been run. > 2. When did we start posting every @
Re: [gentoo-dev] Re: [PATCH 4/5] wxwidgets.eclass: Only inherit eclass ones
On 02/02/16 00:18, Duncan wrote: > Justin Lecher posted on Mon, 01 Feb 2016 12:08:32 +0100 as excerpted: > > [Title/description only comment, body quote snipped] > > What about eclass twos and eclass threes? > > IOW, s/ones/once/ > yeah, I have some weaknesses with those words :D Thanks for spotting. signature.asc Description: OpenPGP digital signature
[gentoo-dev] [PATCH 2/5] wxwidgets.eclass: Fix whitespaces
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/wxwidgets.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 6ca9f76..bcdeb53 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -29,7 +29,7 @@ # DEPEND="wxwidgets? ( x11-libs/wxGTK:2.8[X?] )" # # src_configure() { -# if use wxwidgets; then +# if use wxwidgets; then # WX_GTK_VER="2.8" # if use X; then # need-wxwidgets unicode @@ -106,7 +106,7 @@ need-wxwidgets() { echo die fi - + if [[ ${WX_GTK_VER} != 2.8 && ${WX_GTK_VER} != 2.9 && ${WX_GTK_VER} != 3.0 ]]; then eerror "Invalid WX_GTK_VER: ${WX_GTK_VER} - must be set to a valid wxGTK SLOT." echo -- 2.7.0
[gentoo-dev] [PATCH 4/5] wxwidgets.eclass: Only inherit eclass ones
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/wxwidgets.eclass | 5 + 1 file changed, 5 insertions(+) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index 5c0719d..aaac074 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -58,6 +58,8 @@ # Use the -DNDEBUG preprocessor flag to disable debugging features. # (Using need-wxwidgets will do this for you, see below.) +if [[ -z ${_WXWIDGETS_ECLASS} ]]; then + inherit eutils flag-o-matic multilib # We do this in global scope so ebuilds can get sane defaults just by @@ -163,3 +165,6 @@ need-wxwidgets() { einfo "Using wxWidgets:${wxconf}" echo } + +_WXWIDGETS_ECLASS=1 +fi -- 2.7.0
[gentoo-dev] [PATCH 0/5] RFC: Patches for wxwidgets.eclass
while tracking down the following error when running "egencache" GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found GENTOO.GIT//eclass/wxwidgets.eclass: line 84: get_libdir: command not found I found that the global scope get_libdir() usage of the wxwidgets.eclass doens't work on EAPI=6. The following patches correct some minor things and block EAPI=6 for now until the eclass is ready. Justin Lecher (5): wxwidgets.eclass: Update Copyright year wxwidgets.eclass: Fix whitespaces wxwidgets.eclass: unset unneeded variables in global scope after usage wxwidgets.eclass: Only inherit eclass ones wxwidgets.eclass: Add EAPI support eclass/wxwidgets.eclass | 33 - 1 file changed, 24 insertions(+), 9 deletions(-) -- 2.7.0
[gentoo-dev] [PATCH 1/5] wxwidgets.eclass: Update Copyright year
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/wxwidgets.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index ea7cf9f..6ca9f76 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -- 2.7.0
[gentoo-dev] [PATCH 3/5] wxwidgets.eclass: unset unneeded variables in global scope after usage
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/wxwidgets.eclass | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index bcdeb53..5c0719d 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -64,14 +64,14 @@ inherit eutils flag-o-matic multilib # inheriting. if [[ -z ${WX_CONFIG} ]]; then if [[ -n ${WX_GTK_VER} ]]; then - for wxtoolkit in mac gtk2 base; do + for _wxtoolkit in mac gtk2 base; do # newer versions don't have a seperate debug profile - for wxdebug in xxx release- debug-; do - wxconf="${wxtoolkit}-unicode-${wxdebug/xxx/}${WX_GTK_VER}" + for _wxdebug in xxx release- debug-; do + _wxconf="${_wxtoolkit}-unicode-${_wxdebug/xxx/}${WX_GTK_VER}" - [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf} ]] || continue + [[ -f ${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf} ]] || continue - WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${wxconf}" + WX_CONFIG="${EPREFIX}/usr/$(get_libdir)/wx/config/${_wxconf}" WX_ECLASS_CONFIG="${WX_CONFIG}" break done @@ -80,6 +80,9 @@ if [[ -z ${WX_CONFIG} ]]; then [[ -n ${WX_CONFIG} ]] && export WX_CONFIG WX_ECLASS_CONFIG fi fi +unset _wxtoolkit +unset _wxdebug +unset _wxconf # @FUNCTION:need-wxwidgets # @USAGE: -- 2.7.0
[gentoo-dev] [PATCH 5/5] wxwidgets.eclass: Add EAPI support
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/wxwidgets.eclass | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eclass/wxwidgets.eclass b/eclass/wxwidgets.eclass index aaac074..dc6db5a 100644 --- a/eclass/wxwidgets.eclass +++ b/eclass/wxwidgets.eclass @@ -60,7 +60,14 @@ if [[ -z ${_WXWIDGETS_ECLASS} ]]; then -inherit eutils flag-o-matic multilib +case ${EAPI} in + 0|1|2|3|4|5) + inherit eutils flag-o-matic multilib + ;; + *) + die "EAPI=${EAPI:-0} is not supported" + ;; +esac # We do this in global scope so ebuilds can get sane defaults just by # inheriting. -- 2.7.0
Re: [gentoo-dev] [PATCH 3/3] cmake-utils.eclass: Define default EAPI to 0
On 26/01/16 15:10, Davide Pesavento wrote: > On Tue, Jan 26, 2016 at 1:50 PM, Michał Górny <mgo...@gentoo.org> wrote: >> Dnia 26 stycznia 2016 13:36:00 CET, Davide Pesavento <p...@gentoo.org> >> napisał(a): >>> On Mon, Jan 25, 2016 at 9:29 PM, Justin Lecher <j...@gentoo.org> wrote: >>>> Signed-off-by: Justin Lecher <j...@gentoo.org> >>>> --- >>>> eclass/cmake-utils.eclass | 2 +- >>>> 1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass >>>> index 01de9a5..23339ab 100644 >>>> --- a/eclass/cmake-utils.eclass >>>> +++ b/eclass/cmake-utils.eclass >>>> @@ -112,7 +112,7 @@ _CMAKE_UTILS_ECLASS=1 >>>> # for econf and is needed to pass TRY_RUN results when >>> cross-compiling. >>>> # Should be set by user in a per-package basis in >>> /etc/portage/package.env. >>>> >>>> -case ${EAPI} in >>>> +case ${EAPI:-0} in >>>> 2|3|4|5|6) : ;; >>>> *) die "EAPI=${EAPI:-0} is not supported" ;; >>>> esac >>>> -- >>>> 2.7.0 >>>> >>> >>> Why? >> >> Indeed, why? I think it would be cleaner to simply quote the parameter to >> case. >> > > AFAIK even quoting would be unnecessary in this context (assuming bash). > Guys, if you are sure, that it is enough, then I will drop it. I just thought there has to be something. But I tested it and it's unnecessary. At least with latest bash. Justin
[gentoo-dev] [PATCH 2/3] cmake-utils.eclass: Drop empty line
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/cmake-utils.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index fb7f5ca..01de9a5 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -20,7 +20,6 @@ if [[ -z ${_CMAKE_UTILS_ECLASS} ]]; then _CMAKE_UTILS_ECLASS=1 - # @ECLASS-VARIABLE: BUILD_DIR # @DESCRIPTION: # Build directory where all cmake processed files should be generated. -- 2.7.0
[gentoo-dev] [PATCH 3/3] cmake-utils.eclass: Define default EAPI to 0
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/cmake-utils.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 01de9a5..23339ab 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -112,7 +112,7 @@ _CMAKE_UTILS_ECLASS=1 # for econf and is needed to pass TRY_RUN results when cross-compiling. # Should be set by user in a per-package basis in /etc/portage/package.env. -case ${EAPI} in +case ${EAPI:-0} in 2|3|4|5|6) : ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac -- 2.7.0
[gentoo-dev] [PATCH 1/3] cmake-utils.eclass: Use bash internal testing instead of has()
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/cmake-utils.eclass | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 9e8e71e..fb7f5ca 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -127,7 +127,7 @@ case ${WANT_CMAKE} in always) ;; *) - has "${EAPI:-0}" 2 3 4 5 || die "WANT_CMAKE is banned in EAPI 6 and later" + [[ ${EAPI} == [2345] ]] || die "WANT_CMAKE is banned in EAPI 6 and later" IUSE+=" ${WANT_CMAKE}" CMAKEDEPEND+="${WANT_CMAKE}? ( " ;; @@ -164,7 +164,7 @@ _cmake_use_me_now() { local arg=$2 [[ ! -z $3 ]] && arg=$3 - has "${EAPI:-0}" 2 3 4 5 || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead" + [[ ${EAPI} == [2345] ]] || die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" instead" local uper capitalised x [[ -z $2 ]] && die "cmake-utils_use-$1 []" @@ -186,7 +186,7 @@ _cmake_use_me_now_inverted() { local arg=$2 [[ ! -z $3 ]] && arg=$3 - if ! has "${EAPI:-0}" 2 3 4 5 && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then + if [[ ${EAPI} != [2345] ]] && [[ "${FUNCNAME[1]}" != cmake-utils_use_find_package ]] ; then die "${FUNCNAME[1]} is banned in EAPI 6 and later: use -D$1${arg}=\"\$(usex $2)\" insteadss" fi @@ -283,7 +283,7 @@ cmake_comment_add_subdirectory() { # Comment out an add_subdirectory call in CMakeLists.txt in the current directory # Banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead. comment_add_subdirectory() { - has "${EAPI:-0}" 2 3 4 5 || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead" + [[ ${EAPI} == [2345] ]] || die "comment_add_subdirectory is banned in EAPI 6 and later - use cmake_comment_add_subdirectory instead" cmake_comment_add_subdirectory "$@" } @@ -315,7 +315,7 @@ cmake-utils_use_enable() { _cmake_use_me_now ENABLE_ "$@" ; } # if foo is enabled and -DCMAKE_DISABLE_FIND_PACKAGE_LibFoo=ON if it is disabled. # This can be used to make find_package optional. cmake-utils_use_find_package() { - if ! has "${EAPI:-0}" 2 3 4 5 && [[ "$#" != 2 ]] ; then + if [[ ${EAPI} != [2345] ]] && [[ "$#" != 2 ]] ; then die "Usage: cmake-utils_use_find_package " fi @@ -456,7 +456,7 @@ enable_cmake-utils_src_prepare() { pushd "${S}" > /dev/null || die - if ! has "${EAPI:-0}" 2 3 4 5 ; then + if [[ ${EAPI} != [2345] ]]; then default_src_prepare _cmake_cleanup_cmake else @@ -488,7 +488,7 @@ enable_cmake-utils_src_prepare() { enable_cmake-utils_src_configure() { debug-print-function ${FUNCNAME} "$@" - has "${EAPI:-0}" 2 3 4 5 && _cmake_cleanup_cmake + [[ ${EAPI} == [2345] ]] && _cmake_cleanup_cmake _cmake_check_build_dir @@ -564,7 +564,7 @@ enable_cmake-utils_src_configure() { fi fi - has "${EAPI:-0}" 0 1 2 && ! use prefix && local EPREFIX= + [[ ${EAPI} == 2 ]] && ! use prefix && local EPREFIX= if [[ ${EPREFIX} ]]; then cat >> "${build_rules}" <<- _EOF_ || die @@ -604,7 +604,7 @@ enable_cmake-utils_src_configure() { local mycmakeargstype=$(declare -p mycmakeargs 2>&-) if [[ "${mycmakeargstype}" != "declare -a mycmakeargs="* ]]; then if [[ -n "${mycmakeargstype}" ]] ; then - if has "${EAPI:-0}" 2 3 4 5 ; then + if [[ ${EAPI} != [2345] ]]; then eqawarn "Declaring mycmakeargs as a variable is deprecated. Please use an array instead." else die "Declaring mycmakeargs as a variable is banned in EAPI=${EAPI}. Please use an array instead." -- 2.7.0
[gentoo-dev] [PATCH 0/3] RFC: cmake-utils.eclass minor updates
Hi, Some minor updates on the EAPI testing in the eclass. Justin Justin Lecher (3): cmake-utils.eclass: Use bash internal testing instead of has() cmake-utils.eclass: Drop empty line cmake-utils.eclass: Define default EAPI to 0 eclass/cmake-utils.eclass | 21 ++--- 1 file changed, 10 insertions(+), 11 deletions(-) -- 2.7.0
Re: [gentoo-dev] [PATCH 00/16] devmanual: update the docs for post git-migration #558642
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 17/01/16 08:55, Gokturk Yuksek wrote: > Hi, > > The following patch series attempt to update devmanual to replace > the instances of CVS with their git equivalents. I tried to keep > the changes small in favor of updating the docs over multiple > iterations of patch series. The intention is to get the bare bone > changes in so that the quiz questions can be answered. > > Currently not included in the series are: - References to CVS in > sections about herds since they will have to be rewritten per GLEP > 67 soon anyway. See: > https://bugs.gentoo.org/show_bug.cgi?id=572144 - I am not sure > about what to do with the subsection Ebuild Functions/Miscellaneous > Files/ChangeLog. The ChangeLog files still exist in the rsync tree, > however they are of little importance in terms of development. > Thanks a bunch for all your work. Please direct the mail to devman...@gentoo.org. That alias takes care of the devmanual changes. Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWm7CRXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiIMwP/2/9RGTZYlPjjmmc8kao77kg C0ogMmWjsazNSdUcMztqwyDNMPMtCf1ZbVLq/MJYxFkKH6lXocP6/MDoOgIrACCU gCQhOASG/8fVyLAyT/719qsXPZpEXAqKAImHkB+jvw4SG0W7+uORQWUGXAKd5Oic ZAfWhqBjCkk7pWlP8u+UIM1E8fb3e1KPednbAetNCdRQRiCh77X5BJODAMc25T3O vu5qMxB2UDp4tjZ2+rKahcHabgIgp4vbkNk91t5tskOu9aiQCDCkVyBbsUVlfWd+ PHMxfXI+p19K8eIv7tocdX3bKVdyCtaaB6bBddb9G0skM1Kpi5PK0W2+2H/jBEvL YfQ0gNAENhPK5aAPGR9Z1ulN7aSaiWMEExfF6rTx+5BF+IKzcH4n4jKsE2AIw25c hJC0DlugAW7IXUi7QKCSpbejw+BhjtWppo5f8bgGK+pUot6rbKmItfgcCFOtyZjV oFKL5ZiGpclPaYw8bBh9woFypc1K1cHCkDXrFbag1BXTugit2f0qK2716uL45UcT xqGp1uJ/lm4dS91sptfjOCFVs76df8xl8jzr3zEwmfgac0bjCR7MVucTBvHmP06A UCtNNvKI6GRfjC1BtZ+WpW+Mg6wBcdIu8I46r9wdciVbwqJ8KHAoQ0/o2RRVLYbP Uv/ioCuMAUpTAFbUhPVt =p90x -END PGP SIGNATURE-
Re: [gentoo-dev] News item: Python ABIFLAGS rebuild needed
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 12/12/15 16:11, Mike Gilbert wrote: > On Sat, Dec 12, 2015 at 3:54 AM, Ulrich Mueller <u...@gentoo.org> > wrote: >>>>>>> On Fri, 11 Dec 2015, Mike Gilbert wrote: >> >>> It is worth noting that GLEP 42 makes no mention of EAPI, and >>> current versions of portage do support slots in dependency >>> atoms used in news items. >> >>> I guess it's a matter of documenting this somewhere. Where >>> would that be? >> >> We should update GLEP 42 and introduce a News-Item-Format 1.1 >> that supports EAPI 5 for dependency syntax. >> >> (This has come up several times in the past already, but for >> some reason nobody is willing to take the initiative for updating >> the GLEP. Everyone seems to be happy with a workaround for their >> own news item.) > > Thank you. After skimming thought GLEP 1 to refresh my memory, I > have filed bug 568068 to propose the change. > > https://bugs.gentoo.org/show_bug.cgi?id=568068 > The council has been approved NEWS item format 1.1 supporting EAPI=5 style package dependency specification. Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWk3FPXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi29sP/Rsz7INlTIZiPNJiM1vksPQk s2jgBA3J6CeFc8L8H6WsCEvNpPGmPbj/X+5cYpkbaGRaKfEBarRMuld4328wd4bh z9LlKvrHo+83yB5y6njgDiFW0w/CrskoOW4JoJN5XNanvzQkt5FbJwNoUY/l2IYg ezC6B3TlbDnCci2tnkzAZtjbeHd3DB6hrKuY4SWsSB55blmE24EqNp78e7BId4PA oZZM7ju97OsdjgEFJ6eGa0csi/UiZVGwVLj94I5580Ai+2BGWBDXsoevUqg62PlN eKm1j3afq/bTrcK1MciY+zv4IT5w0/x3gJmn+Tj2V8apxcurgJjbC8h3tWQ67DJ8 99hpiGqCBwCNU8Mpl59ZIkce239S8X8XZ4tmWbLeqZIWJ6yPiF2sRFxD3N5d+Asp zlo7/EzJDrbDr3RXtq9x79VgG+PNJGci1CYoyzr/Pf2WkW9ss4Fie5oB8dXET9+n HJdslP/zlqcAr5kogNeg+Mt68Jms7RQavRJDpaFqvmWGWMV9iAJp4W9dFEovfmoI 8ekMBuEgSU2he0gp6CpAuZy5ufV97q8uz3nv1KcPqCIDtg7J/dvmKZSOmp7Qg+Id ZR1l0vAE6gXzwx1dIw/gbHXWVNudoKRNjQmQ6Ki5ApOKl4PZRb04XTGHeDONT90E V9+Ltk9kxNfPQgHMo1I+ =wBq6 -END PGP SIGNATURE-
Re: [gentoo-dev] packages to grab
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 09/01/16 22:07, Julian Simioni wrote: > I'd love to proxy-maintain app-admin/pwgegn: it's used by > app-admin/pass which I use quite a bit. Hi Julian, do you need a proxy or do you have someone to work with? Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWkggQXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiFC8QAI9jgNdZJh3bHeIaNNqeMfAj 6uiYrfHOp0Z4jhAwgeJ+Sdos0fuEdsyQWmbWtoNMkTpRmSjN3BG2Q7fkNmLcowxE 4epTbdQzZAHAznWKb9JGBHFIHj3ninkZEt41OYx38RX30QoheKTTdb4fm2I1gNU5 NJkCFVXrPSOOiQhf34lu/Z7jphnpyjV0H35XJjmxQoQ1q6kYIgQpGEa6IkTwS+qb BEJogkhw/CTR1tBbgkiQDUntLt3SAlab4hfdpSL1WbLHKOS1i9tF2V2PTCiAn0wy 4YkZ2F0LY2SE3baLw5zVikzJqg3VHwBbH7O94+MGy32Y02HlRpVgvqS5mY/TdB6d uRw6A+rQcFUXvQ4uFmiAg3d4sp4IxR526kfrg+NtYMdz4PJPgJvC8LDoa8TsSXXG SJ5E9TJ64xwjJsw1Hh454pTDW//6bKdW3DDhsrKGDlSmOVj7iH6uvh60ulUg97pT goYJSXERnAHHO90Vdo72v/Efi8IFZvjUPbQc0LwQhMPWCHjnTo7pwJwG3xkn8be4 aypMqn/Z91cR2fkcJwurRtFh/JQKYLYj2zEKquBRgcgqQo4Hwk9oH9hf+IUG4yOF 8B29rZDjQKh/PBgPeyi5qHJHdHxhH8/A5qecrOou9F2OntjDqB6kNbiGFcBLAf5a SgbwXehru1VIT/CKv/2T =XZD+ -END PGP SIGNATURE-
Re: [gentoo-dev] packages to grab
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 08/01/16 10:14, Justin Lecher (jlec) wrote: > I already did that. 90% of all packages can be associated with > some project. I will post a PR for review later. > Please comment if you disagree with some herd/project assignments. https://github.com/gentoo/gentoo/pull/623 -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWj4I6XxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi95sP/0TBkRpuN7kmwlEgekHPIBSb ouaSMza4mFZCUnGQihndU4S/sDS0XgWzT9wihs5fOniDY1PSeATlW+PCGpFj42KB CbfIwrTevfmpvVmgpwyjUcxLc6KhYGC8lLYgvhq/o7/176scLPX0tDg7ZfQ2px9i jE8oqGW9fLufl4d+dBQg5jiAgPuN+pGK55oBdrd7vfnUtDp/3NxHdHG6rCg+YxA7 LuOHgl6zEoeZVYXsMGRJg/VF4UzKztk3QqsO2giP/0vhnaxfJPG7OcuvDp8fgtkS TiFoMtMi96xWAU30eK5odV+C8imw1KDhwAHXpzWojSQ+mAxFHxCMle8BtALSFi/v 7TS0ud/VPnoT2isj2sSM95jl2s40WEo9sU0e0GpK6Ms9YfiLC/ZsCuSVEyrjcxrG 4v4PAm/TDHzOI6UJk1ZlMHYzAPudzMoucC3lkTqmngJFn0VtyHPbAiGc0MAMyWRe Vfxz6FXRnaER7h7TkYHzS80oszHspug32AZ45///BbP2sm9kvoYRj/K8BuPiELfb puHIITv7q9aeS6csz2fxfALWNOgR6bo5YHqGKzKJpeO1x1cOpRrJJqoo6dIy6LUj C53QICirg8bTif7By+F8ST3PHg5wc0sOgsv6kZPVvwNUAt2QJ8sScpbiw8XDZRKv 7bumtPUo4LGr0v1avOUR =GgKG -END PGP SIGNATURE-
Re: [gentoo-dev] packages to grab
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 08/01/16 09:47, Dirkjan Ochtman wrote: > On Thu, Jan 7, 2016 at 4:40 PM, Matthew Thode > <prometheanf...@gentoo.org> wrote: >> gonna take these unless anyone yells at me. >> >> modified: dev-python/ipaddress/metadata.xml modified: >> dev-python/lz4/metadata.xml modified: >> dev-python/mysqlclient/metadata.xml > > It would probably make sense to put these in the Python project, > too? I already did that. 90% of all packages can be associated with some project. I will post a PR for review later. Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWj34IXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3s4QAI0MLYDo2yqN04azi/Gm+XQI Ix7r56MVdLqlcF0+hVaehQYdkcIVOtvcWi6RaAAGnS7uFw7/cc9C9mAkSp6aQJ2N aGHRl85orgYcaKICU+qAr6t3bsgHd2rG4MTpkwyplX+xiUYBfaYfPU45ttC3b8A+ peGxcOKHs8BVkA5LzO3ZeXjdZ3jsdQRh+onNwj8Kiei9QPqbjjkZUkc6DbxYwGVu oiXgRkYPgjtmOIXjRkWlwKHxCAmA0DErJ2B8LqYdc4jMomherumKsNkDooyUkpvB CnKlF3Bi0MDKYb9g9EBPEkmy0zUZNA1WBJg9JH7uMG1BmThLj8KFHmZCtpItRZwd x6rwRIXexPBFF5P8hWMxm5rKEucd4TPX4PK/vTX+ne8ARG/NTWH4V8SOpJJdmD8M LJ987THWK/edzCVZ0yXNL2tYN3R4A/6TW1TaJBiTWnNewhFbtZOGv8KqEgedu2x9 mFOxpjIQF7yqIAj88AQZ+9SdBm4Ox/fR8DL18nmSmeQv/yi9oj32Psygusd+sCRl IkZQMYqtdAouZgi1rvOtHrfPYoEOnsR30UrtZeXWOGYRCoR9UGlmuNknKwOlXqRx Uws/cqj3NdaQVrtlIYUuOj6KyPsTqT0Ht6M6Usu32Dxcx2foNQTqASrXejABrRc3 tAa8yKiTrX/ftG75oisS =MHwA -END PGP SIGNATURE-
[gentoo-dev] packages to grab
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Dear everyone, due to changes in real life I need to cut back vastly my day to day maintainer work starting in February. So far I have no clue how much time I can devote to Gentoo in nearer future. I will move all packages I maintain [1] to the associated projects if possible. All devs are free to take what ever you are interested in. I am also happy to proxy contributors if they like to maintain a package. My plan is to focus more on task which I can handle more flexible. Regarding the projects I am involved in I have the following ideas: _Recruiters_ We are again actively looking for someone who is doing the review session. The candidate should have solid knowledge about the various aspects for Gentoo reaching from packaging to institutional aspects. Further, you should be able to work with inexperienced contributors and have fun teaching the necessary bits. Secondly, I would like to work strategically on our recruitment process. This includes reworking of the quizzes and a general assessment of the process as well as new options. We won't change anything over night, but I really think we can do simpler and better. In case you are interested in either topic, feel free to drop a mail to recruit...@gentoo.org. _Science_ We are understaffed for a long time. So in case you like to join feel free to do so. This is also and especially directed to the community. I strongly encourage you to contribute via PR to the overlay or the main gentoo.git. If you have proven yourself in contributions and still nobody encouraged you to become a full dev, don't hesitate to express your wish and we will manage your recruitment. _Council_ My council duties should not be affected. _Other project_ For the time being, I need to drop most work there. Cheers, Justin 1) http://euscan.gentooexperimental.org/maintainers/jlec%40gentoo.org/ -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWjm0WXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiRJEP/iUdqEAjHiBsQ3sWsXG/kFkc XYYk5L/zcimN7IddWU/6+uo2hsDDHfFuN0C3HYXV6GWqUOmegz9Enb9gteSOfL1X Lmsi+OOAHuTeYzhltoxVzXipyO7+TBPDHHF52XTLruZQkwXeBSO0Eo3Gg6LruwFu WdJoqKTyTaX0kweYngO4ZIQ6oh0H5wHgreJInKgDZMA9eGbImx4NOnEXbtE6X9le OFtN5vZBEEsrwXy4V56k/Af96x5EkmLXFCeaTTsgk90bUuKXnTzmRQ1Q6za1OOro vcZoEEWcwFnyQ5DF4/srWxtkivprf0FR34jeT2RQhekJDcih2PMaHAWc/HhZnQ0b eAde/O4vUfioLtYWZ6fZdAg+98wa/oYA8kVwijXpaDzYCva9hbZDtkwcky22tCd7 Gaxku+aN5CwB8hFoEIinxT47GAIXK1MYRojURSsT5m9R/+BOGiaavzM4DHMFXWZq VhLI5EjYapq9eqe7rHpHzGj06vZA3YioqCXGcyiMHg78qd2WfaupEydVCyxP75v8 +YQHpyojVcxkmdDEc7ZFSHPQ+ti+QwcWzr1UZ23YRnwsYKD/+Ip9dDq8BQlkTno+ dH70jHG1G6E8SjZD8pg52EEKdoxlhS+XGsgiVSvTlnVcrfbSAwdh48kMI3iCLinB nxlJKWBCBHEQPbXXP4WV =dGQ9 -END PGP SIGNATURE-
[gentoo-dev] [gentoo-dev-announce] Last rites: sci-libs/libbufr
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 # Justin Lecher <j...@gentoo.org> (29 Dec 2015) # Fails to build and test runs # No reverse deps # #370021, #478614, #513964 sci-libs/libbufr -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWgkswXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiEOIP/Rtom3pnl6rBmx0eMUOFL4E+ szr74nNaptRWsef2xXcJW5fBDl6IifLnWjHaVGaYSDAKyvBFM9QBlbKlk+Oa/YZs O6aybzDfWiQg0nV3nSeiJ6w580AG167qb9Aung1FP4SrqvoGluK+jTMlm9Gh5aT8 v7zDZRS96oqpDYtnOIyFgOMbvxJ7+hDAcVEKzqTbJy7CHU/SfL9OQwpdcmMN417K 0Ys/eHTkH0LIWtHuuH48muvWYtsotvaIttbhKDPWo4Fq00v1RA/GZmx3RA352jGx bEqvdApRmFea9aqzEOPAOYe41Es8yDBjXw/YqPxZP17Bof7WHr6Kex/lu1bcK2o+ W2tBsTEHLcvYapqbJsQJ34XmA0ywkBwGp2hUQVMcfYCIjOIsvO4jHQ2+QiF5zg0G Qd5G3obzW7vnZkXrhMwZ2Yf+vI8rKA3Vrdto54OJdbE56QR+lzp6YU+K12aWbsVQ 1l+g76d+mpo/ocZ465bOhGORRmV7BE1lK1TbY1mjwaUDny/oBVH6S+QO5at4/Mfw prkaZhtmsFs5QYrUGK6FxSRpr2+WzFj1Vgw7jThDXBqGr90PI5+JDK2MxMn9+VYx Bwhe2HC60t9sdibsW4aCUhQ0YnxK+PKl6l7uucvwTZdcnPJtmzKagvuEBAutVdNK GpKh/PN8T5crpvLJL3iC =frfY -END PGP SIGNATURE-
[gentoo-dev] [PATCH 2/9] check-reqs.eclass: Use eqawarn() from eutils.eclass
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 4f74536..219023e 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -76,10 +76,10 @@ check_reqs() { debug-print-function ${FUNCNAME} "$@" echo - ewarn "QA: Package calling old ${FUNCNAME} function." - ewarn "QA: Please file a bug against the package." - ewarn "QA: It should call check-reqs_pkg_pretend and check-reqs_pkg_setup" - ewarn "QA: and possibly use EAPI=4 or later." + eqawarn "Package calling old ${FUNCNAME} function." + eqawarn "Please file a bug against the package." + eqawarn "It should call check-reqs_pkg_pretend and check-reqs_pkg_setup" + eqawarn "and possibly use EAPI=4 or later." echo check-reqs_pkg_setup "$@" @@ -194,9 +194,9 @@ check-reqs_get_number() { # Check for unset units and warn about them. # Backcompat. if [[ ${size} == ${1} ]]; then - ewarn "QA: Package does not specify unit for the size check" - ewarn "QA: Assuming mebibytes." - ewarn "QA: File bug against the package. It should specify the unit." + eqawarn "Package does not specify unit for the size check" + eqawarn "Assuming mebibytes." + eqawarn "File bug against the package. It should specify the unit." fi echo ${size} -- 2.6.4
[gentoo-dev] [PATCH 1/9] check-reqs.eclass: Only inherit eclass once
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 5 + 1 file changed, 5 insertions(+) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index d685f1f..4f74536 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -38,6 +38,8 @@ # These checks should probably mostly work on non-Linux, and they should # probably degrade gracefully if they don't. Probably. +if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then + inherit eutils # @ECLASS-VARIABLE: CHECKREQS_MEMORY @@ -353,3 +355,6 @@ check-reqs_unsatisfied() { # Internal, do not set yourself. CHECKREQS_FAILED="true" } + +_CHECK_REQS_ECLASS_=1 +fi -- 2.6.4
[gentoo-dev] [PATCH 3/9] check-reqs.eclass: Mark interal function with @INTERNAL
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 10 ++ 1 file changed, 10 insertions(+) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 219023e..3c98baf 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -108,6 +108,7 @@ check-reqs_pkg_pretend() { } # @FUNCTION: check-reqs_prepare +# @INTERNAL # @DESCRIPTION: # Internal function that checks the variables that should be defined. check-reqs_prepare() { @@ -124,6 +125,7 @@ check-reqs_prepare() { } # @FUNCTION: check-reqs_run +# @INTERNAL # @DESCRIPTION: # Internal function that runs the check based on variable settings. check-reqs_run() { @@ -158,6 +160,7 @@ check-reqs_run() { } # @FUNCTION: check-reqs_get_mebibytes +# @INTERNAL # @DESCRIPTION: # Internal function that returns number in mebibytes. # Returns 1024 for 1G or 1048576 for 1T. @@ -180,6 +183,7 @@ check-reqs_get_mebibytes() { } # @FUNCTION: check-reqs_get_number +# @INTERNAL # @DESCRIPTION: # Internal function that returns the numerical value without the unit. # Returns "1" for "1G" or "150" for "150T". @@ -203,6 +207,7 @@ check-reqs_get_number() { } # @FUNCTION: check-reqs_get_unit +# @INTERNAL # @DESCRIPTION: # Internal function that return the unit without the numerical value. # Returns "GiB" for "1G" or "TiB" for "150T". @@ -224,6 +229,7 @@ check-reqs_get_unit() { } # @FUNCTION: check-reqs_output +# @INTERNAL # @DESCRIPTION: # Internal function that prints the warning and dies if required based on # the test results. @@ -246,6 +252,7 @@ check-reqs_output() { } # @FUNCTION: check-reqs_memory +# @INTERNAL # @DESCRIPTION: # Internal function that checks size of RAM. check-reqs_memory() { @@ -283,6 +290,7 @@ check-reqs_memory() { } # @FUNCTION: check-reqs_disk +# @INTERNAL # @DESCRIPTION: # Internal function that checks space on the harddrive. check-reqs_disk() { @@ -316,6 +324,7 @@ check-reqs_disk() { } # @FUNCTION: check-reqs_start_phase +# @INTERNAL # @DESCRIPTION: # Internal function that inform about started check check-reqs_start_phase() { @@ -331,6 +340,7 @@ check-reqs_start_phase() { } # @FUNCTION: check-reqs_unsatisfied +# @INTERNAL # @DESCRIPTION: # Internal function that inform about check result. # It has different output between pretend and setup phase, -- 2.6.4
[gentoo-dev] [PATCH 8/9] check-reqs.eclass: Require units for CHECKREQS_ in EAPIs > 5
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 4513904..26f2dc1 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -198,13 +198,14 @@ check-reqs_get_number() { local unit=${1:(-1)} local size=${1%[GMT]} + local msg=eerror + [[ ${EAPI:-0} == [012345] ]] && msg=eqawarn # Check for unset units and warn about them. # Backcompat. if [[ ${size} == ${1} ]]; then - eqawarn "Package does not specify unit for the size check" - eqawarn "Assuming mebibytes." - eqawarn "File bug against the package. It should specify the unit." + ${msg} "Package does not specify unit for the size check" + ${msg} "File bug against the package. It should specify the unit." fi echo ${size} -- 2.6.4
Re: [gentoo-dev] [PATCH 0/9] Cleanup and EAPI=6 support for check-reqs.eclass
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/12/15 10:35, Andrew Savchenko wrote: > Hi, > > On Mon, 28 Dec 2015 09:43:46 +0100 Justin Lecher wrote: >> Dear all, >> >> please review my suggestion to the check-reqs.eclass according to >> cleanups and EAPI=6 support. Any further ideas you like to see >> implemented? > > It would be useful to allow users to include swap space for memory > estimation. Sometimes this is the only way to build package > without cross-compiling. So I propose something like: > > CHECKREQS_MEMORY_USE_SWAP="yes|no" > > which can be set on command line, in make.conf or in per-package > env setup. > > This option should be disabled by default, of course. > > Best regards, Andrew Savchenko > Hi Andrew, could you please file a bug for this? We do not bind this to any EAPI as this is an additional feature. Thanks, Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWgQOKXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUGwQALGC6G1QpuNLmRoi3HNO4SwF TrFEpiEqBRhYN09PQQOs82ke8m6MkU7miBZazv9ty/GwVz1x+aNsRj3b7IY6kT9S gTTjUcUFtn62mZtym0OFBqlOcjeeHcPMFCfQxBJ5Opgayjcr2//xd8cEj6TH8z11 M4vLvXbQ7283+0bvbd3g0G+JMquF51z+A87zZEu950sTKv2ZF35FBECzqCEmWYOM /o0qj089VxGppvRuA5JWS/BfH/Rjxe4XvdJv9PEwfNX/S9rLHOYi63mb8d2eyINO Eug8pkVSxXl9sGllanVYYNo/WlVZZQDZRwzAV6AsBBKU7QP+OHPjST0ikV2TE0nP eRZ1biekprTYWaL6eucTh8VRhBPewHRC33cElWOYW9mqPz0bF+R1jTgNMU6+D96x j5Uzx/gi1AXN6dnK8B2TqEBbsvBXig6mHiszI2c81A55GrPmpYXZiYpeOKpklopz vwb0h021gTFYScxynthomDDFVWdUprkePHtR3rPLwbiL/aAx0FbVf6yi5QBJBmuM HOSlYtOUK/8yYwl9fXTymvWBJlMbXqUToRsKU+/98S97JnxMBju6JVB+m4+R8PE3 YOQrZirU9JqyOxQZ4f9NHwiwnlGth732qQ3GZd4sVkxNG7b/v0YzEVvrzJtIHo7R lk1NIx/RFE2BQ4YVNrv7 =nfVS -END PGP SIGNATURE-
[gentoo-dev] [PATCH 7/9] check-reqs.eclass: Sanitize MERGE_TYPE for EAPI < 4
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index ad032b9..4513904 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -136,6 +136,8 @@ check-reqs_run() { # some people are *censored* unset CHECKREQS_FAILED + [[ ${EAPI:-0} == [0123] ]] && local MERGE_TYPE="" + # use != in test, because MERGE_TYPE only exists in EAPI 4 and later if [[ ${MERGE_TYPE} != binary ]]; then [[ -n ${CHECKREQS_MEMORY} ]] && \ -- 2.6.4
[gentoo-dev] [PATCH 9/9] check-reqs.eclass: Enable EAPI 6 support
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 26f2dc1..d22e8c2 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -65,7 +65,7 @@ inherit eutils EXPORT_FUNCTIONS pkg_setup case "${EAPI:-0}" in 0|1|2|3) ;; - 4|5) EXPORT_FUNCTIONS pkg_pretend ;; + 4|5|6) EXPORT_FUNCTIONS pkg_pretend ;; *) die "EAPI=${EAPI} is not supported" ;; esac -- 2.6.4
[gentoo-dev] [PATCH 4/9] check-reqs.eclass: Fix typo
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 3c98baf..138bfec 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -71,7 +71,7 @@ esac # @FUNCTION: check_reqs # @DESCRIPTION: -# Obsolete function executing all the checks and priting out results +# Obsolete function executing all the checks and printing out results check_reqs() { debug-print-function ${FUNCNAME} "$@" -- 2.6.4
[gentoo-dev] [PATCH 5/9] check-reqs.eclass: Replace obsolete df option -m with -B ###
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 138bfec..a32f8f8 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -306,7 +306,7 @@ check-reqs_disk() { ${size} \ "disk space at \"${path}\"" - space_megs=$(df -Pm "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}') + space_megs=$(df -P -B 1048576 "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}') if [[ $? == 0 && -n ${space_megs} ]] ; then if [[ ${space_megs} -lt $(check-reqs_get_mebibytes ${size}) ]] ; then -- 2.6.4
[gentoo-dev] [PATCH 6/9] check-reqs.eclass: Ban obsolete functions in newer EAPIs
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index a32f8f8..ad032b9 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -75,6 +75,8 @@ esac check_reqs() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI:-0} == [012345] ]] || die "${FUNCNAME} is banned in EAPI > 5" + echo eqawarn "Package calling old ${FUNCNAME} function." eqawarn "Please file a bug against the package." -- 2.6.4
Re: [gentoo-dev] [PATCH 5/9] check-reqs.eclass: Replace obsolete df option -m with -B ###
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/12/15 14:58, Andrew Savchenko wrote: > Hi, > > On Mon, 28 Dec 2015 09:43:51 +0100 Justin Lecher wrote: >> Signed-off-by: Justin Lecher <j...@gentoo.org> --- >> eclass/check-reqs.eclass | 2 +- 1 file changed, 1 insertion(+), 1 >> deletion(-) >> >> diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass >> index 138bfec..a32f8f8 100644 --- a/eclass/check-reqs.eclass +++ >> b/eclass/check-reqs.eclass @@ -306,7 +306,7 @@ check-reqs_disk() >> { ${size} \ "disk space at \"${path}\"" >> >> -space_megs=$(df -Pm "${1}" 2>/dev/null | awk 'FNR == 2 {print >> $4}') + space_megs=$(df -P -B 1048576 "${1}" 2>/dev/null | awk >> 'FNR == 2 {print $4}') > > Why not "-BM"? IMHO, this will be more readable, though, of > course, both arguments are semantically correct. > Because the output is different to the original version. $ (0) df -Pm / Filesystem 1048576-blocks Used Available Capacity Mounted on /dev/root 47244 25665 19157 58% / $ (0) df -P -B 1048576 / Filesystem 1048576-blocks Used Available Capacity Mounted on /dev/root 47244 25665 19157 58% / $ (0) df -P -BM / Filesystem 1048576-blocks Used Available Capacity Mounted on /dev/root 47244M 25665M19157M 58% / -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWgUQzXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAEUP/RQJRmOaXjUD5orDBpXj/nvj CszwErjdwR43HwEsWeNVGMX1dXd0l1KM5p8tK5d4cn2u920VG8U8ef+SsfJhmfbn tnlM7hOhLmWZOqp57YpLeOvEpz0gqfjgKw3b/5Ywg4ISacufgAwNxbsSBnEmqQYv wETPveQAVETa0SoKD3Ki9PLRVVMN1t+/azMc9hn7+Tm2dth0QoF2sQ3Tm5VbQG/H BfQ4IWAUgpSrU991uliOt7kVTXTEShScSVPVACNoU63qtbNrYU92XGlDCAzPBsjp E8l7jdrlHXlgqu8zh+wvrJ/1qw3t3eqnB96pGe8HAfhdeJ6cVd3mNZITMNmmRl/G IaIdQ1dZlQLmP1ywK3bxS0ehi4XCmaQJKxP0vNAcnrlY41ea8qHp6UhrHT69c+Nr WKCKmanfaadsoLQkHgFiy4kGuXna20XyBdyr1zP9y6L8aSz8Cq6WbESkFu3aNgFT FTNOW4Z6fFwEc/Le3Kaowk8arv9E7yryjkqWzl4EO2nwUReg/4UmfkqgBCSOFh0z JUd1Xvoaeo6hiSEw/VmL+D/HCzlm7Z+SRtNKDR3d8gsyCY0lVMBZscBYdSpAKbn2 5RkkynZdR52Y+1cr8Rt9G7Uz+AaX82L19+WgYd9y5dcUynNJgDU5+SRFT1/hZfSR eO0pNmZ9ywefEvYh/2Mc =4hR/ -END PGP SIGNATURE-
[gentoo-dev] [PATCH] check-reqs.eclass: Replace obsolete df option -m with -k
Using kbi as base unit for calculation as linux and bsd only have -k as common option Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/check-reqs.eclass | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass index 138bfec..a649693 100644 --- a/eclass/check-reqs.eclass +++ b/eclass/check-reqs.eclass @@ -159,12 +159,12 @@ check-reqs_run() { fi } -# @FUNCTION: check-reqs_get_mebibytes +# @FUNCTION: check-reqs_get_kbibytes # @INTERNAL # @DESCRIPTION: -# Internal function that returns number in mebibytes. -# Returns 1024 for 1G or 1048576 for 1T. -check-reqs_get_mebibytes() { +# Internal function that returns number in kbibytes. +# Returns 1024**2 for 1G or 1024**3 for 1T. +check-reqs_get_kbibytes() { debug-print-function ${FUNCNAME} "$@" [[ -z ${1} ]] && die "Usage: ${FUNCNAME} [size]" @@ -173,9 +173,10 @@ check-reqs_get_mebibytes() { local size=${1%[GMT]} case ${unit} in - G) echo $((1024 * size)) ;; - [M0-9]) echo ${size} ;; - T) echo $((1024 * 1024 * size)) ;; + G) echo $((1024 * 1024 * size)) ;; + M) echo $((1024 * size)) ;; + T) echo $((1024 * 1024 * 1024 * size)) ;; + [0-9]) echo $((1024 * size)) ;; *) die "${FUNCNAME}: Unknown unit: ${unit}" ;; @@ -275,7 +276,7 @@ check-reqs_memory() { actual_memory=$(echo $actual_memory | sed -e 's/^[^:=]*[:=]//' ) fi if [[ -n ${actual_memory} ]] ; then - if [[ ${actual_memory} -lt $((1024 * $(check-reqs_get_mebibytes ${size}))) ]] ; then + if [[ ${actual_memory} -lt $(check-reqs_get_kbibytes ${size}) ]] ; then eend 1 check-reqs_unsatisfied \ ${size} \ @@ -300,16 +301,16 @@ check-reqs_disk() { local path=${1} local size=${2} - local space_megs + local space_kbi check-reqs_start_phase \ ${size} \ "disk space at \"${path}\"" - space_megs=$(df -Pm "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}') + space_kbi=$(df -Pk "${1}" 2>/dev/null | awk 'FNR == 2 {print $4}') - if [[ $? == 0 && -n ${space_megs} ]] ; then - if [[ ${space_megs} -lt $(check-reqs_get_mebibytes ${size}) ]] ; then + if [[ $? == 0 && -n ${space_kbi} ]] ; then + if [[ ${space_kbi} -lt $(check-reqs_get_kbibytes ${size}) ]] ; then eend 1 check-reqs_unsatisfied \ ${size} \ -- 2.6.4
[gentoo-dev] [PATCH] Replace df -m with df -k
I replaced al calculations from mbi to kbi so that we can use the common -k flag. Justin Justin Lecher (1): check-reqs.eclass: Replace obsolete df option -m with -k eclass/check-reqs.eclass | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.6.4
Re: [gentoo-dev] [PATCH 5/9] check-reqs.eclass: Replace obsolete df option -m with -B ###
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/12/15 15:24, Michał Górny wrote: > Dnia 28 grudnia 2015 09:43:51 CET, Justin Lecher <j...@gentoo.org> > napisał(a): >> Signed-off-by: Justin Lecher <j...@gentoo.org> --- >> eclass/check-reqs.eclass | 2 +- 1 file changed, 1 insertion(+), 1 >> deletion(-) >> >> diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass >> index 138bfec..a32f8f8 100644 --- a/eclass/check-reqs.eclass +++ >> b/eclass/check-reqs.eclass @@ -306,7 +306,7 @@ check-reqs_disk() >> { ${size} \ "disk space at \"${path}\"" >> >> -space_megs=$(df -Pm "${1}" 2>/dev/null | awk 'FNR == 2 {print >> $4}') + space_megs=$(df -P -B 1048576 "${1}" 2>/dev/null | awk >> 'FNR == 2 {print $4}') > > I don't want to spoil the party but '-B' doesn't seem portable. I > don't see that option in FreeBSD man page. The source code says case 'm': /* obsolescent, exists for BSD compatibility */ So it might silently go away. Let me have a look at the BSD sources. -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWgUclXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiUgP/itabhl/43o8fY79y/cuZuRW xmvQirepGlHrqVZvgOGiBxyK2q0wpVhrsgHe/hwkK/lV8NA+C0eOIUW2wlwLiyEN T6UavwPFdoZ4YgNuj9m8ZCNbZVrJUyEFP01RUWuHyEah6MFBg+D8Jtl8vWNlzZKm W8z3KPDTrDhpcg8i+r9D915RARpo9wraTc/LvK8QXF51YuBcn1MWsRjd50g2FQiu R6Epylw7EmAL4AT9bhx7skdBS2z5GRHJQFEObYqtxve0PDdXOvw8SOcxwcqQXCv2 ZCEuVCURfOlOOVdL1mgfIJa/h1FMO3n1NjrZXFFZtVNs1T3sYm9/lyYjGuYQIFP3 ITkIVPBunjgbmG+wNRFOonNRDnxY0Y8F0AiaDNi07WpbkAoo52oHz9gWL/hsdhDd vfH074JoIVtoXS6yeaESPSwOlurQ30bwhpAz7xzWLW8sWopyR+sGkuW7AQ9PkmZc mwVX6ZIWBdZ6Zk5Ae7UNi3Lc3akSrz4GkiAlbLmxg946BMrTfJFIPBFvR82TkkNw +mRPJUPuiCWDDDyDKNCpGb/YQB8kjkiWHZkr1Id7PLhIIDkeuccVqvEvzTNU22pk DdQkUt9L69FxTE8OtskEDueaINaBMtBpGpPh5K+arsKUt85jIX4oM25IXau8HAWx mDTncoD6QRn2dNXuf5gx =O924 -END PGP SIGNATURE-
Re: [gentoo-dev] [PATCH] check-reqs.eclass: Replace obsolete df option -m with -k
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/12/15 16:41, Michał Górny wrote: > Dnia 28 grudnia 2015 16:27:43 CET, Justin Lecher <j...@gentoo.org> > napisał(a): >> Using kbi as base unit for calculation as linux and bsd only have >> -k as common option > > It's 'kibibyte', or KiB in short. Updated, I had the suspicion that it wasn't correct, but didn't do any research. -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWgVkVXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3AkQALwjL7LRN3AcmQnWBHy56YFK 3YmDwFUDZZ9aA6doO3C5TVKzwBc/+WopqS7sDb8djC4yMmPVJqZJIYmwNbkch7SE UamDfBo8d8asbW+KmfKdOm56IWlL3P+ObPD3qaUcVsOkfw4q4iF5VK55Of7l/Va2 oh1rugmQ22nY0lcSo1QCioiuwqsivQnBdnK+iEHNXxEiF+WFg2MXnedcVF0blGii iXTqJZXavjTanXANPyHn35WpPIw6cQR+vYjXT9JX8uDqchfKtgooYNsatGSc7Osi 0vykwSa4/A7SKrksyPdQ5/NcSArQZEk9M6udEEChx6LLuURtsMMKPEeAxF45CMGR Pqc6InN2xU8eocAHm2eZO+Pj065Pvio3WSXCL4LCADwU9mlktb6GJZIEpOBVs3QP WrV7TFzikbiW4vKfD0nvv3o6IqcwNQQeoPbBOiigPnXOGzJGVklMs8g/VOQvslsZ ALscmFhKmhbS5ISpivXhbQMaZlChhXLCJHmsED2Mf2C5rIuOUxSLjly05K6v7+gB 1Zowqny/nFa6Z9OejNmuSyk0OB/PLV1U0cel0lmsL6RKpRDl9g3YUsIsE09GDWdx x8CWsJXB0YdIaQ8b7TC39/DdT9o2nwddKlfHZVHwXzfq4zn++lU1yq1AAh0fecOz PTt3IvS+XyZlR7Npt298 =OXj4 -END PGP SIGNATURE-
Re: [gentoo-dev] [PATCH 8/8] virtualx.eclass: Simplify API into single virtx()
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 30/11/15 18:40, Davide Pesavento wrote: > > The scenario of bug 517976 is different. I think a minimized test > case is the following (untested): > > foo() { die "meh" return 0 } > > src_test() { virtx foo } > This example will still break the build, although the Xvfb session wouldn't get killed. Let's move the discussion to the bug. Justin * Scanning for an open DISPLAY to start Xvfb ... debug: virtx: XDISPLAY=0 debug: virtx: /usr/bin/Xvfb :0 -screen 0 1280x1024x24 * Starting Xvfb on $DISPLAY=0 ... debug: virtx: emake "foo" * ERROR: app-misc/dummy-1::dummy failed (test phase): * meh * * Call stack: * ebuild.sh, line 133: Called src_test * environment, line 2076: Called virtx 'foo' * environment, line 2699: Called nonfatal 'foo' * isolated-functions.sh, line 105: Called foo * environment, line 987: Called die * The specific snippet of code: * die "meh"; * -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWXUt6XxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWGsQALjFU4Z+1yUOUWGyBf7n31hc FUAq/ZnsFEd8ZPKRSyZVY+os/PjbwMCQQk0U7hUySLZ43mSfzC0aelKMAXx6BYoS ss8jp2s5LoeIV+YdCIUiIE/y4GHvYwln61W+XrM6TslEaAMVbrKuKoa/TvzE6mrN Et9ebl7E6LpwTMc72jdGd8KWtkLdl2Ddgt99pKcC9vA7IEZPGlci/Nz7AtHycP3m YectPEzWVdirNlRcKCDxcCdHbYH1mKjd3kjtatb6nDXURhM4l4qL/OZEdx5mKpyp EAu+7RzU7XOgyUMuvwWpPtmA/jaR6VSEWJY9W+EwYS3LwNRJczADfEGzE2EGCj+r 0iSOvF2b9DqgO800ENSPH7iUgvgw3pTLqMdUSHsvZg5dw1u08S1DCuB2T1/9Nfin OUk/zsGELJQ5C0m7a1vugG1PNBmjKNlaKtW+bIDitPgL71GCeQ2QU0Oo5SKRH+bv Qp2mguaR3nL1xm6MrnRT7bIKW92FRDT2P3eHTRylWg495/i8veaiUL/QBwnegOU5 En4kCyaBusujyT2l5DZnYb6RNOfUWlFQOquaKbK1yRtDsk7tG+HfRkSQR4s6Dlo4 sIdCrjhvgDeTy+6DwcXGWex1nG2ZUkLu36O6uIEFphTgbG3dlXYE1lvrGLwIHyZg /5PC3gOTW6R0s/DfzDDh =8pwz -END PGP SIGNATURE-
[gentoo-dev] [PATCH 1/8] virtualx.eclass: Use case/esac to handle supported EAPIs
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 5d27ed9..e9ff3af 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,6 +9,17 @@ # Original author: Martin Schlemmer <aza...@gentoo.org> # @BLURB: This eclass can be used for packages that needs a working X environment to build. +case "${EAPI:-0}" in + 0|1) + die "virtualx.eclass: EAPI ${EAPI} is too old." + ;; + 2|3|4|5) + ;; + *) + die "virtualx.eclass: EAPI ${EAPI} is not supported yet." + ;; +esac + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -35,7 +46,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND} # (within virtualmake function). : ${VIRTUALX_COMMAND:="emake"} -has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer." case ${VIRTUALX_REQUIRED} in manual) -- 2.6.3
[gentoo-dev] [PATCH 2/8] virtualx.eclass: Only source eclass once
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 + 1 file changed, 5 insertions(+) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index e9ff3af..8d66da0 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -9,6 +9,8 @@ # Original author: Martin Schlemmer <aza...@gentoo.org> # @BLURB: This eclass can be used for packages that needs a working X environment to build. +if [[ ! ${_VIRTUAL_X} ]]; then + case "${EAPI:-0}" in 0|1) die "virtualx.eclass: EAPI ${EAPI} is too old." @@ -195,3 +197,6 @@ Xeconf() { VIRTUALX_COMMAND="econf" virtualmake "$@" } + +_VIRTUAL_X=1 +fi -- 2.6.3
[gentoo-dev] [PATCH 4/8] virtualx.eclass: Whitespace cleanup
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index c2bef68..78f5429 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -50,7 +50,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND} # (within virtualmake function). : ${VIRTUALX_COMMAND:="emake"} - case ${VIRTUALX_REQUIRED} in manual) ;; -- 2.6.3
[gentoo-dev] [PATCH 7/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index bdecda6..344cd63 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -22,7 +22,7 @@ case "${EAPI:-0}" in ;; esac -inherit eutils +[[ ${EAPI} == [2345] ]] && inherit eutils # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: @@ -58,6 +58,8 @@ case ${VIRTUALX_REQUIRED} in RDEPEND="" ;; optional|tests) + [[ ${EAPI} == [2345] ]] \ + || die 'Values "optional" and "tests" for VIRTUALX_REQUIRED are banned in EAPI > 5' # deprecated section YAY. eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." eqawarn "You can drop the variable definition completely from ebuild," @@ -89,8 +91,12 @@ esac virtualmake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx" + # backcompat for maketype if [[ -n ${maketype} ]]; then + [[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5" eqawarn "ebuild is exporting \$maketype=${maketype}" eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." @@ -204,6 +210,9 @@ virtx() { Xmake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 '" + eqawarn "you should not execute make directly" eqawarn "rather execute Xemake -j1 if you have issues with parallel make" VIRTUALX_COMMAND="emake -j1" virtualmake "$@" @@ -215,6 +224,9 @@ Xmake() { Xemake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake '" + VIRTUALX_COMMAND="emake" virtualmake "$@" } @@ -224,6 +236,9 @@ Xemake() { Xeconf() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf '" + VIRTUALX_COMMAND="econf" virtualmake "$@" } -- 2.6.3
[gentoo-dev] [PATCH 3/8] virtualx.eclass: Use eqawarn instead of ewarn "QA:..."
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 8d66da0..c2bef68 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -22,6 +22,8 @@ case "${EAPI:-0}" in ;; esac +inherit eutils + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -58,15 +60,15 @@ case ${VIRTUALX_REQUIRED} in ;; optional|tests) # deprecated section YAY. - ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." - ewarn "QA: You can drop the variable definition completely from ebuild," - ewarn "QA: because it is default behaviour." + eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." + eqawarn "You can drop the variable definition completely from ebuild," + eqawarn "because it is default behaviour." if [[ -n ${VIRTUALX_USE} ]]; then # so they like to specify the useflag - ewarn "QA: VIRTUALX_USE variable is deprecated." - ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" - ewarn "QA: to achieve the same behaviour." + eqawarn "VIRTUALX_USE variable is deprecated." + eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" + eqawarn "to achieve the same behaviour." fi [[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test" @@ -97,9 +99,9 @@ virtualmake() { # backcompat for maketype if [[ -n ${maketype} ]]; then - ewarn "QA: ebuild is exporting \$maketype=${maketype}" - ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." - ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now." + eqawarn "ebuild is exporting \$maketype=${maketype}" + eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." + eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." VIRTUALX_COMMAND=${maketype} fi @@ -175,8 +177,8 @@ virtualmake() { Xmake() { debug-print-function ${FUNCNAME} "$@" - ewarn "QA: you should not execute make directly" - ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make" + eqawarn "you should not execute make directly" + eqawarn "rather execute Xemake -j1 if you have issues with parallel make" VIRTUALX_COMMAND="emake -j1" virtualmake "$@" } -- 2.6.3
[gentoo-dev] [PATCH 0/8] virtualx.eclass updates version 3
So next try. patches slightly resorted, die message wording adopted. Justin Lecher (8): virtualx.eclass: Use case/esac to handle supported EAPIs virtualx.eclass: Only source eclass once virtualx.eclass: Use eqawarn instead of ewarn "QA:..." virtualx.eclass: Whitespace cleanup virtualx.eclass: Add missing die virtualx.eclass: Simplify API into single virtx() virtualx.eclass: Ban deprecated functionality in EAPI > 5 virtualx.eclass: Support EAPI=6 eclass/virtualx.eclass | 103 ++--- 1 file changed, 81 insertions(+), 22 deletions(-) -- 2.6.3
[gentoo-dev] [PATCH 5/8] virtualx.eclass: Add missing die
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 78f5429..3df3fe1 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -92,9 +92,10 @@ virtualmake() { local i=0 local retval=0 local OLD_SANDBOX_ON="${SANDBOX_ON}" - local XVFB=$(type -p Xvfb) - local XHOST=$(type -p xhost) + local XVFB XHOST XDISPLAY local xvfbargs="-screen 0 1280x1024x24" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die # backcompat for maketype if [[ -n ${maketype} ]]; then -- 2.6.3
[gentoo-dev] [PATCH 8/8] virtualx.eclass: Support EAPI=6
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 344cd63..de1582c 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -15,7 +15,7 @@ case "${EAPI:-0}" in 0|1) die "virtualx.eclass: EAPI ${EAPI} is too old." ;; - 2|3|4|5) + 2|3|4|5|6) ;; *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." -- 2.6.3
[gentoo-dev] [PATCH 6/8] virtualx.eclass: Simplify API into single virtx()
The new API runs all specified arguments to virtx() inside an XFVB, instead of defining VIRTUALX_COMMAND and running that in virtualmake. Xemake and Xeconf should be replaced by "virtx emake" and "virtx econf". Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 47 +-- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 3df3fe1..bdecda6 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -89,14 +89,6 @@ esac virtualmake() { debug-print-function ${FUNCNAME} "$@" - local i=0 - local retval=0 - local OLD_SANDBOX_ON="${SANDBOX_ON}" - local XVFB XHOST XDISPLAY - local xvfbargs="-screen 0 1280x1024x24" - XVFB=$(type -p Xvfb) || die - XHOST=$(type -p xhost) || die - # backcompat for maketype if [[ -n ${maketype} ]]; then eqawarn "ebuild is exporting \$maketype=${maketype}" @@ -105,6 +97,41 @@ virtualmake() { VIRTUALX_COMMAND=${maketype} fi + virtx "${VIRTUALX_COMMAND}" "${@}" +} + + +# @FUNCTION: virtx +# @USAGE: [command arguments] +# @DESCRIPTION: +# Start new Xvfb session and run commands in it. +# +# Example: +# +# @CODE +# src_test() { +# virtx default +# } +# @CODE +# +# @CODE +# python_test() { +# virtx py.test --verbose +# } +# @CODE +virtx() { + debug-print-function ${FUNCNAME} "$@" + + [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument" + + local i=0 + local retval=0 + local OLD_SANDBOX_ON="${SANDBOX_ON}" + local XVFB XHOST XDISPLAY + local xvfbargs="-screen 0 1280x1024x24" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die + debug-print "${FUNCNAME}: running Xvfb hack" export XAUTHORITY= # The following is derived from Mandrake's hack to allow @@ -154,10 +181,10 @@ virtualmake() { # to kill Xvfb debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" if has "${EAPI}" 2 3; then - ${VIRTUALX_COMMAND} "$@" + "$@" retval=$? else - nonfatal ${VIRTUALX_COMMAND} "$@" + nonfatal "$@" retval=$? fi -- 2.6.3
Re: [gentoo-dev] [PATCH 4/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 29/11/15 10:57, Michał Górny wrote: > On Sat, 28 Nov 2015 17:21:00 +0100 Justin Lecher <j...@gentoo.org> > wrote: > >> Signed-off-by: Justin Lecher <j...@gentoo.org> --- >> eclass/virtualx.eclass | 5 + 1 file changed, 5 insertions(+) >> >> diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass >> index 230897b..a5e5457 100644 --- a/eclass/virtualx.eclass +++ >> b/eclass/virtualx.eclass @@ -59,6 +59,8 @@ case >> ${VIRTUALX_REQUIRED} in RDEPEND="" ;; optional|tests) + [[ >> ${EAPI} == [2345] ]] \ + || die 'Values "optional" and >> "tests" >> are unsupported for VIRTUALX_REQUIRED' > > You don't mention EAPI here, which can get confusing. Valid point. > >> # deprecated section YAY. eqawarn "VIRTUALX_REQUIRED=optional and >> VIRTUALX_REQUIRED=tests are deprecated." eqawarn "You can drop >> the variable definition completely from ebuild," @@ -177,6 +179,9 >> @@ virtualmake() { Xmake() { debug-print-function ${FUNCNAME} >> "$@" >> >> +[[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is removed >> in >> EAPI > 5; use Xemake -j1 instead" + eqawarn "you should not >> execute make directly" eqawarn "rather execute Xemake -j1 if you >> have issues with parallel make" VIRTUALX_COMMAND="emake -j1" >> virtualmake "$@" > > Still, if you introduced virtx earlier, you wouldn't have to > change this die message later on ;-). > Principally you are right, but resorting the patches generates lots of merge conflicts. But let me practice my git skills -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWWulWXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDUwP/09Q4xMEfaPeAlBIrv120PDc uqkJeBGHuKDtR6gmgydg+5bVdj6UwElZUsOaNMuBMkCAcrnHfP2WQ/lJafooK4K+ baiVqyFXTKemR8ob2hNLLD5lrvWijvjzc9TAutpfVvJm/NnGNRF2BpmnNKMtVWBO 0RP1pl+Wfjbzzb52KT96GUeeJqunY0EReuoZ2U9pG1HAnVbOGNacxkeSeJA+pfQ4 FQPqhnDAOQMS0p/uXro8h8TeDRIF2wwcRvmCOePKjRF/Ut6sw1/Pogj6iuTxTyaz m16ebTJmJ1GKc5mk6Fy4yDp6OR8tdgVwYsq+tjq9fMARqDOA/eJRS0I6/uIgaj0h 0dHzBYXxtTBixseVvPXAHY80RWSf5nseTceYVPSuHp+PRAhkrVneWsWfnBelqyzS Xj+jAPxDRU4gPat3SFt1fRER6A9Ij5VzRTHEEca/kjFvzwxmRs+MxDd7AN8IJK/v IhfDCgWf6kth0iCKHUkPZgd/ZOoHOUW4rMsGylObWQpCKz9Uzlo/T44Mj5Lr38nK Ydr1AND394O+74EOSGl2IcQiEFUQcrRIkUyOHIqBex/GAaL1wbyfcQ2u7mtNmddm Jc5jIM/FzmcDAnZgkxii69fjGb46HsPBUtriAmPydh7mN/ahHy0sPbQqxT3ANYxU QTYUPft2ma0fmb9TJjO4 =ZaQj -END PGP SIGNATURE-
[gentoo-dev] [PATCH 3/8] virtualx.eclass: Use eqawarn instead of ewarn "QA:..."
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 0b6614a..a7f17ec 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -22,6 +22,8 @@ esac if [[ ! ${_VIRTUAL_X} ]]; then +inherit eutils + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -58,15 +60,15 @@ case ${VIRTUALX_REQUIRED} in ;; optional|tests) # deprecated section YAY. - ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." - ewarn "QA: You can drop the variable definition completely from ebuild," - ewarn "QA: because it is default behaviour." + eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." + eqawarn "You can drop the variable definition completely from ebuild," + eqawarn "because it is default behaviour." if [[ -n ${VIRTUALX_USE} ]]; then # so they like to specify the useflag - ewarn "QA: VIRTUALX_USE variable is deprecated." - ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" - ewarn "QA: to achieve the same behaviour." + eqawarn "VIRTUALX_USE variable is deprecated." + eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" + eqawarn "to achieve the same behaviour." fi [[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test" @@ -97,9 +99,9 @@ virtualmake() { # backcompat for maketype if [[ -n ${maketype} ]]; then - ewarn "QA: ebuild is exporting \$maketype=${maketype}" - ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." - ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now." + eqawarn "ebuild is exporting \$maketype=${maketype}" + eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." + eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." VIRTUALX_COMMAND=${maketype} fi @@ -175,8 +177,8 @@ virtualmake() { Xmake() { debug-print-function ${FUNCNAME} "$@" - ewarn "QA: you should not execute make directly" - ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make" + eqawarn "you should not execute make directly" + eqawarn "rather execute Xemake -j1 if you have issues with parallel make" VIRTUALX_COMMAND="emake -j1" virtualmake "$@" } -- 2.6.3
[gentoo-dev] [PATCH 7/8] virtualx.eclass: Add missing die
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 54514b0..f9fa879 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -93,9 +93,10 @@ virtualmake() { local i=0 local retval=0 local OLD_SANDBOX_ON="${SANDBOX_ON}" - local XVFB=$(type -p Xvfb) - local XHOST=$(type -p xhost) + local XVFB XHOST XDISPLAY local xvfbargs="-screen 0 1280x1024x24" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die # backcompat for maketype if [[ -n ${maketype} ]]; then -- 2.6.3
[gentoo-dev] [PATCH 6/8] virtualx.eclass: Whitespace cleanup
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 048359f..54514b0 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -50,7 +50,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND} # (within virtualmake function). : ${VIRTUALX_COMMAND:="emake"} - case ${VIRTUALX_REQUIRED} in manual) ;; -- 2.6.3
[gentoo-dev] [PATCH 8/8] virtualx.eclass: Simplify API into single virtx()
The new API runs all specified arguments to virtx() inside an XFVB, instead of defining VIRTUALX_COMMAND and running that in virtualmake. Xemake and Xeconf should be replaced by "virtx emake" and "virtx econf". Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 42 -- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index f9fa879..ca6a1f9 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -90,22 +90,38 @@ esac virtualmake() { debug-print-function ${FUNCNAME} "$@" - local i=0 - local retval=0 - local OLD_SANDBOX_ON="${SANDBOX_ON}" - local XVFB XHOST XDISPLAY - local xvfbargs="-screen 0 1280x1024x24" - XVFB=$(type -p Xvfb) || die - XHOST=$(type -p xhost) || die + [[ ${EAPI} == [2345] ]] || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx" # backcompat for maketype if [[ -n ${maketype} ]]; then + [[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5" eqawarn "ebuild is exporting \$maketype=${maketype}" eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." VIRTUALX_COMMAND=${maketype} fi + virtx "${VIRTUALX_COMMAND}" "${@}" +} + + +# @FUNCTION: virtx +# @USAGE: [comman arguments] +# @DESCRIPTION: +# Function which start new Xvfb session where the command gets executed. +virtx() { + debug-print-function ${FUNCNAME} "$@" + + [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument" + + local i=0 + local retval=0 + local OLD_SANDBOX_ON="${SANDBOX_ON}" + local XVFB XHOST XDISPLAY + local xvfbargs="-screen 0 1280x1024x24" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die + debug-print "${FUNCNAME}: running Xvfb hack" export XAUTHORITY= # The following is derived from Mandrake's hack to allow @@ -155,10 +171,10 @@ virtualmake() { # to kill Xvfb debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" if has "${EAPI}" 2 3; then - ${VIRTUALX_COMMAND} "$@" + "$@" retval=$? else - nonfatal ${VIRTUALX_COMMAND} "$@" + nonfatal "$@" retval=$? fi @@ -179,7 +195,7 @@ Xmake() { debug-print-function ${FUNCNAME} "$@" [[ ${EAPI} == [2345] ]] \ - || die "${FUNCNAME} is removed in EAPI > 5; use Xemake -j1 instead" + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 '" eqawarn "you should not execute make directly" eqawarn "rather execute Xemake -j1 if you have issues with parallel make" @@ -192,6 +208,9 @@ Xmake() { Xemake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake '" + VIRTUALX_COMMAND="emake" virtualmake "$@" } @@ -201,6 +220,9 @@ Xemake() { Xeconf() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf '" + VIRTUALX_COMMAND="econf" virtualmake "$@" } -- 2.6.3
[gentoo-dev] [PATCH 2/8] virtualx.eclass: Only source eclass once
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 + 1 file changed, 5 insertions(+) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 584fb29..0b6614a 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -20,6 +20,8 @@ case "${EAPI:-0}" in ;; esac +if [[ ! ${_VIRTUAL_X} ]]; then + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -195,3 +197,6 @@ Xeconf() { VIRTUALX_COMMAND="econf" virtualmake "$@" } + +_VIRTUAL_X=1 +fi -- 2.6.3
[gentoo-dev] [PATCH 0/8] virtualx.eclass: New API and EAPI=6 support
The main new feature is the introduction of virtx(). This function executes the arguments inside a Xfvb context in contrast to the deprecated virtualmake which required to set VIRTUALX_COMMAND, which then gets executed. Xemake and Xeconf should be converted to "virtx emake" and "virtx econf", respectively. Justin Lecher (8): virtualx.eclass: Use case/esac to handle supported EAPIs virtualx.eclass: Only source eclas once virtualx.eclass: Use eqawarn instead of ewarn "QA:..." virtualx.eclass: Ban deprecated functionality in EAPI > 5 virtualx.eclass: Support EAPI=6 virtualx.eclass: Whitespace cleanup virtualx.eclass: Add missing die virtualx.eclass: Simplify API into single virtx() eclass/virtualx.eclass | 87 +- 1 file changed, 65 insertions(+), 22 deletions(-) -- 2.6.3
[gentoo-dev] [PATCH 5/8] virtualx.eclass: Support EAPI=6
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 615ff0e..048359f 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -13,7 +13,7 @@ case "${EAPI:-0}" in 0|1) die "virtualx eclass require EAPI=2 or newer." ;; - 2|3|4|5) + 2|3|4|5|6) ;; *) die "EAPI ${EAPI} is not supported yet." -- 2.6.3
[gentoo-dev] [PATCH 1/8] virtualx.eclass: Use case/esac to handle supported EAPIs
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 5d27ed9..584fb29 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,6 +9,17 @@ # Original author: Martin Schlemmer <aza...@gentoo.org> # @BLURB: This eclass can be used for packages that needs a working X environment to build. +case "${EAPI:-0}" in + 0|1) + die "virtualx eclass require EAPI=2 or newer." + ;; + 2|3|4|5) + ;; + *) + die "EAPI ${EAPI} is not supported yet." + ;; +esac + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -35,7 +46,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND} # (within virtualmake function). : ${VIRTUALX_COMMAND:="emake"} -has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer." case ${VIRTUALX_REQUIRED} in manual) -- 2.6.3
[gentoo-dev] [PATCH 4/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 4 1 file changed, 4 insertions(+) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index a7f17ec..615ff0e 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -59,6 +59,7 @@ case ${VIRTUALX_REQUIRED} in RDEPEND="" ;; optional|tests) + [[ ${EAPI} == [2345] ]] || die 'Values "optional" and "tests" are unsupported for VIRTUALX_REQUIRED' # deprecated section YAY. eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." eqawarn "You can drop the variable definition completely from ebuild," @@ -177,6 +178,9 @@ virtualmake() { Xmake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is removed in EAPI > 5; use Xemake -j1 instead" + eqawarn "you should not execute make directly" eqawarn "rather execute Xemake -j1 if you have issues with parallel make" VIRTUALX_COMMAND="emake -j1" virtualmake "$@" -- 2.6.3
Re: [gentoo-dev] [PATCH 4/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/11/15 15:03, Michał Górny wrote: > > > Dnia 28 listopada 2015 14:24:17 CET, Justin Lecher > <j...@gentoo.org> napisał(a): >> Signed-off-by: Justin Lecher <j...@gentoo.org> --- >> eclass/virtualx.eclass | 4 1 file changed, 4 insertions(+) >> >> diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass >> index a7f17ec..615ff0e 100644 --- a/eclass/virtualx.eclass +++ >> b/eclass/virtualx.eclass @@ -59,6 +59,7 @@ case >> ${VIRTUALX_REQUIRED} in RDEPEND="" ;; optional|tests) + [[ >> ${EAPI} == [2345] ]] || die 'Values "optional" and "tests" are >> unsupported for VIRTUALX_REQUIRED' > > You can now make eutils conditional to EAPI. So your idea is only import eutils for EAPIs where I will need eqawarn from an eclass? As we have no ETA for that to change, I don't see a good reason to fix that inherit right now. -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWWbV0XxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiyCoP/3KdY8bSc6sw89Rs2xxl1wOo iZX3dFjq8ya8xd2AU4uMoFyJY/SitAl+/dtcmRGloirZ7o/Y7YT2/Z6s1G+GCqOe fXfivtGTGcGivI7F2Rs4ls8xtS3d4TWUKDR5R70kF8MMSNd+fxTtscqBUSQw8sJb g1nzUeNFgylUraGsCUGXTrXoPzaFRQYNCipufI4JuvL90Agr8PC6v4TsgKew9WO+ MM/R4YnpFxubF2zw4m5qbIdbn28FVGg0mbuDc/QFLFhNApevMJacQG783k1f1TDJ 99Gj+pPj2TgfyVVnhJYvE7s05v8vmrecX//TOvvdKYXEjoB0IR/pyAtr3rOWF+M5 VjFWL3rfeZbKOEeQ52fRfzidOxR/thBZp/flZoJKLZmJ7baBewkpVGt+4d1KwZCM /KRm/1snnZY5GnspH/zxa/MI+azNWkjKKS7PW2zbNwBWQ56aiAcA4vBkBfEBfqoR NbRFyrBm7eEEjIwRHYj5SJuTMd236gnuXEQWeAU5o8HNnh2qiVHjdHnaF4ld/QIo 0n7DYDeJqBeF8D274Ubd4KrQMH9LE2WbKZgNfBxpJdqPRBP6FJhvAtTQW1iqXNpt O4Lp9FO2jiP54Q6GWYmE8s1R2D1dXbTL10PmhGOec4tRWcrMAo5nlIwriezhHnKL NAEsc1lyU5vHp9OGwcjX =yI1e -END PGP SIGNATURE-
[gentoo-dev] [PATCH 7/8] virtualx.eclass: Simplify API into single virtx()
The new API runs all specified arguments to virtx() inside an XFVB, instead of defining VIRTUALX_COMMAND and running that in virtualmake. Xemake and Xeconf should be replaced by "virtx emake" and "virtx econf". Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 56 +- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index d10dbb2..b124034 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -91,22 +91,52 @@ esac virtualmake() { debug-print-function ${FUNCNAME} "$@" - local i=0 - local retval=0 - local OLD_SANDBOX_ON="${SANDBOX_ON}" - local XVFB XHOST XDISPLAY - local xvfbargs="-screen 0 1280x1024x24" - XVFB=$(type -p Xvfb) || die - XHOST=$(type -p xhost) || die + [[ ${EAPI} == [2345] ]] || die "${FUNCNAME} is unsupported in EAPI > 5, please use virtx" # backcompat for maketype if [[ -n ${maketype} ]]; then + [[ ${EAPI} == [2345] ]] || die "maketype is banned in EAPI > 5" eqawarn "ebuild is exporting \$maketype=${maketype}" eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." VIRTUALX_COMMAND=${maketype} fi + virtx "${VIRTUALX_COMMAND}" "${@}" +} + + +# @FUNCTION: virtx +# @USAGE: [command arguments] +# @DESCRIPTION: +# Start new Xvfb session and run commands in it. +# +# Example: +# +# @CODE +# src_test() { +# virtx default +# } +# @CODE +# +# @CODE +# python_test() { +# virtx py.test --verbose +# } +# @CODE +virtx() { + debug-print-function ${FUNCNAME} "$@" + + [[ $# -lt 1 ]] && die "${FUNCNAME} needs at least one argument" + + local i=0 + local retval=0 + local OLD_SANDBOX_ON="${SANDBOX_ON}" + local XVFB XHOST XDISPLAY + local xvfbargs="-screen 0 1280x1024x24" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die + debug-print "${FUNCNAME}: running Xvfb hack" export XAUTHORITY= # The following is derived from Mandrake's hack to allow @@ -156,10 +186,10 @@ virtualmake() { # to kill Xvfb debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" if has "${EAPI}" 2 3; then - ${VIRTUALX_COMMAND} "$@" + "$@" retval=$? else - nonfatal ${VIRTUALX_COMMAND} "$@" + nonfatal "$@" retval=$? fi @@ -180,7 +210,7 @@ Xmake() { debug-print-function ${FUNCNAME} "$@" [[ ${EAPI} == [2345] ]] \ - || die "${FUNCNAME} is removed in EAPI > 5; use Xemake -j1 instead" + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake -j1 '" eqawarn "you should not execute make directly" eqawarn "rather execute Xemake -j1 if you have issues with parallel make" @@ -193,6 +223,9 @@ Xmake() { Xemake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx emake '" + VIRTUALX_COMMAND="emake" virtualmake "$@" } @@ -202,6 +235,9 @@ Xemake() { Xeconf() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is unsupported in EAPI > 5, please use 'virtx econf '" + VIRTUALX_COMMAND="econf" virtualmake "$@" } -- 2.6.3
[gentoo-dev] [PATCH 6/8] virtualx.eclass: Add missing die
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 1f90147..d10dbb2 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -94,9 +94,10 @@ virtualmake() { local i=0 local retval=0 local OLD_SANDBOX_ON="${SANDBOX_ON}" - local XVFB=$(type -p Xvfb) - local XHOST=$(type -p xhost) + local XVFB XHOST XDISPLAY local xvfbargs="-screen 0 1280x1024x24" + XVFB=$(type -p Xvfb) || die + XHOST=$(type -p xhost) || die # backcompat for maketype if [[ -n ${maketype} ]]; then -- 2.6.3
[gentoo-dev] [PATCH 2/8] virtualx.eclass: Only source eclass once
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 + 1 file changed, 5 insertions(+) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 3d0c6c8..517bdac 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -20,6 +20,8 @@ case "${EAPI:-0}" in ;; esac +if [[ ! ${_VIRTUAL_X} ]]; then + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -195,3 +197,6 @@ Xeconf() { VIRTUALX_COMMAND="econf" virtualmake "$@" } + +_VIRTUAL_X=1 +fi -- 2.6.3
[gentoo-dev] [PATCH 8/8] virtualx.eclass: Support EAPI=6
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index b124034..95f4ed0 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -13,7 +13,7 @@ case "${EAPI:-0}" in 0|1) die "virtualx.eclass: EAPI ${EAPI} is too old." ;; - 2|3|4|5) + 2|3|4|5|6) ;; *) die "EAPI ${EAPI} is not supported yet." -- 2.6.3
Re: [gentoo-dev] [PATCH 8/8] virtualx.eclass: Simplify API into single virtx()
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/11/15 16:28, Davide Pesavento wrote: >> else - nonfatal ${VIRTUALX_COMMAND} "$@" + >> nonfatal "$@" > > Please take the opportunity to clean this up, possibly only in > EAPI=6 if you don't want to risk breaking existing ebuilds. See bug > 517976 for details. > >> retval=$? The return value is recorded and gets evaluated correctly. src_test() { virtx false } results in * Scanning for an open DISPLAY to start Xvfb ... debug: virtx: XDISPLAY=1 debug: virtx: /usr/bin/Xvfb :1 -screen 0 1280x1024x24 * Starting Xvfb on $DISPLAY=1 ... debug: virtx: emake "false" * ERROR: app-misc/dummy-1::dummy failed (test phase): * virtx: the emake failed. * * Call stack: * ebuild.sh, line 133: Called src_test * environment, line 2072: Called virtx 'false' * environment, line 2700: Called die * The specific snippet of code: * [[ ${retval} -ne 0 ]] && die "${FUNCNAME}: the ${VIRTUALX_COMMAND} failed."; * Am I missing something? -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWWc1jXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWGcQAK6VSEgzlaUaJ+AEC/I+M+Rz uHOmaEE005MsTpUf8GoRY35fnMNkICES9QLZjaSjliBJ6H/WdGDGcqm7rg5yx0j5 v12vv3LMrFX2D/+2SkTurMlGj0gOz+F27ted/p9tmJJLf0KcbusPiJvmjybNjNH+ 5ksLdZEdnAj1p9qmXfoJ8IlKHO82GUn2cNS9O0XFW9WhSzmOaE+WOp2hQtX0HzUE Y6vcVjl5ZD+RDvc2+7oFptOQxGyEZdP43JikAEsfISHnjA4AtYHMLjIHvItaVdoD 8qbG5WAwp0fg1BwqNM6G9neAbknKeGIBLXNBx1QxVj3toz3j3QR88RB1nyovGNp2 7LZjEWYW9/jLpXVTLTg+vwsM6IgvehFdErlXEcWR/q/Gk5Q7C86o3oN4RPaQ93HV ElxL24u/j1CW1mFzXTgKbM4rxlD8G/aROxiKAh5+66ywSrW1SRhpHSYJxriioco3 iwUyZmBtfCB40+DAHl3cX+yxQ/pKMiR7oN67fsx3F8LEalorcONq5w2e1d0bVbgs EqdlUqxZKyI6fUK67+rI6Nd2ZBduUpm9mTvJHovPMQ3gK2hyRiE6FkhLf53aMR4S 9cmq1Bmqqw3KGTlIu45gKP6NxUr/+n1dg2LYpZF72eKKhPkNOO68YogKS073VEWc DJGgOFCpJQIV+BLid0VF =Nh/f -END PGP SIGNATURE-
Re: [gentoo-dev] [PATCH 4/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 28/11/15 16:57, Michał Górny wrote: > > > Dnia 28 listopada 2015 15:08:52 CET, "Justin Lecher (jlec)" > <j...@gentoo.org> napisał(a): On 28/11/15 15:03, Michał Górny > wrote: >>>> >>>> >>>> Dnia 28 listopada 2015 14:24:17 CET, Justin Lecher >>>> <j...@gentoo.org> napisał(a): >>>>> Signed-off-by: Justin Lecher <j...@gentoo.org> --- >>>>> eclass/virtualx.eclass | 4 1 file changed, 4 >>>>> insertions(+) >>>>> >>>>> diff --git a/eclass/virtualx.eclass >>>>> b/eclass/virtualx.eclass index a7f17ec..615ff0e 100644 --- >>>>> a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ >>>>> -59,6 +59,7 @@ case ${VIRTUALX_REQUIRED} in RDEPEND="" ;; >>>>> optional|tests) + [[ ${EAPI} == [2345] ]] || die 'Values >>>>> "optional" and "tests" are unsupported for >>>>> VIRTUALX_REQUIRED' >>>> >>>> You can now make eutils conditional to EAPI. > > So your idea is only import eutils for EAPIs where I will need > eqawarn >>> from an eclass? As we have no ETA for that to change, I don't >>> see a > good reason to fix that inherit right now. > >> No, only import it for EAPIs in which you actually use it. EAPI 6 >> will die instead, unless you missed some more qa warnings. Good catch. Thanks -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWWc9dXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi2k4P/ip/shOkEwCXPZlPFeY4qiP1 F8fsBAri7M3xlki9DjAp+LoVFVAxVTvoYn8HFWp84gCOjTHSoLbiVpRiX+jKdbUl dcoSrbGtaaKNT038kLrsRsZQTEzARJR3pw2MZdBb4my38c71Vei8uWwZv1CXM1Pi uch5bGjzAbDHHbBa07vkgxNpm03D1fe9d2K8kdxbsFXfTRs25fODP+6R7fzifarc zCYH2Ritif7FXwLwEc1nwveEVt3TnQyxEdPcN5yHYFpQ6GVRQsfJJDk/QauHh9x+ kUnmLwhrzc8AhLltboo1lZgXH7/8W1OaXbHPYtAuk3zEETuKBBzNFp8nlDvFLtfp 1h9sH9VZCddYy2ckA2BCIRosXyAznzgGS1ub0BQsHyjH+ji++pn4ju4LoJLT7i0v fE07E59ipgA0yq0DbPLp5n/6yhnADj0/C9GaT9FVN+YJYceMejyU3v+Ofn7KRD7n 3p8fU4EUFfU0XqufhwTdKuXpcwg2VJm1eSt5DLs4JpA2yNlpgyZev3n+mo1jFrIM RMK9xlcWbsz4oiRUS+uFCVJ4pK6Xa8lqk3BhvbPTCh1tapWivQ00O9iNyj8Wfoeo jV4KQi8ai+1juT+vYvDU3yr831uux4I70D+qfMci+/pQnzHl8AIRicSygUTCD9sl S1MUVE31Ydqg70FjlDAB =NqmF -END PGP SIGNATURE-
[gentoo-dev] [PATCH 1/8] virtualx.eclass: Use case/esac to handle supported EAPIs
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 5d27ed9..3d0c6c8 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,6 +9,17 @@ # Original author: Martin Schlemmer <aza...@gentoo.org> # @BLURB: This eclass can be used for packages that needs a working X environment to build. +case "${EAPI:-0}" in + 0|1) + die "virtualx.eclass: EAPI ${EAPI} is too old." + ;; + 2|3|4|5) + ;; + *) + die "EAPI ${EAPI} is not supported yet." + ;; +esac + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -35,7 +46,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND} # (within virtualmake function). : ${VIRTUALX_COMMAND:="emake"} -has "${EAPI:-0}" 0 1 && die "virtualx eclass require EAPI=2 or newer." case ${VIRTUALX_REQUIRED} in manual) -- 2.6.3
[gentoo-dev] [PATCH 3/8] virtualx.eclass: Use eqawarn instead of ewarn "QA:..."
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 517bdac..230897b 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -22,6 +22,8 @@ esac if [[ ! ${_VIRTUAL_X} ]]; then +[[ ${EAPI} == [2345] ]] && inherit eutils + # @ECLASS-VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. @@ -58,15 +60,15 @@ case ${VIRTUALX_REQUIRED} in ;; optional|tests) # deprecated section YAY. - ewarn "QA: VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." - ewarn "QA: You can drop the variable definition completely from ebuild," - ewarn "QA: because it is default behaviour." + eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." + eqawarn "You can drop the variable definition completely from ebuild," + eqawarn "because it is default behaviour." if [[ -n ${VIRTUALX_USE} ]]; then # so they like to specify the useflag - ewarn "QA: VIRTUALX_USE variable is deprecated." - ewarn "QA: Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" - ewarn "QA: to achieve the same behaviour." + eqawarn "VIRTUALX_USE variable is deprecated." + eqawarn "Please read eclass manpage to find out how to use VIRTUALX_REQUIRED" + eqawarn "to achieve the same behaviour." fi [[ -z ${VIRTUALX_USE} ]] && VIRTUALX_USE="test" @@ -97,9 +99,9 @@ virtualmake() { # backcompat for maketype if [[ -n ${maketype} ]]; then - ewarn "QA: ebuild is exporting \$maketype=${maketype}" - ewarn "QA: Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." - ewarn "QA: Setting VIRTUALX_COMMAND to \$maketype conveniently for now." + eqawarn "ebuild is exporting \$maketype=${maketype}" + eqawarn "Ebuild should be migrated to use VIRTUALX_COMMAND=${maketype} instead." + eqawarn "Setting VIRTUALX_COMMAND to \$maketype conveniently for now." VIRTUALX_COMMAND=${maketype} fi @@ -175,8 +177,8 @@ virtualmake() { Xmake() { debug-print-function ${FUNCNAME} "$@" - ewarn "QA: you should not execute make directly" - ewarn "QA: rather execute Xemake -j1 if you have issues with parallel make" + eqawarn "you should not execute make directly" + eqawarn "rather execute Xemake -j1 if you have issues with parallel make" VIRTUALX_COMMAND="emake -j1" virtualmake "$@" } -- 2.6.3
[gentoo-dev] [PATCH 4/8] virtualx.eclass: Ban deprecated functionality in EAPI > 5
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 5 + 1 file changed, 5 insertions(+) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 230897b..a5e5457 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -59,6 +59,8 @@ case ${VIRTUALX_REQUIRED} in RDEPEND="" ;; optional|tests) + [[ ${EAPI} == [2345] ]] \ + || die 'Values "optional" and "tests" are unsupported for VIRTUALX_REQUIRED' # deprecated section YAY. eqawarn "VIRTUALX_REQUIRED=optional and VIRTUALX_REQUIRED=tests are deprecated." eqawarn "You can drop the variable definition completely from ebuild," @@ -177,6 +179,9 @@ virtualmake() { Xmake() { debug-print-function ${FUNCNAME} "$@" + [[ ${EAPI} == [2345] ]] \ + || die "${FUNCNAME} is removed in EAPI > 5; use Xemake -j1 instead" + eqawarn "you should not execute make directly" eqawarn "rather execute Xemake -j1 if you have issues with parallel make" VIRTUALX_COMMAND="emake -j1" virtualmake "$@" -- 2.6.3
[gentoo-dev] [PATCH 5/8] virtualx.eclass: Whitespace cleanup
Signed-off-by: Justin Lecher <j...@gentoo.org> --- eclass/virtualx.eclass | 1 - 1 file changed, 1 deletion(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index a5e5457..1f90147 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -50,7 +50,6 @@ VIRTUALX_DEPEND="${VIRTUALX_DEPEND} # (within virtualmake function). : ${VIRTUALX_COMMAND:="emake"} - case ${VIRTUALX_REQUIRED} in manual) ;; -- 2.6.3
Re: [gentoo-dev] [PATCH 10/29] python-utils-r1.eclass: Make heredocs consistent
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 22/11/15 20:50, Micha? Górny wrote: > --- eclass/python-utils-r1.eclass | 10 +- 1 file changed, 5 > insertions(+), 5 deletions(-) > > diff --git a/eclass/python-utils-r1.eclass > b/eclass/python-utils-r1.eclass index 7617c3f..6fb1ec5 100644 --- > a/eclass/python-utils-r1.eclass +++ > b/eclass/python-utils-r1.eclass @@ -933,11 +933,11 @@ > python_wrapper_setup() { > > local x for x in "${nonsupp[@]}"; do -cat > >"${workdir}"/bin/${x} > <<__EOF__ || die -#!/bin/sh -echo "${x} is not supported by > ${EPYTHON}" >&2 -exit 127 -__EOF__ + cat > >"${workdir}"/bin/${x} > <<-_EOF_ || die + #!/bin/sh + > echo "${x} is not supported by > ${EPYTHON}" >&2 + exit 127 +_EOF_ Why not indenting this line? -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWUvCNXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiqWwQAJaI+wQ35CBxT7ZSxLMBtA3x TtafJinkacJBbSzxgXHnQ/RprAoRO6Utg2ijJh3rYxu8LCD6Al/iF23MtcdzhBWe oU6KXVzCQI5A+47EFDGifD+GHWkIDwcCepKF+4xKpUGSeN4sxLrENAXt4YysjFPo QN29+zx4IAsCj/EZmi5ViVCZGA2UdedCkbwbhXUJ5hYXNAS1XPQjFvVCKWp57Ayt Njj4sVgOJB7kWcZYV6URzv1TFPENSbEI3/H3RpVJAQCnzQLDux0Evy5dNlBG73RU OnX2mXdZYWibIYgLR6zCtZpiOKcmiIOBlx/PZSgT0ylrHsgzPt7+WY3AEZxtcr+X 9Hii2Qb4WfOXAaVIDSIwUgg44AVSKY5yz+IRmQ6Q7L7u4qmQUMs6JEIb4LJ2oCRH wbmA/D3exiVEGTzeKI3DQnupkpCeEdtY70R38DmI7Jv6vyLI8mvxw/muTaDh2wF7 7PB3S1HPYsfoje+7GO9g4Bq0xVwssn4XqIvRzwO82nbGHCLA8kPT4q0sevl5iUQY c+g8X4n34re/wj/uH0j1skkx49VNrZvd0HZ7JzT4XcGK6s673SK8pcJLlYzjInpF IO4PqBZkRkYPPhyfj8YjbtluquPtQExVBAAQOWF/LlZ9AzHhxkgoxv4lwxFK56/l NPR5/VPzuJOHWB5pcG2C =XqEp -END PGP SIGNATURE-
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 16/11/15 10:01, Alexis Ballier wrote: > On Fri, 13 Nov 2015 23:53:05 + (UTC) "Michał Górny" > <mgo...@gentoo.org> wrote: > >> commit: ad4c142684afb096e8fff2937ae5c5c3385dd22e Author: >> Michał Górny gentoo org> AuthorDate: Fri Nov >> 13 18:46:33 2015 + Commit: Michał Górny >> gentoo org> CommitDate: Fri Nov 13 23:52:53 2015 + >> URL: >> https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4c1426 >> >> autotools-{utils,multilib}.eclass: Ban for EAPI=6 >> >> Ban autotools-utils.eclass and dependant >> autotools-multilib.eclass for EAPI=6 to avoid them being >> accidentally enabled. The former eclass should be replaced with >> inline code, the latter with multilib-minimal.eclass. > > > Not that I particularly like those eclasses, but I seem to have > missed the deprecation warnings for these. I hope you're planning > in submitting patches "fixing" consumers... Probably the developers should fix their ebuilds when they bump to EAPI=6. While I haven't looked at the change exactly, Michał announced it as a EAPI >= 6 Ban. So no backwards breakages expected. Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWSZyJXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiHY4P/0TjhS4isDESbDHkSgcWhdgs aSexsiCJs1bCaTjGAH2Hn8cPaesV0CO96BMFWgjq/io/B+N1x+h5RbhbI/zXHXpK I9sziWWI68J7SvumVEtkoccM4bdWDKj+pdsqCnyJYp0qkTVZbUBNK0vpUYBhIQRt 4LMCEZvo9me1FmBtdv5RssqkLw2nqcb3sfsQ5uQ7icdIR1rRp9OTNdT3/LQAOQ3l nGDz/fZpHOlUhyMdCEtSzv51ZBvejFcuRrSea2jnqOdkcnDwOY8Fo9HH0iv1rVmd SZkAV4yZSz+0OveisjPhQSa1h/uquv49KLcLp6CfPA5228POy/RhFwGx4ZLRhbe3 tlFUApr4ozI4Danry5SlMu2YadJdf+zPu7e/FLwdIVzv7eqZa8ov8cOHyNICVKpr JZsFvk/7pyL0TB+zfo/MZCU5KY72HOcmi5yL7FpDyYg0m/0cn6bH+FHN/rUxpuLT inztt4MThZUb+Oubd40GRpD8xSmhgQYo90Us10tb/6xU5tGD7+ZtvENKvPQsMQgp Zh0tkzpp+jJpqlJ7lupa/f5EjWxhXefD5fkrtxjTAO9aIU6JoY6MWd3uqKndSwjA WrdxnX/lPkDSTqLqPYvPxLYebBuAyKojeIEGaF558ELcwUxNRJdK84CqRsNsLwHe vtEeQFPh0f3cl/+9EZju =TvwF -END PGP SIGNATURE-
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: eclass/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 16/11/15 10:14, Alexis Ballier wrote: > Probably those that want to ban it should fix the(ir) tree so that > developers have no pain in bumping to eapi6? Versioned APIs are made to have incompatible changes. What do you like to see? Someone dropping all usages of that eclass from all ebuilds which are using it so that the maintainer can bump without thinking? I agree with you later statement that the eclasses have been announced to be a great solution when using autotools based packages, and dropping it now means going back to the old. But the changes needed are just straight forward, drop the eclass and use the default functions of EAPI=6. Plus the autotools.eclass when you need to run autoreconf and friends. > While I agree we should move away from those eclasses, the "I > decided to throw the crap at other developers with eapi6 without > deprecation period" is a bit hard to grasp. Esp. when these > eclasses were advertised as the way to go not so long ago... > I don't really understand what deprecation you like to see? We cannot use EAPI=6 right now and when it starts to exist, nothing will be broken. So you have some to time to adopt your thinking until you write your first ebuild in EAPI=6. At which particular point do you seen problems coming up? What do you think will make maintainers struggle with that change? Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWSaIHXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiQqgQAJPqJhNCzec5w/wBNhMAI/AO gu086aIIwHoc1mRCPtkgrfY/UhT6unO3U+V+/MBnyRJB5tJc+6AgM//ovt8ctsyb Aylog8w77mT/v9GULq1PPPRIy0p+Eh3XvhxNWdFZgu4BAVde/4b3rQEklIPiwAiC FQy23LQEZh4wG8CldoR6ULBR0CUO8Ff6xNFVqXvgjhnH+I7BehRP47OE5SiiobCK /4bKb9UjKZqnrttagPlaf6DrzidJd4XgHPrhQSoTA6uLubB0uR7EdrwlgYlR3FES LWbT4kO9RG9GZo1y4mrNxGTugiF3OFwJX5UHJT55lwNPDHcUsNhl3Yyjb9Vc9f9W Ro/6x7gY5dchDARy1LU3419tRzPGvxeyKkc6Z21Ie374LQYuhhKQiPzjW6oSc+j2 MFDzjBphdqXuiSYeC608Q3KGoYruV2fSGhqQDdAsSADkBBXktBApOZpjyrYXv6W1 xwN/FYHE21lZHjCTUJQEz2+5fdZ0VxRtQPQKautkB8+rhfobrexafMVYt8hjB6fG JvCTOb5Yo8VpWs7i/Zls5jB87y6uYrSFGlbbCrMu6vO7m/KrhZZjQ9dpHpeQ78qj grhcoxi2xtvfa72j/eVxgDYHhXjoJLmJ/60dsUt75IwAcVhtwEg6OWVowXxAGmgD DNG/UIoC9yKzVxkAaEm/ =zJp2 -END PGP SIGNATURE-
Re: [gentoo-dev] [gentoo-dev-announce] Last rites:
On 12/11/15 08:22, Hans de Graaff wrote: > On Wed, 2015-11-11 at 11:28 +0100, Justin (jlec) wrote: >> # Justin Lecher <j...@gentoo.org> (28 Feb 2015) >> # Unfixed security problems >> # No upstream support anymore >> # CVE-2015-{0219,0220,0221,0222,5145} >> # #536586 >> # #554864 >> =dev-python/django-1.4* >> =dev-python/django-1.5* >> =dev-python/django-1.6* >> # Not supported by any django version upstream supports >> dev-python/south >> dev-python/Djblets >> dev-util/reviewboard > > Reviewboard upstream is now maintaining its own version of django 1.6 > for security fixes: https://www.reviewboard.org/news/2015/08/24/new-dja > ngo-1-6-11-1-security-releases/ > > Would we be able to keep reviewboard in the tree (with a bump to the > 2.5.x versions) with this? > > Hans > To me it doesn't makes sense to release an unofficial version of the framework instead of bumping reviewboard to support the new LTS version of it. Anyway, the only way I see is that reviewboard bundles that version of django. I strongly object adding that version of django under dev-python/django as this will suggest the user, that there is still support by upstream for 1.6. Justin signature.asc Description: OpenPGP digital signature
[gentoo-dev] Last rites: sci-chemistry/pymol-apbs-plugin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 # Justin Lecher <j...@gentoo.org> (12 Nov 2015) # deprecated version of the plugin. # sci-chemistry/pymol includes the newer version sci-chemistry/pymol-apbs-plugin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWRLrjXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiJMYP/AkrEAsNp/oPL1K7vg4EHcMF mUgsfnF9qIVjnbil6w72hzBV0dWaHMi2KUGx5srp9ExKZ5FdWjDcrlayEWpgDr5d w7uAcsls1YJtEUVEkJwiOxgFwhS+9qBc+mLt0BFNTRDov62S+tQN18+P752OIz2p lujnOecElJUdzfgIaq9B4ZRrhsgoua/gjqimuoGCzc+CdDgKIV6TcbWL7OZwHxsW sDGqd58U3l9YiJUqPwp4E5JyxV/pNS/4iIMNgco8cLdm/RZ0vTC9mZ5SVYehU5dM clFKYmhaPHz4iwgDBcwEjHDgedbsGR21xSR6xcoSyrpgO5OaRb5juWo1BxN6ED4Y 2WDc+7VPXblOJ4mje/lmRAzwFkfnKcU7vC4w9oGtn+lFk0nMBroL3eJ6Ef6Rc0zs ND/SWaucSazxKKhZ/PbJa1T/FbaL0XmhjI8JRYMFGah/gVz6XDUIpFpNmwhM25xB FpOw0miaTSUxhRBs0u8sVwDXAxKsxu6IuqNk7nFRnAozRr2F2tPGpRyWX6FpDBxZ FXE6mbHUlzFKKW6/cbRETTQeK0f7Dp0wdysz2+ss0PjcLknZKucOV9V/wspGH54V bNyxsqtgb3fnURu3xtcKsi3p6InJIR7XOqIS5gAgycSvlTFbzrm/yhVQ3NAeVhGD W5u4Za9vQiQdxCy88ThS =dfd/ -END PGP SIGNATURE-
[gentoo-dev] [gentoo-dev-announce] Last rites:
# Justin Lecher <j...@gentoo.org> (28 Feb 2015) # Unfixed security problems # No upstream support anymore # CVE-2015-{0219,0220,0221,0222,5145} # #536586 # #554864 =dev-python/django-1.4* =dev-python/django-1.5* =dev-python/django-1.6* # Not supported by any django version upstream supports dev-python/south dev-python/Djblets dev-util/reviewboard signature.asc Description: OpenPGP digital signature
[gentoo-dev] [gentoo-dev-announce] Last rites: virtual/python-imaging
# Justin Lecher <j...@gentoo.org> (10 Nov 2015) # Compatibility virtual for transition from # dev-python/imaging to dev-python/pillow # obsolete now #508266 virtual/python-imaging signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyfltk/, dev-python/pyfltk/files/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 08/11/15 11:43, Jeroen Roovers wrote: > On Sun, 8 Nov 2015 08:50:51 +0100 Michał Górny <mgo...@gentoo.org> > wrote: > >> you just removed the last version supporting python2.7. As a >> result, matplotlib and pygene can't be installed at all: > > pyfltk-1.3.3 works absolutely fine with python2.7. I wonder who > removed _that_. > I cannot see that it ever was supported. But thanks for reporting, I will look into that. Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWPzu7XxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilMUP/2cSXGiVqVxmflt31n4StC2v icOQ5uzmyJDxgvNKa90rGwNjGS5Y/xuKSTPb7aMF61GpuzCAyg4j5XQsDFIq2Low km5GBmfUBHid6veWqlhOXvQ933NTAgT8kk4Dv5rhCfUhwOhKSWS0e71PUohTxAcn QodDBnIdNlei4eqYuoZ27vmE0+fHONhQo+Pe8ihYSAvpMwsQUeGJkzrb2A6RWJxs gs6GpkZc0ekFusTHxyOB30I49b30YczCyWjRa8xUsRXFoeuYd0G3tGrUjmtQAkZw 83blEfPUzmKko1Z/V9DCZUDMaKaIqZGQs9QEBFiZEyMbfKTFecNHDRds1Iammeqe B6T2OugFCe6Hwxmafc5Pkue6MrYbsuzlrGJuVI5CS81rEgcjfgIj1c24mYlFhN3J xtEFXh7L+Fae4JKzvvyOuEMygid4juXDn2B2cqfJASEEi2u3Guc2Ff0GJbmdzj6D ubgtmHa8h8k4dj6kVpcXcLqAbC6iXMY1ymNcSbfH8FKx7fN+inB/tu3ILx9D6/Ht h358tKHHmJu5s9Xj87qxwuE/hE5LEzfLOHOCLAUOGOdblMxPOIyYwjOBvEdGYy6z js4NXuy6CjWPBxkzyWxMkBEpbQP4D/6Y3rQCJO8YNkisNxGDIIZj0HorahKT71jM F4/vkc99+GZvCh+xHqQ7 =wxYx -END PGP SIGNATURE-
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyfltk/, dev-python/pyfltk/files/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 08/11/15 08:50, Michał Górny wrote: > On Sun, 8 Nov 2015 06:57:38 + (UTC) "Jeroen Roovers" >wrote: > >> commit: b39f2acde24b95c4be5ed1e83c3a0d71fc58ab11 Author: >> Jeroen Roovers gentoo org> AuthorDate: Sun Nov 8 >> 06:53:39 2015 + Commit: Jeroen Roovers gentoo >> org> CommitDate: Sun Nov 8 06:53:39 2015 + URL: >> https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39f2acd >> >> dev-python/pyfltk: Old. >> >> Package-Manager: portage-2.2.24 >> >> dev-python/pyfltk/Manifest | 1 - >> .../files/pyfltk-1.3.0-format-security.patch | 74 >> -- >> .../files/pyfltk-1.3.0-linux-3.x-detection.patch | 15 - >> dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild | 50 >> --- 4 files changed, 140 deletions(-) > > And you just removed the last version supporting python2.7. As a > result, matplotlib and pygene can't be installed at all: > > https://qa-reports.gentoo.org/output/gentoo-ci/cb08652/1.html#l184 > https://qa-reports.gentoo.org/output/gentoo-ci/cb08652/1.html#l424 > > There are probably even more silent breakages (which will cause > Portage to randomly kill python2.7 in more and more packages via > package.use). > > Please *BE MORE CAREFUL* when removing stuff. Reverted now. > I just fixed it. -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWPwKEXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiWg0P/1aDLLbZlraf/jpfve4Hgg7Y BlB3VKmlzct4/gxgoyMd6l2qQE1tgViSzydpzEXV6n5l8Lc0xtDTdAUGy3pB9hLT lbWKMQQLfFKs4dW6JaGCUUrjdSv3sGvqNtYY+T9v1yGgEfJJvAjkkl+Le0mAJJ/u BELZSzrW13NRZdF2UEEJCJSTqJwmGyhuAlHHXSEyalSQmmPd+uZp+0xhgICoATG6 k/0h6uJ1//97gx9sMCDKyDAJerkyxNV4U7xFgjHMYEL4WoYhE1LCSfIOPHVR/k/i zJc/hTCYxmncAKsbglVNw3nQmBMsBXAnwYOiqQLkMykGA/aBeFYwRtE65uwzudHw fQUspahRJo1vBln/LjivLoXBlVlE6/62btDsmAFHFar/Q3EHif2UbpUzfoFuKCL5 Ey/yWmXJ81/XO9xafzM4xCrgfa7Uh9UYAf+ZRfhIKmfIFgzZFTCmxcL5/Z9KBOMU 1yFyiuSD5kSW6GtY6oIsia0NgXTBPBf8tKor9XRZaUDlm2k+WLcD4+jAlatYY501 U0gdlAuMCGR4se5/PszsClOvfluTe5K21Bd9TJVelmo/OwQFVwE8XJ7mvCuZdNBZ K1MoNricD7pUYrStrZ3QaD0oV7W5QfB+9OQcmjgEp7SrXd/VtBfxghlxJZ9EQXNN uk68bXFbHULaDwhfzUjL =5nR4 -END PGP SIGNATURE-
Re: [gentoo-dev] [PATCH v1] enable gccgo for all platform
On 02/11/15 23:38, William Hubbs wrote: > On Mon, Nov 02, 2015 at 09:12:30PM +0100, Justin Lecher (jlec) wrote: >> -BEGIN PGP SIGNED MESSAGE- >> Hash: SHA512 >> >> How about a virtual here? > > I don't see that working out to well because the compilers are > completely different from each other. As I said, the reference > implementation of the go language is dev-lang/go and the other one, that > is part of gcc, as I understand it, is not quite as fully developed as > dev-lang/go. > > Thanks, > > William > Hi William, but instead of adding DEPEND="||·( >=dev-lang/go-1.4 >=sys-devel/gcc-5.1.0:=[go] to ebuilds, you could create a virtual/go with that dependency and make all packages depend on that instead of this || (). Maybe in future clang gets also support for go, then you would need to edit again all ebuilds. Having a virtual for that case is much simpler. This is how we are doing it for fortran. Another problem which you have with these split deps is the following. Imagine the user has gcc-5[go] installed, which fullfills the dependency requirement. But she selected gcc-4.9 as the active compiler, which doesn't have go support. The build will fail. For fortran we test in pkg_setup if we have a working fortran compiler present. You would need to do the same for go compiler. Justin signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] [PATCH v1] enable gccgo for all platform
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 How about a virtual here? -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWN8OuXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmipKsQALPnDU6VwMdevmupO78LRk0d F5Nu3U6bjEq/roAZYHBEAztFLLG+0fywvvObuhgEloCRpbfhf07QJUdX2LB/n2ep iTGYkEfYYI565SkWF7CXnpE70g88KRPbFDYGgky1jfhmlQrJM5HpnZa0cy+cGGM/ peAnDjCha0pdvJtRWUGdonR+A1dsLso8z+hQmCVxmWqQkZT0rsxAzAVXlpg/3QFE YevCio+ijwMwQV2wzD0gU4EtNKdaRXK1XKgI18UsOBwTYhGOlW5VWtjiixXZVGaC L2QbZiNggCRlv4JuQsW8dEb3p29lQJmtRClMjq7AMjbD6Mzt2aVfbDqkhYLq3gS7 +bGepyX5dG3FVMFAnpfOyH/0+xAzV2L418/mGLJupfJfoF2yXNT76sGFKYsCrFgX iA/dlBsfKhGNoYc4V7JH/ONuUHaMzgLq20opHeOkiPVB2Esv+2QWXQkppwVXQhBq 4w/Nge8HG7rEJ/dzg0ePLwQ6zCq7TafuwV8nTTE+gEfuitleQusQdkjEAHAYFRWH W+L1t+W/W5jtAy6rPv93cWClAsuBTyEPHJpoaxa57cRUtwU1AxRvawKj2XwxrBAq 0h6PYd+qQh46kNS9tdGCEg8PXOdU2QedFPk+4iKrbccGJ6tnaUCt89oFfcBjHn27 NXQQXQoiLv8WA1n3twLg =t7Bd -END PGP SIGNATURE-
[gentoo-dev] [gentoo-dev-announce] Last rites: dev-python/scientificpython
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 # Justin Lecher <j...@gentoo.org> (01 Nov 2015) # Obsolete package # Incompatible to recent numpy version # No upstream activity dev-python/scientificpython -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWNiehXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmivfUP/0qFS2mNj3TKJyb127cpGRn1 6A1BWrEnuBkpu3baSB11T/9aL8NgO0HRzO9rhjJ+pbDXBUgExqphefE9vy7zy5GP QuyG7+dan+UNac4WKDDvAuFHpx4Jx5MpnW/tPMAFX7dr5/tTsQitYz8azVeOMVRM t2iqPkUcIYAy6hhQdU2KgT/FYQB9DtTm+MDWeEM7XwIQMcBUDvg8rxv0NihEAoll 5jmXKUJd+3YRGYBJ/INtoDCt88Qg/VUbxuvmDiJSWwLB7IKLsfYlES7hSkLak6bl GqOWWadxrSUwz43yH5hlsjxqLDZBBnLlCh29OTsz2ZZzA+Sl0o8pcAzs9YBv34VA n6ZC5fuvAONu4byQSf1IUK4imqDcg3escTqCijUEuTXJSZlkTD0sQ3fbR5vwRvmj 2ndtsEt+DxE+wXQ6e16nYjoQc9D0+zLjN7xch0nX7uEbUjpFR1llLa7H7KlHxLsP DYLBLo+eK5s8K8m/d2IRAJFT1e73jryK8CqJDAlslQthX1pcwpwQF/vZqsT0rfOK JvMiTqq9QMZVFBq6ILm8A1MZ8kuXauyrfPZdwrKoLhaVnAcSnqHn9I7x2UqZ67vg u7gGYEWhGw7Zj5snzIfh0wZkhnzJp7zPxJlgHXmVxvGPu5ik2Os/Sp9DS6gAYA4/ B2IKpZeam4oOdLkjXpIK =4DLE -END PGP SIGNATURE-
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-python/intelhex/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 21/10/15 19:32, Justin Lecher (jlec) wrote: > On 21/10/15 19:21, Ciaran McCreesh wrote: >> On Wed, 21 Oct 2015 01:25:53 +0200 hasufell >> <hasuf...@gentoo.org> wrote: >>> Also, my package manager chokes on it. Repoman not, so that >>> looks like a bug. > >> s/Repoman/Portage/ > >> Portage will quite happily let you specify KEYWORDS=":)". > > > Lot's of ebuilds have "-*", which is the negation of what Mike set. > So why is that working but "*" not? > > Justin > Reading PMS helps ;) -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWJ8xoXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi5PsP/1Iqaux1VzlibKC7WRgmqayS p2yuyPka8qH+q1XGQidMNaXLsGFhaK2+JUkZo8BqbjlsxhNOIPpme55qCUi1MQD1 nvPJuDZu3yvA96EZsNRpeDflqmY/hDs3SpZjP1Tk+25Oy5kzBi5keH2yjT7Vpsxx ynR0q8zFChnB9URg9ahE5NgXmz36rCX2aK4mq7eNWbD6kqgz16bvXkzoHYnYLsl1 mSrYdMNy4g6LkEpgros9VVG8Pft6mxvsN0/X2R5O8RzsPYaQBT6lTGjlp2R1uHCG FOc9JV1KR1E2TklbstN4szQYAWPdngyqCpl67XgxZ2q6LXmnjg/DlXaKokFXezvq K/iz2drqZVXmWN1V6S5bHUhtrgqCG2Ja7ri+t84uaZK/MRZnhCs4l1RGE5A6uIAX np0lmgeZ/lgmvSPlRAWA6cqHzofBTvBdjcOoDCkktvz0i8/k1CnDrxmlReRX7abv X4VAuNPl0L1BJixuFW9LN6YVIb5uLpOpamgekpFRZADsB0eWZMWYEaMMkB0phngl sN6xUkY0q7PP/RKL1nQZd9KMLr8k1WOgz3byp49cmagKkfDJSghm/cDctVxJU3lN N0RvnTaD11j4DAs+ZhbVL173pz5hfeT90sJ72fc2HkgISRhVDxLGpFeEbawEkuNs DndQxeE8y5Er8Rv60eAF =f0Li -END PGP SIGNATURE-
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: dev-python/intelhex/
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 21/10/15 19:21, Ciaran McCreesh wrote: > On Wed, 21 Oct 2015 01:25:53 +0200 hasufell <hasuf...@gentoo.org> > wrote: >> Also, my package manager chokes on it. Repoman not, so that >> looks like a bug. > > s/Repoman/Portage/ > > Portage will quite happily let you specify KEYWORDS=":)". > Lot's of ebuilds have "-*", which is the negation of what Mike set. So why is that working but "*" not? Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWJ8xAXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiAWMP/3BafTzLvjKl3ovDQF9RY74R feZ73xa1UX6BpPaBzGqPG8p+5nlN+1aKrC0AkF/rfT1l46/GVGj9eQrCyMeMVUpb lZG6XU40rozDeiYg1Gyg8TXIO1tARJEbs1dkYsAcKhZcNChlc2/m16fk37SkfBQk wAL1qNCEJSmLe3+cIgTi46u+zoxaroYUKAlhiQp3PHeTBG2DXj+P5UN7IvwhHwHf p23CJQVNZHnGC+SQ0Cn3rCdsPIIQx+V2iM/veJfrhIaofUEfSTzwZU2l6NhaOPNt NUUH932oTOm8j6gqfJRBcdRoY9aG5wTWe2/3tcyIYwY9Z+2vltsVEWCZjKdDRErU 1TfGfo3KeP7oyTJ/cH70ea6tcuoeykD6mdUFIcq34qQ5dDzQxdbltP4jPjxym1vS o588dfVHQeGs7yGl1lCAWtl8BH10BvNE0zdI8wP2X/buP6v2r1pbmzQmDuQRBNlI vko/CSw1bHO1dj/L+wFWT+sschb/Gc9oBwknd7UGmdAeLlRxs1OD7eO9VbRL7AQU Fp9xhae+pLAw1hd2ds/YCG5dPq4TLW4wTXQzTrwWPK3xajab4eea+/xER+V9EMx9 HRSumA0mdN8DRNg0N4yLm2iMYjV/zv4XhmTZuNxw3JBM1xzw2ovCt2EGxbfdWw// x3wSoO287X/GAcVaGqv3 =OJI7 -END PGP SIGNATURE-
Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: /
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 10/10/15 13:33, Andreas K. Huettel wrote: > >> You should (almost) never commit reverse-merges of >> git.gentoo.org master[0]. > >> Instead, you have to use git pull --rebase=preserve origin >> master > >> in case you get "push conflicts" [1] > > > Which I tried several times, but git steadfast refused to sign the > commit properly. Maybe a new bug somewhere? > > There was/is a bug when you explicitly set user.singingkey. But that is fixed in 2.6.1-r2 Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWGPgcXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+QYP/3l6pH0GJrSk1bbhVS5bKOEY m6ConS8Z3tqGAsOdT72Ia5FyAla2VewQ32eANWyx8/MRRGOl9Nrv9LOP1s0Zskaa nGK9PPRX5n+xTLICyaV7Mmq2awhfD7Ao1n1pxu4csCtSpTWivWlW/E9tLj6+oluu KLT4NPj9WOULLEveZzaqRuKfI9uD2JsJw+XGr3TfI5ZDqirvOnYFbwEJibN34eER OS3U8PxiUqxAFoTsf1WovFJbqOMJC3pkz35zfS/FLHPa7QRl0ngYi/tglOJR77MR XevOliNkZ7ukYTft+ODywBS6PF6y9xDUsO1RrtBF2KdMsmvXoprTzFTAOPjAtIhC ipAOPftK23S5vwWQCTnYPJLmaL/15wCfHJ8Bdbw6Zcm/0XLs1HvXYlQuZtbTiLe5 l45Cfh8uGNNuLMeNyw6baMhl6qSVkOIA7FlL58TwNeIrYIXqBYEd11NLia5ZIfba iTpiXxt+6flRxnjiMjZPtuTcXe6WhRTk9qHblmashDYKL03NclYiPIXwkOFEA8C+ +qyXY3X3OmOwvmx4CKJbP6x1AL6c1ZT91ewyL1ZHEV2U4s85z6yfDOhgknbg6A08 nPDCkp+LhDknvZjgKLaSHdGW2nkeyhh+25HRhLm6EgXU3HsRymAY3eiiv6/d/5wd cV0Zur6JKyhkGRLjqVF7 =o+qG -END PGP SIGNATURE-
Re: [gentoo-dev] tcltk herd empty
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 30/09/15 15:02, Justin (jlec) wrote: > Hi, > > is no active maintainer for tcltk in Gentoo anymore. > > Please stand up or try to remove tcltk support from your packages. > > Justin > Hi, so it seems there is some interest. Following things are to be done: 1. Stable tcl/tk-8.6 There have been some API changes, so packages exhibit needed to be adopted. https://bugs.gentoo.org/show_bug.cgi?id=tcltk-8.6 But there are only 5 bugs left. 2. General package maintenance tcltk is maintaining quite some packages which have open bugs from time to time. Nothing serious (except for tkimg, which is bundling tiff, jpeg, png ...) https://bugs.gentoo.org/buglist.cgi?bug_status=UNCONFIRMED_status=CO NFIRMED_status=IN_PROGRESS=tcltk%40gentoo.org_t o1=1=substring_id=2929948_format=advanced on=--- I joined the herd because lot's of science packages are depending on tcl/tk, but I need to cut down a little. So hopefully we will find someone else. In case there are question, feel free to contact me. Justin -BEGIN PGP SIGNATURE- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWEOAGXxSAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiiuEQAJf95MtwwwLCX2/84FkA7xWF 2NNdxdBrakK8Hn9UX4ifu+qyFfM4YZEVucKWktlMHjtTt9Ss9UEO/3rkMGz6T1Jg 355WWbVkkbK9n6mMrz3bVL/Iu/qjbTdWvAJygDAIoLugOa3GQZGoP2X2lyHCvVVI 92D8QtasSSn8fGP/IpzA3hlLCb0iOQgegla0UAtmFS0K70+HOne3476ZMKIdHgCn 8Hk0VPb6QVwykOQUg0qZaOzD4koqc7YlimmVhwIqMswP5F7Ilppt2c442fO66LZb XLfR5mXggmzz3mTumvQj8ezNNstvjO7R691D13xAve1L9O4raK7INJadBRGjOoTE 0s09JQMtUsJX89FQsYCyJ8eZmhJTHSA9Ynb84LjmPc5w85WeZHLqOnVNyyV6mqXU L0p8U4+POxAUX0iMz72sqAfAnnbN5UDvG2oAMqNz0Oz8cVlrys/zxHKI+g6QKTqX 14sabHJLCpyRI6pqLmqrBEhg57BRjGme3xX6EfA5djQqh6r33mHQ0MY8Esmq7kAQ lflhErXcOHEEUKgDjrsTbsdATB5f5C36jKBK7gdKiz5JSZnIrzIyKmrNvYi6IOtF ykzYXhUEiMTtCB6PtRKUdMacr/60aE0rWdTk2zGyfjEmlU7dsB73fphyhcSZNWgl qvkS5rFjvuqviBy+Vpak =hHni -END PGP SIGNATURE-