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 1EACD1581FB for ; Tue, 27 Aug 2024 15:26:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1502E2BF3; Tue, 27 Aug 2024 15:16:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A5913E2BEF for ; Tue, 27 Aug 2024 15:16:55 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 42/50] vdr-plugin-2.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:15:27 +0200 Message-ID: <20240827151553.210835-42-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-1-soap@gentoo.org> 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-Transfer-Encoding: 8bit X-Archives-Salt: 5c788e35-3b78-42d4-b369-a9ec242f9607 X-Archives-Hash: c9938c0cd82a0c6080740152862f189c Signed-off-by: David Seifert --- eclass/vdr-plugin-2.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index dc70ca7c5761..f0cf66b51b7a 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -112,14 +112,14 @@ vdr_create_plugindb_file() { # EBUILD=${CATEGORY}/${PN} # EBUILD_V=${PVR} # EOT -# obsolet? fix me later... +# obsolete? fix me later... { echo "VDRPLUGIN_DB=1" echo "CREATOR=ECLASS" echo "EBUILD=${CATEGORY}/${PN}" echo "EBUILD_V=${PVR}" echo "PLUGINS=\"$@\"" - } > "${D%/}/${DB_FILE}" + } > "${D}/${DB_FILE}" || die } # @FUNCTION: vdr_create_header_checksum_file @@ -423,7 +423,7 @@ vdr-plugin-2_pkg_setup() { if [[ -n "${VDR_LOCAL_PATCHES_DIR}" ]]; then eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!" eerror "Please move all your patches into" - eerror "${EROOT%/}/etc/portage/patches/${CATEGORY}/${P}" + eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}" eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable." die fi @@ -564,7 +564,7 @@ vdr-plugin-2_src_install() { emake install \ ${BUILD_PARAMS} \ TMPDIR="${T}" \ - DESTDIR="${D%/}" \ + DESTDIR="${D}" \ || die "emake install (makefile target) failed" else einfo "Notice: Plugin use still the old Makefile handling" @@ -579,12 +579,12 @@ vdr-plugin-2_src_install() { local linguas for linguas in ${LINGUAS[*]}; do insinto "${LOCDIR}" - cp -r --parents ${linguas}* "${D%/}"/${LOCDIR} \ + cp -r --parents ${linguas}* "${D}"/${LOCDIR} \ || die "could not copy linguas files" done fi - cd "${D%/}/usr/$(get_libdir)/vdr/plugins" \ + cd "${D}/usr/$(get_libdir)/vdr/plugins" \ || die "could not change to \$D/usr/libdir/vdr/plugins" # create list of all created plugin libs -- 2.46.0