diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/Manifest deleted file mode 100644 index 0369b07826..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2 -DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57 -DIST p11-kit-0.23.21.tar.xz 827064 BLAKE2B 31a19b80c1ba41db0115bd3ea8381f6c0ad66b173b5d07f2b8f9e3222c83ea5703ec12539b13448e4b1b929b912ce3af88536b30a73ddf7979470282954b0efd SHA512 4c796ca2c72a650f105a7a70aa62e55edb12e1c151e91ef92bfeee6c5c68982b36023400b42c4efcb1d351b7848e8618c26607cdb0f77b48ae40e2ecfd713e3e diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/metadata.xml deleted file mode 100644 index 21a9f711d2..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - zlogene@gentoo.org - Mikle Kolyada - - - Enable ASN.1 certificate support - Build the trust policy module - - - p11-glue/p11-kit - - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild deleted file mode 100644 index 1c0aa67dab..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" -HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html" -SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asn1 debug +libffi systemd +trust" -REQUIRED_USE="trust? ( asn1 )" - -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) - libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) - trust? ( app-misc/ca-certificates )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - # disable unsafe tests, bug#502088 - export FAKED_MODE=1 -} - -src_prepare() { - if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then - # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700) - # drop to XPG6 to make feature_tests.h happy - sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die - # paths.h isn't available, oddly enough also not used albeit included - sed -i -e '/#include /d' trust/test-trust.c || die - # we don't have SUN_LEN here - sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \ - p11-kit/server.c || die - fi - default -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable trust trust-module) \ - $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \ - $(use_enable debug) \ - $(use_with libffi) \ - $(use_with asn1 libtasn1) \ - $(multilib_native_use_with systemd) - - if multilib_is_native_abi; then - # re-use provided documentation - ln -s "${S}"/doc/manual/html doc/manual/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild deleted file mode 100644 index 955332bd5e..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" -HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html" -SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asn1 debug +libffi systemd +trust" -REQUIRED_USE="trust? ( asn1 )" - -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) - libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) - trust? ( app-misc/ca-certificates )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - # disable unsafe tests, bug#502088 - export FAKED_MODE=1 -} - -src_prepare() { - if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then - # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700) - # drop to XPG6 to make feature_tests.h happy - sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die - # paths.h isn't available, oddly enough also not used albeit included - sed -i -e '/#include /d' trust/test-trust.c || die - # we don't have SUN_LEN here - sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \ - p11-kit/server.c || die - fi - default -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable trust trust-module) \ - $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \ - $(use_enable debug) \ - $(use_with libffi) \ - $(use_with asn1 libtasn1) \ - $(multilib_native_use_with systemd) - - if multilib_is_native_abi; then - # re-use provided documentation - ln -s "${S}"/doc/manual/html doc/manual/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.21.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.21.ebuild deleted file mode 100644 index 955332bd5e..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/p11-kit/p11-kit-0.23.21.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib-minimal - -DESCRIPTION="Provides a standard configuration setup for installing PKCS#11" -HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html" -SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="+asn1 debug +libffi systemd +trust" -REQUIRED_USE="trust? ( asn1 )" - -RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] ) - libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) - trust? ( app-misc/ca-certificates )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -pkg_setup() { - # disable unsafe tests, bug#502088 - export FAKED_MODE=1 -} - -src_prepare() { - if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then - # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700) - # drop to XPG6 to make feature_tests.h happy - sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die - # paths.h isn't available, oddly enough also not used albeit included - sed -i -e '/#include /d' trust/test-trust.c || die - # we don't have SUN_LEN here - sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \ - p11-kit/server.c || die - fi - default -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable trust trust-module) \ - $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \ - $(use_enable debug) \ - $(use_with libffi) \ - $(use_with asn1 libtasn1) \ - $(multilib_native_use_with systemd) - - if multilib_is_native_abi; then - # re-use provided documentation - ln -s "${S}"/doc/manual/html doc/manual/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${D}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest new file mode 100644 index 0000000000..af60a22e7d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/Manifest @@ -0,0 +1,2 @@ +DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1 +DIST pkgconf-1.8.0.tar.xz 296304 BLAKE2B 6585a855a313406f77d26fba3cc3cef798b27c4b7ece81738bdba12f36ee93fbcaf838e1065406c28adc20852e34e2de14bc5f4837982f9cc35360d9a3ac83a5 SHA512 58204006408ad5ce91222ed3c93c2e0b61c04fa83c0a8ad337b747b583744578dbebd4ad5ccbc577689637caa1c5dc246b7795ac46e39c6666b1aa78199b7c28 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml new file mode 100644 index 0000000000..492c5279d5 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/metadata.xml @@ -0,0 +1,21 @@ + + + + + floppym@gentoo.org + Mike Gilbert + + + polynomial-c@gentoo.org + Lars Wendler + + + base-system@gentoo.org + + + SONAME version of libpkgconf + + + pkgconf/pkgconf + + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild new file mode 100644 index 0000000000..b174cb7572 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.7.4-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 2012-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf" +else + SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~ppc-macos ~x64-macos" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf" + +LICENSE="ISC" +SLOT="0/3" +IUSE="test" + +# tests require 'kyua' +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND=" + !dev-util/pkgconfig +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) +) + +src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local ECONF_SOURCE="${S}" + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild new file mode 100644 index 0000000000..2e564e60bf --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-1.8.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 2012-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf" +else + SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf" + +LICENSE="ISC" +SLOT="0/3" +IUSE="test" + +# tests require 'kyua' +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND=" + !dev-util/pkgconfig +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) +) + +src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local ECONF_SOURCE="${S}" + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild new file mode 100644 index 0000000000..8ac703ecfd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/pkgconf/pkgconf-9999.ebuild @@ -0,0 +1,74 @@ +# Copyright 2012-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib multilib-minimal + +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/pkgconf/pkgconf.git" +else + SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos" +fi + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +HOMEPAGE="https://git.sr.ht/~kaniini/pkgconf" + +LICENSE="ISC" +SLOT="0/3" +IUSE="test" + +# tests require 'kyua' +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/atf + dev-util/kyua + ) +" +RDEPEND=" + !dev-util/pkgconfig +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf$(get_exeext) +) + +src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config$(get_exeext) + ) +} + +multilib_src_configure() { + local ECONF_SOURCE="${S}" + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" +} + +multilib_src_test() { + unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH + default +} + +multilib_src_install() { + default + + dosym pkgconf$(get_exeext) /usr/bin/pkg-config$(get_exeext) + dosym pkgconf.1 /usr/share/man/man1/pkg-config.1 +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/Manifest deleted file mode 100644 index 5788eb45ab..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 -DIST pkg-config-0.29.1.tar.gz 2013454 BLAKE2B 5f33022b2df83de1c9202e090ea9be926d1f2b796152969d46ad45772ceb792c3f2bb95714cf1def28393b32db1b4052c3fdfe9f71076d130a57172987c04d0e SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 -DIST pkg-config-0.29.2.tar.gz 2016830 BLAKE2B e8f0420033524ad768cac3c82138546e4cd76c47f5835b7b98662ab01eaf3feef08f495a69c04980d51b57935567ab1d465ef4e1d0529735ad0031c828585324 SHA512 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch deleted file mode 100644 index 9515f4f650..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/files/pkgconfig-0.28-lfs.patch +++ /dev/null @@ -1,281 +0,0 @@ -From 217ffa021257fc2313c9eeb3e94e2ee38d255634 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 15 Apr 2015 12:25:29 -0400 -Subject: [PATCH] Enable large file support - -https://bugs.freedesktop.org/show_bug.cgi?id=90078 - -Signed-off-by: Peter Jones - -[Alexandre Rostovtsev : expand out configure, - config.h.in modifications.] ---- - configure.ac | 3 + - config.h.in | 11 ++++ - configure | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 217 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 2b33371..1a321e1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -17,6 +17,9 @@ dnl by either passing --disable-silent-rules to configure or passing V=1 - dnl to make - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -+dnl Enable large file support -+AC_SYS_LARGEFILE -+ - dnl Check for programs - AC_PROG_CC - AC_CHECK_PROG([LN], [ln], [ln], [cp -Rp]) -diff --git a/config.h.in b/config.h.in -index 0aac8f3..fdae454 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -72,3 +72,14 @@ - - /* Version number of package */ - #undef VERSION -+ -+/* Enable large inode numbers on Mac OS X 10.5. */ -+#ifndef _DARWIN_USE_64_BIT_INODE -+# define _DARWIN_USE_64_BIT_INODE 1 -+#endif -+ -+/* Number of bits in a file offset, on hosts where this is settable. */ -+#undef _FILE_OFFSET_BITS -+ -+/* Define for large files, on AIX-style hosts. */ -+#undef _LARGE_FILES -diff --git a/configure b/configure -index 160ecab..f897e22 100755 ---- a/configure -+++ b/configure -@@ -783,6 +783,7 @@ with_gnu_ld - with_sysroot - enable_libtool_lock - enable_silent_rules -+enable_largefile - with_pc_path - with_system_include_path - with_system_library_path -@@ -1435,6 +1436,7 @@ Optional Features: - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-silent-rules less verbose build output (undo: "make V=1") - --disable-silent-rules verbose build output (undo: "make V=0") -+ --disable-largefile omit support for large files - --enable-indirect-deps list both direct and indirect dependencies. - --disable-indirect-deps only list direct dependencies. - default=auto -@@ -11389,6 +11391,207 @@ fi - AM_BACKSLASH='\' - - -+# Check whether --enable-largefile was given. -+if test "${enable_largefile+set}" = set; then : -+ enableval=$enable_largefile; -+fi -+ -+if test "$enable_largefile" != no; then -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -+$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -+if ${ac_cv_sys_largefile_CC+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_cv_sys_largefile_CC=no -+ if test "$GCC" != yes; then -+ ac_save_CC=$CC -+ while :; do -+ # IRIX 6.2 and later do not support large files by default, -+ # so use the C compiler's -n32 option if that helps. -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ if ac_fn_c_try_compile "$LINENO"; then : -+ break -+fi -+rm -f core conftest.err conftest.$ac_objext -+ CC="$CC -n32" -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_sys_largefile_CC=' -n32'; break -+fi -+rm -f core conftest.err conftest.$ac_objext -+ break -+ done -+ CC=$ac_save_CC -+ rm -f conftest.$ac_ext -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -+$as_echo "$ac_cv_sys_largefile_CC" >&6; } -+ if test "$ac_cv_sys_largefile_CC" != no; then -+ CC=$CC$ac_cv_sys_largefile_CC -+ fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -+if ${ac_cv_sys_file_offset_bits+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_sys_file_offset_bits=no; break -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#define _FILE_OFFSET_BITS 64 -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_sys_file_offset_bits=64; break -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_sys_file_offset_bits=unknown -+ break -+done -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -+$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -+case $ac_cv_sys_file_offset_bits in #( -+ no | unknown) ;; -+ *) -+cat >>confdefs.h <<_ACEOF -+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -+_ACEOF -+;; -+esac -+rm -rf conftest* -+ if test $ac_cv_sys_file_offset_bits = unknown; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -+if ${ac_cv_sys_large_files+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ while :; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_sys_large_files=no; break -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#define _LARGE_FILES 1 -+#include -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_sys_large_files=1; break -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_sys_large_files=unknown -+ break -+done -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -+$as_echo "$ac_cv_sys_large_files" >&6; } -+case $ac_cv_sys_large_files in #( -+ no | unknown) ;; -+ *) -+cat >>confdefs.h <<_ACEOF -+#define _LARGE_FILES $ac_cv_sys_large_files -+_ACEOF -+;; -+esac -+rm -rf conftest* -+ fi -+ -+ -+fi -+ -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' --- -2.4.2 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch deleted file mode 100644 index e1a2bb534a..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/files/pkgconfig-0.28-strip_system_library_dirs_reliably.patch +++ /dev/null @@ -1,30 +0,0 @@ -http://bugs.gentoo.org/512336 -http://bugs.freedesktop.org/show_bug.cgi?id=78077 - -From 8691b580ab3f7ac36182060e2253307fbd0aba75 Mon Sep 17 00:00:00 2001 -From: Andrew Oakley -Date: Tue, 29 Apr 2014 13:14:35 +0100 -Subject: [PATCH 1/1] Strip system library directories reliably - -This loop was changed from a while loop to a for loop in commit -9bf6277b, but the iterator is now advanced twice each time round the -loop. ---- - pkg.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pkg.c b/pkg.c -index 3697fec..c847c95 100644 ---- a/pkg.c -+++ b/pkg.c -@@ -917,7 +917,6 @@ verify_package (Package *pkg) - } - system_dir_iter = system_dir_iter->next; - } -- iter = iter->next; - } - g_list_free (system_directories); - --- -1.8.3.2 - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/metadata.xml deleted file mode 100644 index feea3b542d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - freedesktop-bugs@gentoo.org - - - Use internal copy of dev-libs/glib - - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild deleted file mode 100644 index eabba5a8f0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" - inherit autotools git-2 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch - - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - epatch_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize # Required for FreeMiNT wrt #333429 - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild deleted file mode 100644 index 66e5879883..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER - # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 - WANT_AUTOMAKE=1.12 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} - inherit autotools git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-strip_system_library_dirs_reliably.patch - - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - # Large file support, fixed in upstream git; bug #550508 - epatch "${FILESDIR}"/${P}-lfs.patch - # lfs patch touches config.h.in; need this hack to prevent autoreconf and automake - touch aclocal.m4 config.h.in Makefile.in - - epatch_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize # Required for FreeMiNT wrt #333429 - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild deleted file mode 100644 index 80dfe836e0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER - # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 - WANT_AUTOMAKE=1.12 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} - inherit autotools git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - virtual/libintl" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - eapply_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize # Required for FreeMiNT wrt #333429 - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \ - glib/configure || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/glib/giounix.c || die - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - # the glib objects reference symbols from these frameworks, - # not good, esp. since Carbon should be deprecated - [[ ${CHOST} == *-darwin* ]] && \ - append-ldflags -framework CoreFoundation -framework Carbon - if [[ ${CHOST} == *-solaris* ]] ; then - # required due to __EXTENSIONS__ - append-cppflags -DENABLE_NLS - # similar to Darwin - append-ldflags -lintl - fi - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild deleted file mode 100644 index 41c441193c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER - # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 - WANT_AUTOMAKE=1.12 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} - inherit autotools git-r3 -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - virtual/libintl" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - eapply_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize # Required for FreeMiNT wrt #333429 - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \ - glib/configure || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/glib/giounix.c || die - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - # the glib objects reference symbols from these frameworks, - # not good, esp. since Carbon should be deprecated - [[ ${CHOST} == *-darwin* ]] && \ - append-ldflags -framework CoreFoundation -framework Carbon - if [[ ${CHOST} == *-solaris* ]] ; then - # required due to __EXTENSIONS__ - append-cppflags -DENABLE_NLS - # similar to Darwin - append-ldflags -lintl - fi - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-9999.ebuild deleted file mode 100644 index 80dfe836e0..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/pkgconfig/pkgconfig-9999.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856 -inherit eutils flag-o-matic libtool multilib multilib-minimal - -MY_P=pkg-config-${PV} - -if [[ ${PV} == *9999* ]]; then - # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER - # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13 - WANT_AUTOMAKE=1.12 - EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P} - inherit autotools git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz" -fi - -DESCRIPTION="Package config system that manages compile/link flags" -HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib" - -RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - !dev-util/pkgconf[pkg-config] - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - virtual/libintl" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS NEWS README ) - -src_prepare() { - sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320 - - eapply_user - - if [[ ${PV} == *9999* ]]; then - eautoreconf - else - elibtoolize # Required for FreeMiNT wrt #333429 - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \ - glib/configure || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/glib/giounix.c || die - fi -} - -multilib_src_configure() { - local myconf - - if use internal-glib; then - myconf+=' --with-internal-glib' - # non-glibc platforms use GNU libiconv, but configure needs to - # know about that not to get confused when it finds something - # outside the prefix too - if use prefix && use !elibc_glibc ; then - myconf+=" --with-libiconv=gnu" - # add the libdir for libtool, otherwise it'll make love with system - # installed libiconv - append-ldflags "-L${EPREFIX}/usr/$(get_libdir)" - # the glib objects reference symbols from these frameworks, - # not good, esp. since Carbon should be deprecated - [[ ${CHOST} == *-darwin* ]] && \ - append-ldflags -framework CoreFoundation -framework Carbon - if [[ ${CHOST} == *-solaris* ]] ; then - # required due to __EXTENSIONS__ - append-cppflags -DENABLE_NLS - # similar to Darwin - append-ldflags -lintl - fi - fi - else - if ! has_version --host-root dev-util/pkgconfig; then - export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export GLIB_LIBS="-lglib-2.0" - fi - fi - - use ppc64 && use hardened && replace-flags -O[2-3] -O1 - - # Force using all the requirements when linking, so that needed -pthread - # lines are inherited between libraries - use elibc_FreeBSD && myconf+=' --enable-indirect-deps' - - [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode' - - ECONF_SOURCE=${S} \ - econf \ - --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-system-include-path="${EPREFIX}"/usr/include \ - --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \ - ${myconf} -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - if use prefix; then - # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to - # simplify cross-prefix builds - echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN} - doenvd "${T}"/99${PN} - fi -} diff --git a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass index 7a69f485a7..01899635de 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/bash-completion-r1.eclass @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: bash-completion-r1.eclass # @MAINTAINER: # mgorny@gentoo.org -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: A few quick functions to install bash-completion files # @EXAMPLE: # # @CODE -# EAPI=5 +# EAPI=8 # # src_configure() { # econf \ @@ -23,12 +23,17 @@ # } # @CODE +if [[ ! ${_BASH_COMPLETION_R1_ECLASS} ]]; then +_BASH_COMPLETION_R1_ECLASS=1 + inherit toolchain-funcs -case ${EAPI:-0} in - 0|1|2|3|4|5|6|7) ;; - *) die "EAPI ${EAPI} unsupported (yet)." -esac +# Flatcar: we still have some packages that use old EAPI, revert this +# change when we update those packages. +#case ${EAPI} in +# 5|6|7|8) ;; +# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +#esac # @FUNCTION: _bash-completion-r1_get_bashdir # @INTERNAL @@ -40,6 +45,11 @@ esac _bash-completion-r1_get_bashdir() { debug-print-function ${FUNCNAME} "${@}" + # Flatcar: Take a fix for pkg-config paths from systemd.eclass. + # + # https://github.com/pkgconf/pkgconf/issues/205 + local -x PKG_CONFIG_FDO_SYSROOT_RULES=1 + if $(tc-getPKG_CONFIG) --exists bash-completion &>/dev/null; then local path path=$($(tc-getPKG_CONFIG) --variable="${1}" bash-completion) || die @@ -91,9 +101,9 @@ get_bashhelpersdir() { } # @FUNCTION: dobashcomp -# @USAGE: file [...] +# @USAGE: [...] # @DESCRIPTION: -# Install bash-completion files passed as args. Has EAPI-dependant failure +# Install bash-completion files passed as args. Has EAPI-dependent failure # behavior (like doins). dobashcomp() { debug-print-function ${FUNCNAME} "${@}" @@ -106,9 +116,9 @@ dobashcomp() { } # @FUNCTION: newbashcomp -# @USAGE: file newname +# @USAGE: # @DESCRIPTION: -# Install bash-completion file under a new name. Has EAPI-dependant failure +# Install bash-completion file under a new name. Has EAPI-dependent failure # behavior (like newins). newbashcomp() { debug-print-function ${FUNCNAME} "${@}" @@ -136,3 +146,5 @@ bashcomp_alias() { || return done } + +fi diff --git a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass index 63bde5cbb6..430fb865b0 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/multilib.eclass @@ -1,14 +1,22 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: multilib.eclass # @MAINTAINER: -# amd64@gentoo.org # toolchain@gentoo.org +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: This eclass is for all functions pertaining to handling multilib configurations. # @DESCRIPTION: # This eclass is for all functions pertaining to handling multilib configurations. +# Flatcar: we still have some packages that use old EAPI, revert this +# change when we update those packages. +#case ${EAPI:-0} in +# # EAPI=0 is still used by crossdev, bug #797367 +# 0|5|6|7|8) ;; +# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +#esac + if [[ -z ${_MULTILIB_ECLASS} ]]; then _MULTILIB_ECLASS=1 @@ -48,7 +56,8 @@ has_multilib_profile() { # fall back on old behavior. Any profile that has these set should also # depend on a newer version of portage (not yet released) which uses these # over CONF_LIBDIR in econf, dolib, etc... -if has "${EAPI:-0}" 0 1 2 3 4 5; then +# Flatcar: Support older EAPIs for now. +if [[ ${EAPI} == [0345] ]] ; then get_libdir() { local CONF_LIBDIR if [ -n "${CONF_LIBDIR_OVERRIDE}" ] ; then @@ -294,11 +303,22 @@ get_modname() { } # This is for the toolchain to setup profile variables when pulling in -# a crosscompiler (and thus they aren't set in the profile) +# a crosscompiler (and thus they aren't set in the profile). multilib_env() { local CTARGET=${1:-${CTARGET}} local cpu=${CTARGET%%*-} + if [[ ${CTARGET} = *-musl* ]]; then + # musl has no multilib support and can run only in 'lib': + # - https://bugs.gentoo.org/675954 + # - https://gcc.gnu.org/PR90077 + # - https://github.com/gentoo/musl/issues/245 + : ${MULTILIB_ABIS=default} + : ${DEFAULT_ABI=default} + export MULTILIB_ABIS DEFAULT_ABI + return + fi + case ${cpu} in aarch64*) # Not possible to do multilib with aarch64 and a single toolchain. @@ -386,19 +406,43 @@ multilib_env() { : ${DEFAULT_ABI=ppc64} ;; riscv64*) - export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d} + export CFLAGS_lp64d=${CFLAGS_lp64d--mabi=lp64d -march=rv64imafdc} export CHOST_lp64d=${CTARGET} export CTARGET_lp64d=${CTARGET} - export LIBDIR_lp64d="lib64/lp64d" + export LIBDIR_lp64d=${LIBDIR_lp64d-lib64/lp64d} - export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64} + export CFLAGS_lp64=${CFLAGS_lp64--mabi=lp64 -march=rv64imac} export CHOST_lp64=${CTARGET} export CTARGET_lp64=${CTARGET} - export LIBDIR_lp64="lib64/lp64" + export LIBDIR_lp64=${LIBDIR_lp64-lib64/lp64} - : ${MULTILIB_ABIS=lp64d lp64} + export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d -march=rv32imafdc} + export CHOST_ilp32d=${CTARGET/riscv64/riscv32} + export CTARGET_ilp32d=${CTARGET/riscv64/riscv32} + export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d} + + export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac} + export CHOST_ilp32=${CTARGET/riscv64/riscv32} + export CTARGET_ilp32=${CTARGET/riscv64/riscv32} + export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} + + : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32} : ${DEFAULT_ABI=lp64d} ;; + riscv32*) + export CFLAGS_ilp32d=${CFLAGS_ilp32d--mabi=ilp32d} + export CHOST_ilp32d=${CTARGET} + export CTARGET_ilp32d=${CTARGET} + export LIBDIR_ilp32d=${LIBDIR_ilp32d-lib32/ilp32d} + + export CFLAGS_ilp32=${CFLAGS_ilp32--mabi=ilp32 -march=rv32imac} + export CHOST_ilp32=${CTARGET} + export CTARGET_ilp32=${CTARGET} + export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} + + : ${MULTILIB_ABIS=ilp32d ilp32} + : ${DEFAULT_ABI=ilp32d} + ;; s390x*) export CFLAGS_s390=${CFLAGS_s390--m31} # the 31 is not a typo export CHOST_s390=${CTARGET/s390x/s390} @@ -445,9 +489,32 @@ multilib_toolchain_setup() { export ABI=$1 + local save_restore_variables=( + CBUILD + CHOST + AR + CC + CXX + F77 + FC + LD + NM + OBJCOPY + OBJDUMP + PKG_CONFIG + RANLIB + READELF + STRINGS + STRIP + PKG_CONFIG_LIBDIR + PKG_CONFIG_PATH + PKG_CONFIG_SYSTEM_INCLUDE_PATH + PKG_CONFIG_SYSTEM_LIBRARY_PATH + ) + # First restore any saved state we have laying around. if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then - for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in "${save_restore_variables[@]}" ; do vv="_abi_saved_${v}" [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} unset ${vv} @@ -455,11 +522,9 @@ multilib_toolchain_setup() { unset _DEFAULT_ABI_SAVED fi - # We want to avoid the behind-the-back magic of gcc-config as it - # screws up ccache and distcc. See #196243 for more info. if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then - # Back that multilib-ass up so we can restore it later - for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do + # Backup multilib state so we can restore it later + for v in "${save_restore_variables[@]}" ; do vv="_abi_saved_${v}" [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} done @@ -472,15 +537,30 @@ multilib_toolchain_setup() { # Set the CHOST native first so that we pick up the native # toolchain and not a cross-compiler by accident #202811. + # + # Make sure ${save_restore_variables[@]} list matches below. export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) + + export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar' export CC="$(tc-getCC) $(get_abi_CFLAGS)" export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" export F77="$(tc-getF77) $(get_abi_CFLAGS)" export FC="$(tc-getFC) $(get_abi_CFLAGS)" export LD="$(tc-getLD) $(get_abi_LDFLAGS)" + export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm' + export OBJCOPY="$(tc-getOBJCOPY)" # Avoid 'objcopy', use '${CHOST}-objcopy' + export OBJDUMP="$(tc-getOBJDUMP)" # Avoid 'objdump', use '${CHOST}-objdump' + export PKG_CONFIG="$(tc-getPKG_CONFIG)" + export RANLIB="$(tc-getRANLIB)" # Avoid 'ranlib', use '${CHOST}-ranlib' + export READELF="$(tc-getREADELF)" # Avoid 'readelf', use '${CHOST}-readelf' + export STRINGS="$(tc-getSTRINGS)" # Avoid 'strings', use '${CHOST}-strings' + export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip' + export CHOST=$(get_abi_CHOST $1) export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig + export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include + export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir) fi } diff --git a/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass b/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass index 09ea71bbfd..c5145aa5b2 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/systemd.eclass @@ -1,6 +1,12 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 2011-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + +# Flatcar: this file is modified to still support old EAPIs and to +# still provide the deprecated systemd_dotmpfilesd and +# systemd_newtmpfilesd functions. + + # @ECLASS: systemd.eclass # @MAINTAINER: # systemd@gentoo.org @@ -48,6 +54,9 @@ _systemd_get_dir() { [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} " local variable=${1} fallback=${2} d + # https://github.com/pkgconf/pkgconf/issues/205 + local -x PKG_CONFIG_FDO_SYSROOT_RULES=1 + if $(tc-getPKG_CONFIG) --exists systemd; then d=$($(tc-getPKG_CONFIG) --variable="${variable}" systemd) || die d=${d#${EPREFIX}} @@ -138,8 +147,7 @@ _systemd_get_systemgeneratordir() { # @FUNCTION: systemd_get_systemgeneratordir # @DESCRIPTION: # Output the path for the systemd system generator directory (not including -# ${D}). This function always succeeds, even if systemd is not -# installed. +# ${D}). This function always succeeds, even if systemd is not installed. systemd_get_systemgeneratordir() { has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= debug-print-function ${FUNCNAME} "${@}" @@ -147,6 +155,24 @@ systemd_get_systemgeneratordir() { echo "${EPREFIX}$(_systemd_get_systemgeneratordir)" } +# @FUNCTION: _systemd_get_systempresetdir +# @INTERNAL +# @DESCRIPTION: +# Get unprefixed systempresetdir. +_systemd_get_systempresetdir() { + _systemd_get_dir systemdsystempresetdir /lib/systemd/system-preset +} + +# @FUNCTION: systemd_get_systempresetdir +# @DESCRIPTION: +# Output the path for the systemd system preset directory (not including +# ${D}). This function always succeeds, even if systemd is not installed. +systemd_get_systempresetdir() { + debug-print-function ${FUNCNAME} "${@}" + + echo "${EPREFIX}$(_systemd_get_systempresetdir)" +} + # @FUNCTION: systemd_dounit # @USAGE: ... # @DESCRIPTION: @@ -436,29 +462,6 @@ systemd_is_booted() { return ${ret} } -# @FUNCTION: systemd_tmpfiles_create -# @USAGE: ... -# @DESCRIPTION: -# Deprecated in favor of tmpfiles.eclass. -# -# Invokes systemd-tmpfiles --create with given arguments. -# Does nothing if ROOT != / or systemd-tmpfiles is not in PATH. -# This function should be called from pkg_postinst. -# -# Generally, this function should be called with the names of any tmpfiles -# fragments which have been installed, either by the build system or by a -# previous call to systemd_dotmpfilesd. This ensures that any tmpfiles are -# created without the need to reboot the system. -systemd_tmpfiles_create() { - debug-print-function ${FUNCNAME} "${@}" - - [[ ${EBUILD_PHASE} == postinst ]] || die "${FUNCNAME}: Only valid in pkg_postinst" - [[ ${#} -gt 0 ]] || die "${FUNCNAME}: Must specify at least one filename" - [[ ${ROOT:-/} == / ]] || return 0 - type systemd-tmpfiles &> /dev/null || return 0 - systemd-tmpfiles --create "${@}" -} - # @FUNCTION: systemd_reenable # @USAGE: ... # @DESCRIPTION: diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass index ec7b920bcf..032433daa7 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass @@ -1,9 +1,10 @@ -# Copyright 2002-2019 Gentoo Authors +# Copyright 2002-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: # Toolchain Ninjas +# @SUPPORTED_EAPIS: 5 6 7 8 # @BLURB: functions to query common info about the toolchain # @DESCRIPTION: # The toolchain-funcs aims to provide a complete suite of functions @@ -12,6 +13,14 @@ # in such a way that you can rely on the function always returning # something sane. +# Flatcar: we still have some packages that use old EAPI, revert this +# change when we update those packages. +#case ${EAPI:-0} in +# # EAPI=0 is still used by crossdev, bug #797367 +# 0|5|6|7|8) ;; +# *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +#esac + if [[ -z ${_TOOLCHAIN_FUNCS_ECLASS} ]]; then _TOOLCHAIN_FUNCS_ECLASS=1 @@ -505,12 +514,21 @@ tc-ld-is-lld() { # If the gold linker is currently selected, configure the compilation # settings so that we use the older bfd linker instead. tc-ld-disable-gold() { - if ! tc-ld-is-gold "$@" ; then - # They aren't using gold, so nothing to do! + tc-ld-is-gold "$@" && tc-ld-force-bfd "$@" +} + +# @FUNCTION: tc-ld-force-bfd +# @USAGE: [toolchain prefix] +# @DESCRIPTION: +# If the gold or lld linker is currently selected, configure the compilation +# settings so that we use the bfd linker instead. +tc-ld-force-bfd() { + if ! tc-ld-is-gold "$@" && ! tc-ld-is-lld "$@" ; then + # They aren't using gold or lld, so nothing to do! return fi - ewarn "Forcing usage of the BFD linker instead of GOLD" + ewarn "Forcing usage of the BFD linker" # Set up LD to point directly to bfd if it's available. # We need to extract the first word in case there are flags appended @@ -520,7 +538,7 @@ tc-ld-disable-gold() { local path_ld=$(which "${bfd_ld}" 2>/dev/null) [[ -e ${path_ld} ]] && export LD=${bfd_ld} - # Set up LDFLAGS to select gold based on the gcc / clang version. + # Set up LDFLAGS to select bfd based on the gcc / clang version. local fallback="true" if tc-is-gcc; then local major=$(gcc-major-version "$@") @@ -548,7 +566,7 @@ tc-ld-disable-gold() { ln -sf "${path_ld}" "${d}"/ld export LDFLAGS="${LDFLAGS} -B${d}" else - die "unable to locate a BFD linker to bypass gold" + die "unable to locate a BFD linker" fi fi } @@ -665,7 +683,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; } mips*) echo mips;; nios2*) echo nios2;; nios*) echo nios;; - or1k|or32*) echo openrisc;; + or1k*|or32*) echo openrisc;; powerpc*) # Starting with linux-2.6.15, the 'ppc' and 'ppc64' trees # have been unified into simply 'powerpc', but until 2.6.16, diff --git a/sdk_container/src/third_party/portage-stable/eclass/udev.eclass b/sdk_container/src/third_party/portage-stable/eclass/udev.eclass index baf6058493..8fa73fe13e 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/udev.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/udev.eclass @@ -1,9 +1,14 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 + +# Flatcar: this file is modified to still support old EAPIs and to +# still provide the deprecated systemd_dotmpfilesd functions. + + # @ECLASS: udev.eclass # @MAINTAINER: -# udev-bugs@gentoo.org +# systemd@gentoo.org # @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7 # @BLURB: Default eclass for determining udev directories. # @DESCRIPTION: @@ -50,6 +55,8 @@ fi # @DESCRIPTION: # Get unprefixed udevdir. _udev_get_udevdir() { + # https://github.com/pkgconf/pkgconf/issues/205 + local -x PKG_CONFIG_FDO_SYSROOT_RULES=1 if $($(tc-getPKG_CONFIG) --exists udev); then local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" echo "${udevdir#${EPREFIX%/}}" @@ -80,7 +87,7 @@ get_udevdir() { } # @FUNCTION: udev_dorules -# @USAGE: rules [...] +# @USAGE: [...] # @DESCRIPTION: # Install udev rule(s). Uses doins, thus it is fatal in EAPI 4 # and non-fatal in earlier EAPIs. @@ -95,7 +102,7 @@ udev_dorules() { } # @FUNCTION: udev_newrules -# @USAGE: oldname newname +# @USAGE: # @DESCRIPTION: # Install udev rule with a new name. Uses newins, thus it is fatal # in EAPI 4 and non-fatal in earlier EAPIs. @@ -113,7 +120,7 @@ udev_newrules() { # @DESCRIPTION: # Run udevadm control --reload to refresh rules and databases udev_reload() { - if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then + if [[ -n ${ROOT%/} ]]; then return 0 fi diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest index 5f838e4873..48756ff975 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/Manifest @@ -1,4 +1,3 @@ -DIST crossdev-20171230.tar.xz 23016 BLAKE2B 4661b3f9fac314b7346f0de7227d12ae2d6851e448f6d065471499df8ada5d699ef91c6b6bca285b2aefcbf67ab351fefbe9344c0884a7c0d33ff27215c8ed9c SHA512 bf8761a3018790501adb4bb173e3281d1d7628de8f65a1aa5df0b328a4af8088be466dbe8c185e7ed44aca31b078320a4f62c56351f4b7cbf832349184d9709f -DIST crossdev-20181020.tar.xz 27172 BLAKE2B 8a388d5201ab419b865b96a4314190a693a7e00f3b5ecc2db2efdf36efca102206b5c4c5633e5e4ee508f5433ff4e086460501462bacc86c2adb10cab33a0244 SHA512 dd7fa9522ce6f58684b54ddc57e088f19a8ad5392ff45ed5b2b1f95f4be7dbc753442adc1c2591a785d94070979200936ca713913e547e84ae02b05c83bf8cde -DIST crossdev-20181202.tar.xz 27184 BLAKE2B d1770f5148d666b22a20576b638e71bf6325e8a61776b8b47ecaf2e5437150554f6973c5306d233a836e4ffe3ff0480167c9b877c5f9e733681fd502016a19d4 SHA512 896bf050c81f3f34b2be187a851832494c039aa93177c806b689a75d16567f178e4ca33c21282fc320506b76e09b0cde8a45976b6309bf9bc5be8290db3dd8af -DIST crossdev-20200801.tar.xz 28268 BLAKE2B 36f22a2d1422d5f9e27a5559a8c141462853c4dc011ec98c66d235ef262ea9408fd5054b578963fd17ef630ea63e72c068d216f6ffbea7d191d1374a6ecc4033 SHA512 331af1525cdfc66380621b764bfc63178ce962b9071408d1ee08480caad9c0e4782a8fa5e5f3500fd2ea03ccd322895cc95d80106ad9e5b97a0e09ef5d88c94b +DIST crossdev-20210621.tar.xz 28588 BLAKE2B 33ff6069c85cbcff6bf34bf5f6dd8050bd5f9d34e3478c0200965dffd4cee46e71acf4210f533c9b22fd6fe979fa5f447d30b5aaa3a6fc0845b201a80dcb28d8 SHA512 8f8bed6ce53503fa4c2bbce4327d8e1d5ce8edab5ff698f11f312007912a2d73be56242269f798bb633ad3648f6cf936e00e019c05e5781b523059befc26f42c +DIST crossdev-20210718.tar.xz 28640 BLAKE2B 1e9b9313a5c9a1cb4d82f00e4979794d61b9eaa0035c575ac55092c6c015d820a590c5816d212a4ffad95b96a3dd99a9b94ca7c20b78a7d7b062f16dec6ed329 SHA512 e1a37aebf759abaa30f071f43a528f9059b83456e71fd86fc8202a7eff5c506c1f34fdd260c7b91a03f491b9f2a107ce6a65c2314845a352176fcc5a27a766e2 +DIST crossdev-20211027.tar.xz 28752 BLAKE2B 058d6254c702709c18cc426fe15d7a11cb856336236837a15c0b2cb0c2389198f8b0ea9893e7cdadd6ecdabb3e75c05b64c22448324ce2ea86032cb57e92a5d9 SHA512 6c15d71fb551dcb5cb8e95d7e3b1ecb52b34e47335842408da5acc9d258c1a5fa7e4699681b9b414b1b444df98601aa8b99b2000700485ec6028c076abeafd03 diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20171230.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20171230.ebuild deleted file mode 100644 index 23a0747eb4..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20171230.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "99999999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" -else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=">=sys-apps/portage-2.1 - >=app-portage/portage-utils-0.55 - app-shells/bash - sys-apps/gentoo-functions - !sys-devel/crossdev-wrappers" -DEPEND="app-arch/xz-utils" - -src_install() { - default - - if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20181020.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20181020.ebuild deleted file mode 100644 index 684e23fcf0..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20181020.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == "99999999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" -else - SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -fi - -DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://www.gentoo.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=" - || ( - >=sys-apps/portage-2.1 - sys-apps/portage-mgorny - ) - >=app-portage/portage-utils-0.55 - app-shells/bash - sys-apps/gentoo-functions - !sys-devel/crossdev-wrappers" -DEPEND="app-arch/xz-utils" - -src_install() { - default - - if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20200801.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210621.ebuild similarity index 80% rename from sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20200801.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210621.ebuild index 8ce00a587f..59140a11c2 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20200801.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210621.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV} == "99999999" ]] ; then inherit git-r3 EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" else SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" + https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Gentoo Cross-toolchain generator" @@ -17,7 +17,6 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" LICENSE="GPL-2" SLOT="0" -IUSE="" RDEPEND=" >=sys-apps/portage-2.1 @@ -25,7 +24,7 @@ RDEPEND=" app-shells/bash sys-apps/gentoo-functions " -DEPEND="app-arch/xz-utils" +BDEPEND="app-arch/xz-utils" src_install() { default diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20181202.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210718.ebuild similarity index 58% rename from sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20181202.ebuild rename to sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210718.ebuild index aba306ab04..b7f11a2c01 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20181202.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20210718.ebuild @@ -1,39 +1,35 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 if [[ ${PV} == "99999999" ]] ; then inherit git-r3 EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git" else SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://www.gentoo.org/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" LICENSE="GPL-2" SLOT="0" -IUSE="" RDEPEND=" - || ( - >=sys-apps/portage-2.1 - sys-apps/portage-mgorny - ) + >=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions - !sys-devel/crossdev-wrappers" -DEPEND="app-arch/xz-utils" +" +BDEPEND="app-arch/xz-utils" src_install() { default if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211027.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211027.ebuild new file mode 100644 index 0000000000..0c2fe30139 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-20211027.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +if [[ ${PV} == "99999999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" +else + SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="Gentoo Cross-toolchain generator" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=" + >=sys-apps/portage-2.1 + >=app-portage/portage-utils-0.55 + app-shells/bash + sys-apps/gentoo-functions +" +BDEPEND="app-arch/xz-utils" + +src_install() { + default + + if [[ "${PV}" == "99999999" ]] ; then + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die + fi +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild index 9024b91e05..0c2fe30139 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/crossdev-99999999.ebuild @@ -1,39 +1,36 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="8" if [[ ${PV} == "99999999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git" else SRC_URI="mirror://gentoo/${P}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" + https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz + https://dev.gentoo.org/~vapier/dist/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" fi DESCRIPTION="Gentoo Cross-toolchain generator" -HOMEPAGE="https://www.gentoo.org/" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev" LICENSE="GPL-2" SLOT="0" -IUSE="" RDEPEND=" - || ( - >=sys-apps/portage-2.1 - sys-apps/portage-mgorny - ) + >=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions - !sys-devel/crossdev-wrappers" -DEPEND="app-arch/xz-utils" +" +BDEPEND="app-arch/xz-utils" src_install() { default if [[ "${PV}" == "99999999" ]] ; then - sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED%/}"/usr/bin/crossdev || die + sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die fi } diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml index 496c0ca9a6..00b311f551 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-devel/crossdev/metadata.xml @@ -1,12 +1,12 @@ - + - -crossdev@gentoo.org -Gentoo Crossdev Team - - -embedded@gentoo.org -Embedded Gentoo - + + crossdev@gentoo.org + Gentoo Crossdev Team + + + embedded@gentoo.org + Embedded Gentoo + diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/Manifest deleted file mode 100644 index b0cd5ad5d8..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST btrfs-progs-v3.16.2.tar.xz 291604 BLAKE2B 66c19a47062386888209b2bb569cc5db8629446554387af971f5ba13ee49b654b2706fd6ed391115075533e6aa5637c7ebfe87b9abc2fa941739baee9fffe1aa SHA512 7dc0f2f8f0bbddbbf1d4d99854425341c4b3997334c65d7e936bcec1ee5ca880101b8b45498721502857b478edae6237a934c7d4acb735de43c6d8ff35efe53b -DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4 -DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e -DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae1794641d81db066ffab57a8f8cc9f6671c3bc01df5efc6309967e88af418e62eed61b7837863bc222bf371ce24b7d63cea SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f -DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6 -DIST btrfs-progs-v4.19.1.tar.xz 2007160 BLAKE2B fda89842f5117e77a00794054b1a11a7233d33c2135492b4a382cfdbcbbe58624447178cbeba7c44fabd5a5848fb4d47665dffbd838ff1b88432e1d98deb0666 SHA512 834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4 -DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee -DIST btrfs-progs-v4.20-rc1.tar.xz 2027492 BLAKE2B a964d3fe9c3d729b7dd9e927c21b96862201f0453cd79c77502d134752f05134b4883c28b50dbda475bd987eb0f13fc63487aa83b9cb8221a12a42d26eb284cf SHA512 c014500d25555bff8b856bac56360bb1096ee6b8dc66fb213d0503d233a144aa4bc002171c3a0b053e230ab0a77aa46d9b8065c26ff8d46b29d9a018c20fb257 -DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a -DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-3.16.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-3.16.2.ebuild deleted file mode 100644 index 8768a89951..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-3.16.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git - https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-libs/zlib:0= - sys-fs/e2fsprogs:0= -" -DEPEND="${RDEPEND} - sys-apps/acl - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - app-text/xmlto -" - -src_prepare() { - epatch_user -} - -src_compile() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - BUILD_VERBOSE=1 -} - -src_install() { - emake install \ - DESTDIR="${D}" \ - prefix=/usr \ - bindir=/sbin \ - libdir=/usr/$(get_libdir) \ - mandir=/usr/share/man -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild deleted file mode 100644 index ae8956a2b6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - inherit git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git - https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-libs/zlib:0= - sys-fs/e2fsprogs:0= -" -DEPEND="${RDEPEND} - sys-apps/acl - app-text/asciidoc - app-text/docbook-xml-dtd:4.5 - app-text/xmlto -" - -src_prepare() { - epatch_user -} - -src_compile() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - BUILD_VERBOSE=1 -} - -src_install() { - emake install \ - DESTDIR="${D}" \ - prefix=/usr \ - bindir=/sbin \ - libdir=/usr/$(get_libdir) \ - mandir=/usr/share/man -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild deleted file mode 100644 index 0f9295456a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bash-completion-r1 eutils multilib toolchain-funcs - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git - https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -src_prepare() { - epatch_user - if [[ ${PV} == 9999 ]]; then - eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 -} - -src_install() { - default - newbashcomp btrfs-completion btrfs -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild deleted file mode 100644 index 95614d5439..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert static static-libs" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex static-libs '' 'libs_static=') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild deleted file mode 100644 index 783e23d320..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex static-libs '' 'libs_static=') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild deleted file mode 100644 index 04d5383960..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6,7} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild deleted file mode 100644 index 17e1a09b4c..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6,7} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${P}-be-bswap.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild deleted file mode 100644 index 13b960406d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.20_rc1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6,7} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild deleted file mode 100644 index 5d5fe5103a..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit bash-completion-r1 eutils multilib toolchain-funcs - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert static static-libs" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -src_prepare() { - epatch_user - if [[ ${PV} == 9999 ]]; then - eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex static-libs '' 'libs_static=') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.9.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.9.1.ebuild deleted file mode 100644 index 397d271d38..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-4.9.1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit bash-completion-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV=v${PV} - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert static static-libs" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex static-libs '' 'libs_static=') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild deleted file mode 100644 index 04d5383960..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6,7} ) - -inherit bash-completion-r1 python-single-r1 - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}"/${PN}-${MY_PV} -else - WANT_LIBTOOL=none - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.wiki.kernel.org" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert python reiserfs static static-libs +zstd" - -RESTRICT=test # tries to mount repared filesystems - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= - convert? ( - sys-fs/e2fsprogs:0= - sys-libs/e2fsprogs-libs:0= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) -" -DEPEND="${RDEPEND} - convert? ( sys-apps/acl ) - >=app-text/asciidoc-8.6.0 - app-text/docbook-xml-dtd:4.5 - app-text/xmlto - python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs:0[static-libs(+)] - sys-libs/e2fsprogs-libs:0[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" - -if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" -fi - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - $(use_enable convert) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable zstd) - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_install() { - local makeargs=( - $(usex python install_python '') - $(usex static install-static '') - ) - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - newbashcomp btrfs-completion btrfs - use python && python_optimize -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch deleted file mode 100644 index b91b320408..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/files/btrfs-progs-4.19-be-bswap.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build failure on big-endian platforms. - -Reported-by: ernsteiswuerfel -Bug: https://bugs.gentoo.org/670741 ---- a/kernel-lib/bitops.h -+++ b/kernel-lib/bitops.h -@@ -180,5 +180,5 @@ static inline unsigned long ext2_swab(const unsigned long y) - #if BITS_PER_LONG == 64 -- return (unsigned long) bswap64((u64) y); -+ return (unsigned long) bswap_64((u64) y); - #elif BITS_PER_LONG == 32 -- return (unsigned long) bswap32((u32) y); -+ return (unsigned long) bswap_32((u32) y); - #else -@@ -220,3 +220,3 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1, - --unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, -+static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, - unsigned long offset) -@@ -227,3 +227,3 @@ unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, - --unsigned long find_next_bit_le(const void *addr, unsigned long size, -+static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, - unsigned long offset) diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/metadata.xml deleted file mode 100644 index 7da838752d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/btrfs-progs/metadata.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - floppym@gentoo.org - Mike Gilbert - - - slyfox@gentoo.org - Sergei Trofimovich - - - polynomial-c@gentoo.org - Lars Wendler - - - base-system@gentoo.org - Gentoo Base System - - - Build ext2 conversion utility (btrfs-convert) - Enable reiserfs support in btrfs-convert tool. - Build static binaries in addition to the dynamic ones - Enable zstd compression support. - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/ChangeLog b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/ChangeLog deleted file mode 100644 index 71607e4c97..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/ChangeLog +++ /dev/null @@ -1,88 +0,0 @@ -# ChangeLog for virtual/pkgconfig -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/ChangeLog,v 1.28 2014/07/22 12:40:29 ssuominen Exp $ - - 22 Jul 2014; Samuli Suominen -pkgconfig-0.ebuild: - old - - 22 Jul 2014; Mike Frysinger pkgconfig-0-r1.ebuild: - Mark stable for m68k/s390/sh/sparc. - - 19 Jul 2014; Mikle Kolyada pkgconfig-0-r1.ebuild: - Mark ia64 stable - - 18 Jul 2014; Matt Turner pkgconfig-0-r1.ebuild: - alpha stable, bug 516106. - - 16 Jul 2014; Mikle Kolyada pkgconfig-0-r1.ebuild: - ppc64 stable wrt bug #516106 - - 13 Jul 2014; Agostino Sarubbo pkgconfig-0-r1.ebuild: - Stable for ppc, wrt bug #516106 - - 13 Jul 2014; pkgconfig-0-r1.ebuild: - arm64 stable bug #516106 - - 09 Jul 2014; Mikle Kolyada pkgconfig-0-r1.ebuild: - x86 stable wrt bug #516106 - - 06 Jul 2014; Markus Meier pkgconfig-0-r1.ebuild: - arm stable, bug #516106 - - 05 Jul 2014; Mikle Kolyada pkgconfig-0-r1.ebuild: - amd64 stable wrt bug #516106 - - 05 Jul 2014; Jeroen Roovers pkgconfig-0-r1.ebuild: - Stable for HPPA (bug #516106). - -*pkgconfig-0-r1 (30 Mar 2014) - - 30 Mar 2014; Michał Górny +pkgconfig-0-r1.ebuild: - Enable multilib support. - - 18 Jan 2014; Mike Frysinger pkgconfig-0.ebuild: - Add arm64 love. - - 21 Feb 2013; Zac Medico pkgconfig-0.ebuild: - Add ~arm-linux keyword. - - 16 Sep 2012; Samuli Suominen pkgconfig-0.ebuild: - Force latest dev-util/pkgconfig to ensure installed pkg.m4 is up to date. - - 31 Jul 2012; Samuli Suominen pkgconfig-0.ebuild: - Remove dev-util/pkg-config-lite wrt #425292 - - 12 Jun 2012; Jeff Horelick pkgconfig-0.ebuild: - Move dev-util/pkgconf to being the 2nd choice. The pkg-config USE flag for it - is now on by default, it's been extensively tested in Gentoo, it's stable on 2 - arches (with more to come) and it's used by default in Funtoo now. - - 28 May 2012; Richard Yao pkgconfig-0.ebuild: - Remove superfluous userland_BSD from IUSE - - 27 May 2012; Richard Yao pkgconfig-0.ebuild: - Add missing userland_BSD to IUSE - - 27 May 2012; Samuli Suominen pkgconfig-0.ebuild: - Leave dev-util/pkgconfig-openbsd as last since it's not to be considered as - supported yet. Restore dropped version enforcement for dev-util/pkgconfig due - to known issues with broken pkg.m4 in 0.25. - - 27 May 2012; Richard Yao pkgconfig-0.ebuild: - Change order on Gentoo/*BSD, bug #417693 - - 19 May 2012; Alexandre Rostovtsev pkgconfig-0.ebuild: - Do not allow ancient versions of dev-util/pkgconfig, they cause interesting - build failures (e.g. bug #416057, reported by pingouin21). - - 04 May 2012; Samuli Suominen pkgconfig-0.ebuild: - Include dev-util/pkgconfig-openbsd[pkg-config]. - - 02 May 2012; Mike Frysinger pkgconfig-0.ebuild: - Sync stable keywords with dev-util/pkgconfig. - -*pkgconfig-0 (01 May 2012) - - 01 May 2012; Mike Frysinger pkgconfig-0.ebuild, - metadata.xml: - Initial ebuild. diff --git a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/Manifest b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/Manifest deleted file mode 100644 index 3fbfbe123d..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -EBUILD pkgconfig-0-r1.ebuild 905 SHA256 5e057894816a18fdc99e112465ff31817f8976f663fd4cbe614c92440fe18158 SHA512 6d46e0f2787fab4bf0136e036ad614b87f724cad234542b5e268a45303f1c187aebb31bbb9185d2a5a01b7fe8dd58b73a4492f85090b3234b21be70071da47a9 WHIRLPOOL f6a1db7c13e957be2ffa3d597e37be30a782445fb0580af1ebb5278a967d307c5fbbcf0ce80298adb842b819f1dcf9ee4bc10b4d89d2ea7922c832e2ccdf75a0 -MISC ChangeLog 3389 SHA256 3903131eb020a8432058caa6fce144a4c86fe2bd994e922bf58585944cc8f20f SHA512 5374cdbc97d9a3ff7e0cab81bf4332fba5bc804b64ba48ef0d7682916d46cd51f8e2cd0f11949821d296136faf15a478ca25e26f0115a6a065e3c1abab318ef2 WHIRLPOOL f08a74b84bbd3d46fe04fc27ac7e8d417b1b78d4b331772e855f6408e590052d05571fa78e03a0253d1f1c40bc4ee90969c1718837a7117630c4a07fc9005584 -MISC metadata.xml 186 SHA256 c90e43cb0c7e54a082db47d3f0df110024139f524c5a1fd5c180b9b66a34d84e SHA512 9806848d658a14e0ff490f938347d671df37e1e22c59207a3ef4fa57f2bca326e42e5f367e852faf16bf42bde5a299521d2dcd5e249be0edc9b787ad67af8db2 WHIRLPOOL 04dc06912ca111192a1a6ec2503b3e8ef192129f52e5befc85847963e10dcae197fa2c43fe3d5180cd1f1a704772108a8e9d16e39c8e223c19f87bc3a346a123 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAEBCAAGBQJTzlqXAAoJEEdUh39IaPFNSfwH/RRUU71QibxxLH8a1jr7nlHC -h/loKu1CgxM5sR/gI7xMFOxA5uMz5puinuYJjTFhGZE/2gAwKZ8w3pyKlGER3k7T -gjJkVHwNYfF8pZ/P+HRWEy/DKFy9gNHWH3d9jiUClIT4Jwq+9No0HwrFt/HZFM9W -kLzbrhw/q1q2qD7imhTqcQq79IzPagZMBZq0m6EwfNhKFOrphNXusZTLKdVZhEeD -CiJVfgJsw7vG8Ak9SZTfhhyXJKUBsZ0UhRl+7qKD2wLQ5jr1rRmHULrOBPsdGFSO -EOc9Rdv2t1amE1lKv1vefmOCWr5d2BZ45YSgpBJ2PCcf7z1D915NIs6vFv+6s7A= -=YRO/ ------END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/metadata.xml index 08b7896be4..8b2bd471ec 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/metadata.xml @@ -1,6 +1,16 @@ - + -freedesktop -embedded + + base-system@gentoo.org + + + freedesktop-bugs@gentoo.org + Gentoo Freedesktop Project + + + embedded@gentoo.org + Embedded Gentoo + + diff --git a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-0-r1.ebuild deleted file mode 100644 index 1fc7c74d19..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/pkgconfig/pkgconfig-0-r1.ebuild,v 1.11 2014/07/22 12:35:35 vapier Exp $ - -EAPI=5 - -inherit multilib-build - -DESCRIPTION="Virtual for the pkg-config implementation" -HOMEPAGE="" -SRC_URI="" - -LICENSE="" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=" - || ( - >=dev-util/pkgconfig-0.28-r1[${MULTILIB_USEDEP}] - >=dev-util/pkgconf-0.9.3-r1[pkg-config,${MULTILIB_USEDEP}] - >=dev-util/pkgconfig-openbsd-20130507-r1[pkg-config,${MULTILIB_USEDEP}] - )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild new file mode 100644 index 0000000000..b48048d49d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/virtual/pkgconfig/pkgconfig-2-r1.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Virtual for the pkg-config implementation" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND=">=dev-util/pkgconf-1.3.7[pkg-config(+)]"