summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-01-12 17:24:45 -0800
committerZac Medico <zmedico@gentoo.org>2020-01-12 18:15:13 -0800
commit477828e0d50d1f05f0eb08991777785946c74ff2 (patch)
tree020621bb1dd66c9aa855c3863bdbc5d8e8724c61 /app-text
parentapp-text/calibre: Revbump to 4.7.0-r1 for bug 705088 (diff)
downloadgentoo-477828e0d50d1f05f0eb08991777785946c74ff2.tar.gz
gentoo-477828e0d50d1f05f0eb08991777785946c74ff2.tar.bz2
gentoo-477828e0d50d1f05f0eb08991777785946c74ff2.zip
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 <eschwartz@archlinux.org> Bug: https://bugs.gentoo.org/705088#c3 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'app-text')
-rw-r--r--app-text/calibre/calibre-3.48.0-r1.ebuild (renamed from app-text/calibre/calibre-3.48.0.ebuild)13
1 files 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
index 9b8c29fcc23b..438e9707f607 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() {