Security bump, wrt bug #543930. Bump EAPI to 5, add epatch_user, add subslot to dev-libs/icu dependency, wrt bug #522670

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x60C0742D1F357D42)

2 files changed, 106 insertions, 1 deletions

diff --git a/dev-libs/xerces-c/ChangeLog b/dev-libs/xerces-c/ChangeLog
index 0dc0cfc479c4..fcd6e8c71195 100644
--- a/dev-libs/xerces-c/ChangeLog
+++ b/dev-libs/xerces-c/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/xerces-c
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.107 2015/01/28 19:42:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/ChangeLog,v 1.108 2015/05/26 09:15:35 pinkbyte Exp $
+
+*xerces-c-3.1.2 (26 May 2015)
+
+  26 May 2015; Sergey Popov <pinkbyte@gentoo.org> +xerces-c-3.1.2.ebuild:
+  Security bump, wrt bug #543930. Bump EAPI to 5, add epatch_user, add subslot
+  to dev-libs/icu dependency, wrt bug #522670
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> xerces-c-3.1.1-r1.ebuild:
   Switch to CPU_FLAGS_X86.
diff --git a/dev-libs/xerces-c/xerces-c-3.1.2.ebuild b/dev-libs/xerces-c/xerces-c-3.1.2.ebuild
new file mode 100644
index 000000000000..a9006391794f
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.1.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.1.2.ebuild,v 1.1 2015/05/26 09:15:35 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++"
+HOMEPAGE="http://xerces.apache.org/xerces-c/"
+SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD iconv icu static-libs threads"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+	curl? ( net-misc/curl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CREDITS KEYS NOTICE README version.incl )
+
+pkg_setup() {
+	export ICUROOT="/usr"
+
+	if use iconv && use icu ; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU will precede."
+	fi
+}
+
+src_prepare() {
+	use threads || epatch "${FILESDIR}/3.1.1-disable-thread-tests.patch"
+
+	sed -i \
+		-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
+		-e 's/@mkdir_p@/@MKDIR_P@/' \
+		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die
+
+	epatch_user
+}
+
+src_configure() {
+	local mloader="inmemory"
+	use iconv && mloader="iconv"
+	use icu && mloader="icu"
+
+	local transcoder="gnuiconv"
+	use elibc_FreeBSD && transcoder="iconv"
+	use elibc_Darwin && transcoder="macosunicodeconverter"
+	use icu && transcoder="icu"
+	# for interix maybe: transcoder="windows"
+
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor="socket"
+	use elibc_Darwin && netaccessor="cfurl"
+	use curl && netaccessor="curl"
+
+	econf \
+		--disable-pretty-make \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		--enable-msgloader-${mloader} \
+		--enable-netaccessor-${netaccessor} \
+		--enable-transcoder-${transcoder} \
+		$(use_enable cpu_flags_x86_sse2 sse2)
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd "${S}/doc"
+		doxygen || die "making docs failed"
+	fi
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	# To make sure an appropriate NLS msg file is around when using the iconv msgloader
+	# ICU has the messages compiled in.
+	if use iconv && ! use icu ; then
+		doenvd "${FILESDIR}/50xerces-c"
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm -rf samples/Makefile* samples/runConfigure samples/src/*/Makefile* samples/.libs
+		doins -r samples
+		dohtml -r doc/html/*
+	fi
+}