From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A0F7A138334 for ; Thu, 26 Jul 2018 19:23:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7FEBE08F2; Thu, 26 Jul 2018 19:23:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FFB1E08D9 for ; Thu, 26 Jul 2018 19:23:22 +0000 (UTC) Received: from localhost (unknown [70.35.214.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: vdupras) by smtp.gentoo.org (Postfix) with ESMTPSA id E699E335CC0 for ; Thu, 26 Jul 2018 19:23:17 +0000 (UTC) Date: Thu, 26 Jul 2018 15:23:11 -0400 From: Virgil Dupras To: gentoo-dev@lists.gentoo.org Subject: [gentoo-dev] [PATCH] virtualx.eclass: support EAPI 7 Message-Id: <20180726152311.e8b7093d79f782e665404ac0@gentoo.org> X-Mailer: Sylpheed 3.6.0 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Thu__26_Jul_2018_15_23_11_-0400_6zMWWvlGzN/BQbb7" X-Archives-Salt: 195e9f13-8f0f-4996-8a19-70721923c99c X-Archives-Hash: bfee8e82195708b8313bd8a3c52ad38d --Signature=_Thu__26_Jul_2018_15_23_11_-0400_6zMWWvlGzN/BQbb7 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable The only adjustment made here is setting BDEPEND instead of DEPEND when under EAPI 7. (first time trying this, guidance/reviews appreciated, took mgorny's git-r3 patch as a model) --- eclass/virtualx.eclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 38e629eef4f..cd0447a518c 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -14,7 +14,7 @@ case "${EAPI:-0}" in 0|1|2|3) die "virtualx.eclass: EAPI ${EAPI} is too old." ;; - 4|5|6) + 4|5|6|7) ;; *) die "virtualx.eclass: EAPI ${EAPI} is not supported yet." @@ -53,7 +53,11 @@ case ${VIRTUALX_REQUIRED} in manual) ;; always) - DEPEND=3D"${VIRTUALX_DEPEND}" + if [[ ${EAPI:-0} !=3D [0123456] ]]; then + BDEPEND=3D"${VIRTUALX_DEPEND}" + else + DEPEND=3D"${VIRTUALX_DEPEND}" + fi RDEPEND=3D"" ;; optional|tests) @@ -77,7 +81,11 @@ case ${VIRTUALX_REQUIRED} in IUSE=3D"${VIRTUALX_USE}" ;; *) - DEPEND=3D"${VIRTUALX_REQUIRED}? ( ${VIRTUALX_DEPEND} )" + if [[ ${EAPI:-0} !=3D [0123456] ]]; then + BDEPEND=3D"${VIRTUALX_REQUIRED}? ( $ {VIRTUALX_DEPEND} )" + else + DEPEND=3D"${VIRTUALX_REQUIRED}? ( $ {VIRTUALX_DEPEND} )" + fi RDEPEND=3D"" IUSE=3D"${VIRTUALX_REQUIRED}" ;; --=20 2.16.4 --Signature=_Thu__26_Jul_2018_15_23_11_-0400_6zMWWvlGzN/BQbb7 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEzxAa2B+saKTW8nfCbgMDJWya24wFAltaH6AACgkQbgMDJWya 24w+Vwf/Q9Z8i7gUEQ88PzTR+eT2/kxy42ZT89hlFAZlZID6rYrYuECgtTvxd0LR EnOSLbzcQMTDIwz4fP8x2R8Pu0Csj9e1Uqay8vCmcfwsfW4e+h39UAiultrjmMY8 9qYfSSAhFIAOohKGFpA3pT5MDMyRGn+GIqrou7qedTjOKoYvo68y6JUwl+LjQ8K5 kvsRR6AQKfzkYNVeL+bQccRTI15F+IkopvbLwHGmwgNuUznzbMGDCQUGfVxIJV8u ZLHe6F+qbACrdsCKuMMCecnv+DkzPdnmZ73tFwU/HtxkcXe+pBZNS6yZSGiBxqlb j87hw9XUIHynBR8TQ4gPy8P5JpqS+w== =l4DD -----END PGP SIGNATURE----- --Signature=_Thu__26_Jul_2018_15_23_11_-0400_6zMWWvlGzN/BQbb7--