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 DA520138334 for ; Fri, 24 Aug 2018 17:39:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 875BAE096C; Fri, 24 Aug 2018 17:39:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 19CD4E0955 for ; Fri, 24 Aug 2018 17:39:04 +0000 (UTC) Received: from [192.168.2.51] (62.65.228.137.cable.starman.ee [62.65.228.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: leio) by smtp.gentoo.org (Postfix) with ESMTPSA id C3B66335C32 for ; Fri, 24 Aug 2018 17:39:01 +0000 (UTC) Message-ID: <1535132334.6451.2.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] eclass: db-use - Update to eapi7-ver From: Mart Raudsepp To: gentoo-dev@lists.gentoo.org Date: Fri, 24 Aug 2018 20:38:54 +0300 In-Reply-To: <20180824172859.31231-1-grknight@gentoo.org> References: <20180824172859.31231-1-grknight@gentoo.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-M2Lwk7booqDFiHhxYXag" X-Mailer: Evolution 3.24.6 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 X-Archives-Salt: d8f45eb3-4ffe-4dab-9237-4335d5275c68 X-Archives-Hash: 19ddccecb5629dbee061a92245db2a62 --=-M2Lwk7booqDFiHhxYXag Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable =C3=9Chel kenal p=C3=A4eval, R, 24.08.2018 kell 13:28, kirjutas Brian Evans= : > This is a very simple eclass which only calls these functions from > eclasses: > ver_cut (EAPI 0-6) > get_libdir (EAPI 0-5) > get_libname (ALL EAPI) >=20 > I see no little reason to place die statements for unknown EAPIs. > Just changing the eclasses to better suit the latest EAPI should be > OK. I'm unsure about not dying on unknown EAPI, but the rest looks good, as at least in main tree everything inheriting db-use and using versionator functions themselves, do properly inherit from versionator themselves, instead of relying on it via db-use.eclass indirectly. Not dying on unknown EAPI is not a change in status quo, so I don't mind it here and for future EAPI-8 I hope we look through the non- limited eclasses before its introduction. Mart > Signed-off-by: Brian Evans > --- > eclass/db-use.eclass | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) >=20 > diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass > index 35f11df034a..83ae94799ca 100644 > --- a/eclass/db-use.eclass > +++ b/eclass/db-use.eclass > @@ -1,10 +1,14 @@ > -# Copyright 1999-2014 Gentoo Foundation > +# Copyright 1999-2018 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > # This is a common location for functions that aid the use of sys- > libs/db > # > # Bugs: maintainer-needed@gentoo.org > =20 > -inherit versionator multilib > +# multilib is used for get_libname in all EAPI > +case "${EAPI:-0}" in > + 0|1|2|3|4|5|6) inherit eapi7-ver multilib ;; > + *) inherit multilib ;; > +esac > =20 > #Convert a version to a db slot > db_ver_to_slot() { > @@ -38,7 +42,7 @@ db_findver() { > fi > =20 > PKG=3D"$(best_version $1)" > - VER=3D"$(get_version_component_range 1-2 "${PKG/*db-/}")" > + VER=3D"$(ver_cut 1-2 "${PKG/*db-/}")" > if [ -d "${EPREFIX}"/usr/include/db$(db_ver_to_slot "$VER") > ]; then > #einfo "Found db version ${VER}" >&2 > echo -n "$VER" --=-M2Lwk7booqDFiHhxYXag Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQKTBAABCgB9FiEEUdZn9pOq0mlNjRvdEKbJ+k9JlgYFAluAQq5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDUx RDY2N0Y2OTNBQUQyNjk0RDhEMUJERDEwQTZDOUZBNEY0OTk2MDYACgkQEKbJ+k9J lgZxWQ//QPqRLsYtpaiiebKzFM8dmir6Zc59X38pBnaXH4CvoOQ3EiiGBzvZt2fU wVC8UKCMniYiFpdXQYrd+mOFdbIjwLDgAC5bn9pfBGBv/DT2uXwx5ryBOSkW5tKC AcXjLJkFg2kfB+JhoOGXMBr0kqPKzFdON7DowykQ1YvK2ikMOCh++T5WhctwYzhh DWA8Z2SVdjQkc325hHI1qkiaQ0VXwv0tnmCnQ29XeSqL6Hv9GE7Smeze6iDC0Mfg rfDl14G1BoGiduFGj3yRigHuIBVh97J4zgWtkji01ItSuyVKlc30+N5ZZLKPP8E+ SagQhMCz6ZR7KOl0lo4I2pEaKzD/2cB8WNtK9vkWb8ALI54X+R0+6KbxzbmWun7y wffbTfxgBalpGSW2T1ZHWy5wFZ28KzCDoDIQDnC1NThSxlfaTBd5Wzbmh+q9Vl2y c4Kg1nTF10/ktOa+W241rGKYa2HIytPKu/BE0LgqCt0T6Ia9g1gyCOZPI+1MLbDC KBnJHt9N/gQ/Sy5ogt5eTS+4EgE8WbngTMEd8fer04lex6hl8+jy3pQZnzimpvb2 KkaTOH5/UotT2AgsecU68YtL+OQyM1EgDJhTrdYkDDLQ7IU6uFsX98vAZXM9arl/ e0SUHQ0iusMQi3yCB/on/HBoaezohDuWEFwkb9/huJnyXXbbJjU= =d8K0 -----END PGP SIGNATURE----- --=-M2Lwk7booqDFiHhxYXag--