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 45BC6138334 for ; Thu, 15 Aug 2019 19:48:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 738C2E0A03; Thu, 15 Aug 2019 19:48:41 +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 4EE69E0A03 for ; Thu, 15 Aug 2019 19:48:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C4899349BED for ; Thu, 15 Aug 2019 19:48:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B8124D4 for ; Thu, 15 Aug 2019 19:48:38 +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: <1565898513.07d3becfcbb27d4f00ac8f34f165aab0ba99c34d.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.26.1-r1.ebuild app-text/calibre/calibre-3.44.0.ebuild app-text/calibre/calibre-3.46.0-r1.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 07d3becfcbb27d4f00ac8f34f165aab0ba99c34d X-VCS-Branch: master Date: Thu, 15 Aug 2019 19:48:38 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4a2ef382-3f0c-45ba-87f6-4e4a0fbdad94 X-Archives-Hash: 3b35421647228f7bc8b05a220335f2ad commit: 07d3becfcbb27d4f00ac8f34f165aab0ba99c34d Author: Zac Medico gentoo org> AuthorDate: Thu Aug 15 19:47:12 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Aug 15 19:48:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d3becf app-text/calibre: fix gentoo-ci lint Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Zac Medico gentoo.org> app-text/calibre/calibre-3.26.1-r1.ebuild | 2 -- app-text/calibre/calibre-3.44.0.ebuild | 4 +--- app-text/calibre/calibre-3.46.0-r1.ebuild | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild b/app-text/calibre/calibre-3.26.1-r1.ebuild index 5fb25df4b35..c92715c1e5f 100644 --- a/app-text/calibre/calibre-3.26.1-r1.ebuild +++ b/app-text/calibre/calibre-3.26.1-r1.ebuild @@ -206,8 +206,6 @@ src_install() { [[ -e ${x} ]] && addpredict ${x} done - #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py - #dodir $(python_get_sitedir) PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ "${PYTHON}" setup.py install \ --root="${D}" \ diff --git a/app-text/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.44.0.ebuild index 2459339e259..9b8c29fcc23 100644 --- a/app-text/calibre/calibre-3.44.0.ebuild +++ b/app-text/calibre/calibre-3.44.0.ebuild @@ -196,8 +196,6 @@ src_install() { addpredict /dev/dri #665310 - #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py - #dodir $(python_get_sitedir) PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ "${PYTHON}" setup.py install \ --root="${D}" \ @@ -252,7 +250,7 @@ pkg_preinst() { pkg_postinst() { [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" local x - for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do + for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then elog "Purging '${x}'" rm -rf "${x}" diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild b/app-text/calibre/calibre-3.46.0-r1.ebuild index 2459339e259..9b8c29fcc23 100644 --- a/app-text/calibre/calibre-3.46.0-r1.ebuild +++ b/app-text/calibre/calibre-3.46.0-r1.ebuild @@ -196,8 +196,6 @@ src_install() { addpredict /dev/dri #665310 - #dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py - #dodir $(python_get_sitedir) PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ "${PYTHON}" setup.py install \ --root="${D}" \ @@ -252,7 +250,7 @@ pkg_preinst() { pkg_postinst() { [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset" local x - for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do + for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then elog "Purging '${x}'" rm -rf "${x}"