-----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 iQJ8BAEBCgBmBQJWWulWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w 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-----