commit: 3987dd53792f13f21ea045df19ec0f3240e08467 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Sat Feb 16 08:52:25 2019 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Sat Feb 16 08:55:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3987dd53
dev-libs/expat: Drop old Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> dev-libs/expat/Manifest | 3 - dev-libs/expat/expat-2.2.1.ebuild | 88 -------------------- dev-libs/expat/expat-2.2.4.ebuild | 96 ---------------------- dev-libs/expat/expat-2.2.5.ebuild | 96 ---------------------- 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 ------ 7 files changed, 364 deletions(-) diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest index 733b50e8365..438f8571d79 100644 --- a/dev-libs/expat/Manifest +++ b/dev-libs/expat/Manifest @@ -1,4 +1 @@ -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 DIST expat-2.2.6.tar.bz2 513322 BLAKE2B 386736da1f2204fa8f15ee4d1b3d11f01ed691efe6951b9f24f2bd30ab5494e75da6a97ceb1ffe4a0a8ecdc80f96f51d21c54f35a2cbc352a9fe9425545bf15b SHA512 dbfb635a5fe7b190722664263a0dd437b512fdf519bc53bd4905567f4bfb4b1e89a021562da63df8cacd48b706d1dea60ccde47f279e57400ad3c846b6e9c4e6 diff --git a/dev-libs/expat/expat-2.2.1.ebuild b/dev-libs/expat/expat-2.2.1.ebuild deleted file mode 100644 index 84e0ee7bea0..00000000000 --- a/dev-libs/expat/expat-2.2.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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 ~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 deleted file mode 100644 index b99fa87d64f..00000000000 --- a/dev-libs/expat/expat-2.2.4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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 ~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 deleted file mode 100644 index 427cb0428d7..00000000000 --- a/dev-libs/expat/expat-2.2.5.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# 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 ~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 deleted file mode 100644 index 9bf9bfe4492..00000000000 --- a/dev-libs/expat/files/expat-2.2.1-gentoo-dash.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9502963fd2e84ac529950f3a6f4173d86b93b5d2 Mon Sep 17 00:00:00 2001 -From: Kerin Millar <k...@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 deleted file mode 100644 index 6ceb7d9993f..00000000000 --- a/dev-libs/expat/files/expat-2.2.1-getrandom-detection.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 602e6c78ca750c082b72f8cdf4a38839b312959f Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebast...@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 deleted file mode 100644 index ab680451d8e..00000000000 --- a/dev-libs/expat/files/expat-2.2.1-posix-shell.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e5e25fac1698d9ea8dbb2e51c18d1072254b5f4b Mon Sep 17 00:00:00 2001 -From: spzeidler <s...@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}],
