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 F2748138206 for ; Thu, 18 Jan 2018 00:27:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9883E081A; Thu, 18 Jan 2018 00:27:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A447FE081A for ; Thu, 18 Jan 2018 00:27:52 +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 DDBA6335C34 for ; Thu, 18 Jan 2018 00:27:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FFBA1BA for ; Thu, 18 Jan 2018 00:27:48 +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: <1516235249.63861c0d8e631387566113508b80cfc93930ca43.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-2.2.8-r1.ebuild media-video/vlc/vlc-2.2.9999.ebuild media-video/vlc/vlc-3.0.9999.ebuild 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: 63861c0d8e631387566113508b80cfc93930ca43 X-VCS-Branch: master Date: Thu, 18 Jan 2018 00:27:48 +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: 0d647d36-3d2c-45d0-af09-05845ae7cd70 X-Archives-Hash: 5f96ea80938de53ed5593e8b6688b392 commit: 63861c0d8e631387566113508b80cfc93930ca43 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 18 00:23:13 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 18 00:27:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63861c0d media-video/vlc: Disable vlc-cache-gen during build Tested-by: Andrius Štikonas stikonas.eu> Closes: https://bugs.gentoo.org/608256 Closes: https://bugs.gentoo.org/564842 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/vlc/vlc-2.2.8-r1.ebuild | 8 ++++++++ media-video/vlc/vlc-2.2.9999.ebuild | 10 +++++++++- media-video/vlc/vlc-3.0.9999.ebuild | 10 +++++++++- media-video/vlc/vlc-9999.ebuild | 10 +++++++++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/media-video/vlc/vlc-2.2.8-r1.ebuild b/media-video/vlc/vlc-2.2.8-r1.ebuild index 997cd366883..e5ea1722312 100644 --- 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 5d8fafca188..e9fdb939b36 100644 --- 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 044aa2ff014..f97e73f1b77 100644 --- 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 86a7661c3f4..d4545b0e1f9 100644 --- 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