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 86C8B138350 for ; Sun, 12 Jan 2020 01:42:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23D5EE0B60; Sun, 12 Jan 2020 01:42:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 EF78FE0B60 for ; Sun, 12 Jan 2020 01:42:08 +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 89A7934DE92 for ; Sun, 12 Jan 2020 01:42:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E4DE89 for ; Sun, 12 Jan 2020 01:42:05 +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: <1578793203.b0068ce396d2c44e43bc5675062db7e15e51da36.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-4.8.0-r1.ebuild app-text/calibre/calibre-4.8.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b0068ce396d2c44e43bc5675062db7e15e51da36 X-VCS-Branch: master Date: Sun, 12 Jan 2020 01:42:05 +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: a9ad5097-6836-4353-bc13-35be0725751d X-Archives-Hash: 57c61ed7771f90c76872926797ec08a8 commit: b0068ce396d2c44e43bc5675062db7e15e51da36 Author: Rayslava gmail com> AuthorDate: Sun Jan 12 01:27:45 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jan 12 01:40:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0068ce3 app-text/calibre: Revbump to 4.8.0-r1 for bug 602902 Depend on beautifulsoup:4 and html5-parser-0.4.9. Closes: https://bugs.gentoo.org/705088 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Zac Medico gentoo.org> .../calibre/{calibre-4.8.0.ebuild => calibre-4.8.0-r1.ebuild} | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app-text/calibre/calibre-4.8.0.ebuild b/app-text/calibre/calibre-4.8.0-r1.ebuild similarity index 94% rename from app-text/calibre/calibre-4.8.0.ebuild rename to app-text/calibre/calibre-4.8.0-r1.ebuild index d15693e1393..3049f662198 100644 --- a/app-text/calibre/calibre-4.8.0.ebuild +++ b/app-text/calibre/calibre-4.8.0-r1.ebuild @@ -47,7 +47,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}] >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}] >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}] @@ -57,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/dnspython[${PYTHON_USEDEP}] >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}] >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}] - >=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}] + >=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}] >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}] >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}] >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}] @@ -149,13 +149,6 @@ src_prepare() { '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \ '-i', 'Makefile'])" \ -i setup/build.py || die "sed failed to patch build.py" - - # use system beautifulsoup, instead of bundled - rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \ - || die "could not remove bundled beautifulsoup" - find "${S}" -type f -name \*.py -exec \ - sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \ - || die "could not sed bundled beautifulsoup out of the source tree" } src_install() {