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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E0CF15817D for ; Sat, 8 Jun 2024 16:17:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADB9CE2AF8; Sat, 8 Jun 2024 16:17:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60B83E2ADF for ; Sat, 8 Jun 2024 16:17:31 +0000 (UTC) From: Ulrich Mueller To: gentoo-dev@lists.gentoo.org Cc: =?utf-8?B?TWljaGHFgiBHw7Nybnk=?= Subject: Re: [gentoo-dev] Last rites: ltprune.eclass In-Reply-To: (Ulrich Mueller's message of "Sat, 08 Jun 2024 18:11:25 +0200") References: <3fb256412dd518ad8224a6c2d36a4bb792ad44c7.camel@gentoo.org> Date: Sat, 08 Jun 2024 18:17:24 +0200 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) 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 X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Archives-Salt: f58604d5-1374-49a5-b65b-1755421b0fe9 X-Archives-Hash: 06c151f48ff6d2e6967eedf941eed802 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable >>>>> On Sat, 08 Jun 2024, Ulrich Mueller wrote: > gnome2.eclass still inherits ltprune, shouldn't this be updated first? > That is, drop EAPI 6 support from gnome2.eclass? I.e. like this? From=20cb1cfe6e9fae160f5934ef490386fd6799123793 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Ulrich=3D20M=3DC3=3DBCller?=3D Date: Sat, 8 Jun 2024 18:15:31 +0200 Subject: [PATCH] gnome2.eclass: Drop support for EAPI 6 MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich M=C3=BCller =2D-- eclass/gnome2.eclass | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 66de2df97f9f..84f3aabf8ea7 100644 =2D-- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -4,7 +4,7 @@ # @ECLASS: gnome2.eclass # @MAINTAINER: # gnome@gentoo.org =2D# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @PROVIDES: gnome2-utils # @BLURB: Provides phases for Gnome/Gtk+ based packages. # @DESCRIPTION: @@ -12,7 +12,7 @@ # GNOME framework. For additional functions, see gnome2-utils.eclass. =20 case ${EAPI} in =2D 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac =20 @@ -26,7 +26,6 @@ _GNOME2_ECLASS=3D1 GNOME2_EAUTORECONF=3D${GNOME2_EAUTORECONF:-""} =20 [[ ${GNOME2_EAUTORECONF} =3D=3D yes ]] && inherit autotools =2D[[ ${EAPI} =3D=3D 6 ]] && inherit ltprune =20 inherit libtool gnome.org gnome2-utils xdg =20 @@ -43,11 +42,9 @@ ELTCONF=3D${ELTCONF:-""} =20 # @ECLASS_VARIABLE: GNOME2_LA_PUNT # @DESCRIPTION: =2D# In EAPI 6, it relies on prune_libtool_files (from ltprune.eclass) for =2D# this. Later EAPIs use find ... -delete. Available values for GNOME2_LA= _PUNT: +# Use find ... -delete. Available values for GNOME2_LA_PUNT: # - "no": will not clean any .la files =2D# - "yes": will run prune_libtool_files --modules =2D# - If it is not set, it will run prune_libtool_files +# - otherwise, will clean .la files GNOME2_LA_PUNT=3D${GNOME2_LA_PUNT:-""} =20 # @FUNCTION: gnome2_src_prepare @@ -170,16 +167,8 @@ gnome2_src_install() { rm -rf "${ED}/usr/share/applications/mimeinfo.cache" || die =20 # Delete all .la files =2D if has ${EAPI} 6; then =2D case "${GNOME2_LA_PUNT}" in =2D yes) prune_libtool_files --modules;; =2D no) ;; =2D *) prune_libtool_files;; =2D esac =2D else =2D if [[ ${GNOME2_LA_PUNT} !=3D 'no' ]]; then =2D find "${ED}" -name '*.la' -delete || die =2D fi + if [[ ${GNOME2_LA_PUNT} !=3D 'no' ]]; then + find "${ED}" -type f -name '*.la' -delete || die fi } =20 =2D-=20 2.45.2 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCAAtFiEEtDnZ1O9xIP68rzDbUYgzUIhBXi4FAmZkhBQPHHVsbUBnZW50 b28ub3JnAAoJEFGIM1CIQV4uV5AIAKj9d+qtRkAdtJLisPK2ylWMpw/f15CkiuMz D7Q6txG9DwLvPmdOvjtr9s2IviRwaGa+MeM6xj2CK3qR+YpigtI2j7X5QMbqBBsp kcoLFODmK2EdCutZazuIUxSSN5X2t7M2amLVK6+14QzYy5XVJb7TJZg7Rfwjz8B8 VKQVyjukTMr/RfTbSpGvXNSnOS5FR0hi6xFgJKzJBQtcNi0UmX+FA4jTQhnb6u6E 13v2yLrI7tXA0YFRQHohVK/sU6OgPBhRk2FaRAThHirDxNrQhuRKRyFq1EvssOyy nxieMkFNnLRGp9uQyFm2xF4RXC6kLlAaq3mGY+P17Pc5amGHZIM= =aQZI -----END PGP SIGNATURE----- --=-=-=--