gentoo resync : 29.10.2017

3 files changed, 170 insertions, 0 deletions

diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index 8ae5c0a98529..42a6af1f4005 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -2,12 +2,14 @@ AUX 1.1.30-unbreak-xslt-config.patch 791 SHA256 e7b85942dae4da41ac1ae20d9b335b57
 AUX libxslt-1.1.28-disable-static-modules.patch 1109 SHA256 706fab8fb584bc6ce2452423847d0484b9499455cf63a492a6d39d0f649048fb SHA512 d7a091d2b303450d46e94ca53df630ec6cdee8707ffd7d7d2920a56a624f1f8f53d2c1753768b49786c0ce17b6512f8de7740b54bf1c3cdbc5e8a5f3d052b1d1 WHIRLPOOL 1dd8eee2fb5d47baefde89d73912f1416c76b6224a1326fecbaafd6060002d8c842346d29ca8b2dd7d8e59c136509760b5ec353e4735cefb337cbc91eb2cc2e4
 AUX libxslt-1.1.28-simplify-python.patch 7468 SHA256 a06baa32549f17ed0595404125c8d3347d153b51beac37a34551390457c56737 SHA512 434000c035fe5427dd3d63fcb717f5e2b8863ed734d5451d54092b21ce5074b137299378c03d5130e18064d89be4ae942702eb8bc3295bd39287f353655c47c4 WHIRLPOOL 8a2079ddd6c5dc3c7e2b8adbe00ff65382a23aa0d91c36b68484575488068e847475f569811f4b612656d1f77ff7a1eb3242267a03b6c9a5b1c1d1b98e6b726a
 AUX libxslt-1.1.29-cygwin.patch 1148 SHA256 f0b3271faf0a7bd201964642d6b018e2909d20dd356dd13c08fc9fbe6757dc58 SHA512 9d24169d749356b6887bdd6c3dc3d4b34c455569fc79bd7235cea7d9e1ee3114b135ca79ac6f4b8c3ad2cf467c119316d8c934bb27c9d041312d0b0a19b635e8 WHIRLPOOL cec857824be7fc7d39093892c1f6411a8219bb0698931e9df709a5582d36a56a72db9374fc033f0f54648bc19265a885e4b96583ce002786079d68ddf6a4cdf2
+AUX libxslt-1.1.30-glibc226.patch 908 SHA256 02a57690c9e2d6c941877304a16f14e3bc6c82d002b7a043fa7461a5562f070e SHA512 9e13920ddfecd0cd634c009e5d117a4f9985d728df24ea0f11fbe5fb8a976664713b3d4166d0df4f5d2ce6f44dd39bdfde632fd0bc039c4dd375aca0ff1bd326 WHIRLPOOL f8859ed188205b8b05db6f0ad1ce976c3c7f129b2379563bc38516276d9bbb2f0883fd01b06ab4f2f6fb0d5cae409910dc253a53a75df4dbabada40b6447f4e3
 AUX libxslt-1.1.30-simplify-python.patch 7487 SHA256 899c40e3fcf5cd45f6dbf56154ff81b7dffc60a20d1a725751e3d49da7f318bc SHA512 4b0b622aff880de8ca2fbdd9e61cbea117f1f497767caabcc4ab4e6532145683b08d127f497bdd41035dc7b3fa6d3ab5b53c2d8674e87f5193c652858ee31586 WHIRLPOOL 69201905f868669bcd9b4810d4ab601431136cc8607c06f377ea3576ae95ba37a49123e40bd8d426ab1e7e685d737a3d1043533ab6db1a1a11c0d55c2243ce32
 AUX libxslt.m4-libxslt-1.1.26.patch 1421 SHA256 c02cd8437064db0921c08e63245c403dad12410d2997715aa7aa36600bfaa895 SHA512 78cfb6bd823805f660c9d07c4f6f83a87cf2385c48fcb11bff82792101f06b36d08f851089497f0c019f5743f31248cbabe341f78f4ca7e7617c86c4e5a8404a WHIRLPOOL 0b4da6d1ce77e653a6c175fc203f5fecd0c831a018a5063e66e5ff0cc19d9a19d8938b06e4318938a35f665f91442290f267bb3fc86b9268c2455ac9616caeff
 DIST libxslt-1.1.29.tar.gz 3428524 SHA256 b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31 WHIRLPOOL 874dca166a147e3928207b0dea720b92a3657406363536be0cc3c904dcea7bad0af48536a722d1570743908a7e730073a13440f41885b8fbaeba919b1e99521b
 DIST libxslt-1.1.30.tar.gz 3444029 SHA256 ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 WHIRLPOOL 7a346a1cdd340f6ee39b4d8d426dd894164ce4b8c55ee74b832cdcc9e7bb7bd2e13fdabb57a50a206c40be8bf238a57132bd1cf6fe48e77c710d8ec75f1aaffc
 EBUILD libxslt-1.1.29-r1.ebuild 3496 SHA256 646933711df2c10425193358e01f4a2277c1e537a8b3d0091e3f8e92ea118733 SHA512 8881813ff55064e4d37308de04fa30750a54bcc3c0c932954d0930542435241b84f6300655eaf715c2e784086ef6cc400bfa5cf0f5ba256edc38c13d06fea372 WHIRLPOOL 74ae64d1646874adcfab060728c4b13e9482c5a8982d198548dbd624efc02ec857d5498e2fc731dead0e09b33294c77adfd2797b706bd791131d96363553f40a
 EBUILD libxslt-1.1.30-r1.ebuild 3570 SHA256 34e5f78b59d8c0e0215169c99635bdf4524f7a0b4dca5ecebf10a35f3b582b98 SHA512 7899c43b5a0c4933cf44dd583e3c67f34a369a3e7909458545e3c63bc67c36a46389877583e35720ad384014668e5d336ca36eaa105523e1e8643328d8f19bad WHIRLPOOL 7fdabda4d6230f26c62856030957fc41252c01e14dce6552ebea4497c82044e64daf6cb2d9b1e863113d9054eae7ea299f10bbd2fad363d4a20a184e3701237c
