From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1538876-garchives=archives.gentoo.org@lists.gentoo.org> 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 C6F7515800A for <garchives@archives.gentoo.org>; Wed, 19 Jul 2023 21:33:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E794BE07A9; Wed, 19 Jul 2023 21:33:54 +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 D42FCE07A9 for <gentoo-commits@lists.gentoo.org>; Wed, 19 Jul 2023 21:33:54 +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 0118F340BE8 for <gentoo-commits@lists.gentoo.org>; Wed, 19 Jul 2023 21:33:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91563BD0 for <gentoo-commits@lists.gentoo.org>; Wed, 19 Jul 2023 21:33:52 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1689802423.50511cf04b1fbc205c81aa1ce5748899f20504a6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/vlc/vlc-9999.ebuild X-VCS-Directories: media-video/vlc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 50511cf04b1fbc205c81aa1ce5748899f20504a6 X-VCS-Branch: master Date: Wed, 19 Jul 2023 21:33:52 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: caa80e61-556e-4be7-bf7e-aa0294a07641 X-Archives-Hash: 066b135da0ef2f3c3bc577d55d814475 commit: 50511cf04b1fbc205c81aa1ce5748899f20504a6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jul 19 21:29:35 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 19 21:33:43 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50511cf0 media-video/vlc: fix vlc-cache-gen call in 9999 Thanks to josef64 for reporting. This.. seems to have changed years ago in https://code.videolan.org/videolan/vlc/-/commit/ba05ad61645b38ad206e23949a6352871ab59773. Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/vlc/vlc-9999.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 712516931946..45d981062cd6 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -491,12 +491,12 @@ src_install() { } pkg_postinst() { - if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" - "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/" + if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}"/usr/libexec/vlc/vlc-cache-gen ]] ; then + einfo "Running ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" + "${EPREFIX}"/usr/libexec/vlc/vlc-cache-gen "${EROOT}/usr/$(get_libdir)/vlc/plugins/" else ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" - ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "Please run ${EPREFIX}/usr/libexec/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi