From 195821396ef9a16012bae73bf179425b9930277b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 24 Feb 2022 16:23:49 +0100
Subject: [PATCH] python-lxml: remove package

---
 srcpkgs/python-lxml/template                  | 38 -------------------
 srcpkgs/python3-lxml                          |  1 -
 .../patches/tests-fix-encoding-name.patch     | 16 ++++++++
 srcpkgs/python3-lxml/template                 | 27 +++++++++++++
 srcpkgs/{python-lxml => python3-lxml}/update  |  0
 srcpkgs/removed-packages/template             |  1 +
 6 files changed, 44 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/python-lxml/template
 delete mode 120000 srcpkgs/python3-lxml
 create mode 100644 srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch
 create mode 100644 srcpkgs/python3-lxml/template
 rename srcpkgs/{python-lxml => python3-lxml}/update (100%)

diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template
deleted file mode 100644
index f01ee0c963c..00000000000
--- a/srcpkgs/python-lxml/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'python-lxml'
-pkgname=python-lxml
-version=4.6.4
-revision=2
-wrksrc="lxml-lxml-${version}"
-build_style=python-module
-make_build_args="--with-cython"
-hostmakedepends="python-Cython python-setuptools python3-Cython python3-setuptools"
-makedepends="libxslt-devel python-devel python3-devel"
-checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
-short_desc="Python2 binding for the libxml2 and libxslt libraries"
-maintainer="Alessio Sergi <al3hex@gmail.com>"
-license="BSD-3-Clause, custom:ElementTree"
-homepage="https://lxml.de/"
-distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
-checksum=5a7cef132353fc36de6f6b26dacde07b22217c6b4f8c11ef48e8bf0011f48160
-
-do_check() {
-	cp -f build-3.*/lib.linux-*/lxml/*.so src/lxml
-	python3 test.py -vv --all-levels -p
-}
-
-post_install() {
-	vlicense LICENSES.txt
-	vlicense doc/licenses/BSD.txt
-	vlicense doc/licenses/elementtree.txt
-}
-
-python3-lxml_package() {
-	short_desc="${short_desc/Python2/Python3}"
-	depends="python3"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSES.txt
-		vlicense doc/licenses/BSD.txt
-		vlicense doc/licenses/elementtree.txt
-	}
-}
diff --git a/srcpkgs/python3-lxml b/srcpkgs/python3-lxml
deleted file mode 120000
index e69b7beb133..00000000000
--- a/srcpkgs/python3-lxml
+++ /dev/null
@@ -1 +0,0 @@
-python-lxml
\ No newline at end of file
diff --git a/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch b/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch
new file mode 100644
index 00000000000..28f165c24f4
--- /dev/null
+++ b/srcpkgs/python3-lxml/patches/tests-fix-encoding-name.patch
@@ -0,0 +1,16 @@
+from alpine: https://gitlab.alpinelinux.org/alpine/aports/-/commit/369de77b6197a5d04beb551537533fc82141a516
+
+From: Patrycja Rosa <alpine@ptrcnull.me>
+Date: Thu, 10 Feb 2022 14:09:24 +0100
+Subject: test_incremental_xmlfile: fix encoding name
+
+diff --git a/src/lxml/tests/test_incremental_xmlfile.py b/src/lxml/tests/test_incremental_xmlfile.py
+--- a/src/lxml/tests/test_incremental_xmlfile.py
++++ b/src/lxml/tests/test_incremental_xmlfile.py
+@@ -173,4 +173,4 @@
+-        with etree.xmlfile(self._file, encoding='utf16') as xf:
++        with etree.xmlfile(self._file, encoding='utf-16') as xf:
+             with xf.element('test'):
+                 xf.write('toast')
+-        self.assertXml('<test>toast</test>', encoding='utf16')
++        self.assertXml('<test>toast</test>', encoding='utf-16')
diff --git a/srcpkgs/python3-lxml/template b/srcpkgs/python3-lxml/template
new file mode 100644
index 00000000000..e980df0e97e
--- /dev/null
+++ b/srcpkgs/python3-lxml/template
@@ -0,0 +1,27 @@
+# Template file for 'python3-lxml'
+pkgname=python3-lxml
+version=4.6.4
+revision=2
+wrksrc="lxml-lxml-${version}"
+build_style=python3-module
+make_build_args="--with-cython"
+hostmakedepends="python3-Cython python3-setuptools"
+makedepends="libxslt-devel python3-devel"
+depends="python3"
+checkdepends="python3-cssselect python3-BeautifulSoup4 python3-html5lib"
+short_desc="Python binding for the libxml2 and libxslt libraries"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+license="BSD-3-Clause, custom:ElementTree"
+homepage="https://lxml.de/"
+distfiles="https://github.com/lxml/lxml/archive/lxml-${version}.tar.gz"
+checksum=5a7cef132353fc36de6f6b26dacde07b22217c6b4f8c11ef48e8bf0011f48160
+
+do_check() {
+	make test3
+}
+
+post_install() {
+	vlicense LICENSES.txt
+	vlicense doc/licenses/BSD.txt
+	vlicense doc/licenses/elementtree.txt
+}
diff --git a/srcpkgs/python-lxml/update b/srcpkgs/python3-lxml/update
similarity index 100%
rename from srcpkgs/python-lxml/update
rename to srcpkgs/python3-lxml/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 7c19293ada4..6503f383520 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -272,6 +272,7 @@ replaces="
  python-gntp<=1.0.3_7
  python-iso8601<=0.1.16_2
  python-jellyfish<=0.6.1_2
+ python-lxml<=4.6.4_2
  python-matplotlib-data<=2.2.4_2
  python-matplotlib<=2.2.4_2
  python-netifaces<=0.10.9_3