From 03df8f07546d8aeaaced0de1531e65af53351a5e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 9 Jan 2022 14:13:10 +0100 Subject: [PATCH] libxml2-python: remove package * add python3 to dependencies of libxml2-python3 --- srcpkgs/libxml2-python/template | 34 ------------------- srcpkgs/libxml2-python3 | 1 - .../patches/py39compat.patch | 0 .../patches/python3-utf8.patch | 0 srcpkgs/libxml2-python3/template | 26 ++++++++++++++ srcpkgs/libxml2/template | 2 +- 6 files changed, 27 insertions(+), 36 deletions(-) delete mode 100644 srcpkgs/libxml2-python/template delete mode 120000 srcpkgs/libxml2-python3 rename srcpkgs/{libxml2-python => libxml2-python3}/patches/py39compat.patch (100%) rename srcpkgs/{libxml2-python => libxml2-python3}/patches/python3-utf8.patch (100%) create mode 100644 srcpkgs/libxml2-python3/template diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template deleted file mode 100644 index 1d75b7ac56b..00000000000 --- a/srcpkgs/libxml2-python/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'libxml2-python' -pkgname=libxml2-python -version=2.9.10 -revision=4 -wrksrc="${pkgname%-python}-${version}" -build_wrksrc=python -build_style=python-module -hostmakedepends="python-devel python3-devel" -makedepends="libxml2-devel python-devel python3-devel" -depends="python python3" -short_desc="Library providing XML and HTML support - Python2 bindings" -maintainer="Enno Boland " -license="MIT" -homepage="http://www.xmlsoft.org/" -distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz" -checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f - -post_patch() { - if [ "${CROSS_BUILD}" ]; then - vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:" - fi -} - -post_install() { - vlicense ../COPYING -} - -libxml2-python3_package() { - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove "usr/lib/python3*" - vlicense ../COPYING - } -} diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3 deleted file mode 120000 index 7ba590df866..00000000000 --- a/srcpkgs/libxml2-python3 +++ /dev/null @@ -1 +0,0 @@ -libxml2-python \ No newline at end of file diff --git a/srcpkgs/libxml2-python/patches/py39compat.patch b/srcpkgs/libxml2-python3/patches/py39compat.patch similarity index 100% rename from srcpkgs/libxml2-python/patches/py39compat.patch rename to srcpkgs/libxml2-python3/patches/py39compat.patch diff --git a/srcpkgs/libxml2-python/patches/python3-utf8.patch b/srcpkgs/libxml2-python3/patches/python3-utf8.patch similarity index 100% rename from srcpkgs/libxml2-python/patches/python3-utf8.patch rename to srcpkgs/libxml2-python3/patches/python3-utf8.patch diff --git a/srcpkgs/libxml2-python3/template b/srcpkgs/libxml2-python3/template new file mode 100644 index 00000000000..46dfd05a0bc --- /dev/null +++ b/srcpkgs/libxml2-python3/template @@ -0,0 +1,26 @@ +# Template file for 'libxml2-python3' +pkgname=libxml2-python3 +version=2.9.10 +revision=5 +wrksrc="libxml2-${version}" +build_wrksrc=python +build_style=python3-module +hostmakedepends="python3-devel" +makedepends="libxml2-devel python3-devel" +depends="python3" +short_desc="Library providing XML and HTML support - Python3 bindings" +maintainer="Enno Boland " +license="MIT" +homepage="http://www.xmlsoft.org/" +distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz" +checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f + +post_patch() { + if [ "${CROSS_BUILD}" ]; then + vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:" + fi +} + +post_install() { + vlicense ../COPYING +} diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 6a68fb6691c..22d533816ab 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,6 +1,6 @@ # Template file for 'libxml2' # -# Please keep this in sync with "srcpkgs/libxml2-python" +# Please keep this in sync with "srcpkgs/libxml2-python3" # pkgname=libxml2 version=2.9.10