From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-libs/expat/Manifest | 10 +++ dev-libs/expat/expat-2.2.1.ebuild | 86 +++++++++++++++++++ dev-libs/expat/expat-2.2.4.ebuild | 97 ++++++++++++++++++++++ dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch | 31 +++++++ .../files/expat-2.2.1-getrandom-detection.patch | 24 ++++++ dev-libs/expat/files/expat-2.2.1-posix-shell.patch | 26 ++++++ dev-libs/expat/metadata.xml | 16 ++++ 7 files changed, 290 insertions(+) create mode 100644 dev-libs/expat/Manifest create mode 100644 dev-libs/expat/expat-2.2.1.ebuild create mode 100644 dev-libs/expat/expat-2.2.4.ebuild create mode 100644 dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch create mode 100644 dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch create mode 100644 dev-libs/expat/files/expat-2.2.1-posix-shell.patch create mode 100644 dev-libs/expat/metadata.xml (limited to 'dev-libs/expat') diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest new file mode 100644 index 000000000000..f278c9de3e72 --- /dev/null +++ b/dev-libs/expat/Manifest @@ -0,0 +1,10 @@ +AUX expat-2.2.1-gentoo-dash.patch 1346 SHA256 9450d877ec75345a2ce09f9119ac732421dc16310346d3c94858aefa7fb315cd SHA512 692fe6f8c99bce93d883c8764c904561a32114c8e4908658b32b04911467d9b1348b99c6d3ada7cbc6f9c72f15732bd9617c114a8b6994c3dc300d970e0b5d81 WHIRLPOOL 9792916ba8b28034fc833b37dade489d19dc92d912685c907e6586577c8ac17ff55bc051efb9ba6519e244c7395d831c461d56c622ea4730338a687beb4cba51 +AUX expat-2.2.1-getrandom-detection.patch 807 SHA256 6b52907317b8495bd06c538bb2609e8fc0423604a13cfb03478626be49705a1a SHA512 3399e097b66d9afc009fdc9f5fcdf8326f4b69dd72edf352b920e1ac1172e784aeb534ca4da256b2e30a276c6e4990820d5e48563fcac580f7a335ac80a8250b WHIRLPOOL 44b4e2460e0a2e52fa32634946647c9374a3301f794d5f6483f623279e4537f1fffb4ac2d950f8a615577d618b9c9846920c96701f46861b812832fe54123829 +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 +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 +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.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild new file mode 100644 index 000000000000..d5f190aaaa5b --- /dev/null +++ b/dev-libs/expat/expat-2.2.1.ebuild @@ -0,0 +1,86 @@ +# 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="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 ~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" +RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" + +DOCS=( AUTHORS Changes README ) + +src_prepare() { + epatch "${FILESDIR}"/${P}-getrandom-detection.patch + epatch "${FILESDIR}"/${P}-posix-shell.patch + epatch "${FILESDIR}"/${P}-gentoo-dash.patch # bug 622360 + eapply_user + 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..54b4485b3fc8 --- /dev/null +++ b/dev-libs/expat/expat-2.2.4.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="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 ~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)" + + 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..a0eb60ce6cc0 --- /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 +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/expat/conftools/get-version.sh ++++ b/expat/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..eba004843db6 --- /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 +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/expat/configure.ac ++++ b/expat/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 /* for NULL */ + #include + 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..3f34d0d9853b --- /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 +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/expat/configure.ac ++++ b/expat/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 @@ + + + + + freedesktop-bugs@gentoo.org + Gentoo Freedesktop Project + + + sping@gentoo.org + Sebastian Pipping + + + cpe:/a:libexpat:expat + expat + + -- cgit v1.2.3