summaryrefslogtreecommitdiff
path: root/dev-libs/libxslt
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/libxslt')
-rw-r--r--dev-libs/libxslt/Manifest6
-rw-r--r--dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch250
-rw-r--r--dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch29
-rw-r--r--dev-libs/libxslt/libxslt-1.1.29-r1.ebuild130
-rw-r--r--dev-libs/libxslt/libxslt-1.1.30-r2.ebuild2
5 files changed, 2 insertions, 415 deletions
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index d6d5e100e18d..dc743afcf23f 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,12 +1,8 @@
AUX 1.1.30-unbreak-xslt-config.patch 791 BLAKE2B 2ce4909cfbb4301bfe603e586c43a1a20324427da20f324c9bfed6186552388eb6e9ffb87e1aef252ec5dfa8c200c070db6509673700c2cfa9b29f8c32c171c9 SHA512 0bf8365043d183062b92e158a972d616e7c4744f5282f807f430862f8f831a1afbff793665754e2aedb438ee2ebb01d4526aec10573cef6f6e79d67c218c1ba2
AUX libxslt-1.1.28-disable-static-modules.patch 1109 BLAKE2B fc4c8c1dc932ff9bdce27064bf68b7bb7c8de94902e26250ba280d771464e9c92bc069f36910ed96269bd1c4270e1f881921d8f7f9101941a4fcdbe9f77380e9 SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1
-AUX libxslt-1.1.28-simplify-python.patch 7468 BLAKE2B 4d772fb059aecfb5730201e87974396eaab98df30bee214b9cd132d7ad0542100a443349ef4a4dc95e69aab3a0a52cc72c08b6c2eac1c65d745ef4d6d63c8a9b SHA512 434000c035fe5427dd3d63fcb717f5e2b8863ed734d5451d54092b21ce5074b137299378c03d5130e18064d89be4ae942702eb8bc3295bd39287f353655c47c4
-AUX libxslt-1.1.29-cygwin.patch 1148 BLAKE2B 77907a5195b526a213b638b5f3b3e23c634a7f2b90a33c0523be8d69ef999f5c914887f536a388c2fe1fb99a9c131e98fe45772c36163b466e4f70c7f80e535b SHA512 9d24169d749356b6887bdd6c3dc3d4b34c455569fc79bd7235cea7d9e1ee3114b135ca79ac6f4b8c3ad2cf467c119316d8c934bb27c9d041312d0b0a19b635e8
AUX libxslt-1.1.30-glibc226.patch 908 BLAKE2B c6df4080c1f99d72a903632bd6fe99af92c412ff72bb378f342671ec57bd0443272ce4c8d60e4fc8d2a12aa7ae74ce30f397423bdac1c46c6b6b43314370ff85 SHA512 9e13920ddfecd0cd634c009e5d117a4f9985d728df24ea0f11fbe5fb8a976664713b3d4166d0df4f5d2ce6f44dd39bdfde632fd0bc039c4dd375aca0ff1bd326
AUX libxslt-1.1.30-simplify-python.patch 7487 BLAKE2B d4a355c285a3c62b1c96846c62bb161a52c1ce41168ef0c07641fc948480f2457345e24641f18fef84f5f34bc930943ad312c9d6c2b9da4141175c7afe320a32 SHA512 4b0b622aff880de8ca2fbdd9e61cbea117f1f497767caabcc4ab4e6532145683b08d127f497bdd41035dc7b3fa6d3ab5b53c2d8674e87f5193c652858ee31586
AUX libxslt.m4-libxslt-1.1.26.patch 1421 BLAKE2B 91a1bf2487158d5e364247d29da4485e7b62f1838cbe1f8eabc7617b67929640280f6f2b649ea090fcc818fd5e5e99809b960e1cd69a5df42ca73abe86839b98 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a
-DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31
DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986
-EBUILD libxslt-1.1.29-r1.ebuild 3252 BLAKE2B 46ca2f9ebfda27d0795ad4f041028eac85fc456733d1e91e8bb3b57999fbad4d7e6e12b12584eaeb0db9d48c5d0bf9dc23f038d3fc8ca8e4823aa7f2beeb1b91 SHA512 719a10deac3cbb09b7b2ac407f80cabbdb44457d8308d9760a253322244a96f4f8af048037875df7da87357ae3cf00576c8dac292eef47f5c009f7bd13463c68
-EBUILD libxslt-1.1.30-r2.ebuild 3701 BLAKE2B cffe1a9a2e207d172525a51abea907873f1466b39a732b853f43c1f82c0f7815c5325f5f7ef081bce13449a7b53f2a8d42514d920b0f18696b50e3264174b7d7 SHA512 75b1d752952b606b4b6a87fe430b8ab26ecc2a4e0fa38483edcd2557fca9414b6fbf5ea3fee4ed9cf2616f253938f35dfef8fccd0d9e77eee84b4bbaed22e0b2
+EBUILD libxslt-1.1.30-r2.ebuild 3697 BLAKE2B 1ccf6efd66585d9331fcbdafe28cc95b447319160c92f4285199a839a6f7b40cee988d6cc0a9f2c60c30b56dd1a890909f4e1b1cc39178d1146a2a338436fa11 SHA512 51c36880c9f8a6a9882c4a5b8143ab96af96e0123d4a82767d0eb8e5fae9ce24d1ebc9be6692c842cdb049c34ae3f6757494d7e4bc6f2b7e090e33002ce69ec3
MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch
deleted file mode 100644
index 7cbaaf69e092..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-From f8aeca1dca05c7053532c576add6ab4a472c5e4e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Nov 2015 17:49:07 +0100
-Subject: [PATCH] Simplify python setup in autoconf
-
-AM_PATH_PYTHON does most of the job without using pkg-config as expected
-from the rest of the autoconf script.
----
- Makefile.am | 14 +++++--
- configure.in | 119 ++++++++++++++---------------------------------------
- python/Makefile.am | 28 ++++---------
- 3 files changed, 49 insertions(+), 112 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e357f19..c396913 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,9 +2,13 @@ SUBDIRS = \
- libxslt \
- libexslt \
- xsltproc \
-- doc \
-- $(PYTHON_SUBDIR) \
-- tests
-+ doc
-+
-+if WITH_PYTHON
-+SUBDIRS += python
-+endif
-+
-+SUBDIRS += tests
-
- DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
-
-@@ -51,7 +55,9 @@ tests: dummy
- @echo '## Running the regression test suite'
- @(cd tests ; $(MAKE) tests)
- @(cd xsltproc ; $(MAKE) tests)
-- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) tests ; fi)
-+if WITH_PYTHON
-+ @(cd python ; $(MAKE) tests)
-+endif
-
- valgrind:
- @echo '## Running the regression tests under Valgrind'
-diff --git a/configure.in b/configure.in
-index e84ad4f..102c733 100644
---- a/configure.in
-+++ b/configure.in
-@@ -291,90 +291,37 @@ dnl
- dnl check for python
- dnl
-
--PYTHON_VERSION=
--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 test -x "$with_python/bin/python"
-- then
-- echo Found python in $with_python/bin/python
-- PYTHON="$with_python/bin/python"
-- else
-- if test -x "$with_python"
-- then
-- echo Found python in $with_python
-- PYTHON="$with_python"
-- else
-- if test -x "$PYTHON"
-- then
-- echo Found python in environment PYTHON=$PYTHON
-- with_python=`$PYTHON -c "import sys; print sys.exec_prefix"`
-- else
-- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5)
-- fi
-- fi
-- fi
-- if test "$PYTHON" != ""
-- then
-- echo "PYTHON is pointing at $PYTHON"
-- PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
-- echo Found Python version $PYTHON_VERSION
-- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1
--except: print 0"`
-- if test "$LIBXML2_PYTHON" = "1"
-- then
-- echo Found libxml2-python module
-- else
-- echo Warning: Missing libxml2-python
-- fi
-- fi
-- if test "$PYTHON_VERSION" != ""
-- then
-- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
-- -d $with_python/lib/python$PYTHON_VERSION/site-packages
-- then
-- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
-- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-- else
-- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
-- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-- else
-- if test -r /usr/include/python$PYTHON_VERSION/Python.h
-- then
-- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
-- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-- else
-- echo could not find python$PYTHON_VERSION/Python.h
-- fi
-- fi
-- if test ! -d "$PYTHON_SITE_PACKAGES"
-- then
-- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"`
-- fi
-- fi
-- PYTHON_LIBS=`python$PYTHON_VERSION-config --libs`
-- fi
-- if test "$with_python" != ""
-- then
-- pythondir='$(PYTHON_SITE_PACKAGES)'
-- else
-- pythondir='$(libdir)/python$(PYTHON_VERSION)/site-packages'
-- fi
--fi
--AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
--if test "$PYTHON_INCLUDES" != ""
--then
-- PYTHON_SUBDIR=python
--else
-- PYTHON_SUBDIR=
--fi
--AC_SUBST(pythondir)
--AC_SUBST(PYTHON_SUBDIR)
--AC_SUBST(PYTHON_LIBS)
-+AC_ARG_WITH([python],
-+ AS_HELP_STRING([--with-python], [Build Python bindings if found])
-+)
-+
-+AS_IF([test "$with_python" = "yes"],
-+ [AM_PATH_PYTHON
-+ AC_PATH_TOOL([PYTHON_CONFIG], [python$PYTHON_VERSION-config], [no])
-+ AS_IF([test "$PYTHON_CONFIG" = "no"],
-+ [AC_PATH_TOOL([PYTHON_CONFIG], [python-config], [no])])
-+ AS_IF([test "$PYTHON_CONFIG" != "no"],
-+ [PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
-+ PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-+ PYTHON_LIBS=`$PYTHON_CONFIG --libs`],
-+ [AC_MSG_ERROR([Missing python development files.])])
-+ AC_MSG_CHECKING([libxml2 module in $PYTHON])
-+ LIBXML2_PYTHON=`$PYTHON -c "import sys;
-+try:
-+ import libxml2
-+ sys.stdout.write('1')
-+except:
-+ sys.stdout.write('0')"`
-+ AS_IF([test "$LIBXML2_PYTHON" = "1"],
-+ [AC_MSG_RESULT([yes])],
-+ [AC_MSG_RESULT([no])
-+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])])
-+ ])
-+
-+AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"])
-+AC_SUBST([PYTHON_CFLAGS])
-+AC_SUBST([PYTHON_LDFLAGS])
-+AC_SUBST([PYTHON_LIBS])
-
- AC_ARG_WITH(crypto, [ --with-crypto Add crypto support to exslt (on)])
- WITH_CRYPTO=0
-@@ -644,10 +591,6 @@ AC_SUBST(PYTHONSODV)
- AC_SUBST(XML_CONFIG)
- AC_SUBST(LIBXML_LIBS)
- AC_SUBST(LIBXML_CFLAGS)
--AC_SUBST(PYTHON)
--AC_SUBST(PYTHON_VERSION)
--AC_SUBST(PYTHON_INCLUDES)
--AC_SUBST(PYTHON_SITE_PACKAGES)
-
- XSLT_LIBDIR='-L${libdir}'
- XSLT_INCLUDEDIR='-I${includedir}'
-diff --git a/python/Makefile.am b/python/Makefile.am
-index fa58b78..3a5ecd6 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -5,9 +5,9 @@ SUBDIRS= . tests
-
- AM_CFLAGS = $(LIBXML_CFLAGS)
-
--DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
-+docsdir = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
- # libxsltclass.txt is generated
--DOCS = TODO
-+dist_docs_DATA = TODO
-
- EXTRA_DIST = \
- libxslt.c \
-@@ -16,10 +16,7 @@ EXTRA_DIST = \
- libxml_wrap.h \
- libxslt_wrap.h \
- libxsl.py \
-- libxslt-python-api.xml \
-- $(DOCS)
--
--libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version
-+ libxslt-python-api.xml
-
- if WITH_PYTHON
- mylibs = \
-@@ -28,31 +25,22 @@ mylibs = \
-
- all-local: libxslt.py
-
--python_LTLIBRARIES = libxsltmod.la
-+python_PYTHON = libxslt.py
-+pyexec_LTLIBRARIES = libxsltmod.la
-
- libxsltmod_la_CPPFLAGS = \
-- -I$(PYTHON_INCLUDES) \
- -I$(top_srcdir)/libxslt \
- -I$(top_srcdir) \
-- -I../libexslt
-+ -I$(top_srcdir)/libexslt \
-+ $(PYTHON_CFLAGS)
- libxsltmod_la_SOURCES = libxslt.c types.c
- nodist_libxsltmod_la_SOURCES = libxslt-py.c
- libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
-+libxsltmod_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) $(PYTHON_LDFLAGS) -module -avoid-version
-
- libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
- cat $(srcdir)/libxsl.py libxsltclass.py > $@
-
--install-data-local:
-- $(MKDIR_P) $(DESTDIR)$(pythondir)
-- $(INSTALL) -m 0644 libxslt.py $(DESTDIR)$(pythondir)
-- $(MKDIR_P) $(DESTDIR)$(DOCS_DIR)
-- @(for doc in $(DOCS) ; \
-- do $(INSTALL) -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
--
--uninstall-local:
-- rm -f $(DESTDIR)$(pythondir)/libxslt.py
-- rm -rf $(DESTDIR)$(DOCS_DIR)
--
- GENERATE = generator.py
- API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml
- GENERATED= libxsltclass.py \
---
-2.6.3
-
diff --git a/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch b/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch
deleted file mode 100644
index 221da9a55da0..000000000000
--- a/dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2fbf5b1f440534a46b7b440a487768620cfb039c Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Wed, 13 Jul 2016 13:31:05 +0200
-Subject: Add WIN32_EXTRA_LDFLAGS to tests/plugins/Makefile.am
-
-Fixes a compilation problem with Cygwin.
-
-Fixes bug #766669:
-https://bugzilla.gnome.org/show_bug.cgi?id=766669
----
- tests/plugins/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
-index e0736ab..0f8c378 100644
---- a/tests/plugins/Makefile.am
-+++ b/tests/plugins/Makefile.am
-@@ -21,7 +21,7 @@ plugindir = $(abs_builddir)/.libs
- xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
- xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
- xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)
--xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version -rpath $(plugindir)
-+xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir)
-
- test-logall:
- @echo '## Running plugin tests'
---
-cgit v0.12
-
diff --git a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
deleted file mode 100644
index 75eb84873318..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.29-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools ltprune 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="arm64 m68k s390 sh"
-
-IUSE="crypt debug examples python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}]
- crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-libs/libxml2:2[python,${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/xslt-config
-)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/libxslt/xsltconfig.h
-)
-
-src_prepare() {
- default
-
- DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO )
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=684621
- eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch
- # https://bugzilla.gnome.org/show_bug.cgi?id=766669
- eapply "${FILESDIR}"/${PN}-1.1.29-cygwin.patch
-
- # Simplify python setup
- eapply "${FILESDIR}"/${PN}-1.1.28-simplify-python.patch
- eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
-
- mv configure.{in,ac} || die
-
- 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 \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-html-subdir=html \
- $(use_with crypt crypto) \
- $(use_with debug) \
- $(use_with debug mem-debug) \
- $(use_enable static-libs static) \
- "$@"
- }
-
- libxslt_py_configure() {
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist
- run_in_build_dir libxslt_configure --with-python
- }
-
- libxslt_configure --without-python # build python bindings separately
-
- if multilib_is_native_abi && use python; then
- python_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}" \
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
- EXAMPLE_DIR="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
- install
- python_foreach_impl python_optimize
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if ! use examples; then
- rm -rf "${ED}"/usr/share/doc/${PF}/examples
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
- 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}" "$@"
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
index efcf07da26d3..7b2ee91de7da 100644
--- a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -13,7 +13,7 @@ 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 examples python static-libs elibc_Darwin"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"