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 A4B18138350 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 69E47E0D9E; Mon, 13 Jan 2020 02:15:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 4158DE0D9E 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 B779334DDFF 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 6C870A5 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.477828e0d50d1f05f0eb08991777785946c74ff2.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.48.0-r1.ebuild app-text/calibre/calibre-3.48.0.ebuild X-VCS-Directories: app-text/calibre/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 477828e0d50d1f05f0eb08991777785946c74ff2 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: 3a72b766-3ef2-4e65-933e-82318510fa32 X-Archives-Hash: 7e3d0c8248b9002071b1ac9d0b768d8e commit: 477828e0d50d1f05f0eb08991777785946c74ff2 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=477828e0 app-text/calibre: Revbump to 3.48.0-r1 and stabilize for bug 705088 Depend on beautifulsoup:4 and html5-parser-0.4.9 and stabilize this version since version 3.47.1 has broken beautifulsoup support as reported by Eli Schwartz in bug 705088. 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-3.48.0.ebuild => calibre-3.48.0-r1.ebuild} | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app-text/calibre/calibre-3.48.0.ebuild b/app-text/calibre/calibre-3.48.0-r1.ebuild similarity index 94% rename from app-text/calibre/calibre-3.48.0.ebuild rename to app-text/calibre/calibre-3.48.0-r1.ebuild index 9b8c29fcc23..438e9707f60 100644 --- a/app-text/calibre/calibre-3.48.0.ebuild +++ b/app-text/calibre/calibre-3.48.0-r1.ebuild @@ -31,7 +31,7 @@ LICENSE=" OFL-1.1 PSF-2 " -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" SLOT="0" IUSE="ios +udisks" @@ -45,7 +45,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}] @@ -54,7 +54,7 @@ COMMON_DEPEND="${PYTHON_DEPS} >=sys-apps/dbus-1.10.8 dev-python/dnspython[${PYTHON_USEDEP}] >=dev-python/feedparser-5.2.1[${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}] @@ -144,13 +144,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() {