app-text/calibre: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r2.ebuild
similarity index 84%
rename from app-text/calibre/calibre-3.48.0-r1.ebuild
rename to app-text/calibre/calibre-3.48.0-r2.ebuild
index 750bc132087d613d0b341fa517f7d91a71711b55..4aac7817f183b66dea67305b318ab5e230efc258 100644 (file)
--- a/app-text/calibre/calibre-3.48.0-r1.ebuild
+++ b/app-text/calibre/calibre-3.48.0-r2.ebuild
@@ -44,28 +44,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-libs/glib:2=
        >=dev-libs/icu-57.1:=
        dev-libs/libinput:=
-       >=dev-python/apsw-3.25.2_p1[${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}]
-       >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
        >=dev-libs/dbus-glib-0.106
        >=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.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}]
-       >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-       >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-       >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-       dev-python/regex[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+               dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+               dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+               dev-python/regex[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-qt/qtcore:5=
        dev-qt/qtdbus:5=
        dev-qt/qtgui:5=
@@ -94,8 +96,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
        udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
 DEPEND="${COMMON_DEPEND}
-       >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-       dev-python/sip[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+               dev-python/sip[${PYTHON_MULTI_USEDEP}]
+       ')
        >=virtual/podofo-build-0.9.6_pre20171027
        virtual/pkgconfig"
 

diff --git a/app-text/calibre/calibre-4.10.1.ebuild b/app-text/calibre/calibre-4.10.1-r1.ebuild
similarity index 83%
rename from app-text/calibre/calibre-4.10.1.ebuild
rename to app-text/calibre/calibre-4.10.1-r1.ebuild
index 96f088d77812d80fa297dbfc8fb57b99cf481e46..87653101234517f1a7883c86cd880fe53ee2e8ab 100644 (file)
--- a/app-text/calibre/calibre-4.10.1.ebuild
+++ b/app-text/calibre/calibre-4.10.1-r1.ebuild
@@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-libs/hyphen:=
        >=dev-libs/icu-57.1:=
        dev-libs/libinput:=
-       >=dev-python/apsw-3.25.2_p1[${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}]
-       >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
        >=dev-libs/dbus-glib-0.106
        >=sys-apps/dbus-1.10.8
-       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.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}]
-       >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-       >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-       >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-       >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-       dev-python/regex[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+               dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+               dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+               >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+               dev-python/regex[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-qt/qtcore:5=
        dev-qt/qtdbus:5=
        dev-qt/qtgui:5=
@@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
        udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
 DEPEND="${COMMON_DEPEND}
-       >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-       dev-python/sip[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+               dev-python/sip[${PYTHON_MULTI_USEDEP}]
+       ')
        >=virtual/podofo-build-0.9.6_pre20171027
        virtual/pkgconfig"
 

diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild
index a1cc4a33f5d12d3ecd14ed01fef313266e1407ef..10509962f2eed2561a67b2cd9dee14119b299122 100644 (file)
--- a/app-text/calibre/calibre-4.9.1-r1.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r1.ebuild
@@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-libs/hyphen:=
        >=dev-libs/icu-57.1:=
        dev-libs/libinput:=
-       >=dev-python/apsw-3.25.2_p1[${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}]
-       >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
        >=dev-libs/dbus-glib-0.106
        >=sys-apps/dbus-1.10.8
-       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.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}]
-       >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-       >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-       >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-       >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-       >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-       >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-       >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-       dev-python/regex[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+               dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+               dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+               >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+               >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+               dev-python/regex[${PYTHON_MULTI_USEDEP}]
+       ')
        dev-qt/qtcore:5=
        dev-qt/qtdbus:5=
        dev-qt/qtgui:5=
@@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 RDEPEND="${COMMON_DEPEND}
        udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
 DEPEND="${COMMON_DEPEND}
-       >=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-       dev-python/sip[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+               dev-python/sip[${PYTHON_MULTI_USEDEP}]
+       ')
        >=virtual/podofo-build-0.9.6_pre20171027
        virtual/pkgconfig"