diff --git a/srcpkgs/libxml2-python b/srcpkgs/libxml2-python deleted file mode 120000 index 0ccd6d6e543..00000000000 --- a/srcpkgs/libxml2-python +++ /dev/null @@ -1 +0,0 @@ -libxml2 \ No newline at end of file diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template new file mode 100644 index 00000000000..38e06f1d341 --- /dev/null +++ b/srcpkgs/libxml2-python/template @@ -0,0 +1,32 @@ +# Template file for 'libxml2-python' +pkgname=libxml2-python +version=2.9.8 +revision=6 +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="Rasmus Thomsen " +license="MIT" +homepage="http://www.xmlsoft.org/" +distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz" +checksum=0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732 + +pre_build() { + sed "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:" -i setup.py +} + +post_install() { + vlicense ../COPYING +} + +libxml2-python3_package() { + short_desc+="${short_dest/Python2/Python3}" + pkg_install() { + vmove "usr/lib/python3*" + vlicense ../COPYING + } +} diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3 new file mode 120000 index 00000000000..7ba590df866 --- /dev/null +++ b/srcpkgs/libxml2-python3 @@ -0,0 +1 @@ +libxml2-python \ No newline at end of file diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index 0a9bb4a13a0..e2de5389780 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -1,13 +1,16 @@ # Template file for 'libxml2' +# +# Please keep this in sync with "srcpkgs/libxml2-python" +# pkgname=libxml2 version=2.9.8 -revision=5 +revision=6 patch_args="-Np1" build_style=gnu-configure -configure_args="--disable-static --with-threads --with-history --with-icu" -hostmakedepends="automake libtool gettext-devel pkg-config python-devel" -makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel - icu-devel python-devel" +configure_args="--disable-static --with-threads --with-history --with-icu + --without-python" +hostmakedepends="automake libtool gettext-devel pkg-config" +makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel" short_desc="Library providing XML and HTML support" maintainer="Juan RP " homepage="http://www.xmlsoft.org/" @@ -21,11 +24,7 @@ pre_configure() { autoreconf -fi sed '/PROGRAMS =/s,$(noinst_PROGRAMS),,' -i Makefile.in } -pre_build() { - if [ "$CROSS_BUILD" ]; then - sed "s|/usr/\(include/python2.7\)|$XBPS_CROSS_BASE/\1|g" -i python/Makefile - fi -} + post_install() { vlicense COPYING } @@ -47,11 +46,3 @@ libxml2-devel_package() { vmove "usr/lib/*.so" } } -libxml2-python_package() { - lib32disabled=yes - short_desc+=" - python extension" - pkg_install() { - vmove "usr/lib/python*" - vmove usr/share/doc/${sourcepkg}-python-${version} - } -}