gentoo Easter resync : 12.04.2020

5 files changed, 21 insertions, 88 deletions

diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index d5131422df4c..8b50f1c7f19d 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -1,7 +1,4 @@
-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
-DIST WeasyPrint-43.tar.gz 315365 BLAKE2B af643f6a6d09d09d89802dd3823e43e9f05873738b14e4f853a324850ffc12902cb791c3f187f6b550dded40669d376cf3d2e4d7d83e9747e87795a4d57e9014 SHA512 fc4c4decb298d4f9caf244433566c9b675b23db2508093d8c43c6e361119c5fe8298213075f550bebc72fe4156cfc516f04c8d7a2c6215fcd5add14360821f40
-EBUILD weasyprint-0.41.ebuild 1292 BLAKE2B 6fb4579eb430a2a8244dc7946f5a38d9ffc7033f5a47b0d775a90a3c8fea69f612058d341b8e5018577e13a8470bb22cf2ed278a85131503a9beb92583b8ce4f SHA512 833b80aa30d6eb63298f82c057f77bf4bcbe6583c18eb1e4b53dbb4b8e80d4bafab4ea71b6d9a90d0578175106e9e9931a2ce6753af9137694d457d3d85a5874
-EBUILD weasyprint-43.ebuild 1381 BLAKE2B 6ec2ac57641d599626a38afd1e84e29ac17480b5fa238164ebfc2248023e40b6c909d7c7d88e875e1c5e9ba1b4f98bf9b7b73259f7c1ef89d6865ff845f5890e SHA512 c74b5799d26a22540dbcf338aeecfd761a474f6759eb3982f1c2fb8a0bf0a789f5c09eed43f1f8b76ee3e55710a468841004a1626fba54c114229b5263c39b27
+AUX weasyprint-51-skip-useless-deps.patch 526 BLAKE2B 8e0fc794ffab3b9ba9d9c5992dba9f2ca5d88a3e79018f108558e81556f968498087a13aacd7030677e86000b7ad3f5ecab276dfe53b13b1fd0d3356c597cfd7 SHA512 dad97fd25f9f506aa7806a55b459eff051bb5592e28393733bb5c2c03473a8a93e78116339bd435f8d215e7f297772c9feae68cb84d5d1710bc72a6476cf608a
+DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8ce6b8ac99a08d86746677d40a86affe3c56dd3e3e6a0eb2fc915f77036271f049f6ccc644d508be51d01d97b7c SHA512 631038bece7ac0c15c6a668a7d06137e4bccc049eb80484a153ca9c4a996256de8647428b21ed1d0c1607af3893c747a1956a3d3f012b30105ba4f8613a96fcd
+EBUILD weasyprint-51.ebuild 1393 BLAKE2B 025316863d5ce799339bc276d910407c49b5bba967f525eaf1e1f43991148b2de179cda9b36983e8b3eb86695a6bc08fa996b8ce61fb7a5ac076619a13117239 SHA512 0187760cbe1854a9f5457e64fea9260825ac85a71d741481c7e5a345a97f9a36a65aa44f73296f9002aacc72036c8501dc453102619da969b64cffd87a53d6a0
 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
deleted file mode 100644
index f49635fc8479..000000000000
--- a/dev-python/weasyprint/files/weasyprint-43-skip-failing-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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('''
-       <article style="display: flex; flex-flow: column wrap-reverse;
-                       height: 50px">
diff --git a/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch b/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch
index 1229f0bed26d..862f11dc0a04 100644
--- a/dev-python/weasyprint/files/weasyprint-43-skip-useless-deps.patch
+++ b/dev-python/weasyprint/files/weasyprint-51-skip-useless-deps.patch
@@ -1,26 +1,26 @@
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -34,7 +34,6 @@
+@@ -40,7 +40,6 @@
  [options]
  packages = find:
  zip_safe = false
 -setup_requires = pytest-runner
  install_requires = 
+ 	setuptools>=39.2.0
  	cffi>=0.6
- 	html5lib>=0.999999999
-@@ -43,11 +42,6 @@
+@@ -50,11 +49,6 @@
  	cssselect2>=0.1
- 	CairoSVG>=1.0.20
- 	Pyphen>=0.8
+ 	CairoSVG>=2.4.0
+ 	Pyphen>=0.9.1
 -tests_require = 
 -	pytest-runner
 -	pytest-cov
 -	pytest-flake8
 -	pytest-isort
+ python_requires = >= 3.5
  
  [options.entry_points]
- console-scripts = weasyprint = weasyprint.__main__:main
-@@ -72,7 +72,6 @@
+@@ -86,7 +80,6 @@
  test = pytest
  
  [tool:pytest]
diff --git a/dev-python/weasyprint/weasyprint-0.41.ebuild b/dev-python/weasyprint/weasyprint-0.41.ebuild
deleted file mode 100644
index 18d60ad1e73f..000000000000
--- a/dev-python/weasyprint/weasyprint-0.41.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-RESTRICT="test"
-
-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="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="jpeg test tiff"
-
-# Note: specific subslot of pango since it inlines some of pango headers.
-RDEPEND="
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf[jpeg?,tiff?]
-	x11-libs/pango:0/0
-	>=dev-python/cairocffi-0.5[${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}]
-	>=dev-python/pdfrw-0.4[${PYTHON_USEDEP}]
-"
-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-43.ebuild b/dev-python/weasyprint/weasyprint-51.ebuild
index d50684ae43a1..fdcc64deeca7 100644
--- a/dev-python/weasyprint/weasyprint-43.ebuild
+++ b/dev-python/weasyprint/weasyprint-51.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -20,19 +20,20 @@ IUSE="jpeg test tiff"
 RESTRICT="!test? ( test )"
 
 # Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
 RDEPEND="
-	>=x11-libs/cairo-1.15.4
-	x11-libs/gdk-pixbuf[jpeg?,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}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	>=media-gfx/cairosvg-2.4.0[${PYTHON_USEDEP}]
+	>=x11-libs/cairo-1.15.4
+	x11-libs/gdk-pixbuf[jpeg?,tiff?]
+	x11-libs/pango:0/0
 "
+
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
@@ -41,10 +42,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-43-skip-useless-deps.patch"
-	"${FILESDIR}/${PN}-43-skip-failing-test.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-51-skip-useless-deps.patch" )
+# 	"${FILESDIR}/${PN}-43-skip-failing-test.patch"
 
 S="${WORKDIR}/${MY_P}"