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 096CE139694 for ; Mon, 26 Jun 2017 22:17:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 424C3234075; Mon, 26 Jun 2017 22:17:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1BE0F234075 for ; Mon, 26 Jun 2017 22:17:56 +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 01137341743 for ; Mon, 26 Jun 2017 22:17:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A94A748A for ; Mon, 26 Jun 2017 22:17:54 +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: <1498515468.a16a17a3b8e8c9b137d093bdba652aea1e8fe77d.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-3.1.1-r1.ebuild app-text/calibre/calibre-3.1.1-r2.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: a16a17a3b8e8c9b137d093bdba652aea1e8fe77d X-VCS-Branch: master Date: Mon, 26 Jun 2017 22:17:54 +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: 5f0ddecc-8491-4cc1-99a9-4e026236198f X-Archives-Hash: 0a0b1f7830a18d1be8b01d8df294b8a8 commit: a16a17a3b8e8c9b137d093bdba652aea1e8fe77d Author: Zac Medico gentoo org> AuthorDate: Mon Jun 26 22:13:31 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jun 26 22:17:48 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16a17a3 app-text/calibre: revbump to 3.1.1-r2 with fix for bug 622728 Indentify and purge stray directories from upstream's "Binary install" method. Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../{calibre-3.1.1-r1.ebuild => calibre-3.1.1-r2.ebuild} | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app-text/calibre/calibre-3.1.1-r1.ebuild b/app-text/calibre/calibre-3.1.1-r2.ebuild similarity index 93% rename from app-text/calibre/calibre-3.1.1-r1.ebuild rename to app-text/calibre/calibre-3.1.1-r2.ebuild index 4e9fbac4f7f..46710a8a845 100644 --- a/app-text/calibre/calibre-3.1.1-r1.ebuild +++ b/app-text/calibre/calibre-3.1.1-r2.ebuild @@ -249,7 +249,23 @@ src_install() { } +pkg_preinst() { + # Indentify stray directories from upstream's "Binary install" + # method (see bug 622728). + CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre + CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do + printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}" +} + pkg_postinst() { + [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" + local x + for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do + if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then + elog "Purging '${x}'" + rm -rf "${x}" + fi + done fdo-mime_desktop_database_update fdo-mime_mime_database_update }