media-video/vlc: Disable vlc-cache-gen during build

Tested-by: Andrius Štikonas <andrius@stikonas.eu>
Closes: https://bugs.gentoo.org/608256
Closes: https://bugs.gentoo.org/564842
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild
index 997cd366883d94a989f0e33bf129682051c6e5f4..e5ea17223128d159c22de3fba2d35c20ba7e57cb 100644 (file)
--- a/media-video/vlc/vlc-2.2.8-r1.ebuild
+++ b/media-video/vlc/vlc-2.2.8-r1.ebuild
@@ -242,6 +242,10 @@ src_prepare() {
                sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
        fi
 
+       # Disable running of vlc-cache-gen, we do that in pkg_postinst
+       sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+               -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
        eautoreconf
 
        # Disable automatic running of tests.
@@ -466,6 +470,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+       if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+               rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+       fi
+
        gnome2_icon_cache_update
        xdg_mimeinfo_database_update
        xdg_desktop_database_update

diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 5d8fafca1886e8ae6e72073ae708f041c5d4e71c..e9fdb939b3662ce67e4c7c171ad5e0f97a38c664 100644 (file)
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -242,6 +242,10 @@ src_prepare() {
                sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
        fi
 
+       # Disable running of vlc-cache-gen, we do that in pkg_postinst
+       sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+               -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
        eautoreconf
 
        # Disable automatic running of tests.
@@ -466,6 +470,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+       if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+               rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+       fi
+
        gnome2_icon_cache_update
        xdg_mimeinfo_database_update
        xdg_desktop_database_update

diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 044aa2ff014a002c21cfdddd64901eae83aec696..f97e73f1b770fd4bb436601a80e6ff6f3044cc58 100644 (file)
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -267,6 +267,10 @@ src_prepare() {
                sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
        fi
 
+       # Disable running of vlc-cache-gen, we do that in pkg_postinst
+       sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+               -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
        eautoreconf
 
        # Disable automatic running of tests.
@@ -473,6 +477,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+       if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+               rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+       fi
+
        gnome2_icon_cache_update
        xdg_mimeinfo_database_update
        xdg_desktop_database_update

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 86a7661c3f4ddfbe8d6f916a109bbc72568a58a9..d4545b0e1f96e63eb607bf248306ef6a207fc75a 100644 (file)
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -267,6 +267,10 @@ src_prepare() {
                sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
        fi
 
+       # Disable running of vlc-cache-gen, we do that in pkg_postinst
+       sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
+               -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+
        eautoreconf
 
        # Disable automatic running of tests.
@@ -473,6 +477,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+       if [[ -e /usr/lib64/vlc/plugins/plugins.dat ]]; then
+               rm /usr/lib64/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat"
+       fi
+
        gnome2_icon_cache_update
        xdg_mimeinfo_database_update
        xdg_desktop_database_update