+EBUILD libxslt-1.1.30-r2.ebuild 3674 SHA256 2569237c3c19a092a1f04d88732e08b38c62cc93e9b226ec607fa2fa55da113e SHA512 37358f9c889b0e9c62237c48e94b364887fa95b102a139e45f79ef07b48ecadc9c168a577e414e0b0724eb37dbb5dd2d7f8f615da34dacd5d4961e3f4ee10214 WHIRLPOOL 9f7764cee24e75bd80cdea77618c16718cf1c7ac80938428bd36cbec6d5b152094bd9810d0a2920f6775009ea0211a15b26e1dd8cf8041b6c2fdfa7a1d58d9e9
 EBUILD libxslt-1.1.30.ebuild 3461 SHA256 39915675e1deb05a107e8d90aa38e5cf68701dfe657406309b5663d69f17071b SHA512 b44d3c1f72cfded5bbdbd2ac0de4bec9b5d51945e9697f5fe7d71c01a507e005b77828312634e4095e9433e733a5ede58f4b822e0b2ef34027a3cd6e66542fc0 WHIRLPOOL adde0aa2a69d73c878c18073d15194e6b6f25247371aeff0a434325879f205141c436782832e4c801ca8bace4d1dfa4fe7d08b8201a10d70e6fbf5328aafee37
 MISC ChangeLog 8365 SHA256 b65a2f465bb43a077d88e2d6a9b519f298b0c00ff5332f071fb30ae97509440f SHA512 d6e29b3b6c1fda15a020b17728315bf11b6c208ddd7415d4c107c5777307ed37e43864e9b1feb9772c5257cd5f1df90051fce85944308d9e0a1afcb3d0147664 WHIRLPOOL 13da17ac13ee9bdda67134a6bc9bcb7f6127ced0a8cd8c35ce7df0284f107c079733170915bd73620bffbc3754fd477d907bc120ba8e328e833362aaa4d56d34
 MISC ChangeLog-2015 38221 SHA256 3ac8ca41025991ec887baeb5ad276a1a6fcc5f5a9e0014a50a5ba7c9dae878ec SHA512 d7a28c1e8f8884ae84d5fe11fb150edaadeffb2a3b7e3453a9276a9eb3bda47d529f0b0064ff23a45bd648652b8d82a505fa6f6c358e47bd583f1df8018205cc WHIRLPOOL d0a81a32dd6cb3f975bf3e52cab952531bd5eed4e0460a35c1c2ba2fd950d2b2800ca4bf7db526123d846b7d6b440e8b57285f4e34e41fcdc14c3ad527c7714e
diff --git a/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch
new file mode 100644
index 000000000000..e1e97229d60f
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.30-glibc226.patch
@@ -0,0 +1,32 @@
+diff --git a/configure.in b/configure.in
+index d6aa366..20aafb8 100644
+--- a/configure.in
++++ b/configure.in
+@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0
+ XSLT_LOCALE_WINAPI=0
+ 
+ AC_CHECK_HEADERS([locale.h xlocale.h])
+-if test $ac_cv_header_xlocale_h = yes; then
++if test $ac_cv_header_locale_h = yes; then
+ dnl
+ dnl Check for generic locale_t declaration
+ dnl
+-AC_MSG_CHECKING([if xlocale program link])
++AC_MSG_CHECKING([if locale program link])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h
+index 8a9ca15..2f64424 100644
+--- a/libxslt/xsltlocale.h
++++ b/libxslt/xsltlocale.h
+@@ -17,7 +17,9 @@
+ #ifdef XSLT_LOCALE_XLOCALE
+ 
+ #include <locale.h>
++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26
+ #include <xlocale.h>
++#endif
+ 
+ #ifdef __GLIBC__
+ /*locale_t is defined only if _GNU_SOURCE is defined*/
diff --git a/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
new file mode 100644
index 000000000000..8e852aaf2c52
--- /dev/null
+++ b/dev-libs/libxslt/libxslt-1.1.30-r2.ebuild
@@ -0,0 +1,136 @@
+# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
+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
+
+	# Simplify python setup
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758095
+	eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch
+	eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch
+
+	# Fix xslt-config
+	# https://bugs.gentoo.org/630784
+	eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch
+
+	# Fix build and headers with glibc-2.26, bug 632214
+	eapply "${FILESDIR}"/${PN}-1.1.30-glibc226.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}" "$@"
+}