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 A51E415807A for ; Tue, 8 Oct 2024 15:32:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3C30E29F4; Tue, 8 Oct 2024 15:32:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 BB368E29F3 for ; Tue, 8 Oct 2024 15:32:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id CD70A3431C2 for ; Tue, 8 Oct 2024 15:32:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C466726E4 for ; Tue, 8 Oct 2024 15:32:05 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1728401502.cce64b79655fac9dbcf4111c89533fb13832fb23.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/vdr-plugin-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: cce64b79655fac9dbcf4111c89533fb13832fb23 X-VCS-Branch: master Date: Tue, 8 Oct 2024 15:32:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5e40c163-9194-49df-af69-e979cf581d3f X-Archives-Hash: a9c5c7195c03b95004923bda71728622 commit: cce64b79655fac9dbcf4111c89533fb13832fb23 Author: David Seifert gentoo org> AuthorDate: Tue Oct 8 15:31:42 2024 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Oct 8 15:31:42 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce64b79 vdr-plugin-2.eclass: drop support for EAPI 6 Signed-off-by: David Seifert gentoo.org> eclass/vdr-plugin-2.eclass | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index dc70ca7c5761..a00426fdad39 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -60,14 +60,14 @@ # PO_SUBDIR="bla foo/bla" # @CODE +if [[ -z ${_VDR_PLUGIN_2_ECLASS} ]]; then +_VDR_PLUGIN_2_ECLASS=1 + case ${EAPI} in 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ -z ${_VDR_PLUGIN_2_ECLASS} ]]; then -_VDR_PLUGIN_2_ECLASS=1 - inherit flag-o-matic strip-linguas toolchain-funcs unpacker # Name of the plugin stripped from all vdrplugin-, vdr- and -cvs pre- and postfixes @@ -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 @@ -517,8 +517,7 @@ vdr-plugin-2_src_compile() { LOCALEDIR="${TMP_LOCALE_DIR}" \ LOCDIR="${TMP_LOCALE_DIR}" \ LIBDIR="${S}" \ - TMPDIR="${T}" \ - || die "emake all failed" + TMPDIR="${T}" ;; esac @@ -564,8 +563,7 @@ vdr-plugin-2_src_install() { emake install \ ${BUILD_PARAMS} \ TMPDIR="${T}" \ - DESTDIR="${D%/}" \ - || die "emake install (makefile target) failed" + DESTDIR="${D}" else einfo "Notice: Plugin use still the old Makefile handling" insinto "${VDR_PLUGIN_DIR}" @@ -579,12 +577,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