gentoo resync : 02.11.2017

2 files changed, 99 insertions, 0 deletions

diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index f278c9de3e72..06bd2f0f9faf 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -3,8 +3,10 @@ AUX expat-2.2.1-getrandom-detection.patch 807 SHA256 6b52907317b8495bd06c538bb26
 AUX expat-2.2.1-posix-shell.patch 1039 SHA256 30f05e3193299d4481e6996131dc03607ba9b0c189c20b26eba2def2cdb334df SHA512 7d8d293c90548ed6e622bdf7eff6ff3beda97ec9d7b0fea67fbf7c2b185575195325e26662e05886c9fcf4067aaa93533d05d48951c46e803a5215ca6c34b0c1 WHIRLPOOL 1c277239b78971fc25b46961f5361b5e88bf5a2f3f823508e3ecd17b981ec7c530e050f0aa05292abdd347dfa815d2a3c7670a616e9294eeeb37718be85cf1ed
 DIST expat-2.2.1.tar.bz2 405441 SHA256 1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885 SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea WHIRLPOOL f571ee00d43813c20d81d02d5d25f3fd4fdec3ec5a6aa331a965b4373ca681053e4e66d22fed4523f9a207333b80eb5e63c78d2e36e0c2b5a64ad1c38b0fe38a
 DIST expat-2.2.4.tar.bz2 505038 SHA256 03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592 WHIRLPOOL 77e62bca8da807e3175b05d121fd59b22b0018e57a3a82863794a220db49dfd2ff08f9463c2d319633e3aa4bb183347d1d43ed0d8baf0a65c97e893147123984
+DIST expat-2.2.5.tar.bz2 510868 SHA256 d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6 SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637 WHIRLPOOL 3e24be002c02a4aa05936515a73cb873bb797f34707c07a588cfeeed5fcc2d2a6668c460e5e4417fae4e3c7eec8f5ef6d767b066dfb44184c77f6c9943e978c1
 EBUILD expat-2.2.1.ebuild 2361 SHA256 ab687a53f68ebd56d8b812690f614f61cb4b58440450f9cd5cac0db4a9d738ad SHA512 413b086b98f14b370ac4234d7e55d631c17d1a8191f53067d89626e9b85f1187019d70581aa45912cdb518fa93b4fe82768ab7109c9e9c9083c81c62a004416f WHIRLPOOL 0f334fde26d6a7aa31584d4646e90d66ed9825436fb09e156f2109d615ae713445354a1aa3efd4d1f47609e6d39da04666894d122cab1fec5b539555dcfb1bce
 EBUILD expat-2.2.4.ebuild 2550 SHA256 9bee4fa99dae7f74c123a3541aeef1a4cd491dafdc228e1fbdc336f1af67cc71 SHA512 4cf005511f819146e0276b9f0df9b6c7d3261d38010a369c4b56b005c02115dff894d6c86ff2fb2e66bb1c4cbefed40e6ab862f5f17c3c0a60e5b6ed30735d4d WHIRLPOOL 8f09452359571218e8dce89888853d1dbb6c2b895b06138441fc4b4b21c39d0a47e70b6b4a87abb93fe7dbe4289576f18d02406ee20b33ff803f2dbea001e80c
+EBUILD expat-2.2.5.ebuild 2617 SHA256 2a10c6988712891d0294e6a7f237b30667eeeedabb68473dc1eec180bba101f0 SHA512 069a55aeae1aedf8392937f5bd37d073362fa919aa80f7998e75e4ef1797db095a36ff631d40915c1199e84b383a0ba05ba4af38f8af0afe84876c4f268cc6d5 WHIRLPOOL fb7ea802ac6fb258a70cc6020cf29d1bf80b119fac13f338c9fbf5c7b5f2a0ca8259a23c6ef20b4d4fa54b4da7a04b92306b3daafdf184948dcfe65404e17588
 MISC ChangeLog 8649 SHA256 59edba0a9eb652e75e3d6cdc1777d0fda8596358059bfd800278d2d05182943c SHA512 04b3b043f2c0ee716bb38950f106d54c17d3c6e77edfabd48432c7b8bc53fa32f306b411a82c090587a0f97e28452eb225de9dca0a885f3364f16db4470cbf4e WHIRLPOOL 7a463e3cab59777b18ac8bf9fcf24dd644a4d8654e90aa3dd4edda84339ff059216eb7b935fced84be73729f41540500c8bf74b0fb1675ea8e345cc27a77b523
 MISC ChangeLog-2015 23846 SHA256 b3def05f3722d69bced3909610d042a4014f2ea76ec73e754b8d0d47911fe595 SHA512 a7ec156a1bba3a2dd68c3b27838ce67f1a6dbeb1b928d788f18c23d169af0129a68c1e42cac4aeeef323a0e12869e6fd9209f96c1865e2624d84a06af4f0455c WHIRLPOOL 31fec33870b640ab06e9c8556c3fed405f29c3a6907319e18665a9f7ac751fdc4c980f23192a86da602bba39ac9a83a696e500fd36d301c712c0d49fa02d4018
 MISC metadata.xml 513 SHA256 1fa2d32af3480d18801983f2dd4b6bd82f1339b2109dbc9e4d99d117c6b2eaa5 SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3 WHIRLPOOL 915ee8c1312962dddd6915985bb1e745adaa2a27b614fd7883cede092d5d9893afed2c17a03fb7618326db1b7e9cacde62c02c0506e16c8cf619476b0302797c
diff --git a/dev-libs/expat/expat-2.2.5.ebuild b/dev-libs/expat/expat-2.2.5.ebuild
new file mode 100644
index 000000000000..4c9fc081bf59
--- /dev/null
+++ b/dev-libs/expat/expat-2.2.5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils libtool multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Stream-oriented XML parser library"
+HOMEPAGE="https://libexpat.github.io/"
+SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.bz2"
+
+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 ~x86-winnt"
+IUSE="elibc_FreeBSD examples static-libs unicode"
+DEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+DOCS=( README.md )
+
+src_prepare() {
+	eapply_user
+
+	# fix interpreter to be a recent/good shell
+	sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
+	if use unicode; then
+		cp -R "${S}" "${S}"w || die
+		pushd "${S}"w >/dev/null
+		find -name Makefile.am \
+			-exec sed \
+			-e 's,libexpat\.la,libexpatw.la,' \
+			-e 's,libexpat_la,libexpatw_la,' \
+			-i {} + || die
+		eautoreconf
+		popd >/dev/null
+	fi
+}
+
+multilib_src_configure() {
+	local myconf="$(use_enable static-libs static) --without-docbook"
+
+	mkdir -p "${BUILD_DIR}"w || die
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
+		popd >/dev/null
+	fi
+
+	ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib
+		popd >/dev/null
+	fi
+}
+
+multilib_src_install() {
+	emake install DESTDIR="${D}"
+
+	if use unicode; then
+		pushd "${BUILD_DIR}"w >/dev/null
+		emake -C lib install DESTDIR="${D}"
+		popd >/dev/null
+
+		pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
+		cp expat.pc expatw.pc
+		sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
+		popd >/dev/null
+	fi
+
+	if multilib_is_native_abi ; then
+		# libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
+		# we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
+		use elibc_FreeBSD && gen_usr_ldscript -a expat
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
+	docinto html
+	dodoc doc/*.{css,html,png}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.c
+	fi
+
+	prune_libtool_files
+}