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 D0BA9138351 for ; Mon, 13 Jan 2020 02:15:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70ADBE0E5A; Mon, 13 Jan 2020 02:15:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 51C77E0E5A for ; Mon, 13 Jan 2020 02:15:29 +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 F335134DFF0 for ; Mon, 13 Jan 2020 02:15:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 592A9A1 for ; Mon, 13 Jan 2020 02:15:25 +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: <1578881713.2ef3fe8391f810ede0e19cfb3d1811709bacc607.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.7.0-r1.ebuild app-text/calibre/calibre-4.7.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2ef3fe8391f810ede0e19cfb3d1811709bacc607 X-VCS-Branch: master Date: Mon, 13 Jan 2020 02:15:25 +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: 8642068b-5378-409c-8766-cf0a9b400a67 X-Archives-Hash: 54a2000642e2d392f70ad1535f1d3592 commit: 2ef3fe8391f810ede0e19cfb3d1811709bacc607 Author: Zac Medico gentoo org> AuthorDate: Mon Jan 13 01:24:45 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Jan 13 02:15:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef3fe83 app-text/calibre: Revbump to 4.7.0-r1 for bug 705088 Depend on beautifulsoup:4 and html5-parser-0.4.9. Reported-by: Eli Schwartz archlinux.org> Bug: https://bugs.gentoo.org/705088#c3 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Zac Medico gentoo.org> .../{calibre-4.7.0.ebuild => calibre-4.7.0-r1.ebuild} | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app-text/calibre/calibre-4.7.0.ebuild b/app-text/calibre/calibre-4.7.0-r1.ebuild similarity index 94% rename from app-text/calibre/calibre-4.7.0.ebuild rename to app-text/calibre/calibre-4.7.0-r1.ebuild index 4f133b668aa..3049f662198 100644 --- a/app-text/calibre/calibre-4.7.0.ebuild +++ b/app-text/calibre/calibre-4.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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() {