From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- dev-python/weasyprint/Manifest | 8 ++-- .../files/weasyprint-43-skip-failing-test.patch | 13 ++++++ .../files/weasyprint-43-skip-useless-deps.patch | 30 +++++++++++++ dev-python/weasyprint/weasyprint-0.29.ebuild | 41 ----------------- dev-python/weasyprint/weasyprint-0.41.ebuild | 11 ++--- dev-python/weasyprint/weasyprint-43.ebuild | 52 ++++++++++++++++++++++ 6 files changed, 104 insertions(+), 51 deletions(-) create mode 100644 dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch create mode 100644 dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch delete mode 100644 dev-python/weasyprint/weasyprint-0.29.ebuild create mode 100644 dev-python/weasyprint/weasyprint-43.ebuild (limited to 'dev-python/weasyprint') diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest index 42122c361dda..23e5f4e10648 100644 --- a/dev-python/weasyprint/Manifest +++ b/dev-python/weasyprint/Manifest @@ -1,5 +1,7 @@ -DIST WeasyPrint-0.29.tar.gz 1418105 BLAKE2B b94f1f0099fcac68aa393758fda23562eae6350e2fb185397cf888735389974f863b6b7025ce349c29e349c91d884320c96b9c7afba2c83e52f6c78ab81e8885 SHA512 3875240b7bed6991372f6a45f82d32f0d2f3add29ab1937001c5559368405737d185aa85871358730989a91ee6b17e62cc21535735c884c47705d0d2d38bb167 +AUX weasyprint-43-skip-failing-test.patch 517 BLAKE2B 27f574095d9dde6ac9cb99f64eddff83f7906c1386bd7acdfb30efb45f7cef7b693520d06039233af05ea52076759eac0df652a81b68efa4339d1ec4c33594cc SHA512 df95d9b9c6c9b509bb547929e9df43bbd0c0498c1400c1e070ccc432c035b84cd3fcf1c8b031eaef9e298a614505a2300306d9d54d77dab09c8e238e11a44f89 +AUX weasyprint-43-skip-useless-deps.patch 559 BLAKE2B c11b646137f26ad9a3398678534c2f8999ccdbd1baaecaf72eecdbcbf9870f168a51ee91482a3ca8aa8e0372e11c350204c14556e58b60839df571216a103492 SHA512 0d0be1d5234549d98a6c6ae43255a1dfd2ac543d72f85b9e54da4e864e961859100201de447bf88b428a66bc4a3762f4f1cc2e09465051058fd4563e3093a4f1 DIST WeasyPrint-0.41.tar.gz 393866 BLAKE2B 895624ee547a9ed91157db6a7a72890a56f270d2ea00a508c42899e42922e51867782b1dff3ab55f98df0a130b727a7db13aaf3553a90c4405b75b6813c95ab9 SHA512 44b2d9e0a186c5767cd01d6e66495241d088908467e0fa28cee114a9c480bfcb4ef393236e9304653603f3917c73c452c05a38286932e0a271946860120d9a1f -EBUILD weasyprint-0.29.ebuild 1199 BLAKE2B b9bcb1ae2a5c13665befba0c6538062336344415ac7d339aa5b62c04479c860edf57fe7fe255bce19c55c82bf2dfb51d56d8e0b8e98ac6852be200d16b6bb2c5 SHA512 4f178b61ead5faaa0be43c9d86eca83add1a4448908a0fdbff459a5e7eb6955fdd7e7fb6eb71deb19c11a77b277fa4ed2f3afa0863335fd89e6ad7d1a36ff681 -EBUILD weasyprint-0.41.ebuild 1468 BLAKE2B 589e6474546b05b2cd38542d2ff1c4415e526d4f5e08f2ea250b7e67e521de2e35a4f89e74a1ba94c7be7512e7c6872c2631aef6c142c86af93484e45043f74f SHA512 cc74288870f66a25436b7d1aa6e78dddf833bd4a8b7dd736096e6e12f31cbdce325ef8002c098233c73f7c14ac13f11dc022cffb7c0bf58bfe130c5cf2613def +DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40 +EBUILD weasyprint-0.41.ebuild 1322 BLAKE2B 909faf1d09fb85b1fe167fff0995d5b96750ed9eb6022eea65b9cc841f0a87d8bf3713b78f3c0898ced55ac624d6dd4b0dcf95279a321c0915b7a21ec185d0fb SHA512 98623e08b261959388e1de4dfc0285fe5f54b5584039122b2f30d81b6173c3dc6a3a356642e5c392bab1fa6c9f95085c52aa1a7049434652e418cea0a8713eb2 +EBUILD weasyprint-43.ebuild 1374 BLAKE2B fcbd23418925b890827b9d9c2a7e7a20bdb9036e1c93a1afd1c53a3daf56e24590abb3c7e2309e03187f315e1d55b8c6293495e5edd2040dd2ac0f29f24b480b SHA512 e51e941af915240dbd1982261a93a72e5c84027fd05f834c64eb7422bd12182aa9f63fe3ea9bb8e4bc8613cb5b04ad0158e1d53e4590c454e92743d5ec87958d MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398 diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch b/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch new file mode 100644 index 000000000000..f49635fc8479 --- /dev/null +++ b/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch @@ -0,0 +1,13 @@ +diff --git a/weasyprint/tests/test_layout/test_flex.py b/weasyprint/tests/test_layout/test_flex.py +index 890df3e8..77c6bbf5 100644 +--- a/weasyprint/tests/test_layout/test_flex.py ++++ b/weasyprint/tests/test_layout/test_flex.py +@@ -189,7 +189,7 @@ def test_flex_row_wrap_reverse(): + + + @assert_no_logs +-def test_flex_column_wrap_reverse(): ++def xtest_flex_column_wrap_reverse(): + page, = render_pages(''' +
diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch b/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch new file mode 100644 index 000000000000..1229f0bed26d --- /dev/null +++ b/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch @@ -0,0 +1,30 @@ +--- a/setup.cfg ++++ b/setup.cfg +@@ -34,7 +34,6 @@ + [options] + packages = find: + zip_safe = false +-setup_requires = pytest-runner + install_requires = + cffi>=0.6 + html5lib>=0.999999999 +@@ -43,11 +42,6 @@ + cssselect2>=0.1 + CairoSVG>=1.0.20 + Pyphen>=0.8 +-tests_require = +- pytest-runner +- pytest-cov +- pytest-flake8 +- pytest-isort + + [options.entry_points] + console-scripts = weasyprint = weasyprint.__main__:main +@@ -72,7 +72,6 @@ + test = pytest + + [tool:pytest] +-addopts = --flake8 --isort + norecursedirs = build dist .cache .eggs .git + + [coverage:run] diff --git a/dev-python/weasyprint/weasyprint-0.29.ebuild b/dev-python/weasyprint/weasyprint-0.29.ebuild deleted file mode 100644 index 737ee058558a..000000000000 --- a/dev-python/weasyprint/weasyprint-0.29.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit distutils-r1 - -DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF" -MY_PN="WeasyPrint" -MY_P="${MY_PN}-${PV}" -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" -HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -# Note: specific subslot of pango since it inlines some of pango headers. -RDEPEND="x11-libs/pango:0/0 - >=media-gfx/cairosvg-1.0.7[${PYTHON_USEDEP}] - >=dev-python/html5lib-0.999[${PYTHON_USEDEP}] - dev-python/cffi:=[${PYTHON_USEDEP}] - >=dev-python/lxml-3.0[${PYTHON_USEDEP}] - >=dev-python/cairocffi-0.5[${PYTHON_USEDEP}] - ~dev-python/tinycss-0.3[${PYTHON_USEDEP}] - >=dev-python/cssselect-0.6[${PYTHON_USEDEP}] - >=dev-python/pyphen-0.8[${PYTHON_USEDEP}]" -# x11-libs/gdk-pixbuf # optional dep -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - media-fonts/ahem )" - -S="${WORKDIR}/${MY_P}" - -python_test() { - py.test || die "testsuite failed under ${EPYTHON}" -} diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild index fce99c16ede2..ba921c850bc0 100644 --- a/dev-python/weasyprint/weasyprint-0.41.ebuild +++ b/dev-python/weasyprint/weasyprint-0.41.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -37,12 +37,9 @@ RDEPEND=" " DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] test? ( - ${RDEPEND} - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/pytest-flake8[${PYTHON_USEDEP}] - dev-python/pytest-isort[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - media-fonts/ahem + ${RDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + media-fonts/ahem ) " diff --git a/dev-python/weasyprint/weasyprint-43.ebuild b/dev-python/weasyprint/weasyprint-43.ebuild new file mode 100644 index 000000000000..d18200b1057c --- /dev/null +++ b/dev-python/weasyprint/weasyprint-43.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit distutils-r1 + +DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF" +MY_PN="WeasyPrint" +MY_P="${MY_PN}-${PV}" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +HOMEPAGE="http://weasyprint.org https://github.com/Kozea/WeasyPrint" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="jpeg jpeg2k test tiff" + +# Note: specific subslot of pango since it inlines some of pango headers. +RDEPEND=" + >=x11-libs/cairo-1.15.4 + x11-libs/gdk-pixbuf[jpeg?,jpeg2k?,tiff?] + x11-libs/pango:0/0 + >=dev-python/cairocffi-0.9[${PYTHON_USEDEP}] + >=dev-python/cffi-0.6:=[${PYTHON_USEDEP}] + >=dev-python/cssselect2-0.1[${PYTHON_USEDEP}] + >=dev-python/html5lib-0.999999999[${PYTHON_USEDEP}] + >=dev-python/lxml-3.0[${PYTHON_USEDEP}] + >=dev-python/pyphen-0.8[${PYTHON_USEDEP}] + >=dev-python/tinycss2-0.5[${PYTHON_USEDEP}] + >=media-gfx/cairosvg-1.0.20[${PYTHON_USEDEP}] +" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + ${RDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + media-fonts/ahem + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-43-skip-useless-deps.patch" + "${FILESDIR}/${PN}-43-skip-failing-test.patch" +) + +S="${WORKDIR}/${MY_P}" + +python_test() { + pytest -vv || die "testsuite failed under ${EPYTHON}" +} -- cgit v1.2.3