diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/expat | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/expat')
-rw-r--r-- | dev-libs/expat/Manifest | 10 | ||||
-rw-r--r-- | dev-libs/expat/expat-2.2.1.ebuild | 88 | ||||
-rw-r--r-- | dev-libs/expat/expat-2.2.4.ebuild | 96 | ||||
-rw-r--r-- | dev-libs/expat/expat-2.2.5.ebuild | 96 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch | 24 | ||||
-rw-r--r-- | dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 26 | ||||
-rw-r--r-- | dev-libs/expat/metadata.xml | 16 |
8 files changed, 387 insertions, 0 deletions
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest new file mode 100644 index 000000000000..b05aff87084d --- /dev/null +++ b/dev-libs/expat/Manifest @@ -0,0 +1,10 @@ +AUX expat-2.2.1-gentoo-dash.patch 1334 BLAKE2B 87980af994bad94c9a339accef714903d63c187b66f430893363edd36105623197f9a3bd3ca98ce48bd30dd1bed413440b31ecd17a6b0190b7e6b93c20ae9ecd SHA512 af33e9708deff13d7bf1a8af732b3c171902d6044ca59bd63b3e10bfcc09328f141ad6022046b97eff53ed3e1a9b749f372db954567690a479ff92860b5cd7cc +AUX expat-2.2.1-getrandom-detection.patch 795 BLAKE2B 278e3afd0f2b79ac1f528ebc06d56315e96e0d08ca6d49ae84747ca5a7124f209af189fd192b5632a6f4a82785f27838b8d7d5ee0427bba2acd467a63a68dafb SHA512 c0a918d48845c2270930ccf87411a89b60379db860c09d0bebe914cbd48f9c6b3941fa3b31b69ffaef4d754882b5d3b397a8e69352f354402a8aea29cfbe88ca +AUX expat-2.2.1-posix-shell.patch 1027 BLAKE2B bfdeb67f4f41cfcf1db8bf4a9e0501789b35a8d1a47dd678877475e022810d5709bfff34ce6188df0608d30f280a341a1f47e825bb56ff43e60a4ed7fe2ab1d0 SHA512 9ec6056f5c86918bbd6f6017a29b73a26472cb0470437639845889068f6209d0dde12bbb37cade792525ce295944d60cd3dfe61d308896f2befabe28736a626f +DIST expat-2.2.1.tar.bz2 405441 BLAKE2B 273960016692f3b9a1121eb07b67c28e5b3066fa324df0d7249329b2dc346c2601e4548def5e14b7f76d58f89f3cd12edad72fbd32da9f4c04ac61dfce23e15a SHA512 74089b55872df16f214a4baba0143e6353736dfa34063391293bb2760aa3e5118d9ccb3592e07c74c9d52a2a5b91496e15153f28214c4c01242d95b3019b67ea +DIST expat-2.2.4.tar.bz2 505038 BLAKE2B 4d40629621bde41b44cdef4fa37937ce064cdbd621cc0d466b50a1a4626aff8bc8c8f6e9fbd94a36b709d449384da76ade683f31cf0aec0470006b750fc0a6ea SHA512 788249e2c6edf8521c4a99830fd5e51a55c062b834516f6775759cd71accf6375f12d3bd38f8b069777d081a4380b9549049921386ca0cb4b9b9daa4861d6592 +DIST expat-2.2.5.tar.bz2 510868 BLAKE2B 9d4709c2d157a04c08afd80b05f120407dc320023c3dbfe9e6872fadf0de2d6fa497f85ad9a21679fa0689c13cbb25adfd92912ae374d08de791dfeb4eb6918d SHA512 8226970a7e5d2b8d7818081758ca59bb6ce2d655feaa9d3a92481629000b73fde4782f50343d58ec4e1cebe75649e1980f636775a731d8aa4b55ceb843d9f637 +EBUILD expat-2.2.1.ebuild 2209 BLAKE2B f4910c2e5a6462c7c1859d2f20a2d9892c72572077c9e479851a47d49882f8ff578e399b40b93bb162e50052b0374ac7f632a02a6accdf509646cd6ee5e37bf1 SHA512 ea6413bb3948b72797acda79e186da6416ab0f95c5313391d158d4ddad549622f85fe0f69ec81811ed84a5c4497b63bd07feffaf964476bc64becfa66246a126 +EBUILD expat-2.2.4.ebuild 2409 BLAKE2B 1db61d230d3038095018a1f4a996ada84ca9f93df5b0f8de4bcfa258d4c8f0e56f00ba449ebed7c8e5c605856d28df2530f64c8f62b16b6463d6b756123bf793 SHA512 7d0ebe8c7ff822bec9908c5118eeee8a3145a9ecbb6986acb08806dce5134184706bf5c017ce766901671c7d733a1d59b700a3a889f62857726fdc38847a80a0 +EBUILD expat-2.2.5.ebuild 2466 BLAKE2B 5f4b6db129c491de37e2da970e2143c69f12a830a1aff5125d8b149f7ea3a668bc98df055c1999363d0b968cafc8f3528a6f0d8fcb0bdc02567dbf892de3d232 SHA512 526292962f0f8a1ae6032061ff3f8b6d681ca128692726734e81686e52e3f1113810640bb2f5f48aba89824731689cac5a4345804ee3c6714697986a2ff95e7a +MISC metadata.xml 513 BLAKE2B 1f90bebcf78b72abf04ef2e0370792ab4cc9c12f6edeb1985b42846e2d17905b0c454adfea4427a7795158c9de1963ec28ef24c21a07e5d423e576fc394a446f SHA512 8683789b6958547b10ac2d225eb59314feb942e5762308ec17704d9ade28b25b528e8df697892b0e090ecd6830c0ef8d64b1da05337b7878731e6df82abcc2a3 diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild new file mode 100644 index 000000000000..ac06d60513e4 --- /dev/null +++ b/dev-libs/expat/expat-2.2.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2018 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="mirror://sourceforge/expat/${P}.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 ~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" +RDEPEND="" + +DOCS=( AUTHORS Changes README ) + +PATCHES=( + "${FILESDIR}"/${P}-getrandom-detection.patch + "${FILESDIR}"/${P}-posix-shell.patch + "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360 +) + +src_prepare() { + default + eautoreconf +} + +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}"w >/dev/null + CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}" econf ${myconf} + popd >/dev/null + fi +} + +multilib_src_compile() { + emake + + if use unicode; then + 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}"w >/dev/null + emake installlib DESTDIR="${D}" LIBRARY=libexpatw.la + 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 +} diff --git a/dev-libs/expat/expat-2.2.4.ebuild b/dev-libs/expat/expat-2.2.4.ebuild new file mode 100644 index 000000000000..fc3869969b43 --- /dev/null +++ b/dev-libs/expat/expat-2.2.4.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 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="mirror://sourceforge/expat/${P}.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 ~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="" + +DOCS=( README.md ) + +src_prepare() { + default + + # 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)" + + 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 +} 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..62fe398a4281 --- /dev/null +++ b/dev-libs/expat/expat-2.2.5.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2018 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 ~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="" + +DOCS=( README.md ) + +src_prepare() { + default + + # 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 +} diff --git a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch new file mode 100644 index 000000000000..9bf9bfe44929 --- /dev/null +++ b/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch @@ -0,0 +1,31 @@ +From 9502963fd2e84ac529950f3a6f4173d86b93b5d2 Mon Sep 17 00:00:00 2001 +From: Kerin Millar <kfm@plushkava.net> +Date: Thu, 29 Jun 2017 16:51:18 +0100 +Subject: [PATCH] conftools/get-version.sh: Use printf rather than try to infer + non-portable echo options + +--- + expat/conftools/get-version.sh | 13 +------------ + 1 file changed, 1 insertion(+), 12 deletions(-) + +diff --git a/expat/conftools/get-version.sh b/expat/conftools/get-version.sh +index a70e0fb..91e5c64 100755 +--- a/conftools/get-version.sh ++++ b/conftools/get-version.sh +@@ -32,15 +32,4 @@ MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`" + MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`" + MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`" + +-# Determine how to tell echo not to print the trailing \n. This is +-# similar to Autoconf's @ECHO_C@ and @ECHO_N@; however, we don't +-# generate this file via autoconf (in fact, get-version.sh is used +-# to *create* ./configure), so we just do something similar inline. +-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in +- *c*,-n*) ECHO_N= ECHO_C=' +-' ;; +- *c*,* ) ECHO_N=-n ECHO_C= ;; +- *) ECHO_N= ECHO_C='\c' ;; +-esac +- +-echo $ECHO_N "$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$ECHO_C" ++printf '%s.%s.%s' "$MAJOR_VERSION" "$MINOR_VERSION" "$MICRO_VERSION" diff --git a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch new file mode 100644 index 000000000000..6ceb7d9993fc --- /dev/null +++ b/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch @@ -0,0 +1,24 @@ +From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sun, 18 Jun 2017 18:55:10 +0200 +Subject: [PATCH] configure.ac: Fix mis-detection of getrandom on Debian + GNU/kFreeBSD (#50) + +There is no such thing but we need to link (not just compile) to realize. +--- + expat/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/expat/configure.ac b/expat/configure.ac +index 1357c9a..444c002 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -130,7 +130,7 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([ + + + AC_MSG_CHECKING([for getrandom (Linux 3.17+, glibc 2.25+)]) +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ++AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <stdlib.h> /* for NULL */ + #include <sys/random.h> + int main() { diff --git a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch new file mode 100644 index 000000000000..ab680451d8e0 --- /dev/null +++ b/dev-libs/expat/files/expat-2.2.1-posix-shell.patch @@ -0,0 +1,26 @@ +From e5e25fac1698d9ea8dbb2e51c18d1072254b5f4b Mon Sep 17 00:00:00 2001 +From: spzeidler <spz@netbsd.org> +Date: Sun, 18 Jun 2017 14:30:22 +0200 +Subject: [PATCH] Fix sh syntax in configure.ac (#49) + +The old '==' sh-is-not-C issue +It doesn't matter in bash, but some other sh don't like it, so it's a portability issue +--- + expat/configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/expat/configure.ac b/expat/configure.ac +index e48c32e..1357c9a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -220,8 +220,8 @@ AS_HELP_STRING([--disable-xml-context], + [Do not retain context around the current parse point]), + [enable_xml_context=${enableval}]) + AS_IF([test "x${enable_xml_context}" != "xno"], [ +- AS_IF([test "x${enable_xml_context}" == "xyes" \ +- -o "x${enable_xml_context}" == "x"], [ ++ AS_IF([test "x${enable_xml_context}" = "xyes" \ ++ -o "x${enable_xml_context}" = "x"], [ + enable_xml_context=1024 + ]) + AC_DEFINE_UNQUOTED([XML_CONTEXT_BYTES], [${enable_xml_context}], diff --git a/dev-libs/expat/metadata.xml b/dev-libs/expat/metadata.xml new file mode 100644 index 000000000000..173bc1d11186 --- /dev/null +++ b/dev-libs/expat/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>freedesktop-bugs@gentoo.org</email> + <name>Gentoo Freedesktop Project</name> + </maintainer> + <maintainer type="person"> + <email>sping@gentoo.org</email> + <name>Sebastian Pipping</name> + </maintainer> + <upstream> + <remote-id type="cpe">cpe:/a:libexpat:expat</remote-id> + <remote-id type="sourceforge">expat</remote-id> + </upstream> +</pkgmetadata> |