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 E4483138336 for ; Sat, 11 Aug 2018 16:44:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7505AE07B3; Sat, 11 Aug 2018 16:44:30 +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 50E11E07B3 for ; Sat, 11 Aug 2018 16:44:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1544335CCB for ; Sat, 11 Aug 2018 16:44:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B1383A2 for ; Sat, 11 Aug 2018 16:44:25 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1534005834.30e5e1fa723931b0c728d9e7c2713614cfa392f8.asturm@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: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 30e5e1fa723931b0c728d9e7c2713614cfa392f8 X-VCS-Branch: master Date: Sat, 11 Aug 2018 16:44:25 +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-Archives-Salt: 47c88c1d-c349-455b-b5d5-f8465f84eeca X-Archives-Hash: 805605a0bc55858d8fcc74c80dbd97bc commit: 30e5e1fa723931b0c728d9e7c2713614cfa392f8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 11 14:28:43 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 11 16:43:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e5e1fa media-video/vlc: Fix location of vlc-cache-gen and plugins dir Thanks-to: jospezial gmx.de> Closes: https://bugs.gentoo.org/656200 Package-Manager: Portage-2.3.45, Repoman-2.3.10 media-video/vlc/vlc-9999.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 857714b2e49..ae4e442515a 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -465,12 +465,12 @@ src_install() { } pkg_postinst() { - if [[ "$ROOT" = "/" ]] && [[ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/" - "/usr/$(get_libdir)/vlc/vlc-cache-gen" "/usr/$(get_libdir)/vlc/plugins/" + if [[ "$ROOT" = "/" ]] && [[ -x "/usr/libexec/vlc/vlc-cache-gen" ]] ; then + einfo "Running /usr/libexec/vlc/vlc-cache-gen on /usr/libexec/vlc/plugins/" + "/usr/libexec/vlc/vlc-cache-gen" "/usr/libexec/vlc/plugins/" else ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)" - ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "Please run /usr/libexec/vlc/vlc-cache-gen manually" ewarn "If you do not do it, vlc will take a long time to load." fi @@ -480,8 +480,8 @@ pkg_postinst() { } pkg_postrm() { - if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + if [[ -e /usr/libexec/vlc/plugins/plugins.dat ]]; then + rm /usr/libexec/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" fi gnome2_icon_cache_update