[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/

[Zac Medico]

commit:     b0068ce396d2c44e43bc5675062db7e15e51da36
Author:     Rayslava <rayslava <AT> gmail <DOT> com>
AuthorDate: Sun Jan 12 01:27:45 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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 <zmedico <AT> 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() {