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 961E2138330 for ; Mon, 8 Jan 2018 02:16:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E6FDE0B1A; Mon, 8 Jan 2018 02:16:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5700DE0B1A for ; Mon, 8 Jan 2018 02:16:50 +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 26D3F335D4F for ; Mon, 8 Jan 2018 02:16:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 76F18151 for ; Mon, 8 Jan 2018 02:16:47 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1515377797.ca867bcc34fa438c48e0632de7fe07db7c986fb8.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/calibre/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/calibre/calibre-2.78.0.ebuild app-text/calibre/calibre-3.15.0.ebuild app-text/calibre/calibre-3.3.0.ebuild app-text/calibre/calibre-3.8.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ca867bcc34fa438c48e0632de7fe07db7c986fb8 X-VCS-Branch: master Date: Mon, 8 Jan 2018 02:16:47 +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: c6467c9a-e9c9-46ba-9f09-9e9b44b42206 X-Archives-Hash: 288f658022e099d643a082c2a18cde0b commit: ca867bcc34fa438c48e0632de7fe07db7c986fb8 Author: Zac Medico gentoo org> AuthorDate: Mon Jan 8 02:04:57 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jan 8 02:16:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca867bcc app-text/calibre: call gnome2_icon_cache_update Closes: https://bugs.gentoo.org/643832 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-text/calibre/calibre-2.78.0.ebuild | 10 ++++++++-- app-text/calibre/calibre-3.15.0.ebuild | 5 ++++- app-text/calibre/calibre-3.3.0.ebuild | 7 +++++-- app-text/calibre/calibre-3.8.0.ebuild | 7 +++++-- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild index b2d45db79e7..1e03a38661b 100644 --- a/app-text/calibre/calibre-2.78.0.ebuild +++ b/app-text/calibre/calibre-2.78.0.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 @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,ssl" -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 DESCRIPTION="Ebook management application" HOMEPAGE="http://calibre-ebook.com/" @@ -240,12 +240,18 @@ src_install() { } +pkg_preinst() { + gnome2_icon_savelist +} + pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild index ec7d26d1453..87d9fc99591 100644 --- a/app-text/calibre/calibre-3.15.0.ebuild +++ b/app-text/calibre/calibre-3.15.0.ebuild @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,ssl" -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 DESCRIPTION="Ebook management application" HOMEPAGE="http://calibre-ebook.com/" @@ -253,6 +253,7 @@ src_install() { } pkg_preinst() { + gnome2_icon_savelist # Indentify stray directories from upstream's "Binary install" # method (see bug 622728). CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre @@ -271,9 +272,11 @@ pkg_postinst() { done fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } diff --git a/app-text/calibre/calibre-3.3.0.ebuild b/app-text/calibre/calibre-3.3.0.ebuild index 46710a8a845..8cf13775969 100644 --- a/app-text/calibre/calibre-3.3.0.ebuild +++ b/app-text/calibre/calibre-3.3.0.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 @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,ssl" -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 DESCRIPTION="Ebook management application" HOMEPAGE="http://calibre-ebook.com/" @@ -250,6 +250,7 @@ src_install() { } pkg_preinst() { + gnome2_icon_savelist # Indentify stray directories from upstream's "Binary install" # method (see bug 622728). CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre @@ -268,9 +269,11 @@ pkg_postinst() { done fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild index e18eb11846b..f57de91b600 100644 --- a/app-text/calibre/calibre-3.8.0.ebuild +++ b/app-text/calibre/calibre-3.8.0.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 @@ -6,7 +6,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="sqlite,ssl" -inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1 +inherit eutils fdo-mime bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 DESCRIPTION="Ebook management application" HOMEPAGE="http://calibre-ebook.com/" @@ -251,6 +251,7 @@ src_install() { } pkg_preinst() { + gnome2_icon_savelist # Indentify stray directories from upstream's "Binary install" # method (see bug 622728). CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre @@ -269,9 +270,11 @@ pkg_postinst() { done fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update } pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update + gnome2_icon_cache_update }