From 12c3cf9ba7535b27e9a7d79f4600312c72db6bb3 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 25 Sep 2015 09:07:04 +0200 Subject: [PATCH] dev-libs/libxslt: Drop old Package-Manager: portage-2.2.21 Signed-off-by: Justin Lecher --- .../files/libxslt-1.1.27-python-config.patch | 26 ---- .../libxslt-1.1.28-libgcrypt-config.patch | 30 ----- .../files/libxslt-1.1.28-manual-python.patch | 36 ------ dev-libs/libxslt/libxslt-1.1.28-r1.ebuild | 98 ---------------- dev-libs/libxslt/libxslt-1.1.28-r2.ebuild | 104 ---------------- dev-libs/libxslt/libxslt-1.1.28-r3.ebuild | 111 ------------------ 6 files changed, 405 deletions(-) delete mode 100644 dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch delete mode 100644 dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch delete mode 100644 dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch delete mode 100644 dev-libs/libxslt/libxslt-1.1.28-r1.ebuild delete mode 100644 dev-libs/libxslt/libxslt-1.1.28-r2.ebuild delete mode 100644 dev-libs/libxslt/libxslt-1.1.28-r3.ebuild diff --git a/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch b/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch deleted file mode 100644 index 352a75352092..000000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.27-python-config.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4514fed897ab0911097e54715e7936048bf43dd9 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sat, 22 Sep 2012 16:37:36 -0400 -Subject: [PATCH] Gentoo uses /usr/bin/python-config with automatic version - detection - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 0d7ba86..3c8a5ad 100644 ---- a/configure.in -+++ b/configure.in -@@ -353,7 +353,7 @@ except: print 0"` - PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` - fi - fi -- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs` -+ PYTHON_LIBS=`python-config --libs` - fi - if test "$with_python" != "" - then --- -1.7.12 - diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch b/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch deleted file mode 100644 index 74ee935e4d8d..000000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.28-libgcrypt-config.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4eeed7de3fa90e27658c48cb06f034da43b4f057 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 4 Mar 2014 00:10:37 -0500 -Subject: [PATCH] configure: use AC_PATH_TOOL to find libgcrypt-config - -Since libgcrypt-config is used to find host system libraries, we should -be using AC_PATH_TOOL, not AC_PATH_PROG, for proper cross-compiling and -multilib support. - -https://bugzilla.gnome.org/show_bug.cgi?id=725635 ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index a861e90..8328625 100644 ---- a/configure.in -+++ b/configure.in -@@ -393,7 +393,7 @@ case $host in - CRYPTO_TESTDIR=crypto - ;; - *) -- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) - if test "$LIBGCRYPT_CONFIG" != "no" ; then - LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version` - if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42") --- -1.9.0 - diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch deleted file mode 100644 index 019f3253d876..000000000000 --- a/dev-libs/libxslt/files/libxslt-1.1.28-manual-python.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1671e1004e18fa9bbce410050d1365374ececb6a Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Tue, 18 Dec 2012 02:22:47 -0500 -Subject: [PATCH] build/test/install python bindings manually - -To support building for multiple python ABIs, we want to skip checks for -python in configure, and build/test/install python bindings manually. ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index fc8d5a8..6312c37 100644 ---- a/configure.in -+++ b/configure.in -@@ -296,7 +296,7 @@ PYTHON_INCLUDES= - PYTHON_SITE_PACKAGES= - pythondir= - AC_ARG_WITH(python, [ --with-python[=DIR] Build Python bindings if found]) --if test "$with_python" != "no" ; then -+if false ; then - if test -x "$with_python/bin/python" - then - echo Found python in $with_python/bin/python -@@ -365,7 +365,7 @@ except: print 0"` - pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages' - fi - fi --AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "") -+AM_CONDITIONAL(WITH_PYTHON, test "$with_python" != "no") - if test "$PYTHON_INCLUDES" != "" - then - PYTHON_SUBDIR=python --- -1.8.0.2 - diff --git a/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild deleted file mode 100644 index 96c5d02b101f..000000000000 --- a/dev-libs/libxslt/libxslt-1.1.28-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils python-r1 toolchain-funcs - -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="crypt debug python static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=dev-libs/libxml2-2.8.0:2 - crypt? ( >=dev-libs/libgcrypt-1.1.42:0= ) - python? ( - ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND}" - -src_prepare() { - # https://bugzilla.gnome.org/show_bug.cgi?id=684621 - epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch - - epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch - - # Python bindings are built/tested/installed manually. - epatch "${FILESDIR}"/${PN}-1.1.28-manual-python.patch - - eautoreconf - # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary - # and it is propably otherwise too if upstream generated with new - # autoconf -# epunt_cxx -} - -src_configure() { - # libgcrypt is missing pkg-config file, so fixing cross-compile - # here. see bug 267503. - tc-is-cross-compiler && \ - export LIBGCRYPT_CONFIG="${SYSROOT}"/usr/bin/libgcrypt-config - - econf \ - $(use_enable static-libs static) \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ - $(use_with crypt crypto) \ - $(use_with python) \ - $(use_with debug) \ - $(use_with debug mem-debug) -} - -src_compile() { - default - if use python; then - python_copy_sources - python_foreach_impl libxslt_py_emake - fi -} - -src_test() { - default - use python && python_foreach_impl libxslt_py_emake test -} - -src_install() { - default - dodoc FEATURES - - if use python; then - python_foreach_impl libxslt_py_emake DESTDIR="${D}" install - python_foreach_impl python_optimize - mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python - fi - - prune_libtool_files --modules -} - -libxslt_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake \ - PYTHON="${PYTHON}" \ - PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \ - PYTHON_LIBS="$(python-config --ldflags)" \ - PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ - pythondir="${EPREFIX}$(python_get_sitedir)" \ - PYTHON_VERSION=${EPYTHON/python} "$@" - popd > /dev/null -} diff --git a/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild deleted file mode 100644 index 0701648aadef..000000000000 --- a/dev-libs/libxslt/libxslt-1.1.28-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils python-r1 toolchain-funcs multilib-minimal - -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="crypt debug python static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r20 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - - # https://bugzilla.gnome.org/show_bug.cgi?id=684621 - epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch - - epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch - - # use AC_PATH_TOOL for libgcrypt-config for sane cross-compile and multilib support - # https://bugzilla.gnome.org/show_bug.cgi?id=725635 - epatch "${FILESDIR}"/${PN}-1.1.28-libgcrypt-config.patch - - # Python bindings are built/tested/installed manually. - epatch "${FILESDIR}"/${PN}-1.1.28-manual-python.patch - - eautoreconf - # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary - # and it is propably otherwise too if upstream generated with new - # autoconf -# epunt_cxx -} - -multilib_src_configure() { - ECONF_SOURCE=${S} econf \ - $(use_enable static-libs static) \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ - $(use_with crypt crypto) \ - $(multilib_is_native_abi && use_with python || echo --without-python) \ - $(use_with debug) \ - $(use_with debug mem-debug) -} - -multilib_src_compile() { - default - if use python && multilib_is_native_abi; then - python_copy_sources - python_foreach_impl libxslt_py_emake - fi -} - -multilib_src_test() { - default - use python && multilib_is_native_abi && python_foreach_impl libxslt_py_emake test -} - -multilib_src_install() { - # "default" does not work here - docs are installed by multilib_src_install_all - emake DESTDIR="${D}" install - - if use python && multilib_is_native_abi; then - python_foreach_impl libxslt_py_emake DESTDIR="${D}" install - python_foreach_impl python_optimize - mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python - fi - - prune_libtool_files --modules -} - -libxslt_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake \ - PYTHON="${PYTHON}" \ - PYTHON_INCLUDES="${EPREFIX}/usr/include/${EPYTHON}" \ - PYTHON_LIBS="$(python-config --ldflags)" \ - PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \ - pythondir="${EPREFIX}$(python_get_sitedir)" \ - PYTHON_VERSION=${EPYTHON/python} "$@" - popd > /dev/null -} diff --git a/dev-libs/libxslt/libxslt-1.1.28-r3.ebuild b/dev-libs/libxslt/libxslt-1.1.28-r3.ebuild deleted file mode 100644 index aff69fa75fbb..000000000000 --- a/dev-libs/libxslt/libxslt-1.1.28-r3.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit autotools eutils python-r1 toolchain-funcs multilib-minimal - -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="http://www.xmlsoft.org/" -SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt debug python static-libs" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=">=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20131008-r20 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) - - # https://bugzilla.gnome.org/show_bug.cgi?id=684621 - epatch "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch - - epatch "${FILESDIR}"/${PN}-1.1.26-disable_static_modules.patch - - # use AC_PATH_TOOL for libgcrypt-config for sane cross-compile and multilib support - # https://bugzilla.gnome.org/show_bug.cgi?id=725635 - epatch "${FILESDIR}"/${PN}-1.1.28-libgcrypt-config.patch - - eautoreconf - # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary - # and it is propably otherwise too if upstream generated with new - # autoconf -# epunt_cxx - # But Prefix always needs elibtoolize if not eautoreconf'd. -# elibtoolize -} - -multilib_src_configure() { - libxslt_configure() { - ECONF_SOURCE=${S} econf \ - $(use_enable static-libs static) \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-subdir=html \ - $(use_with crypt crypto) \ - $(use_with debug) \ - $(use_with debug mem-debug) \ - "$@" - } - - libxslt_py_configure() { - mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist - run_in_build_dir libxslt_configure "--with-python=${PYTHON}" # odd build system - } - - libxslt_configure --without-python # build python bindings separately - - if multilib_is_native_abi && use python; then - python_parallel_foreach_impl libxslt_py_configure - fi -} - -multilib_src_compile() { - default - multilib_is_native_abi && use python && libxslt_foreach_py_emake all -} - -multilib_src_test() { - default - multilib_is_native_abi && use python && libxslt_foreach_py_emake test -} - -multilib_src_install() { - # "default" does not work here - docs are installed by multilib_src_install_all - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - libxslt_foreach_py_emake DESTDIR="${D}" install - python_foreach_impl python_optimize - mv "${ED}"/usr/share/doc/${PN}-python-${PV} "${ED}"/usr/share/doc/${PF}/python - fi - - prune_libtool_files --modules -} - -libxslt_foreach_py_emake() { - libxslt_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - emake "$@" - popd > /dev/null - } - local native_builddir=${BUILD_DIR} - python_foreach_impl libxslt_py_emake top_builddir="${native_builddir}" "$@" -} -- 2.26.2