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 14A4A139085 for ; Thu, 26 Jan 2017 22:57:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22819234033; Thu, 26 Jan 2017 22:57:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7E98234033 for ; Thu, 26 Jan 2017 22:57:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68AEC340DD8 for ; Thu, 26 Jan 2017 22:57:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64B8F30DB for ; Thu, 26 Jan 2017 22:57:29 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1485471363.c7c99395c686f50367155fdc220540f8346d3bf0.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/obs-studio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/obs-studio/obs-studio-17.0.2.ebuild media-video/obs-studio/obs-studio-9999.ebuild X-VCS-Directories: media-video/obs-studio/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: c7c99395c686f50367155fdc220540f8346d3bf0 X-VCS-Branch: master Date: Thu, 26 Jan 2017 22:57:29 +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: 5b5a9e2e-4e0a-4e24-94fa-37c8785a1232 X-Archives-Hash: 05ebb07ff9ddfc04b6e966c64f084708 commit: c7c99395c686f50367155fdc220540f8346d3bf0 Author: Jimi Huotari gentoo org> AuthorDate: Wed Jan 25 12:21:09 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Jan 26 22:56:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c99395 media-video/obs-studio: Use 'gnome2-utils' to update the icon cache. Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3643 media-video/obs-studio/obs-studio-17.0.2.ebuild | 12 +++++++- media-video/obs-studio/obs-studio-9999.ebuild | 41 ++++++++++++++----------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/media-video/obs-studio/obs-studio-17.0.2.ebuild b/media-video/obs-studio/obs-studio-17.0.2.ebuild index 2e48f5f..5a3784f 100644 --- a/media-video/obs-studio/obs-studio-17.0.2.ebuild +++ b/media-video/obs-studio/obs-studio-17.0.2.ebuild @@ -4,7 +4,7 @@ EAPI=6 -inherit cmake-utils +inherit cmake-utils gnome2-utils if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -71,7 +71,13 @@ src_configure() { cmake-utils_src_configure } +pkg_preinst() { + gnome2_icon_savelist +} + pkg_postinst() { + gnome2_icon_cache_update + if ! use alsa && ! use pulseaudio; then elog elog "For the audio capture features to be available," @@ -98,3 +104,7 @@ pkg_postinst() { elog fi } + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 678d13d..51a70f5 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="6" +EAPI=6 -inherit cmake-utils +inherit cmake-utils gnome2-utils if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -52,30 +52,31 @@ DEPEND=" " RDEPEND="${DEPEND}" -src_prepare() { - CMAKE_REMOVE_MODULES_LIST=(FindFreetype) - - cmake-utils_src_prepare -} +CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) src_configure() { - local libdir="$(get_libdir)" + local libdir=$(get_libdir) local mycmakeargs=( - -DDISABLE_ALSA="$(usex !alsa)" - -DDISABLE_FREETYPE="$(usex !truetype)" - -DDISABLE_JACK="$(usex !jack)" - -DDISABLE_LIBFDK="$(usex !fdk)" - -DDISABLE_PULSEAUDIO="$(usex !pulseaudio)" - -DDISABLE_V4L2="$(usex !v4l)" - -DLIBOBS_PREFER_IMAGEMAGICK="$(usex imagemagick)" - -DOBS_MULTIARCH_SUFFIX="${libdir#lib}" + -DDISABLE_ALSA=$(usex !alsa) + -DDISABLE_FREETYPE=$(usex !truetype) + -DDISABLE_JACK=$(usex !jack) + -DDISABLE_LIBFDK=$(usex !fdk) + -DDISABLE_PULSEAUDIO=$(usex !pulseaudio) + -DDISABLE_V4L2=$(usex !v4l) + -DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick) + -DOBS_MULTIARCH_SUFFIX=${libdir#lib} -DUNIX_STRUCTURE=1 ) - cmake-utils_src_configure } +pkg_preinst() { + gnome2_icon_savelist +} + pkg_postinst() { + gnome2_icon_cache_update + if ! use alsa && ! use pulseaudio; then elog elog "For the audio capture features to be available," @@ -102,3 +103,7 @@ pkg_postinst() { elog fi } + +pkg_postrm() { + gnome2_icon_cache_update +}