From 1a5ddb2ca4912f54f2763fa6fc5e070da7b05ca3 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 5 Jan 2022 20:06:53 +0100 Subject: [PATCH] *: Drop mentions of elibc_uclibc --- .../app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild | 1 - .../portage-stable/dev-lang/perl/perl-5.32.1.ebuild | 3 +-- .../portage-stable/dev-lang/perl/perl-5.34.0-r1.ebuild | 3 +-- .../portage-stable/dev-lang/perl/perl-5.34.0-r2.ebuild | 3 +-- .../portage-stable/dev-lang/perl/perl-5.34.0.ebuild | 3 +-- .../portage-stable/dev-lang/python/python-2.7.18_p13.ebuild | 3 +-- .../sys-devel/gnuconfig/gnuconfig-20210107.ebuild | 1 - .../sys-devel/gnuconfig/gnuconfig-99999999.ebuild | 1 - .../src/third_party/portage-stable/virtual/libc/libc-0.ebuild | 1 - .../portage-stable/virtual/libiconv/libiconv-0-r1.ebuild | 4 ++-- .../portage-stable/virtual/libiconv/libiconv-0-r2.ebuild | 4 ++-- .../portage-stable/virtual/libiconv/libiconv-0.ebuild | 4 ++-- .../portage-stable/virtual/libintl/libintl-0-r1.ebuild | 4 ++-- .../portage-stable/virtual/libintl/libintl-0-r2.ebuild | 4 ++-- .../portage-stable/virtual/libintl/libintl-0.ebuild | 4 ++-- 15 files changed, 17 insertions(+), 26 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild index 72de3d804c..acc2457ef3 100644 --- a/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-cdr/cdrtools/cdrtools-3.02_alpha06.ebuild @@ -47,7 +47,6 @@ src_prepare() { # going to include this so let's try to carry it forward. # Contact me if it needs updating. Bug #486782. # Anthony G. Basile . - use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch # Remove profiled make files. find -name '*_p.mk' -delete diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.32.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.32.1.ebuild index 97963cf440..0f7097a137 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.32.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.32.1.ebuild @@ -528,7 +528,7 @@ src_configure() { [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 # Perl has problems compiling with -Os in your flags with glibc - use elibc_uclibc || replace-flags "-Os" "-O2" + replace-flags "-Os" "-O2" # xlocale.h is going away in glibc-2.26, so it's counterproductive # if we use it and include it in CORE/perl.h ... Perl builds just @@ -737,7 +737,6 @@ src_test() { ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." return 0 fi - use elibc_uclibc && export MAKEOPTS+=" -j1" TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" } diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r1.ebuild index 8f4017c898..7a294fedba 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r1.ebuild @@ -528,7 +528,7 @@ src_configure() { [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 # Perl has problems compiling with -Os in your flags with glibc - use elibc_uclibc || replace-flags "-Os" "-O2" + replace-flags "-Os" "-O2" # xlocale.h is going away in glibc-2.26, so it's counterproductive # if we use it and include it in CORE/perl.h ... Perl builds just @@ -737,7 +737,6 @@ src_test() { ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." return 0 fi - use elibc_uclibc && export MAKEOPTS+=" -j1" TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" } diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r2.ebuild index bc8f99f97e..48656abf54 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0-r2.ebuild @@ -529,7 +529,7 @@ src_configure() { [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 # Perl has problems compiling with -Os in your flags with glibc - use elibc_uclibc || replace-flags "-Os" "-O2" + replace-flags "-Os" "-O2" # xlocale.h is going away in glibc-2.26, so it's counterproductive # if we use it and include it in CORE/perl.h ... Perl builds just @@ -738,7 +738,6 @@ src_test() { ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." return 0 fi - use elibc_uclibc && export MAKEOPTS+=" -j1" TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" } diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0.ebuild index a9aa55e737..c13ea3d2ed 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/perl/perl-5.34.0.ebuild @@ -525,7 +525,7 @@ src_configure() { [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 # Perl has problems compiling with -Os in your flags with glibc - use elibc_uclibc || replace-flags "-Os" "-O2" + replace-flags "-Os" "-O2" # xlocale.h is going away in glibc-2.26, so it's counterproductive # if we use it and include it in CORE/perl.h ... Perl builds just @@ -734,7 +734,6 @@ src_test() { ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." return 0 fi - use elibc_uclibc && export MAKEOPTS+=" -j1" TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" } diff --git a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild index 5d9f006564..cf4d5d89db 100644 --- a/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-lang/python/python-2.7.18_p13.ebuild @@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="PSF-2" SLOT="${PYVER}" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="berkdb bluetooth build elibc_uclibc examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml" +IUSE="berkdb bluetooth build examples gdbm hardened +ncurses +readline +sqlite +ssl tk wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. # If you need to apply a patch which requires python for bootstrapping, please @@ -292,7 +292,6 @@ src_install() { use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die - use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test} use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20210107.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20210107.ebuild index f109360473..e1bf1fb4f4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20210107.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-20210107.ebuild @@ -47,7 +47,6 @@ src_unpack() { src_prepare() { default eapply "${S}"/*.patch - use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637 } src_compile() { :;} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild index 1032fedf8e..de2a73f412 100644 --- a/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-devel/gnuconfig/gnuconfig-99999999.ebuild @@ -47,7 +47,6 @@ src_unpack() { src_prepare() { default eapply "${S}"/*.patch - use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637 } src_compile() { :;} diff --git a/sdk_container/src/third_party/portage-stable/virtual/libc/libc-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libc/libc-0.ebuild index 3b738f5526..3d32ca1062 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libc/libc-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libc/libc-0.ebuild @@ -13,6 +13,5 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 RDEPEND="!prefix? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) - elibc_uclibc? ( sys-libs/uclibc ) elibc_FreeBSD? ( sys-freebsd/freebsd-lib ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild index e46b442ffd..9b69bd7b20 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r1.ebuild @@ -8,8 +8,8 @@ inherit multilib-build DESCRIPTION="Virtual for the GNU conversion library" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib" +IUSE="elibc_glibc elibc_musl elibc_mintlib" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc -RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) ) ) )" +RDEPEND="!elibc_glibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild index 24e76cfc02..5b86f1bb09 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0-r2.ebuild @@ -8,8 +8,8 @@ inherit multilib-build DESCRIPTION="Virtual for the GNU conversion library" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_glibc elibc_uclibc elibc_musl elibc_mintlib" +IUSE="elibc_glibc elibc_musl elibc_mintlib" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc -RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) ) ) )" +RDEPEND="!elibc_glibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] >=sys-freebsd/freebsd-lib-10.0[${MULTILIB_USEDEP}] ) ) ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild index c41fdf881d..c89c687511 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libiconv/libiconv-0.ebuild @@ -6,8 +6,8 @@ EAPI=5 DESCRIPTION="Virtual for the GNU conversion library" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_glibc elibc_uclibc elibc_musl" +IUSE="elibc_glibc elibc_musl" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc -RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libiconv ) ) )" +RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libiconv ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild index c3467fefe9..3f8f181b2d 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r1.ebuild @@ -8,8 +8,8 @@ inherit multilib-build DESCRIPTION="Virtual for the GNU Internationalization Library" 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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="elibc_glibc elibc_uclibc" +IUSE="elibc_glibc" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc. And don't force uClibc to dep on this. -RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}] ) ) )" +RDEPEND="!elibc_glibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}] ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild index c1d489860f..8c81d5f612 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0-r2.ebuild @@ -8,8 +8,8 @@ inherit multilib-build DESCRIPTION="Virtual for the GNU Internationalization Library" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="elibc_glibc elibc_musl elibc_uclibc" +IUSE="elibc_glibc elibc_musl" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc. And don't force uClibc to dep on this. -RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) ) )" +RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild index 852e45d2fa..35f465a8b0 100644 --- a/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild +++ b/sdk_container/src/third_party/portage-stable/virtual/libintl/libintl-0.ebuild @@ -6,8 +6,8 @@ EAPI=5 DESCRIPTION="Virtual for the GNU Internationalization Library" 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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="elibc_glibc elibc_uclibc" +IUSE="elibc_glibc" # - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between # that and gcc. And don't force uClibc to dep on this. -RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( sys-devel/gettext ) ) )" +RDEPEND="!elibc_glibc? ( !elibc_musl? ( sys-devel/gettext ) )"