From 8dd17625671faf6a47abf31d4c96a1e20d764ba5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Feb 2023 02:17:30 +0000 Subject: gentoo auto-resync : 20:02:2023 - 02:17:29 --- sys-devel/Manifest.gz | Bin 10642 -> 10636 bytes sys-devel/gcc/Manifest | 2 ++ sys-devel/gcc/gcc-12.2.1_p20230218.ebuild | 52 ++++++++++++++++++++++++++++++ sys-devel/gettext/Manifest | 4 +-- sys-devel/gettext/gettext-0.21.1.ebuild | 10 +++--- sys-devel/gettext/metadata.xml | 27 ++++++---------- 6 files changed, 71 insertions(+), 24 deletions(-) create mode 100644 sys-devel/gcc/gcc-12.2.1_p20230218.ebuild (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index 45571bdf5d06..642efcd94df2 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 4a4aab75ef1e..c3a3331de0a1 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -22,6 +22,7 @@ DIST gcc-11.4.0-patches-8.tar.xz 13788 BLAKE2B a1406d5dcd906ed51ef06bb6571c216d8 DIST gcc-12-20221126.tar.xz 79631864 BLAKE2B 3bb97ef4a1a17ab8b92b431b1f792c11131085a1b523efa08c5b4f995b44bf628be371564813e5affb1f8e2320bb8a9b04532e57b2deeef26b33f517783daa5e SHA512 163e0aa39dc5c24980f84000bd6ccd4b7c24581831b7a4cdbd63e4726be5c2b1933d034ce12c65cf95e4c0ebe1175af7e32facace465bfd7c7c377401350a2df DIST gcc-12-20230121.tar.xz 79652428 BLAKE2B f4f0e6474d179454dc56dd05c823fca919a894e9efdc64625bb13045c7bd549a7bab59dfb4052d45d594d4484801ab5b18cf3f3d6277be54eaec24a53abd439c SHA512 b6c2486916418a64fab64c3655329bc18ca93ee4eca240e8779bd6d8280124fcd07b1aa8eff979fd317656646ecdba9353107887338354d8bd2c1f68c1609349 DIST gcc-12-20230211.tar.xz 79698020 BLAKE2B 0de8d0b8f8823276fc7b0c70225a1c957455645cafd9c46ab8d3cd80d4e641a0d48df03a9d1d5206fde65e9f0dca09a481311b9b68a7993899e4060d44e08cf6 SHA512 6ae3979cfff1376ba2ea639d9a01428e55a67a2cc6582bc77a476b050bfd3ba00e078907067b74a1f59188014febc3fd1e4c5e98fae00421e0c82c9db54f1028 +DIST gcc-12-20230218.tar.xz 79705112 BLAKE2B 28b230d4e66f773a6ea32a3112f66c81ffb787f16ba1c36d3d4d2498b03031a9dbe3c2aefb40b07aab1eca64a32636c1cff2497eae996565d633fa1d70ac890e SHA512 bf2b109a12a981ae97ca4c6d9a27b11adcf1c7acaf167c532936a027dad4217e75b197fd12b2c5e37f6e89fe39a54f483984023accfb76f7517cc3d35ced416a DIST gcc-12.2.0-musl-patches-7.tar.xz 3652 BLAKE2B 295ea907efea854a3c2447d472bedb24714d78b7b725476b1eac3898d89c0c549da8e69db28911205bb3293f62cf344a90ade0898ecf5fed57ff00fcf8547a9f SHA512 7a7a440bc08de8dcb37c080ea0c27904adaaadaaaafaab24d90becd2d009243dcfc886d8f674ce3ccddb4ebb5ad17f04d841064d9ec2e2e2e96a1afac3002111 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258 DIST gcc-12.2.0-patches-10.tar.xz 14252 BLAKE2B 99368db982227728a6a9e2b1f694999f041f38db4a3806b6a740c86218735f9b561197bc150423a3caad0b5fd335c95d1aca130a519754423cd44a083e655373 SHA512 f7f0d8185e908926046f579793dba5916dc27392b85bfe50a7e70c213c3ba29479dfdb1b27514765b76bc897c4dbb530680e59c4deca7a245a808ed566120e4c @@ -50,6 +51,7 @@ EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B 6d074d9c9e2bc3ea20812064a12dbfe53a597e841f EBUILD gcc-12.2.1_p20221126.ebuild 1434 BLAKE2B aab865ca5ada835b8689c2768cf9da20fc1aed75b375b74fa242592153997d44924c6c4be7d4ad230650fcb36e22961894098d52008e09c6606629ba650b40be SHA512 eeadbd21f07818dfed588308c38c1c445139a53539756d5015c546bd11d888dce54210778090466ab9084340f244f1789e9b3ca5ca17e10188506b7bd908407c EBUILD gcc-12.2.1_p20230121-r1.ebuild 1429 BLAKE2B ff9a7a13e5c5fc57defe20f2cb0c08a679eb34007e780694b7d3ae03e630c7ab8ec419d9aee3239042ec32f07829b0b0e0a2252b23880c6d3221d9ac28343121 SHA512 a888e5184edc997ced6ccd751bc0ad36c2f438042cb4f59e2d9ba0d9949d4609f81d674d03d8ca8be8c86004e5e1a6a627498eaba534d343bbb17edce09ab61c EBUILD gcc-12.2.1_p20230211.ebuild 1438 BLAKE2B 7bb9b18ec1d12eee06f28b76b106e29605c19e6026c18d8bd784fc05cb4a7a3443eb1a04a6c04c2bdda96a8dd0e8afa859082aef29aeb49b13f451ab941788fb SHA512 b6b61b818e4ffd1012c860fe413b9d3437a163d2797b7d1d83a9632cd035db8fb2a976db018356f24b0eb82f52de9297ce9d8b642dae3db04a70bfb3eaef1e65 +EBUILD gcc-12.2.1_p20230218.ebuild 1438 BLAKE2B 7bb9b18ec1d12eee06f28b76b106e29605c19e6026c18d8bd784fc05cb4a7a3443eb1a04a6c04c2bdda96a8dd0e8afa859082aef29aeb49b13f451ab941788fb SHA512 b6b61b818e4ffd1012c860fe413b9d3437a163d2797b7d1d83a9632cd035db8fb2a976db018356f24b0eb82f52de9297ce9d8b642dae3db04a70bfb3eaef1e65 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279 EBUILD gcc-13.0.1.9999.ebuild 1252 BLAKE2B e8feaecedb676e0ddce69ec0e7fc5e944d8df870ba897a2e495781a0a860c972b013667ffc3b83a2e4da97cd1e8ce69b93fb3d212d5cd9af2fc8e5e3d799f3d1 SHA512 ba91dd930efdbd01f57a95f70e5e9e12fa9e7e1254d574239ecdf0b54d20515ede1df6dffa9772ef590c128fe852e378ae7e2c56d2f8f88db344675b7cc7ab45 EBUILD gcc-13.0.1_pre20230212.ebuild 1299 BLAKE2B 636e7cbe0eb844ad4cd92b20a4e1e7747d4dc05e90aa043a410077c99593cb92cb8d0c6d226cfb3819223954d1ea9344fb50e385142daa790c26ead4de4c1628 SHA512 d1cbd97fe9362c44aa81679a4267bde19030dcea0e0303063c998f8b6e7d7ff4eec3538313dbcb4c4636ce5a577f563f7a2c67141caa02b89d07b17dbce0324a diff --git a/sys-devel/gcc/gcc-12.2.1_p20230218.ebuild b/sys-devel/gcc/gcc-12.2.1_p20230218.ebuild new file mode 100644 index 000000000000..3a7a472a2f2f --- /dev/null +++ b/sys-devel/gcc/gcc-12.2.1_p20230218.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TOOLCHAIN_PATCH_DEV="sam" +PATCH_VER="13" +PATCH_GCC_VER="12.2.0" +MUSL_VER="7" +MUSL_GCC_VER="12.2.0" + +if [[ $(ver_cut 3) == 9999 ]] ; then + MY_PV_2=$(ver_cut 2) + if [[ ${MY_PV_2} == 0 ]] ; then + MY_PV_2=0 + else + MY_PV_2=$(($(ver_cut 2) - 1)) + fi + + # e.g. 12.2.9999 -> 12.1.1 + TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998)) +elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then + # Cheesy hack for RCs + MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5) + MY_P=${PN}-${MY_PV} + GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz" + TOOLCHAIN_SET_S=no + S="${WORKDIR}"/${MY_P} +fi + +inherit toolchain + +# Needs to be after inherit (for now?), bug #830908 +EGIT_BRANCH=releases/gcc-$(ver_cut 1) + +# Don't keyword live ebuilds +#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then +# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +#fi + +# Technically only if USE=hardened *too* right now, but no point in complicating it further. +# If GCC is enabling CET by default, we need glibc to be built with support for it. +# bug #830454 +RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )" +DEPEND="${RDEPEND}" +BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]" + +src_prepare() { + toolchain_src_prepare + + eapply_user +} diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest index 5c54ff3b076e..7011505f29ef 100644 --- a/sys-devel/gettext/Manifest +++ b/sys-devel/gettext/Manifest @@ -6,5 +6,5 @@ AUX gettext-0.21.1-java-autoconf.patch 2280 BLAKE2B 79605c0ea6c5a56be1a6d586210e AUX gettext-0.21_rc1-avoid_eautomake.patch 1362 BLAKE2B eed15ecde829aa63859dc196052f97abc0386e6c496b7d7e073769e0ad6208623cc1fb6322ff422647f3a55aac6453bd6390432d707d179da7cfc820d487c23a SHA512 5089af3dabb2459345aec6196de70591dafabfc292495f052dd67ce3d2566c4b62a8554eb11db7499378e16a8d11953f044fcfd23c77a71ad01feec4c0c41956 DIST gettext-0.21.1.tar.xz 10054564 BLAKE2B e994924284b3fd5b3e3bf59d4bf43eb30c9b21cc213dc3b98616b4a9fc321c90911d94d314f323cfffd0d2c3e9371b5b8f7985b9a785adc61617dd042b6f4df5 SHA512 61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9 DIST gettext-0.21.1.tar.xz.sig 833 BLAKE2B f673436d315e972f9e110a1b5c8d1b2f20a32fc1b7ce027fcd3bc2fe7a81af183fb8db744cbed1a8c3a6ce1a13d55e19a8e8829fc944960fbfc7efcd9aaed91c SHA512 fba912830c57d0616fb66cf81da0cb7a3ab1e27497c45daa63249d3c9f85182a4f42dfeb1591d8f31c2a340ba0c519f04fd2f05429d1cf26a3ea316d047993d0 -EBUILD gettext-0.21.1.ebuild 5318 BLAKE2B afe61292abc7c97de7c408f3be855020d9229d36d715f4b4441a4ff48a2c4617cce4cf3c3452214c8abb86937777830ceca37acdb484868ad2c53c6b8ad01ddd SHA512 eef70c6b966654a83b2155310c53bc08e2f7b354b7bf9cd5a5cf11f808e19a201df82bdf1010ef52be993ab86fcffaee81062f6f4a249b5bef55cbd7fae35535 -MISC metadata.xml 708 BLAKE2B 851174e455d052a1c3a4e0a5dbfeac2feb10781a54fa0bfb52b3934ed88a3f8a2437a922f3ce5b56e21aa6aaec3488539e151362e3441344f97c246b79e2c2e2 SHA512 9dbd43e82384160c392bcfa94a271951a754c2cbf116cf61659642660e93b4a82a7636d600cc8a83b68fcd2d92669e4b5b009334039ff66c58b92baa24961aac +EBUILD gettext-0.21.1.ebuild 5254 BLAKE2B 004788da492cb425e32415d906a68d009e4cf1bb5198766fb6f6199e9bfab9644aa58b5979f38f5d3d08285832e8ccfa6e8a06a4ecaaba9d23d7972201708aec SHA512 0057cbafeea00cadc0a4287c1f0fc19920b369fb42d1fdd83c8d14f83e25b6a57bea745a1c628d953ad6cca5d9f636a9e7f281ec20f33590387d085576606294 +MISC metadata.xml 529 BLAKE2B 7043c2adba0d48824bf343847a587b7eb9ce0947b1985ee375f08a0af0fce3809e7a581001872b98ceb5305aeb410d4e2e72425e7906563593e168cfe60904f5 SHA512 06a0877db14a56e71a90ecc4eed1658e21703403c5739ed8e62202e5fe3958fccab5ffcc633975c7269402022f40653638cc41d1ae5b6427203dc8c28d6a502c diff --git a/sys-devel/gettext/gettext-0.21.1.ebuild b/sys-devel/gettext/gettext-0.21.1.ebuild index df051017c102..e7f594906b2e 100644 --- a/sys-devel/gettext/gettext-0.21.1.ebuild +++ b/sys-devel/gettext/gettext-0.21.1.ebuild @@ -23,7 +23,7 @@ fi # so put that license behind USE=cxx. LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )" SLOT="0" -IUSE="acl cvs +cxx doc emacs git java ncurses nls openmp static-libs" +IUSE="acl +cxx doc emacs git java ncurses nls openmp static-libs" # only runtime goes multilib # Note: The version of libxml2 corresponds to the version bundled via gnulib. @@ -40,11 +40,9 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 )" RDEPEND="${DEPEND} - !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 )" BDEPEND=" - !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) verify-sig? ( sec-keys/openpgp-keys-gettext )" PDEPEND="emacs? ( app-emacs/po-mode )" @@ -94,7 +92,9 @@ src_prepare() { elibtoolize - use elibc_musl && eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + if use elibc_musl || use elibc_Darwin; then + eapply "${FILESDIR}"/${PN}-0.21-musl-omit_setlocale_lock.patch + fi } multilib_src_configure() { @@ -119,12 +119,12 @@ multilib_src_configure() { --without-included-libxml --disable-csharp + --without-cvs $(use_enable acl) $(use_enable cxx c++) $(use_enable cxx libasprintf) $(use_with git) - $(usex git --without-cvs $(use_with cvs)) $(multilib_native_use_enable java) $(use_enable ncurses curses) $(use_enable nls) diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml index 502becbd6b66..aad767169a65 100644 --- a/sys-devel/gettext/metadata.xml +++ b/sys-devel/gettext/metadata.xml @@ -1,21 +1,14 @@ - - base-system@gentoo.org - Gentoo Base System - - - - When running `autopoint`, use cvs to store the internal development files; - this requires cvs at runtime, but will be faster/smaller than raw archives - - - When running `autopoint`, use git to store the internal development files; - this requires git at runtime, but will be faster/smaller than raw archives - - - - cpe:/a:gnu:gettext - + + base-system@gentoo.org + Gentoo Base System + + + When running `autopoint`, use git to store the internal development files; this requires git at runtime, but will be faster/smaller than raw archives + + + cpe:/a:gnu:gettext + -- cgit v1.2.3