diff options
| -rw-r--r-- | app-text/libpaper/Manifest | 1 | ||||
| -rw-r--r-- | app-text/libpaper/libpaper-2.0.9.ebuild | 24 | ||||
| -rw-r--r-- | dev-games/aseprite/aseprite-1.2.40.ebuild | 1 | ||||
| -rw-r--r-- | dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch | 245 | ||||
| -rw-r--r-- | eclass/go-module.eclass | 2 | ||||
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 7 | ||||
| -rw-r--r-- | media-video/vdr/vdr-2.6.3.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/logwatch/logwatch-7.8-r1.ebuild (renamed from sys-apps/logwatch/logwatch-7.8.ebuild) | 1 | ||||
| -rw-r--r-- | sys-apps/logwatch/logwatch-9999.ebuild | 3 | ||||
| -rw-r--r-- | sys-devel/gcc/Manifest | 1 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-12.2.1_p20230218.ebuild | 52 | ||||
| -rw-r--r-- | sys-libs/pkgcraft/Manifest | 1 | ||||
| -rw-r--r-- | sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild | 90 | ||||
| -rw-r--r-- | sys-libs/pkgcraft/pkgcraft-9999.ebuild | 318 |
14 files changed, 433 insertions, 315 deletions
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest index 38e7016ec157..ff58d90d2d9f 100644 --- a/app-text/libpaper/Manifest +++ b/app-text/libpaper/Manifest @@ -1,3 +1,4 @@ DIST libpaper-2.0.4.tar.gz 1286975 BLAKE2B 2751422ca3176d1f47d98c74d948d986e6dcff15acbac126535f526312900650e25fa0a4d68ceebc5d718f5135be22a9f9407d690dc5d5e22eab9dc55b040fc8 SHA512 d603a807c8fdc57b704cdfdc90bedf05c54c8a7b67e8cf52f26298c22a6cee5291fcadc6e67d28b00cf9d68f4890a394e56c8e91f0b97c8edfac4662fe4dc8f0 DIST libpaper-2.0.8.tar.gz 1304248 BLAKE2B d42b239b5e6d79fccc42508ab55e3d0a7b7f688c288aae7a75286332cd13d563e6164289195e7b67ef1216d5b4d4127a75dffe4bbe97080e093f89b64f48a57b SHA512 06318779cee2d1cf9bea090a5956f90bf8cccc0d753eb7c931615c0dcb321e012ea870a20613b84e7f4350ab608237a2d21d5170c119d8908c86a94e0cba1d1f +DIST libpaper-2.0.9.tar.gz 1290212 BLAKE2B a1b54af2463c97d90b902fc31ae92347e47ff25d589712ab1f86cc46ccda0751b69733c37ab95bf4abbdad11639b133d812cf46760a04a5aff0ba8749e9a6bf6 SHA512 79d2f6d2b0c88f6edbfb1bbd9be43461cffaa05bfda67bc31b3b29c8f4988125cb7dbd2e982ac5b3b19315b6fea5757efc5c6f45a26b2e34d1569b050673788a DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc diff --git a/app-text/libpaper/libpaper-2.0.9.ebuild b/app-text/libpaper/libpaper-2.0.9.ebuild new file mode 100644 index 000000000000..d77438c2f590 --- /dev/null +++ b/app-text/libpaper/libpaper-2.0.9.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Library for handling paper characteristics" +HOMEPAGE="https://github.com/rrthomas/libpaper" +SRC_URI="https://github.com/rrthomas/libpaper/releases/download/v${PV}/${P}.tar.gz" + +# See README. +# paperspecs is public-domain +LICENSE="LGPL-2.1+ GPL-3+ public-domain" +SLOT="0/$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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" + +src_configure() { + econf --enable-relocatable +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/dev-games/aseprite/aseprite-1.2.40.ebuild b/dev-games/aseprite/aseprite-1.2.40.ebuild index b475dc122883..ace0f6db885e 100644 --- a/dev-games/aseprite/aseprite-1.2.40.ebuild +++ b/dev-games/aseprite/aseprite-1.2.40.ebuild @@ -73,6 +73,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.2.40_shared_webp.patch" "${FILESDIR}/${PN}-1.2.35_laf_fixes.patch" "${FILESDIR}/${PN}-1.2.40_musl_pthreads.patch" + "${FILESDIR}/${PN}-1.2.40_ixwebsocket-gcc13.patch" ) src_prepare() { diff --git a/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch b/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch new file mode 100644 index 000000000000..85ae6739beb8 --- /dev/null +++ b/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch @@ -0,0 +1,245 @@ +From a5d86afd43920d2401682ecd3ec6879a574845ea Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Sun, 19 Feb 2023 21:08:36 +0300 +Subject: [PATCH] Fix compilation on GCC-13 + +GCC-13 changes internal cstdint includes, and now files that uses +standart integer types should directly include cstdint header. + +See: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes +See: https://github.com/machinezone/IXWebSocket/pull/443 +Bug: https://bugs.gentoo.org/865117 +Bug: https://bugs.gentoo.org/895440 +--- a/third_party/IXWebSocket/ixwebsocket/IXBench.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXBench.h +@@ -6,7 +6,7 @@ + #pragma once + + #include <chrono> +-#include <stdint.h> ++#include <cstdint> + #include <string> + + namespace ix +--- a/third_party/IXWebSocket/ixwebsocket/IXConnectionState.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXConnectionState.h +@@ -7,9 +7,9 @@ + #pragma once + + #include <atomic> ++#include <cstdint> + #include <functional> + #include <memory> +-#include <stdint.h> + #include <string> + + namespace ix +--- a/third_party/IXWebSocket/ixwebsocket/IXDNSLookup.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXDNSLookup.h +@@ -12,6 +12,7 @@ + + #include "IXCancellationRequest.h" + #include <atomic> ++#include <cstdint> + #include <memory> + #include <mutex> + #include <set> +--- a/third_party/IXWebSocket/ixwebsocket/IXHttp.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXHttp.h +@@ -9,6 +9,7 @@ + #include "IXProgressCallback.h" + #include "IXWebSocketHttpHeaders.h" + #include <atomic> ++#include <cstdint> + #include <tuple> + #include <unordered_map> + +--- a/third_party/IXWebSocket/ixwebsocket/IXHttpClient.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXHttpClient.cpp +@@ -12,6 +12,7 @@ + #include "IXUserAgent.h" + #include "IXWebSocketHttpHeaders.h" + #include <assert.h> ++#include <cstdint> + #include <cstring> + #include <iomanip> + #include <random> +--- a/third_party/IXWebSocket/ixwebsocket/IXHttpServer.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXHttpServer.cpp +@@ -10,6 +10,7 @@ + #include "IXNetSystem.h" + #include "IXSocketConnect.h" + #include "IXUserAgent.h" ++#include <cstdint> + #include <cstring> + #include <fstream> + #include <sstream> +--- a/third_party/IXWebSocket/ixwebsocket/IXNetSystem.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXNetSystem.h +@@ -6,6 +6,8 @@ + + #pragma once + ++#include <cstdint> ++ + #ifdef _WIN32 + + #ifndef WIN32_LEAN_AND_MEAN +--- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterrupt.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterrupt.h +@@ -6,8 +6,8 @@ + + #pragma once + ++#include <cstdint> + #include <memory> +-#include <stdint.h> + #include <string> + + namespace ix +--- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h +@@ -5,8 +5,8 @@ + #pragma once + + #include "IXSelectInterrupt.h" ++#include <cstdint> + #include <mutex> +-#include <stdint.h> + #include <string> + #include <deque> + #ifdef _WIN32 +--- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h +@@ -7,6 +7,7 @@ + #pragma once + + #include "IXSelectInterrupt.h" ++#include <cstdint> + #include <mutex> + #include <stdint.h> + #include <string> +--- a/third_party/IXWebSocket/ixwebsocket/IXSocket.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXSocket.cpp +@@ -14,7 +14,6 @@ + #include <array> + #include <assert.h> + #include <fcntl.h> +-#include <stdint.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +--- a/third_party/IXWebSocket/ixwebsocket/IXSocket.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXSocket.h +@@ -7,6 +7,7 @@ + #pragma once + + #include <atomic> ++#include <cstdint> + #include <functional> + #include <memory> + #include <mutex> +--- a/third_party/IXWebSocket/ixwebsocket/IXSocketMbedTLS.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXSocketMbedTLS.cpp +@@ -14,6 +14,7 @@ + #include "IXNetSystem.h" + #include "IXSocket.h" + #include "IXSocketConnect.h" ++#include <cstdint> + #include <string.h> + + #ifdef _WIN32 +--- a/third_party/IXWebSocket/ixwebsocket/IXUuid.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXUuid.cpp +@@ -16,6 +16,7 @@ + + #include "IXUuid.h" + ++#include <cstdint> + #include <iomanip> + #include <random> + #include <sstream> +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocket.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocket.cpp +@@ -13,6 +13,7 @@ + #include "IXWebSocketHandshake.h" + #include <cassert> + #include <cmath> ++#include <cstdint> + + + namespace +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocket.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocket.h +@@ -21,6 +21,7 @@ + #include "IXWebSocketTransport.h" + #include <atomic> + #include <condition_variable> ++#include <cstdint> + #include <mutex> + #include <string> + #include <thread> +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.cpp +@@ -46,6 +46,8 @@ + * + */ + ++#include <cstdint> ++ + #include "IXWebSocketPerMessageDeflate.h" + + #include "IXUniquePtr.h" +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h +@@ -10,6 +10,7 @@ + #include "zlib.h" + #endif + #include <array> ++#include <cstdint> + #include <string> + #include <vector> + #include "IXWebSocketSendData.h" +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + + namespace ix +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + #include <vector> + #include <iterator> +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.cpp ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.cpp +@@ -45,7 +45,6 @@ + #include <cstdarg> + #include <cstdlib> + #include <sstream> +-#include <stdlib.h> + #include <string.h> + #include <string> + #include <thread> +--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.h ++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.h +@@ -21,6 +21,7 @@ + #include "IXWebSocketSendData.h" + #include "IXWebSocketSendInfo.h" + #include <atomic> ++#include <cstdint> + #include <functional> + #include <list> + #include <memory> +-- +2.39.2 + diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass index 5703b4fd8810..bcdd521619ac 100644 --- a/eclass/go-module.eclass +++ b/eclass/go-module.eclass @@ -352,7 +352,7 @@ go-module_setup_proxy() { # - Otherwise do a normal unpack. go-module_src_unpack() { if use amd64 || use arm || use arm64 || - ( use ppc64 && ! use big-endian ) || use s390 || use x86; then + ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then GOFLAGS="-buildmode=pie ${GOFLAGS}" fi GOFLAGS="${GOFLAGS} -p=$(makeopts_jobs)" diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 8a4f33e71bb7..805a3b0dfe61 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -757,6 +757,13 @@ tc-arch() { tc-ninja_magic_to_arch portage "$@" } +# @FUNCTION: tc-endian +# @USAGE: [toolchain prefix] +# @RETURN: 'big' or 'little' corresponding to the passed (or host) endianness +# @DESCRIPTION: +# Accepts 'host' as an argument which defaults to CTARGET and falls back to CHOST +# if unspecified. Returns 'big' or 'little' depending on whether 'host' is +# big or little endian. tc-endian() { local host=$1 [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} diff --git a/media-video/vdr/vdr-2.6.3.ebuild b/media-video/vdr/vdr-2.6.3.ebuild index dc7302616595..9dfbf7706e9a 100644 --- a/media-video/vdr/vdr-2.6.3.ebuild +++ b/media-video/vdr/vdr-2.6.3.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> $ LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose" COMMON_DEPEND=" diff --git a/sys-apps/logwatch/logwatch-7.8.ebuild b/sys-apps/logwatch/logwatch-7.8-r1.ebuild index 3147899cb63c..5f4d3a5769c8 100644 --- a/sys-apps/logwatch/logwatch-7.8.ebuild +++ b/sys-apps/logwatch/logwatch-7.8-r1.ebuild @@ -23,6 +23,7 @@ RDEPEND=" dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip + dev-perl/HTML-Parser dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild index db6cdabae32a..5f4d3a5769c8 100644 --- a/sys-apps/logwatch/logwatch-9999.ebuild +++ b/sys-apps/logwatch/logwatch-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,6 +23,7 @@ RDEPEND=" dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip + dev-perl/HTML-Parser dev-perl/Tie-IxHash dev-perl/Sys-CPU dev-perl/Sys-MemInfo diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index a2ae74c72259..f1f608f1f6a7 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -20,6 +20,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 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-libs/pkgcraft/Manifest b/sys-libs/pkgcraft/Manifest index 25333678072f..963c27c249fc 100644 --- a/sys-libs/pkgcraft/Manifest +++ b/sys-libs/pkgcraft/Manifest @@ -174,6 +174,7 @@ DIST pkgcraft-0.0.4.crate 460046 BLAKE2B c0bb2ecd035e34321b4af0b546f12219bb51773 DIST pkgcraft-bash-4c79d69fbfc508b78ef480e2449e81b244f59ab1.tar.gz 10906926 BLAKE2B 0765989039f14e2ecc97c746f1b5f592aa0cbd79f4800a0a6e76ed533bd2bf5fbc84e9427772e0c1944d15604201663b58a0032d6ffb164f4ebd7c6ff72cbb5b SHA512 71f8ffb4d42e4f6895b6f3ec14a16e8aff8277a04015e41263762886ff7a52caa8806dbd2239eeace5073bdfa6f553e3f7d0d76d0715fd09a08141829d0706fd DIST pkgcraft-c-0.0.4.crate 14662 BLAKE2B 38fc76f4ee0829519978d7ce60e9073abad24a96e224e20bb3c07745ff58e6dec381da8501f539f54cbffda2731df893abb819736def0ceb11cbe3638d1a31ba SHA512 20f9b9cb089d39d738e7be01a159e8da6b1d6a8e24fbecaf9e2064d72bd5e2434642b8c73972516f20e6a52359f7e876b49a648bb5e5bfc00799e89d2565320b DIST pkgcraft-c-0.0.5.tar.gz 188123 BLAKE2B 636d9f3fc2e0bcd3ae16c4b770e776850d1a34b3e36dceba752999f2e9274b42894fea37e9a383447a19114fdd2ff8c2294786362a316ccbb7ec2445aa660e96 SHA512 18b61b9b4e506e2328087b03e105ac20abdac08895570ea6e48df439c00a5680ad7bef4399e1d33d8a0abfff5277bf23185feaf8e1cb3d6a4e546a4671dd9655 +DIST pkgcraft-c-0.0.6.tar.xz 18239736 BLAKE2B b037ab525abeee07f6bfa766248220bbb9d5259b735e953add63b2e363826ccb5cf96beda31e05022ec3adbbcdc7e57012f441923cecb96e73372189e8aee755 SHA512 f8c12a3f8f1a9097bfd21ad32d4ce2af16d69fa768c0647189c06678b8c110dcf23e1ef844136df763d9b6fa0d2297f82409bb7fff9eacaaf2eee073197568bf DIST plotters-0.3.4.crate 143219 BLAKE2B 3121caf7d2a62d3dd337d887ea2343981d23b26ab742fa192456d58a73ebd07d384ad6e1de58671b5c06344c2efea8e32168d830051d425a63299d15746f3a73 SHA512 04d490ad1b822195259a661dbc605ec2f8e190a5bbbbf549741b286aa888b26a2c7468d226cee7718bd69b77e026283944367504db98c0293b3db4ce45103534 DIST plotters-backend-0.3.4.crate 13416 BLAKE2B 2b7090fb98ab9c28fd8525e1b3b4ca3410dafdb80563f52b545af70db638899123455254861e95973fb9c9e178e83cccd941c7305977de033091ed957291c28d SHA512 4784da70eda90a48aab38192619cfa7df733519cadc3b9aecd339dc735a9237e03144eee4f22f5f03ca214a732e8807d179d455032dd255a8125092ea489228b DIST plotters-svg-0.3.3.crate 6916 BLAKE2B 74c2c71afefe1148c82f8695ca3ae5283bad5b084e542325f3b6d587eac23f9fc087b64033043ff52ebcd661d40bb91c33ccd0de3c424ac0916baaa3a69c63b6 SHA512 1233eece4ab91ec690f93c7134ae8e6405183aaf500b2dce6973b6e212058334b7335aa80915e40363b9d2057398028c57d0b3aa974b88bb42c4e0e4726e7a92 diff --git a/sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild b/sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild new file mode 100644 index 000000000000..af77f15e2a08 --- /dev/null +++ b/sys-libs/pkgcraft/pkgcraft-0.0.6.ebuild @@ -0,0 +1,90 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" " +inherit edo cargo toolchain-funcs + +DESCRIPTION="C library for pkgcraft" +HOMEPAGE="https://pkgcraft.github.io/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcraft/pkgcraft" + inherit git-r3 + + S="${WORKDIR}"/${P}/crates/pkgcraft-c + + BDEPEND="test? ( dev-util/cargo-nextest )" +else + MY_P=${PN}-c-${PV} + SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz" + S="${WORKDIR}"/${MY_P} + + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +# Dependent crate licenses +LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016" +SLOT="0/${PV}" +IUSE="test" +RESTRICT="!test? ( test )" + +# clang needed for bindgen +BDEPEND+=" + dev-util/cargo-c + sys-devel/clang + >=virtual/rust-1.65 +" + +QA_FLAGS_IGNORED="usr/lib.*/libpkgcraft.so.*" + +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + cargo_live_src_unpack + else + cargo_src_unpack + fi +} + +src_compile() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + ) + + # For scallop building bash + tc-export AR CC + + # Can pass -vv if need more output from e.g. scallop configure + edo cargo cbuild "${cargoargs[@]}" +} + +src_test() { + if [[ ${PV} == 9999 ]] ; then + # It's interesting to test the whole thing rather than just + # pkgcraft-c. + cd "${WORKDIR}"/${P} || die + + # Need nextest per README (separate processes required) + # Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56 + edo cargo nextest run --color always --all-features + else + # There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft. + :; + fi +} + +src_install() { + local cargoargs=( + --library-type=cdylib + --prefix=/usr + --libdir="/usr/$(get_libdir)" + --destdir="${ED}" + ) + + edo cargo cinstall "${cargoargs[@]}" +} diff --git a/sys-libs/pkgcraft/pkgcraft-9999.ebuild b/sys-libs/pkgcraft/pkgcraft-9999.ebuild index b89bfe9cb848..af77f15e2a08 100644 --- a/sys-libs/pkgcraft/pkgcraft-9999.ebuild +++ b/sys-libs/pkgcraft/pkgcraft-9999.ebuild @@ -3,300 +3,7 @@ EAPI=8 -CRATES=" - adler-1.0.2 - ahash-0.7.6 - aho-corasick-0.7.20 - anes-0.1.6 - annotate-snippets-0.6.1 - anyhow-1.0.68 - assert_cmd-2.0.8 - async-stream-0.3.3 - async-stream-impl-0.3.3 - async-trait-0.1.64 - async_once-0.2.6 - atty-0.2.14 - autocfg-1.1.0 - autotools-0.2.5 - axum-0.6.4 - axum-core-0.3.2 - base64-0.13.1 - base64-0.21.0 - bindgen-0.63.0 - bitflags-1.3.2 - bstr-1.2.0 - bumpalo-3.12.0 - bytes-1.4.0 - cached-0.42.0 - cached_proc_macro-0.16.0 - cached_proc_macro_types-0.1.0 - camino-1.1.2 - cast-0.3.0 - cc-1.0.79 - cexpr-0.6.0 - cfg-if-1.0.0 - chic-1.2.2 - ciborium-0.2.0 - ciborium-io-0.2.0 - ciborium-ll-0.2.0 - clang-sys-1.4.0 - clap-3.2.23 - clap-4.1.4 - clap_derive-4.1.0 - clap_lex-0.2.4 - clap_lex-0.3.1 - config-0.13.3 - crc32fast-1.3.2 - criterion-0.4.0 - criterion-plot-0.5.0 - crossbeam-channel-0.5.6 - crossbeam-deque-0.8.2 - crossbeam-epoch-0.9.13 - crossbeam-utils-0.8.14 - ctor-0.1.26 - darling-0.14.2 - darling_core-0.14.2 - darling_macro-0.14.2 - difflib-0.4.0 - dlv-list-0.3.0 - doc-comment-0.3.3 - either-1.8.1 - encoding_rs-0.8.32 - enum-as-inner-0.5.1 - errno-0.2.8 - errno-dragonfly-0.1.2 - fastrand-1.8.0 - filetime-0.2.19 - fixedbitset-0.4.2 - flate2-1.0.25 - fnv-1.0.7 - form_urlencoded-1.1.0 - futures-0.3.26 - futures-channel-0.3.26 - futures-core-0.3.26 - futures-executor-0.3.26 - futures-io-0.3.26 - futures-macro-0.3.26 - futures-sink-0.3.26 - futures-task-0.3.26 - futures-util-0.3.26 - getrandom-0.2.8 - git2-0.16.1 - glob-0.3.1 - h2-0.3.15 - half-1.8.2 - hashbrown-0.12.3 - hashbrown-0.13.2 - heck-0.4.1 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - hermit-abi-0.3.0 - http-0.2.8 - http-body-0.4.5 - http-range-header-0.3.0 - httparse-1.8.0 - httpdate-1.0.2 - hyper-0.14.24 - hyper-rustls-0.23.2 - hyper-timeout-0.4.1 - ident_case-1.0.1 - idna-0.3.0 - indexmap-1.9.2 - indoc-2.0.0 - instant-0.1.12 - io-lifetimes-1.0.5 - ipnet-2.7.1 - is-terminal-0.4.3 - is_executable-1.0.1 - itertools-0.10.5 - itoa-1.0.5 - jobserver-0.1.25 - js-sys-0.3.61 - lazy_static-1.4.0 - lazycell-1.3.0 - libc-0.2.139 - libgit2-sys-0.14.2+1.5.1 - libloading-0.7.4 - libssh2-sys-0.2.23 - libz-sys-1.1.8 - linux-raw-sys-0.1.4 - lock_api-0.4.9 - log-0.4.17 - maplit-1.0.2 - matchers-0.1.0 - matchit-0.7.0 - memchr-2.5.0 - memoffset-0.7.1 - mime-0.3.16 - minimal-lexical-0.2.1 - miniz_oxide-0.6.2 - mio-0.8.5 - multimap-0.8.3 - nix-0.26.2 - nom-7.1.3 - nom8-0.2.0 - nu-ansi-term-0.46.0 - num-traits-0.2.15 - num_cpus-1.15.0 - once_cell-1.17.0 - oorandom-11.1.3 - openssl-probe-0.1.5 - openssl-sys-0.9.80 - ordered-multimap-0.4.3 - os_str_bytes-6.4.1 - overload-0.1.1 - parking_lot-0.12.1 - parking_lot_core-0.9.7 - pathdiff-0.2.1 - peeking_take_while-0.1.2 - peg-0.8.1 - peg-macros-0.8.1 - peg-runtime-0.8.1 - percent-encoding-2.2.0 - petgraph-0.6.2 - pin-project-1.0.12 - pin-project-internal-1.0.12 - pin-project-lite-0.2.9 - pin-utils-0.1.0 - pkg-config-0.3.26 - plotters-0.3.4 - plotters-backend-0.3.4 - plotters-svg-0.3.3 - ppv-lite86-0.2.17 - predicates-2.1.5 - predicates-core-1.0.5 - predicates-tree-1.0.7 - prettyplease-0.1.23 - proc-macro-error-1.0.4 - proc-macro-error-attr-1.0.4 - proc-macro2-1.0.50 - prost-0.11.6 - prost-build-0.11.6 - prost-derive-0.11.6 - prost-types-0.11.6 - quote-1.0.23 - rand-0.8.5 - rand_chacha-0.3.1 - rand_core-0.6.4 - rayon-1.6.1 - rayon-core-1.10.2 - redox_syscall-0.2.16 - regex-1.7.1 - regex-automata-0.1.10 - regex-syntax-0.6.28 - remove_dir_all-0.5.3 - reqwest-0.11.14 - ring-0.16.20 - roxmltree-0.18.0 - rust-ini-0.18.0 - rustc-hash-1.1.0 - rustix-0.36.8 - rustls-0.20.8 - rustls-pemfile-1.0.2 - rustversion-1.0.11 - ryu-1.0.12 - same-file-1.0.6 - scopeguard-1.1.0 - sct-0.7.0 - serde-1.0.152 - serde_derive-1.0.152 - serde_json-1.0.91 - serde_spanned-0.6.1 - serde_urlencoded-0.7.1 - serde_with-2.2.0 - serde_with_macros-2.2.0 - sharded-slab-0.1.4 - shlex-1.1.0 - signal-hook-registry-1.4.0 - slab-0.4.7 - smallvec-1.10.0 - socket2-0.4.7 - spin-0.5.2 - static_assertions-1.1.0 - strsim-0.10.0 - strum-0.24.1 - strum_macros-0.24.3 - syn-1.0.107 - sync_wrapper-0.1.2 - sys-info-0.9.1 - tar-0.4.38 - tempfile-3.3.0 - termcolor-1.2.0 - termtree-0.4.0 - textwrap-0.16.0 - thiserror-1.0.38 - thiserror-impl-1.0.38 - thread_local-1.1.4 - tinytemplate-1.2.1 - tinyvec-1.6.0 - tinyvec_macros-0.1.1 - tokio-1.25.0 - tokio-io-timeout-1.2.0 - tokio-macros-1.8.2 - tokio-rustls-0.23.4 - tokio-stream-0.1.11 - tokio-util-0.7.4 - toml-0.5.11 - toml-0.7.1 - toml_datetime-0.6.1 - toml_edit-0.19.1 - tonic-0.8.3 - tonic-build-0.8.4 - tower-0.4.13 - tower-http-0.3.5 - tower-layer-0.3.2 - tower-service-0.3.2 - tracing-0.1.37 - tracing-attributes-0.1.23 - tracing-core-0.1.30 - tracing-futures-0.2.5 - tracing-log-0.1.3 - tracing-subscriber-0.3.16 - tracing-test-0.2.4 - tracing-test-macro-0.2.4 - try-lock-0.2.4 - unicode-bidi-0.3.10 - unicode-ident-1.0.6 - unicode-normalization-0.1.22 - untrusted-0.7.1 - url-2.3.1 - valuable-0.1.0 - vcpkg-0.2.15 - version_check-0.9.4 - wait-timeout-0.2.0 - walkdir-2.3.2 - want-0.3.0 - wasi-0.11.0+wasi-snapshot-preview1 - wasm-bindgen-0.2.84 - wasm-bindgen-backend-0.2.84 - wasm-bindgen-futures-0.4.34 - wasm-bindgen-macro-0.2.84 - wasm-bindgen-macro-support-0.2.84 - wasm-bindgen-shared-0.2.84 - wasm-streams-0.2.3 - web-sys-0.3.61 - webpki-0.22.0 - webpki-roots-0.22.6 - which-4.4.0 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.42.0 - windows-sys-0.45.0 - windows-targets-0.42.1 - windows_aarch64_gnullvm-0.42.1 - windows_aarch64_msvc-0.42.1 - windows_i686_gnu-0.42.1 - windows_i686_msvc-0.42.1 - windows_x86_64_gnu-0.42.1 - windows_x86_64_gnullvm-0.42.1 - windows_x86_64_msvc-0.42.1 - winreg-0.10.1 - xattr-0.2.3 - xmlparser-0.13.5 -" - +CRATES=" " inherit edo cargo toolchain-funcs DESCRIPTION="C library for pkgcraft" @@ -310,14 +17,10 @@ if [[ ${PV} == 9999 ]] ; then BDEPEND="test? ( dev-util/cargo-nextest )" else - export BASH_SUBMODULE_COMMIT="4c79d69fbfc508b78ef480e2449e81b244f59ab1" - SRC_URI=" - https://github.com/pkgcraft/pkgcraft/archive/refs/tags/${PN}-c-${PV}.tar.gz - https://github.com/pkgcraft/bash/archive/${BASH_SUBMODULE_COMMIT}.tar.gz -> ${PN}-bash-${BASH_SUBMODULE_COMMIT}.tar.gz - $(cargo_crate_uris) - " + MY_P=${PN}-c-${PV} + SRC_URI="https://github.com/pkgcraft/pkgcraft/releases/download/${MY_P}/${MY_P}.tar.xz" + S="${WORKDIR}"/${MY_P} - S="${WORKDIR}"/${PN}-${PN}-c-${PV}/crates/${PN}-c KEYWORDS="~amd64" fi @@ -346,15 +49,6 @@ src_unpack() { fi } -src_prepare() { - default - - if [[ ${PV} != 9999 ]] ; then - rm -rvf ../scallop/bash || die - ln -sv "${WORKDIR}/bash-"* ../scallop/bash || die - fi -} - src_compile() { local cargoargs=( --library-type=cdylib @@ -379,8 +73,8 @@ src_test() { # Invocation from https://github.com/pkgcraft/pkgcraft/blob/main/.github/workflows/ci.yml#L56 edo cargo nextest run --color always --all-features else - # TODO: swap to meson for tests to avoid overtesting - cargo_src_test + # There are no tests for pkgcraft-c. Test via e.g. dev-python/pkgcraft. + :; fi } |