Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/vlc/
Date: Wed, 14 Feb 2018 22:20:40
Message-Id: 1518646826.3cd5824f4f1d0414b5a3b091c845353072fd1be1.asturm@gentoo
1 commit: 3cd5824f4f1d0414b5a3b091c845353072fd1be1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 14 22:13:40 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 22:20:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd5824f
7
8 media-video/vlc: Fix pkg_postrm
9
10 Thanks-to: Arfrever
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 media-video/vlc/vlc-2.2.8-r1.ebuild | 4 ++--
14 media-video/vlc/vlc-3.0.0-r1.ebuild | 4 ++--
15 media-video/vlc/vlc-3.0.9999.ebuild | 4 ++--
16 media-video/vlc/vlc-9999.ebuild | 4 ++--
17 4 files changed, 8 insertions(+), 8 deletions(-)
18
19 diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
20 index e5ea1722312..cf77af60167 100644
21 --- a/media-video/vlc/vlc-2.2.8-r1.ebuild
22 +++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
23 @@ -470,8 +470,8 @@ pkg_postinst() {
24 }
25
26 pkg_postrm() {
27 - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
28 - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
29 + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
30 + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
31 fi
32
33 gnome2_icon_cache_update
34
35 diff --git a/media-video/vlc/vlc-3.0.0-r1.ebuild b/media-video/vlc/vlc-3.0.0-r1.ebuild
36 index 2690e5572c6..ea2550b2cc9 100644
37 --- a/media-video/vlc/vlc-3.0.0-r1.ebuild
38 +++ b/media-video/vlc/vlc-3.0.0-r1.ebuild
39 @@ -489,8 +489,8 @@ pkg_postinst() {
40 }
41
42 pkg_postrm() {
43 - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
44 - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
45 + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
46 + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
47 fi
48
49 gnome2_icon_cache_update
50
51 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
52 index 2690e5572c6..ea2550b2cc9 100644
53 --- a/media-video/vlc/vlc-3.0.9999.ebuild
54 +++ b/media-video/vlc/vlc-3.0.9999.ebuild
55 @@ -489,8 +489,8 @@ pkg_postinst() {
56 }
57
58 pkg_postrm() {
59 - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
60 - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
61 + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
62 + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
63 fi
64
65 gnome2_icon_cache_update
66
67 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
68 index 20e11569243..a6cc30a0528 100644
69 --- a/media-video/vlc/vlc-9999.ebuild
70 +++ b/media-video/vlc/vlc-9999.ebuild
71 @@ -489,8 +489,8 @@ pkg_postinst() {
72 }
73
74 pkg_postrm() {
75 - if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
76 - rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
77 + if [[ -e /usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then
78 + rm /usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
79 fi
80
81 gnome2_icon_cache_update