diff options
| -rw-r--r-- | dev-libs/expat/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/expat/expat-2.1.0-r4.ebuild | 93 | ||||
| -rw-r--r-- | dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch | 15 |
3 files changed, 115 insertions, 1 deletions
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog index b5481c2a9e73..2dbf906f09f1 100644 --- a/dev-libs/expat/ChangeLog +++ b/dev-libs/expat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/expat # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.162 2014/01/18 04:35:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.163 2014/02/05 14:12:50 ssuominen Exp $ + +*expat-2.1.0-r4 (05 Feb 2014) + + 05 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> +expat-2.1.0-r4.ebuild, + +files/expat-2.1.0-xmlwfargs.patch: + Fix "xmlwf -h" output using patch from Fedora. 18 Jan 2014; Mike Frysinger <vapier@gentoo.org> expat-2.1.0-r3.ebuild: Add arm64 love. diff --git a/dev-libs/expat/expat-2.1.0-r4.ebuild b/dev-libs/expat/expat-2.1.0-r4.ebuild new file mode 100644 index 000000000000..3d915b201af6 --- /dev/null +++ b/dev-libs/expat/expat-2.1.0-r4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0-r4.ebuild,v 1.1 2014/02/05 14:12:50 ssuominen Exp $ + +EAPI=5 +inherit eutils libtool multilib toolchain-funcs multilib-minimal + +DESCRIPTION="XML parsing libraries" +HOMEPAGE="http://expat.sourceforge.net/" +SRC_URI="mirror://sourceforge/expat/${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="elibc_FreeBSD examples static-libs unicode" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +src_prepare() { + epatch "${FILESDIR}"/${P}-xmlwfargs.patch + elibtoolize +} + +multilib_src_configure() { + local myconf="$(use_enable static-libs static)" + + mkdir -p "${BUILD_DIR}"{u,w} || die + + ECONF_SOURCE="${S}" econf ${myconf} + + if use unicode; then + pushd "${BUILD_DIR}"u >/dev/null + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} + popd >/dev/null + + pushd "${BUILD_DIR}"w >/dev/null + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE_WCHAR_T" ECONF_SOURCE="${S}" econf ${myconf} + popd >/dev/null + fi +} + +multilib_src_compile() { + emake + + if use unicode; then + pushd "${BUILD_DIR}"u >/dev/null + emake buildlib LIBRARY=libexpatu.la + popd >/dev/null + + pushd "${BUILD_DIR}"w >/dev/null + emake buildlib LIBRARY=libexpatw.la + popd >/dev/null + fi +} + +multilib_src_install() { + emake install DESTDIR="${D}" + + if use unicode; then + pushd "${BUILD_DIR}"u >/dev/null + emake installlib DESTDIR="${D}" LIBRARY=libexpatu.la + popd >/dev/null + + pushd "${BUILD_DIR}"w >/dev/null + emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la + popd >/dev/null + + pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null + cp expat.pc expatu.pc + sed -i -e '/^Libs/s:-lexpat:&u:' expatu.pc || die + cp expat.pc expatw.pc + sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die + popd >/dev/null + fi + + if multilib_build_binaries ; 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() { + dodoc Changes README + dohtml doc/* + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.c + fi + + prune_libtool_files +} diff --git a/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch b/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch new file mode 100644 index 000000000000..5ac5d54eba18 --- /dev/null +++ b/dev-libs/expat/files/expat-2.1.0-xmlwfargs.patch @@ -0,0 +1,15 @@ +Fix "xmlwf -h" output + +Patch is from: http://pkgs.fedoraproject.org/cgit/expat.git/plain/expat-2.1.0-xmlwfargs.patch + +--- xmlwf/xmlwf.c ++++ xmlwf/xmlwf.c +@@ -634,7 +634,7 @@ static void + usage(const XML_Char *prog, int rc) + { + ftprintf(stderr, +- T("usage: %s [-n] [-p] [-r] [-s] [-w] [-x] [-d output-dir] " ++ T("usage: %s [-s] [-n] [-p] [-x] [-w] [-d output-dir] [-c] [-m] [-r] [-t] [-v] " + "[-e encoding] file ...\n"), prog); + exit(rc); + } |