From b28e80ccc7f64eaf719ddf4bda612d8cb970af37 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:26:50 +0100 Subject: [PATCH 01/13] overlay coreos-base/coreos: Add some group packages We had those packages in portage-stable, but nothing pulled them in. These packages add groups that exist in group file in baselayout, which we would want to get rid of eventually. --- .../{coreos-0.0.1-r316.ebuild => coreos-0.0.1-r317.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 6 ++++++ 2 files changed, 6 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r316.ebuild => coreos-0.0.1-r317.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r316.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r317.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r316.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r317.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 4d6a180e869..cc54f9fb1e1 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -215,3 +215,9 @@ RDEPEND+=" sys-auth/google-oslogin ) " + +# Group and user packages to eventually replace passwd in baselayout. +RDEPEND="${RDEPEND} + acct-group/floppy + acct-group/uucp +" From 3fbf8ced1ca0cb7cedc36ebc6dd98ce60e58513a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:29:00 +0100 Subject: [PATCH 02/13] app-crypt/{m,s}hash: Drop unused packages --- .../workflows/portage-stable-packages-list | 2 - .../portage-stable/app-crypt/mhash/Manifest | 1 - ...h-0.9.9-autotools-namespace-stomping.patch | 93 --------- .../files/mhash-0.9.9-fix-mem-leak.patch | 27 --- .../mhash-0.9.9-fix-snefru-segfault.patch | 27 --- .../mhash-0.9.9-fix-whirlpool-segfault.patch | 27 --- .../mhash/files/mhash-0.9.9.9-align.patch | 118 ----------- .../mhash/files/mhash-0.9.9.9-alignment.patch | 15 -- .../files/mhash-0.9.9.9-cast-temp-64bit.patch | 13 -- .../mhash-0.9.9.9-force64bit-tiger.patch | 13 -- .../files/mhash-0.9.9.9-hmac-uaf-test.patch | 19 -- .../files/mhash-0.9.9.9-no-malloc-check.patch | 20 -- .../mhash-0.9.9.9-remove_premature_free.patch | 11 - .../app-crypt/mhash/files/mhash.pc | 4 - .../app-crypt/mhash/metadata.xml | 8 - .../app-crypt/mhash/mhash-0.9.9.9-r3.ebuild | 72 ------- .../portage-stable/app-crypt/shash/Manifest | 1 - .../shash/files/0.2.6-manpage-fixes.patch | 29 --- .../shash/files/shash-0.2.6-C99-decls.patch | 195 ------------------ .../files/shash-0.2.6-binary-files.patch | 34 --- .../files/shash-0.2.6-format-security.patch | 28 --- .../shash/files/shash.bash-completion | 38 ---- .../app-crypt/shash/metadata.xml | 9 - .../app-crypt/shash/shash-0.2.6-r4.ebuild | 42 ---- 24 files changed, 846 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-align.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-hmac-uaf-test.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/files/0.2.6-manpage-fixes.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-C99-decls.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-binary-files.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-format-security.patch delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash.bash-completion delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/shash/shash-0.2.6-r4.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 66fd15050ff..651762717af 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -123,12 +123,10 @@ app-crypt/gnupg app-crypt/gpgme app-crypt/libb2 app-crypt/libmd -app-crypt/mhash app-crypt/mit-krb5 app-crypt/p11-kit app-crypt/pinentry app-crypt/rhash -app-crypt/shash app-crypt/tpm2-tools app-crypt/tpm2-tss diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/Manifest deleted file mode 100644 index 81d7f0ab65c..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch deleted file mode 100644 index 4bccf6765ae..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-autotools-namespace-stomping.patch +++ /dev/null @@ -1,93 +0,0 @@ -Per debian 473204: http://bugs.debian.org/473204, mhash exports #defines that -are customarily autotools-private. This results in warnings when other packages -attempt to use mhash's headers. - -Gentoo-Bug: 221093 -Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=221093 -Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=152625&action=view -Signed-off-by: Peter Alfredson - ---- a/configure.in -+++ b/configure.in -@@ -4,10 +4,11 @@ - AC_CANONICAL_TARGET - AC_CONFIG_SRCDIR([lib/mhash.c]) - AM_INIT_AUTOMAKE - - AC_DEFINE([MHASH_VERSION], PROGRAM_VERSION, "MHash Version") -+AC_CONFIG_HEADER([include/mutils/config.h]) - AC_CONFIG_HEADER([include/mutils/mhash_config.h]) - - - dnl Check system. - ---- a/include/mutils/config.h.in -+++ b/include/mutils/config.h.in -@@ -0,0 +1,22 @@ -+/* Name of package */ -+#undef PACKAGE -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#undef PACKAGE_BUGREPORT -+ -+/* Define to the full name of this package. */ -+#undef PACKAGE_NAME -+ -+/* Define to the full name and version of this package. */ -+#undef PACKAGE_STRING -+ -+/* Define to the one symbol short name of this package. */ -+#undef PACKAGE_TARNAME -+ -+/* Define to the version of this package. */ -+#undef PACKAGE_VERSION -+ -+/* Version number of package */ -+#undef VERSION -+ -+ ---- a/include/mutils/mhash_config.h.in -+++ b/include/mutils/mhash_config.h.in -@@ -179,28 +179,10 @@ - #undef MHASH_VERSION - - /* Define to 1 if your C compiler doesn't accept -c and -o together. */ - #undef NO_MINUS_C_MINUS_O - --/* Name of package */ --#undef PACKAGE -- --/* Define to the address where bug reports for this package should be sent. */ --#undef PACKAGE_BUGREPORT -- --/* Define to the full name of this package. */ --#undef PACKAGE_NAME -- --/* Define to the full name and version of this package. */ --#undef PACKAGE_STRING -- --/* Define to the one symbol short name of this package. */ --#undef PACKAGE_TARNAME -- --/* Define to the version of this package. */ --#undef PACKAGE_VERSION -- - /* Define to 1 if the C compiler supports function prototypes. */ - #undef PROTOTYPES - - /* The size of `unsigned char', as computed by sizeof. */ - #undef SIZEOF_UNSIGNED_CHAR -@@ -221,13 +203,10 @@ - #undef STDC_HEADERS - - /* dmalloc */ - #undef USE_DMALLOC - --/* Version number of package */ --#undef VERSION -- - /* Define if using the dmalloc debugging malloc package */ - #undef WITH_DMALLOC - - /* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch deleted file mode 100644 index f6083eb180f..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-mem-leak.patch +++ /dev/null @@ -1,27 +0,0 @@ -The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are -affected by a bug which causes memory to be leaked during -mhash_restore_state_mem. - -In this function/patch, ret->state is allocated towards the beginning and later -on replaced with a new allocated area without freeing the old. The patch fixes -it. - -Patch already submitted upstream, but depending on speed, this may be faster to -patch in a new patchset. - -Gentoo-Bug: 255006 -Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255006 -Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178560 -Signed-off-by: Thomas Harning - ---- a/lib/mhash.c -+++ b/lib/mhash.c -@@ -719,6 +719,8 @@ - mutils_memcpy( &ret->state_size, &mem[pos], sizeof(ret->state_size)); - pos += sizeof( ret->state_size); - -+ if (ret->state) -+ mutils_free(ret->state); - ret->state = mutils_malloc(ret->state_size); - if (ret->state==NULL) - goto freeall; diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch deleted file mode 100644 index 6e9e0275b02..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-snefru-segfault.patch +++ /dev/null @@ -1,27 +0,0 @@ -The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are -affected by a bug which causes a NULL ptr dereference in whirlpool/snefru -digest-completion functionality. - -In this patch, whirlpool and snefru's code is updated to bail if 'digest' is -NULL. The code portion aborted is only responsible for writing data to the -digest, so this appears to be correct behavior. - -Patch already submitted upstream, but depending on speed, this may be faster to -patch in a new patchset. - -Gentoo-Bug: 255131 -Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131 -Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178666&action=view -Signed-off-by: Thomas Harning - ---- a/lib/snefru.c -+++ b/lib/snefru.c -@@ -859,6 +859,8 @@ - { - mutils_word32 i; - -+ if(!digest) return; -+ - for (i = 0; i < len; i++, digest += 4) - { - *(mutils_word32 *)digest = mutils_bend2sys32(ctx->hash[i]); diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch deleted file mode 100644 index 8437e624b2e..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9-fix-whirlpool-segfault.patch +++ /dev/null @@ -1,27 +0,0 @@ -The package app-crypt/mhash-0.9.9 as well as app-crypt/mhash-0.9.9-r1 are -affected by a bug which causes a NULL ptr dereference in whirlpool/snefru -digest-completion functionality. - -In this patch, whirlpool and snefru's code is updated to bail if 'digest' is -NULL. The code portion aborted is only responsible for writing data to the -digest, so this appears to be correct behavior. - -Patch already submitted upstream, but depending on speed, this may be faster to -patch in a new patchset. - -Gentoo-Bug: 255131 -Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=255131 -Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=178667&action=view -Signed-off-by: Thomas Harning - ---- a/lib/whirlpool.c -+++ b/lib/whirlpool.c -@@ -970,6 +970,8 @@ - mutils_word8 * digest) - { - mutils_word32 i; -+ -+ if(!digest) return; - /* - * return the completed message digest: - */ diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-align.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-align.patch deleted file mode 100644 index 81486034cb6..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-align.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- a/lib/stdfns.c -+++ b/lib/stdfns.c -@@ -152,6 +152,18 @@ mutils_bzero(void *s, __const mutils_wor - } - } - -+static void -+mutils_memset8(void *s, __const mutils_word8 c, __const mutils_word32 n) -+{ -+ mutils_word8 *stmp = s; -+ mutils_word32 i; -+ -+ for (i = 0; i < n; i++, stmp++) -+ { -+ *stmp = c; -+ } -+} -+ - WIN32DLL_DEFINE - void - mutils_memset(void *s, __const mutils_word8 c, __const mutils_word32 n) -@@ -160,8 +172,7 @@ mutils_memset(void *s, __const mutils_wo - /* Sparc needs 8-bit alignment - just use standard memset */ - memset(s, (int) c, (size_t) n); - #else -- mutils_word8 *stmp; -- mutils_word32 *ltmp = (mutils_word32 *) s; -+ mutils_word32 *ltmp; - mutils_word32 lump; - mutils_word32 i; - mutils_word32 words; -@@ -172,22 +183,30 @@ mutils_memset(void *s, __const mutils_wo - return; - } - -+ if (n < 16) -+ { -+ return mutils_memset8(s, c, n); -+ } -+ -+ /* unaligned portion at beginning */ -+ remainder = (-(mutils_word32)s) & 0x3; -+ mutils_memset8(s, c, remainder); -+ -+ /* aligned words in the middle */ -+ ltmp = (mutils_word32 *) (s + remainder); -+ - lump = (c << 24) + (c << 16) + (c << 8) + c; - -- words = n >> 2; -- remainder = n - (words << 2); -+ words = (n - remainder) >> 2; -+ remainder = n - remainder - (words << 2); - - for (i = 0; i < words; i++, ltmp++) - { - *ltmp = lump; - } - -- stmp = (mutils_word8 *) ltmp; -- -- for (i = 0; i < remainder; i++, stmp++) -- { -- *stmp = c; -- } -+ /* unaligned portion at end */ -+ return mutils_memset8(ltmp, c, remainder); - #endif - } - -@@ -281,6 +300,9 @@ mutils_word32nswap(mutils_word32 *x, mut - mutils_word32 *buffer; - mutils_word32 *ptrIn; - mutils_word32 *ptrOut; -+ mutils_word8 *ptr8In; -+ mutils_word8 *ptr8Out; -+ mutils_word8 tmp8; - mutils_word32 count = n * 4; - - if (destructive == MUTILS_FALSE) -@@ -301,9 +323,35 @@ mutils_word32nswap(mutils_word32 *x, mut - * data on a little-endian machine. - */ - -- for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++) -+ if ((mutils_word32)x & 0x3) -+ { -+ ptr8In = (mutils_word8 *) x; -+ ptr8Out = (mutils_word8 *) buffer; -+ for (loop = 0; loop < n; loop++) -+ { -+#ifdef WORDS_BIGENDIAN -+ tmp8 = ptr8In[0]; -+ ptr8Out[0] = ptr8In[3]; -+ ptr8Out[3] = tmp8; -+ tmp8 = ptr8In[1]; -+ ptr8Out[1] = ptr8In[2]; -+ ptr8Out[2] = tmp8; -+#else -+ ptr8Out[0] = ptr8In[0]; -+ ptr8Out[1] = ptr8In[1]; -+ ptr8Out[2] = ptr8In[2]; -+ ptr8Out[3] = ptr8In[3]; -+#endif -+ ptr8Out += 4; -+ ptr8In += 4; -+ } -+ } -+ else - { -- *ptrOut = mutils_lend32(*ptrIn); -+ for (loop = 0, ptrIn = x, ptrOut = buffer; loop < n; loop++, ptrOut++, ptrIn++) -+ { -+ *ptrOut = mutils_lend32(*ptrIn); -+ } - } - - return(buffer); diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch deleted file mode 100644 index 0df89bc8486..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-alignment.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/lib/stdfns.c -+++ b/lib/stdfns.c -@@ -378,6 +378,12 @@ mutils_memmove(void *dest, __const void - bigptr1 = (mutils_word32 *) dest; - bigptr2 = (mutils_word32 *) src; - -+ /* copy byte-by-byte for small and/or unaligned copies */ -+ if ((n < 16) || ((mutils_word32)dest & 0x3) || ((mutils_word32)src & 0x3)) -+ { -+ return mutils_memcpy8(dest, src, n); -+ } -+ - words = n >> 2; - remainder = n - (words << 2); - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch deleted file mode 100644 index 3b173f8072c..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-cast-temp-64bit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/tiger.c b/lib/tiger.c -index 8f15df4..8d28f27 100644 ---- a/lib/tiger.c -+++ b/lib/tiger.c -@@ -254,7 +254,7 @@ void tiger_final(struct tiger_ctx *ctx) - register mutils_word64 i, j; - /* Force 64-bit alignment */ - mutils_word64 temp_64bit[TIGER_DATASIZE/8]; -- mutils_word8 *temp = temp_64bit; -+ mutils_word8 *temp = (mutils_word8 *) temp_64bit; - i = ctx->index; - - #if defined(WORDS_BIGENDIAN) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch deleted file mode 100644 index 08f18d45828..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-force64bit-tiger.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/lib/tiger.c -+++ b/lib/tiger.c -@@ -252,7 +252,9 @@ void tiger_update(struct tiger_ctx *ctx, - void tiger_final(struct tiger_ctx *ctx) - { - register mutils_word64 i, j; -- mutils_word8 temp[TIGER_DATASIZE]; -+ /* Force 64-bit alignment */ -+ mutils_word64 temp_64bit[TIGER_DATASIZE/8]; -+ mutils_word8 *temp = temp_64bit; - i = ctx->index; - - #if defined(WORDS_BIGENDIAN) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-hmac-uaf-test.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-hmac-uaf-test.patch deleted file mode 100644 index cd9b3c04189..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-hmac-uaf-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/914173 -https://sourceforge.net/p/mhash/patches/12/ -https://sourceforge.net/p/mhash/bugs/43/ - -Fixes a segfault due to use-after-free on x86 & ARM in the test suite. - -Index: mhash-0.9.9.9/src/hmac_test.c -=================================================================== ---- mhash-0.9.9.9/src/hmac_test.c -+++ mhash-0.9.9.9/src/hmac_test.c 2020-04-01 00:04:44.039815882 +0200 -@@ -76,8 +76,6 @@ - - /* Test No 2 */ - -- mutils_memset(tmp, 0, sizeof(tmp)); -- - passlen=sizeof(KEY2) - 1; - password = (mutils_word8 *) mutils_malloc(passlen+1); - mutils_memcpy(password, KEY2, passlen); diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch deleted file mode 100644 index 6da1f98ac78..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-no-malloc-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://sourceforge.net/p/mhash/patches/11/ - -Compiling mhash-0.9.9.9 on platforms (like AIX) without GNU libc compatible malloc leads to undefined symbol rpl_malloc -when linking the in-mhash executables drver, frag_test, rest_test, hmac_test, keygen_test. - -Reason is that configure.in still contains AC_FUNC_MALLOC, detecting need -to "#define malloc rpl_malloc", while mhash does not provide a rpl_malloc implementation. - -As the only use of malloc() in lib/stdfns.c does not rely on GNU libc -compatible malloc actually, there is no need to check for one. ---- a/configure.in -+++ b/configure.in -@@ -64,7 +64,6 @@ AC_CHECK_HEADERS(signal.h stdint.h stdio.h stdlib.h string.h strings.h) - - dnl Checks for functions - --AC_FUNC_MALLOC - AC_FUNC_MEMCMP - - AC_CHECK_FUNCS(bcopy bzero) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch deleted file mode 100644 index f81ec66b6f9..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash-0.9.9.9-remove_premature_free.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/keygen_test.c -+++ b/src/keygen_test.c -@@ -121,8 +121,6 @@ - - mhash_keygen_ext(KEYGEN_S2K_SALTED, data, key, keysize, password, passlen); - -- mutils_memset(tmp, 0, keysize * 2); -- - tmp = mutils_asciify(key, keysize); - - result = mutils_strcmp((mutils_word8 *) KEY2, tmp); diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc deleted file mode 100644 index 6186f85c783..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/files/mhash.pc +++ /dev/null @@ -1,4 +0,0 @@ -Libs:-lmhash -Name: mhash -Version: @VERSION@ -Description: provides a uniform interface to several hash algorithms diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml deleted file mode 100644 index 11aead93f45..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - mhash - - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild deleted file mode 100644 index 0d5b3371eb8..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/mhash/mhash-0.9.9.9-r3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="Library providing a uniform interface to a large number of hash algorithms" -HOMEPAGE="https://mhash.sourceforge.net/" -SRC_URI="https://downloads.sourceforge.net/mhash/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="static-libs" - -BDEPEND="dev-lang/perl" # pod2html - -PATCHES=( - "${FILESDIR}"/${PN}-0.9.9-fix-mem-leak.patch - "${FILESDIR}"/${PN}-0.9.9-fix-snefru-segfault.patch - "${FILESDIR}"/${PN}-0.9.9-fix-whirlpool-segfault.patch - "${FILESDIR}"/${PN}-0.9.9-autotools-namespace-stomping.patch - "${FILESDIR}"/${P}-remove_premature_free.patch - "${FILESDIR}"/${P}-force64bit-tiger.patch - "${FILESDIR}"/${P}-align.patch - "${FILESDIR}"/${P}-alignment.patch - "${FILESDIR}"/${P}-no-malloc-check.patch - "${FILESDIR}"/${P}-hmac-uaf-test.patch - "${FILESDIR}"/${P}-cast-temp-64bit.patch -) - -DOCS=( doc/example.c doc/skid2-authentication ) - -HTML_DOCS=( doc/mhash.html ) - -src_prepare() { - default - - sed -i \ - -e 's/--netscape//' \ - "${S}"/doc/Makefile.in || die - - sed \ - -e "s:@VERSION@:${PV}:" \ - "${FILESDIR}"/${PN}.pc > ${PN}.pc || die - - # Refresh bundled libtool (ltmain.sh) - # (elibtoolize is not sufficient) - # bug #668666 - eautoreconf -} - -src_configure() { - # bug #943960 - append-cflags -std=gnu17 - - econf $(use_enable static-libs static) -} - -src_compile() { - default - - emake -C doc mhash.html -} - -src_install() { - default - insinto /usr/$(get_libdir)/pkgconfig - doins ${PN}.pc - find "${ED}" -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/shash/Manifest deleted file mode 100644 index 89172981587..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/0.2.6-manpage-fixes.patch b/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/0.2.6-manpage-fixes.patch deleted file mode 100644 index 111730c5782..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/0.2.6-manpage-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/doc/shash.1 -+++ b/doc/shash.1 -@@ -31,7 +31,7 @@ Because of this shash also supports HMAC - a mechanism for message authentication using cryptographic hash functions. - So shash can use a key with a hash algorithm to produce hashes that can only - be verified with the key. This way you can securely check (i.e. you are sure --that nobody can modify the mac, without beeing detected) -+that nobody can modify the mac, without being detected) - if files in a filesystem were altered. - - If the list of files and digests, that shash produces, is stored as -@@ -72,7 +72,7 @@ Suppress some not critical warnings. - .TP - .B \-b - Use binary mode. In unix environment, only difference between this and --the normal mode is an asterix preceding the filename in the output. -+the normal mode is an asterisk preceding the filename in the output. - .TP - .B \-c - Check the checksum of all files listed in -@@ -94,7 +94,7 @@ Enter the keyword via the command line. - keyword instead of prompting for it. Keep in mind that someone - may see the command you are executing and so your key. - .TP --.B \-c --config FILE -+.B \-i --config FILE - Use the specified configuration file. The default is .shashrc - in your home directory. The format of the configuration - file is the same as the parameters. An example file is: diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-C99-decls.patch b/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-C99-decls.patch deleted file mode 100644 index bf2f3ab79d8..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-C99-decls.patch +++ /dev/null @@ -1,195 +0,0 @@ ---- a/src/environ.c -+++ b/src/environ.c -@@ -4,7 +4,7 @@ - #endif - #include "environ.h" - --int check_env() -+int check_env(void) - { - - if (getenv(SHASH_KEY) != NULL -@@ -15,7 +15,7 @@ - } - - char * -- get_env_key() -+ get_env_key(void) - { - - if (getenv(SHASH_KEY) != NULL) { -@@ -26,7 +26,7 @@ - - } - --char *get_env_bit_mode() -+char *get_env_bit_mode(void) - { - - return getenv(SHASH_KEYMODE); ---- a/src/environ.h -+++ b/src/environ.h -@@ -3,7 +3,7 @@ - #define SHASH_KEY "SHASH_KEY" - #define SHASH_KEYMODE "SHASH_KEYMODE" - --int check_env(); --char * get_env_key(); --char * get_env_bit_mode(); -+int check_env(void); -+char * get_env_key(void); -+char * get_env_bit_mode(void); - ---- a/src/errors.c -+++ b/src/errors.c -@@ -1,5 +1,7 @@ - #include - -+#include -+ - extern int quiet; - - void err_quit(char *errmsg) ---- a/src/extra.c -+++ b/src/extra.c -@@ -1,5 +1,10 @@ - #include - -+#include -+#include -+#include -+#include -+ - #ifdef HAVE_STAT - - int check_file(char *filename) ---- a/src/gaaout.c -+++ b/src/gaaout.c -@@ -11,6 +11,11 @@ - #endif - #endif - -+void hash_license(void); -+void hash_version(void); -+void list_keygen_algorithms(void); -+int hash_list(void); -+ - void* gaa_malloc( size_t size) { - void* ret; - ret = malloc(size); ---- a/src/random.c -+++ b/src/random.c -@@ -24,7 +24,7 @@ - static FILE *ffd; - - word32 --get_rand32() -+get_rand32(void) - { - int fd, x; - word32 rand_data; -@@ -46,7 +46,7 @@ - - - word8 --get_rand8() -+get_rand8(void) - { - - int fd, x; -@@ -69,7 +69,7 @@ - - - word32 --get_safe_rand32() -+get_safe_rand32(void) - { - int fd, x; - word32 rand_data; -@@ -91,7 +91,7 @@ - - - word8 --get_safe_rand8() -+get_safe_rand8(void) - { - - int fd, x; -@@ -131,13 +131,13 @@ - return 0; - } - --void close_rand() -+void close_rand(void) - { - fclose(ffd); - } - - word32 --get_o_rand32() -+get_o_rand32(void) - { - int x; - word32 rand_data; -@@ -152,7 +152,7 @@ - } - - word8 --get_o_rand8() -+get_o_rand8(void) - { - - int x; ---- a/src/random.h -+++ b/src/random.h -@@ -1,14 +1,14 @@ - - #ifdef HAVE_DEV_RANDOM - --word32 get_rand32(); --word8 get_rand8(); --word32 get_safe_rand32(); --word8 get_safe_rand8(); -+word32 get_rand32(void); -+word8 get_rand8(void); -+word32 get_safe_rand32(void); -+word8 get_safe_rand8(void); - - int open_rand(int); --void close_rand(); --word32 get_o_rand32(); --word8 get_o_rand8(); -+void close_rand(void); -+word32 get_o_rand32(void); -+word8 get_o_rand8(void); - - #endif ---- a/src/shash.c -+++ b/src/shash.c -@@ -485,7 +485,7 @@ - } - } - --int hash_list() -+int hash_list(void) - { - hashid i; - char *y; -@@ -715,7 +715,7 @@ - return counter; - } - --void hash_license() -+void hash_license(void) - { - fprintf(stdout, ("\nCopyright (C) 1999,2001,2002 Nikos Mavroyanopoulos\n" - "This program is free software; you can redistribute it and/or modify \n" -@@ -733,7 +733,7 @@ - "Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\n")); - } - --void hash_version() -+void hash_version(void) - { - fprintf(stderr, ("shash v.%s (%s-%s-%s)\n"), VERSION, T_CPU, - T_VENDOR, T_OS); diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-binary-files.patch b/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-binary-files.patch deleted file mode 100644 index 9cb5a7dc4c0..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-binary-files.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/src/shash.c -+++ b/src/shash.c -@@ -631,11 +631,11 @@ - - if (nosalt == FALSE && hmac == 1) { - if (sscanf -- (linebuf, "%s %s %s\n", hexbuffer, buffer, -- buffer2) < 2) { -+ (linebuf, "%s %s *%s\n", hexbuffer, buffer, -+ buffer2) != 3) { - if (sscanf -- (linebuf, "%s %s *%s\n", hexbuffer, -- buffer, buffer2) < 2) -+ (linebuf, "%s %s %s\n", hexbuffer, -+ buffer, buffer2) != 3) - continue; - } - -@@ -648,11 +648,11 @@ - key = pass2key(algorithm, keymode_buffer, &keylen, password, plen); - - } else { -- if (sscanf(linebuf, "%s %s\n", buffer, buffer2) == -- 0) { -+ if (sscanf(linebuf, "%s *%s\n", buffer, buffer2) != -+ 2) { - if (sscanf -- (linebuf, "%s *%s\n", buffer, -- buffer2) == 0) -+ (linebuf, "%s %s\n", buffer, -+ buffer2) != 2) - continue; - } - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-format-security.patch b/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-format-security.patch deleted file mode 100644 index 20f850316cc..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash-0.2.6-format-security.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/errors.c -+++ b/src/errors.c -@@ -4,7 +4,7 @@ - - void err_quit(char *errmsg) - { -- fprintf(stderr, errmsg); -+ fputs(errmsg, stderr); - exit(-1); - } - -@@ -12,7 +12,7 @@ - { - - if (quiet < 1) { -- fprintf(stderr, errmsg); -+ fputs(errmsg, stderr); - } - - } -@@ -20,6 +20,6 @@ - void err_crit(char *errmsg) - { - if (quiet <= 2) { -- fprintf(stderr, errmsg); -+ fputs(errmsg, stderr); - } - } diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash.bash-completion b/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash.bash-completion deleted file mode 100644 index 15a677dce5b..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/files/shash.bash-completion +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# -# shash(1) completion. - -_shash() { - local cur prev - - COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - - case "${prev}" in - -c|--config) - _filedir - return 0 ;; - -o|--keymode) - COMPREPLY=( $( compgen -W "$( shash --listkeygen | tail -n +2 )" \ - -- ${cur} ) ) - return ;; - -a|--algorithm) - COMPREPLY=( $( compgen -W "$( shash --list )" \ - -- ${cur} ) ) - return ;; - *) - ;; - esac - - COMPREPLY=( $( compgen -W '-V -q -m -d -c -b -t -o -i -a -l -k -h -v \ - -L \ - --verbose --quiet --nosalt --time --hmac --doublecheck \ - --check --binary --text --keymode --config --algorithm \ - --list --key --listkeygen --help --version --license' \ - -- ${cur} ) ) - _filedir - return 0 -} -complete -F _shash ${filenames} shash diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/shash/metadata.xml deleted file mode 100644 index e93ad590e0e..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - swegener@gentoo.org - Sven Wegener - - shash is a command-line interface for libmhash and is used to generate or check digests or MACs of files. - diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/shash/shash-0.2.6-r4.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/shash/shash-0.2.6-r4.ebuild deleted file mode 100644 index 90f637047de..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-crypt/shash/shash-0.2.6-r4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 - -DESCRIPTION="Generate or check digests or MACs of files" -HOMEPAGE="http://mcrypt.hellug.gr/shash/" -SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="static" - -DEPEND=" - >=app-crypt/mhash-0.8.18-r1 - static? ( app-crypt/mhash[static-libs(+)] )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PV}-manpage-fixes.patch - "${FILESDIR}"/${P}-binary-files.patch - "${FILESDIR}"/${P}-format-security.patch - "${FILESDIR}"/${P}-C99-decls.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf $(use_enable static static-link) -} - -src_install() { - default - dodoc doc/sample.shashrc doc/FORMAT - newbashcomp "${FILESDIR}"/shash.bash-completion ${PN} -} From 64fbf9d4f34a8c8561cef4ce90ec93d6b84a2240 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:30:48 +0100 Subject: [PATCH 03/13] app-misc/zisofs-tools: Drop unused package --- .../workflows/portage-stable-packages-list | 1 - .../app-misc/zisofs-tools/Manifest | 1 - .../app-misc/zisofs-tools/metadata.xml | 5 --- .../zisofs-tools/zisofs-tools-1.0.8-r1.ebuild | 36 ------------------- 4 files changed, 43 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 651762717af..ae0d551d763 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -152,7 +152,6 @@ app-misc/editor-wrapper app-misc/jq app-misc/mime-types app-misc/pax-utils -app-misc/zisofs-tools app-portage/elt-patches app-portage/gentoolkit diff --git a/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/Manifest b/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/Manifest deleted file mode 100644 index e7acf1df7a6..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d diff --git a/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/metadata.xml b/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/metadata.xml deleted file mode 100644 index 85e4ed814fa..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild deleted file mode 100644 index 91ef7bff250..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-misc/zisofs-tools/zisofs-tools-1.0.8-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -DESCRIPTION="User utilities for zisofs" -HOMEPAGE="https://www.kernel.org/pub/linux/utils/fs/zisofs/" -SRC_URI="mirror://gentoo/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="static" - -RDEPEND=">=sys-libs/zlib-1.1.4:=" -DEPEND="${RDEPEND}" - -src_prepare() { - default - - # Clang 16 - sed -i -e 's:configure.in:configure.ac:' Makefile || die - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - default -} - -src_install() { - emake INSTALLROOT="${D}" install - einstalldocs -} From d8a50667964417749668107f1dd639e626551ce0 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:31:52 +0100 Subject: [PATCH 04/13] app-text/docbook-xsl-ns-stylesheets: Drop unused package It used to be pulled in by net-misc/iputils, but now this happens only for 9999 version of the package, which we don't use. --- .../workflows/portage-stable-packages-list | 1 - .../docbook-xsl-ns-stylesheets/Manifest | 1 - .../docbook-xsl-ns-stylesheets-1.79.1.ebuild | 82 ------------------- .../docbook-xsl-ns-stylesheets/metadata.xml | 16 ---- 4 files changed, 100 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index ae0d551d763..fe8a92fc4ea 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -165,7 +165,6 @@ app-shells/gentoo-bashcomp app-text/asciidoc app-text/build-docbook-catalog app-text/docbook-xml-dtd -app-text/docbook-xsl-ns-stylesheets app-text/docbook-xsl-stylesheets app-text/mandoc app-text/manpager diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/Manifest b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/Manifest deleted file mode 100644 index bb3c6b9bdb5..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9 diff --git a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild deleted file mode 100644 index d4641a9d2fb..00000000000 --- a/sdk_container/src/third_party/portage-stable/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOCBOOKDIR="/usr/share/sgml/${PN/-//}" -MY_PN="${PN%-stylesheets}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="XSL Stylesheets for Docbook" -HOMEPAGE="https://github.com/docbook/wiki/wiki" -SRC_URI="https://downloads.sourceforge.net/docbook/${MY_P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="ruby" - -RDEPEND=">=app-text/build-docbook-catalog-1.4 - ruby? ( dev-lang/ruby )" -DEPEND="" - -S="${WORKDIR}/${MY_P}" - -# Makefile is broken since 1.76.0 -RESTRICT=test - -# The makefile runs tests, not builds. -src_compile() { :; } - -src_test() { - emake check -} - -src_install() { - # The changelog is now zipped, and copied as the RELEASE-NOTES, so we - # don't need to install it - dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO - - insinto ${DOCBOOKDIR} - doins VERSION VERSION.xsl - - local i - for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do - [[ "${i}" == "epub" ]] && ! use ruby && continue - - cd "${S}"/${i} - for doc in ChangeLog README; do - if [[ -e "${doc}" ]] ; then - mv ${doc} ${doc}.${i} || die - dodoc ${doc}.${i} - rm ${doc}.${i} || die - fi - done - - doins -r "${S}"/${i} - done - - if use ruby; then - local cmd="dbtoepub${MY_PN#docbook-xsl}" - - # we can't use a symlink or it'll look for the library in the - # wrong path. - dodir /usr/bin - cat - > "${ED}"/usr/bin/${cmd} < - - - - - - Install the Ruby-based dbtoepub script; requires an interpreter - compatible with app-eselect/eselect-ruby. - - - - - docbook - docbook/wiki - - From 586e4c094f794d68caf649831887a6600c9418f6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:35:20 +0100 Subject: [PATCH 05/13] dev-cpp/abseil-cpp: Drop unused package I think I pulled the package from Gentoo in order to update some protobuf package, which needed abseil. But it fizzled out once I realized that update_engine needs to be updated first to the new version of protobuf library. --- .../workflows/portage-stable-packages-list | 1 - .../coreos/base/package.accept_keywords | 5 -- .../dev-cpp/abseil-cpp/Manifest | 10 --- .../abseil-cpp-20211102.0-r2.ebuild | 72 --------------- .../abseil-cpp/abseil-cpp-20220623.1.ebuild | 70 --------------- .../abseil-cpp/abseil-cpp-20230125.2.ebuild | 70 --------------- .../abseil-cpp-20230125.3-r3.ebuild | 66 -------------- .../abseil-cpp-20230125.3-r4.ebuild | 67 -------------- .../abseil-cpp-20230125.3-r5.ebuild | 68 -------------- .../abseil-cpp-20230802.0-r3.ebuild | 67 -------------- .../abseil-cpp-20230802.0-r4.ebuild | 86 ------------------ .../abseil-cpp-20240116.2-r3.ebuild | 67 -------------- .../abseil-cpp-20240116.2-r4.ebuild | 86 ------------------ .../abseil-cpp/abseil-cpp-20240722.0.ebuild | 89 ------------------- ...l-cpp-20211102.0-fix-cuda-nvcc-build.patch | 51 ----------- ...p-20211102.0-r2-cuda11.6-compile-fix.patch | 22 ----- .../abseil-cpp-20211102.0-r2-gcc-13.patch | 24 ----- .../abseil-cpp-20211102.0-r2-loong.patch | 18 ---- .../abseil-cpp-20230125.2-musl-1.2.4.patch | 49 ---------- ...-20230802.0-conditional-use-of-lzcnt.patch | 49 ---------- .../abseil-cpp-20230802.0-sdata-tests.patch | 41 --------- .../files/abseil-cpp-20240722.0-lto-odr.patch | 30 ------- .../abseil-cpp/files/abseil-cpp-atomic.patch | 18 ---- .../files/abseil-cpp-include-cstdint.patch | 33 ------- .../files/abseil-cpp-random-tests.patch | 19 ---- .../dev-cpp/abseil-cpp/metadata.xml | 16 ---- 26 files changed, 1194 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index fe8a92fc4ea..e133e8ff85f 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -186,7 +186,6 @@ dev-build/meson dev-build/meson-format-array dev-build/ninja -dev-cpp/abseil-cpp dev-cpp/azure-core dev-cpp/azure-identity dev-cpp/azure-security-keyvault-certificates diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 98140eec137..9f58d6f1c71 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -46,12 +46,7 @@ # Keep versions on both arches in sync. =app-emulation/qemu-guest-agent-8.2.0 ~arm64 - -# Keep versions on both arches in sync. =dev-build/meson-1.5.2 ~arm64 -=dev-cpp/abseil-cpp-20230125.3-r4 ~arm64 - -# Keep versions on both arches in sync. =dev-cpp/glog-0.6.0 ~arm64 =dev-lang/yasm-1.3.0-r1 ~arm64 =dev-libs/ding-libs-0.6.2-r1 ~arm64 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest deleted file mode 100644 index 190373fa4aa..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -DIST abseil-cpp-20211102.0.tar.gz 1884080 BLAKE2B a148f3b7cc9516fbeacc25116032a956bfa3cce61b4294c226e826e1171d24c043ab199757a11fae3fec0bc307b2222773a6b4f4563b289f7565b0ce4f72318a SHA512 fed68aa434c02ec6faa9d1c81f1ad35b60ec024b44957e2e0ac31e6075e385c06a3e1b616afeb4bb7c2413191fd7827d82e1f9f0796b52ed21fb2c41dd9031cf -DIST abseil-cpp-20220623.1.tar.gz 1957483 BLAKE2B 5bcf60b5a55882bcb78c7095a9892f6d1e5819fb116e325a8299fb22780ab009f0e1d92d5d8aca5ae0d4acc6d60e620e3357a24e389059f6e75d94f1cbdc1ced SHA512 ab4fccd9a2bfa0c5ad4b56c8e8f8b7ec7a8eca8b6cc6959802acadd1da785e1feb078c6ac621808cd699c82717a9e637dc426d94b70a8db7f2a807059d41cbc2 -DIST abseil-cpp-20230125.2.tar.gz 2119685 BLAKE2B 130e55c68acdec7af0f807189365a5206427fe0bcf564a2ece9837d84429505e763399384fae89a07db6b68ed18c63918dc5ae0e53e59cdb844e4d524932abf5 SHA512 b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f -DIST abseil-cpp-20230125.3.tar.gz 2119655 BLAKE2B 6c60201e4fc2cb5cd942fafb6023347739544f02fd257d003eeedff9e2e5137ee0c954342134d17a64844b9a5f309392a4c3ff9336907f35ba6c967ab03524ee SHA512 50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70 -DIST abseil-cpp-20230802.0.tar.gz 2156669 BLAKE2B 34de2f949db3e7578cae39bdd851785fd5327a80662436e7d77f18e196cc28eb1b463e9f49c8fc66060073c6c88222015af8b41044d56af6811c8914e84fbea3 SHA512 320295fa687ded05b774741eb4c5285291d44cc14402ec5d997057cb4f53fb3ba54cd162c7a7b1003312b677603a1c25e14bfdbd1fc22ccf4b4443e8a6e3ec02 -DIST abseil-cpp-20240116.2.tar.gz 2151288 BLAKE2B 2e843e29869bf69e46ec48884cbd2ba955eab2329716c4df7b9be0ded550f976184b945587af08d01a7aa77560ae679191c1a1de51c75311d3a5ee87c15017c8 SHA512 5062e731ee8c9a757e6d75fc1c558652deb4dd1daab4d6143f7ad52a139501c61365f89acbf82480be0f9a4911a58286560068d8b1a8b6774e6afad51739766e -DIST abseil-cpp-20240722.0.tar.gz 2242861 BLAKE2B 6756f9a5f70656a6ef1985ba44af69a7fc3ab23b4be8a36ae39d7eedc318a4a9b0da08b31d26b3c46857913a757c916f0e31254278e080497807bed24e4978ce SHA512 bd2cca8f007f2eee66f51c95a979371622b850ceb2ce3608d00ba826f7c494a1da0fba3c1427728f2c173fe50d59b701da35c2c9fdad2752a5a49746b1c8ef31 -DIST gtest-1.13.0.tar.gz 862871 BLAKE2B d2768332c233d62f7a5f5332b63dc587c96c24765b2eeaa4f4caf5d421b175aa850d81cec4f50eeef9e06d4b86cb959555b4c2862a197ce3cb86d61fcb51f5d1 SHA512 70c0cfb1b4147bdecb467ecb22ae5b5529eec0abc085763213a796b7cdbd81d1761d12b342060539b936fa54f345d33f060601544874d6213fdde79111fa813e -DIST gtest-1b18723e874b256c1e39378c6774a90701d70f7a.tar.gz 833195 BLAKE2B cfeb4fc1569529f8a08557330ab2c88db7703c4f2e8628d18b403f424342ad82b062edb8cc9c0dc122c453235ab327ea742a5ef12e49726e2fa2f60f5ea762d9 SHA512 cb90a54681e0be20a9a8c7a19f960a97cc567931308f4956ee142b86769c062fcf612b9635f5548009ee6d598ae0c1e83692151ec9f1ff1e409b89e158d8b954 -DIST gtest-e68764c147ea0dac1e8811925c531d937396878e.tar.gz 862129 BLAKE2B d6decb9d1ad4e379a76119ec984deaa7649fca033f225698ce421bcee1207b52da3c4fdb2f6d68b968248575704ebe501b7b1d0a02c180901ffa78f9aa47f549 SHA512 aca72b5f64894aeee34cb869bdeda2d25ec04e901fe0e4e8d08d49472de1c9b19a97ba97a2e8570a88be74aea26d1cd526b4e605005a881e1cb6ab03ed3a4ceb diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild deleted file mode 100644 index a0d429b7ac4..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20211102.0-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake python-any-r1 - -# yes, it needs SOURCE, not just installed one -# and no, 1.11.0 is not enough -GTEST_COMMIT="1b18723e874b256c1e39378c6774a90701d70f7a" -GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz" - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" - -LICENSE=" - Apache-2.0 - test? ( BSD ) -" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" -IUSE="test" - -BDEPEND=" - ${PYTHON_DEPS} - test? ( sys-libs/timezone-data ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20211102.0-fix-cuda-nvcc-build.patch" - "${FILESDIR}/${PN}-20211102.0-r2-cuda11.6-compile-fix.patch" - "${FILESDIR}/${PN}-20211102.0-r2-loong.patch" - "${FILESDIR}/${PN}-20211102.0-r2-gcc-13.patch" -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die - - if use test; then - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die - fi -} - -src_configure() { - local mycmakeargs=( - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" - -DCMAKE_CXX_STANDARD=17 - -DABSL_PROPAGATE_CXX_STD=TRUE - $(usex test -DBUILD_TESTING=ON '') #intentional usex - ) - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild deleted file mode 100644 index 7aed5f2d233..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20220623.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake python-any-r1 - -# yes, it needs SOURCE, not just installed one -# and no, 1.11.0 is not enough -GTEST_COMMIT="e68764c147ea0dac1e8811925c531d937396878e" -GTEST_FILE="gtest-${GTEST_COMMIT}.tar.gz" - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" - -LICENSE=" - Apache-2.0 - test? ( BSD ) -" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" -IUSE="test" - -BDEPEND=" - ${PYTHON_DEPS} - test? ( sys-libs/timezone-data ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die - - if use test; then - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT}"/googletest/cmake/internal_utils.cmake || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=17 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT}" - -DABSL_PROPAGATE_CXX_STD=TRUE - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests. - ) - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild deleted file mode 100644 index a2402a45796..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake-multilib python-any-r1 - -# yes, it needs SOURCE, not just installed one -GTEST_COMMIT="v1.13.0" -GTEST_FILE="gtest-${GTEST_COMMIT#v}.tar.gz" - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz -> ${GTEST_FILE} )" - -LICENSE=" - Apache-2.0 - test? ( BSD ) -" -SLOT="0/${PV%%.*}" -KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" -IUSE="test" - -BDEPEND=" - ${PYTHON_DEPS} - test? ( sys-libs/timezone-data ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die - - if use test; then - sed -i 's/-Werror//g' \ - "${WORKDIR}/googletest-${GTEST_COMMIT#v}"/googletest/cmake/internal_utils.cmake || die - fi -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=17 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_LOCAL_GOOGLETEST_DIR="${WORKDIR}/googletest-${GTEST_COMMIT#v}" - -DABSL_PROPAGATE_CXX_STD=TRUE - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') #intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild deleted file mode 100644 index c248fe6ae1a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}.0" -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 - "${FILESDIR}"/${PN}-random-tests.patch #935417 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild deleted file mode 100644 index f1cf1e20630..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r4.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}.0" -KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 - "${FILESDIR}"/${PN}-random-tests.patch #935417 - "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild deleted file mode 100644 index e16880542a7..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230125.3-r5.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}.0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-20230125.2-musl-1.2.4.patch #906218 - "${FILESDIR}"/${PN}-random-tests.patch #935417 - "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 - "${FILESDIR}/${PN}-include-cstdint.patch" #937307 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild deleted file mode 100644 index dc13dfe5045..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - "${FILESDIR}/${PN}-random-tests.patch" #935417 - "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild deleted file mode 100644 index 94183102f81..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20230802.0-r4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - "${FILESDIR}/${PN}-random-tests.patch" #935417 - "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 - "${FILESDIR}/${PN}-include-cstdint.patch" -) - -src_prepare() { - cmake_src_prepare - - use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} - -multilib_src_test() { - if ! use amd64; then - CMAKE_SKIP_TESTS=( - absl_symbolize_test - ) - - if use ppc; then - CMAKE_SKIP_TESTS+=( - absl_failure_signal_handler_test - ) - fi - fi - - cmake_src_test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild deleted file mode 100644 index dc13dfe5045..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - "${FILESDIR}/${PN}-random-tests.patch" #935417 - "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 -) - -src_prepare() { - cmake_src_prepare - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild deleted file mode 100644 index c51b3cdc3c0..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV%%.*}" -KEYWORDS="~alpha amd64 ~arm arm64 ~loong ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - "${FILESDIR}/${PN}-random-tests.patch" #935417 - "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 - "${FILESDIR}/${PN}-include-cstdint.patch" #937307 -) - -src_prepare() { - cmake_src_prepare - - use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - # We use -std=c++14 here so that abseil-cpp's string_view is used - # See the discussion in https://github.com/gentoo/gentoo/pull/32281. - -DCMAKE_CXX_STANDARD=14 - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING=$(usex test ON OFF) - $(usex test -DBUILD_TESTING=ON '') # intentional usex, it used both variables for tests. - ) - - cmake_src_configure -} - -multilib_src_test() { - if ! use amd64; then - CMAKE_SKIP_TESTS=( - absl_symbolize_test - ) - - if use ppc; then - CMAKE_SKIP_TESTS+=( - absl_failure_signal_handler_test - ) - fi - fi - - cmake_src_test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild deleted file mode 100644 index ecc8966ed48..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/abseil-cpp-20240722.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit cmake-multilib python-any-r1 - -DESCRIPTION="Abseil Common Libraries (C++), LTS Branch" -HOMEPAGE="https://abseil.io/" -SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV:2:4}.$(ver_cut 2).0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" -IUSE="test" - -RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - test? ( - sys-libs/timezone-data - ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-20230802.0-sdata-tests.patch" - # "${FILESDIR}/${PN}-random-tests.patch" #935417 - # "${FILESDIR}/${PN}-20230802.0-conditional-use-of-lzcnt.patch" #934337 - "${FILESDIR}/${PN}-include-cstdint.patch" #937307 - "${FILESDIR}/${PN}-20240722.0-lto-odr.patch" -) - -src_prepare() { - cmake_src_prepare - - use ppc && eapply "${FILESDIR}/${PN}-atomic.patch" - - # un-hardcode abseil compiler flags - sed -i \ - -e '/"-maes",/d' \ - -e '/"-msse4.1",/d' \ - -e '/"-mfpu=neon"/d' \ - -e '/"-march=armv8-a+crypto"/d' \ - absl/copts/copts.py || die - - # now generate cmake files - python_fix_shebang absl/copts/generate_copts.py - absl/copts/generate_copts.py || die -} - -multilib_src_configure() { - local mycmakeargs=( - -DABSL_ENABLE_INSTALL=TRUE - -DABSL_USE_EXTERNAL_GOOGLETEST=ON - -DABSL_PROPAGATE_CXX_STD=TRUE - # TEST_HELPERS needed for protobuf (bug #915902) - -DABSL_BUILD_TEST_HELPERS=ON - -DABSL_BUILD_TESTING="$(usex test)" - ) - # intentional use, it uses both variables for tests. - if use test; then - mycmakeargs+=( - -DBUILD_TESTING="yes" - ) - fi - - cmake_src_configure -} - -multilib_src_test() { - if ! use amd64; then - CMAKE_SKIP_TESTS=( - absl_symbolize_test - ) - - if use ppc; then - CMAKE_SKIP_TESTS+=( - absl_failure_signal_handler_test - ) - fi - fi - - cmake_src_test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch deleted file mode 100644 index 0933c62660a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch +++ /dev/null @@ -1,51 +0,0 @@ -Fixes compile failure with CUDA nvcc -https://github.com/abseil/abseil-cpp/commit/5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 -https://github.com/tensorflow/tensorflow/commit/e45ca6adf2458d4759e5c40f1f27bbf9505a3c79#diff-b79a9a542260a33fd122a5d1cdb923e08e16cbe321d69c014a9acdde34052b3dR235 - -From 5202173ca7671ebe241cb4d9447dc4b1f2d3ec10 Mon Sep 17 00:00:00 2001 -From: Abseil Team -Date: Tue, 1 Feb 2022 13:52:49 -0800 -Subject: [PATCH] Export of internal Abseil changes - --- -121db1a08321eaa3006726cc32b459cf17880e35 by Derek Mauro : - -Internal change - -PiperOrigin-RevId: 425707805 - --- -0dec484389bbb75aae0a412146e3564bf833a739 by Derek Mauro : - -macOS CI: Avoid depending on external sites like GitHub by prepopulating -dependencies and setting --distdir - -Our Linux CI does this, but for some reason was never enabled on macOS - -PiperOrigin-RevId: 425668638 -GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35 -Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea ---- a/absl/container/internal/inlined_vector.h -+++ b/absl/container/internal/inlined_vector.h -@@ -925,8 +925,8 @@ auto Storage::Swap(Storage* other_storage_ptr) -> void { - inlined_ptr->GetSize()); - } - ABSL_INTERNAL_CATCH_ANY { -- allocated_ptr->SetAllocation( -- {allocated_storage_view.data, allocated_storage_view.capacity}); -+ allocated_ptr->SetAllocation(Allocation{ -+ allocated_storage_view.data, allocated_storage_view.capacity}); - ABSL_INTERNAL_RETHROW; - } - -@@ -934,8 +934,8 @@ auto Storage::Swap(Storage* other_storage_ptr) -> void { - inlined_ptr->GetInlinedData(), - inlined_ptr->GetSize()); - -- inlined_ptr->SetAllocation( -- {allocated_storage_view.data, allocated_storage_view.capacity}); -+ inlined_ptr->SetAllocation(Allocation{allocated_storage_view.data, -+ allocated_storage_view.capacity}); - } - - swap(GetSizeAndIsAllocated(), other_storage_ptr->GetSizeAndIsAllocated()); diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch deleted file mode 100644 index 28347d489c1..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/absl/strings/internal/string_constant.h -+++ b/absl/strings/internal/string_constant.h -@@ -35,12 +35,18 @@ namespace strings_internal { - // below. - template - struct StringConstant { -+ private: -+ static constexpr bool ValidateConstant(absl::string_view view) { -+ return view.empty() || 2 * view[0] != 1; -+ } -+ -+public: - static constexpr absl::string_view value = T{}(); - constexpr absl::string_view operator()() const { return value; } - - // Check to be sure `view` points to constant data. - // Otherwise, it can't be constant evaluated. -- static_assert(value.empty() || 2 * value[0] != 1, -+ static_assert(ValidateConstant(value), - "The input string_view must point to constant data."); - }; - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch deleted file mode 100644 index 2a847be09e9..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-gcc-13.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/abseil/abseil-cpp/commit/36a4b073f1e7e02ed7d1ac140767e36f82f09b7c - -From 36a4b073f1e7e02ed7d1ac140767e36f82f09b7c Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Fri, 27 May 2022 22:27:58 +0100 -Subject: [PATCH] absl/strings/internal/str_format/extension.h: add missing - include - -Without the change absl-cpp build fails on this week's gcc-13 snapshot as: - - /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::' - 34 | enum class FormatConversionChar : uint8_t; - | ^ - | :: ---- a/absl/strings/internal/str_format/extension.h -+++ b/absl/strings/internal/str_format/extension.h -@@ -17,6 +17,7 @@ - #define ABSL_STRINGS_INTERNAL_STR_FORMAT_EXTENSION_H_ - - #include -+#include - - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch deleted file mode 100644 index 2031f9f33d8..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-loong.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1 - -From 808bc202fc13e85a7948db0d7fb58f0f051200b1 Mon Sep 17 00:00:00 2001 -From: imaiguo -Date: Wed, 23 Feb 2022 22:56:32 +0800 -Subject: [PATCH] Add support of loongarch64 (#1110) - ---- a/absl/debugging/internal/examine_stack.cc -+++ b/absl/debugging/internal/examine_stack.cc -@@ -82,6 +82,8 @@ void* GetProgramCounter(void* vuc) { - return reinterpret_cast(context->uc_mcontext.gregs[16]); - #elif defined(__e2k__) - return reinterpret_cast(context->uc_mcontext.cr0_hi); -+#elif defined(__loongarch__) -+ return reinterpret_cast(context->uc_mcontext.__pc); - #else - #error "Undefined Architecture." - #endif diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch deleted file mode 100644 index e4834250cfc..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230125.2-musl-1.2.4.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/906218 -https://github.com/abseil/abseil-cpp/issues/1473 -https://github.com/abseil/abseil-cpp/commit/4500c2fada4e952037c59bd65e8be1ba0b29f21e - -From 4500c2fada4e952037c59bd65e8be1ba0b29f21e Mon Sep 17 00:00:00 2001 -From: Derek Mauro -Date: Mon, 12 Jun 2023 08:11:36 -0700 -Subject: [PATCH] DirectMmap: Use off_t instead of off64_t for the offset - parameter - -off_t is best for portability. Its size varies with the platform. -off64_t is non-standard, but is present in glibc and some BSDs. -It also matches the signature specified in the manual. -https://man7.org/linux/man-pages/man2/mmap.2.html - -This is a re-spin of #1349, but correctly casts the type to the type -expected by the kernel for mmap2. -https://man7.org/linux/man-pages/man2/mmap2.2.html - -Fixes #1473 - -PiperOrigin-RevId: 539656313 -Change-Id: I7a30dd9d3eb6af03a99da0d93d721a86f6521b25 ---- - absl/base/internal/direct_mmap.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index 815b8d23ba3..1beb2ee4e52 100644 ---- a/absl/base/internal/direct_mmap.h -+++ b/absl/base/internal/direct_mmap.h -@@ -72,7 +72,7 @@ namespace base_internal { - // Platform specific logic extracted from - // https://chromium.googlesource.com/linux-syscall-support/+/master/linux_syscall_support.h - inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, -- off64_t offset) noexcept { -+ off_t offset) noexcept { - #if defined(__i386__) || defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \ - defined(__m68k__) || defined(__sh__) || \ - (defined(__hppa__) && !defined(__LP64__)) || \ -@@ -102,7 +102,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, - #else - return reinterpret_cast( - syscall(SYS_mmap2, start, length, prot, flags, fd, -- static_cast(offset / pagesize))); -+ static_cast(offset / pagesize))); // NOLINT - #endif - #elif defined(__s390x__) - // On s390x, mmap() arguments are passed in memory. diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch deleted file mode 100644 index 1fa00d9ff62..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-conditional-use-of-lzcnt.patch +++ /dev/null @@ -1,49 +0,0 @@ -Bug: https://bugs.gentoo.org/934337 -From: https://github.com/abseil/abseil-cpp/commit/c1e1b47d989978cde8c5a2a219df425b785a0c47.patch -From c1e1b47d989978cde8c5a2a219df425b785a0c47 Mon Sep 17 00:00:00 2001 -From: Derek Mauro -Date: Fri, 3 May 2024 09:14:22 -0700 -Subject: [PATCH] Use __builtin_ctzg and __builtin_clzg in the implementations - of CountTrailingZeroesNonzero16 and CountLeadingZeroes16 when they are - available. - -GCC 14 and Clang 19 adds these new builtins. The g-suffix is for -"generic". The s-suffix on __builtin_ctzs and __builtin_clzs is for -"short". GCC never implemented the short versions and #1664 reports -GCC 14 (pre-release) gives an error here, although this may be a -pre-release bug. - -Fixes #1664 - -PiperOrigin-RevId: 630408249 -Change-Id: I4aedcc82b85430f50d025f8eb1cab089c6fcd1bc ---- - absl/numeric/internal/bits.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h -index bfef06bce1f..0917464d6ad 100644 ---- a/absl/numeric/internal/bits.h -+++ b/absl/numeric/internal/bits.h -@@ -167,7 +167,9 @@ CountLeadingZeroes32(uint32_t x) { - - ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CLZ inline int - CountLeadingZeroes16(uint16_t x) { --#if ABSL_HAVE_BUILTIN(__builtin_clzs) -+#if ABSL_HAVE_BUILTIN(__builtin_clzg) -+ return x == 0 ? 16 : __builtin_clzg(x); -+#elif ABSL_HAVE_BUILTIN(__builtin_clzs) - static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int) - "__builtin_clzs does not take 16-bit arg"); - return x == 0 ? 16 : __builtin_clzs(x); -@@ -303,7 +305,9 @@ CountTrailingZeroesNonzero64(uint64_t x) { - - ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int - CountTrailingZeroesNonzero16(uint16_t x) { --#if ABSL_HAVE_BUILTIN(__builtin_ctzs) -+#if ABSL_HAVE_BUILTIN(__builtin_ctzg) -+ return __builtin_ctzg(x); -+#elif ABSL_HAVE_BUILTIN(__builtin_ctzs) - static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int) - "__builtin_ctzs does not take 16-bit arg"); - return __builtin_ctzs(x); diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch deleted file mode 100644 index 67d3a969773..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20230802.0-sdata-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=917062 -https://github.com/matoro/abseil-cpp/commit/cc37c61553fa2a186d4abf48e97ad9df4e5d62e3 - -From cc37c61553fa2a186d4abf48e97ad9df4e5d62e3 Mon Sep 17 00:00:00 2001 -From: matoro -Date: Tue, 14 Nov 2023 10:39:34 -0500 -Subject: [PATCH] symbolize_test: account for platforms with ".sdata" small - data sections - -A handful of ELF targets use a ".sdata" section for small data. The -default maximum size of symbols in this section as well as the gcc flag -to change that maximum size differ between two targets. On such -platforms, if there is no data large enough to exceed the small data -limit then the ".data" section will be excluded entirely. This changes -the check to ensure that at least one of a ".sdata" section OR a ".data" -section is present. ---- - absl/debugging/symbolize_test.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/absl/debugging/symbolize_test.cc b/absl/debugging/symbolize_test.cc -index d0feab2ffa6..1e4b5ba6105 100644 ---- a/absl/debugging/symbolize_test.cc -+++ b/absl/debugging/symbolize_test.cc -@@ -44,6 +44,7 @@ - #define MAP_ANONYMOUS MAP_ANON - #endif - -+using testing::AnyOf; - using testing::Contains; - - #ifdef _WIN32 -@@ -456,7 +457,7 @@ TEST(Symbolize, ForEachSection) { - EXPECT_THAT(sections, Contains(".rodata")); - EXPECT_THAT(sections, Contains(".bss")); - ++in_data_section; -- EXPECT_THAT(sections, Contains(".data")); -+ EXPECT_THAT(sections, AnyOf(Contains(".data"), Contains(".sdata"))); - - close(fd); - } diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch deleted file mode 100644 index 93c07b70194..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-20240722.0-lto-odr.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 05ed7fe8985d4903fb33031519eb3bc3d1211fa9 Mon Sep 17 00:00:00 2001 -From: Paul Zander -Date: Fri, 30 Aug 2024 02:14:26 +0200 -Subject: [PATCH] lto odr - -Signed-off-by: Paul Zander - -diff --git a/absl/flags/CMakeLists.txt b/absl/flags/CMakeLists.txt -index 7376d11..9914f73 100644 ---- a/absl/flags/CMakeLists.txt -+++ b/absl/flags/CMakeLists.txt -@@ -326,6 +326,7 @@ absl_cc_test( - GTest::gtest_main - ) - -+#[===[ - absl_cc_test( - NAME - flags_flag_test -@@ -349,6 +350,7 @@ absl_cc_test( - absl::time - GTest::gtest_main - ) -+]===] - - absl_cc_test( - NAME --- -2.46.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch deleted file mode 100644 index 4a999760eb0..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-atomic.patch +++ /dev/null @@ -1,18 +0,0 @@ -From beee02af5b83cfe72159e2579fa3c6e0fb8f93db Mon Sep 17 00:00:00 2001 -From: Paul Zander -Date: Sun, 8 Sep 2024 17:09:17 +0200 -Subject: [PATCH] link to atomic on ppc - -Bug: https://bugs.gentoo.org/918981 -Signed-off-by: Paul Zander - ---- a/absl/base/CMakeLists.txt -+++ b/absl/base/CMakeLists.txt -@@ -131,6 +131,7 @@ absl_cc_library( - absl::base_internal - absl::core_headers - absl::errno_saver -+ atomic - ) - - absl_cc_library( diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch deleted file mode 100644 index 7aa5c2f1eed..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-include-cstdint.patch +++ /dev/null @@ -1,33 +0,0 @@ -https://github.com/abseil/abseil-cpp/commit/809e5de7b92950849289236a5a09e9cb4f32c7b9 - -From: Christopher Fore -Date: Mon, 5 Aug 2024 10:48:19 -0400 -Subject: [PATCH] container/internal: Explicitly include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 15 will no longer include by default, resulting in build -failures in projects that do not explicitly include it. - -Error: -absl/container/internal/container_memory.h:66:27: error: ‘uintptr_t’ does not name a type - 66 | assert(reinterpret_cast(p) % Alignment == 0 && - | ^~~~~~~~~ -absl/container/internal/container_memory.h:31:1: note: ‘uintptr_t’ is defined in header ‘’; this is probably fixable by adding ‘#include ’ - 30 | #include "absl/utility/utility.h" - +++ |+#include - 31 | - -See-also: https://gcc.gnu.org/pipermail/gcc-cvs/2024-August/407124.html -Signed-off-by: Christopher Fore ---- a/absl/container/internal/container_memory.h -+++ b/absl/container/internal/container_memory.h -@@ -17,6 +17,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch deleted file mode 100644 index 769ac6a56e3..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/files/abseil-cpp-random-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/abseil/abseil-cpp/issues/1528 - -From: Paul Zander -Date: Sat, 7 Jul 2024 01:53:19 +0200 -Subject: [PATCH] remove abseil::random_internal_mock_overload_set -See-Also: https://bugs.gentoo.org/935417 - -diff --git a/absl/random/CMakeLists.txt b/absl/random/CMakeLists.txt -index bd363d8..7692a35 100644 ---- a/absl/random/CMakeLists.txt -+++ b/absl/random/CMakeLists.txt -@@ -112,7 +112,6 @@ absl_cc_library( - absl::raw_logging_internal - absl::random_distributions - absl::random_internal_distribution_caller -- absl::random_internal_mock_overload_set - absl::random_random - absl::strings - absl::span diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml deleted file mode 100644 index 16dd7edb45a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/abseil-cpp/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - negril.nx+gentoo@gmail.com - Paul Zander - - - proxy-maint@gentoo.org - Proxy Maintainers - - - abseil/abseil-cpp - - From aa28b134fd776dfc7764f4d1f0c49608ec8b6e56 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:42:12 +0100 Subject: [PATCH 06/13] sys-fs/udisks: Drop unused package and its dependencies --- .../workflows/portage-stable-packages-list | 5 - .../dev-libs/libatasmart/Manifest | 2 - .../libatasmart/libatasmart-0.19_p5.ebuild | 51 ------ .../dev-libs/libatasmart/metadata.xml | 7 - .../dev-libs/libbytesize/Manifest | 3 - .../files/libbytesize-2.4-no_Werror.patch | 24 --- .../libbytesize/libbytesize-2.10.ebuild | 88 ---------- .../libbytesize/libbytesize-2.11.ebuild | 88 ---------- .../libbytesize/libbytesize-2.9.ebuild | 91 ----------- .../dev-libs/libbytesize/metadata.xml | 11 -- .../portage-stable/dev-libs/libgudev/Manifest | 1 - .../files/238-clang18-export-dynamic.patch | 37 ----- .../dev-libs/libgudev/libgudev-238-r1.ebuild | 47 ------ .../dev-libs/libgudev/libgudev-238-r2.ebuild | 51 ------ .../dev-libs/libgudev/metadata.xml | 14 -- .../portage-stable/sys-fs/udisks/Manifest | 2 - .../udisks-2.10.1-BLKRRPART_harder.patch | 55 ------- ...disks-2.10.1-slibtool-export-dynamic.patch | 58 ------- ...-targetcli_config.json_netif_timeout.patch | 38 ----- ...iskslinuxblock_survive_missing_fstab.patch | 32 ---- ....1-udiskslinuxmanager_use_after_free.patch | 112 ------------- .../udisks/files/udisks-2.9.4-undefined.patch | 143 ----------------- .../portage-stable/sys-fs/udisks/metadata.xml | 18 --- .../sys-fs/udisks/udisks-2.10.1-r1.ebuild | 150 ------------------ .../sys-fs/udisks/udisks-2.10.1.ebuild | 141 ---------------- .../sys-fs/udisks/udisks-2.9.4-r3.ebuild | 150 ------------------ .../sys-libs/libblockdev/Manifest | 3 - .../files/libblockdev-2.28-sh_tests.patch | 23 --- ...d-non-systemd-method-for-distro-info.patch | 30 ---- .../libblockdev/libblockdev-2.28-r1.ebuild | 136 ---------------- .../libblockdev/libblockdev-2.29.ebuild | 135 ---------------- .../libblockdev/libblockdev-3.1.1.ebuild | 132 --------------- .../sys-libs/libblockdev/metadata.xml | 20 --- 33 files changed, 1898 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.10.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.11.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.9.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgudev/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgudev/files/238-clang18-export-dynamic.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgudev/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.9.4-undefined.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.9.4-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.29.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-3.1.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index e133e8ff85f..f984bcaf83a 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -231,16 +231,13 @@ dev-libs/json-c dev-libs/jsoncpp dev-libs/libaio dev-libs/libassuan -dev-libs/libatasmart dev-libs/libbsd -dev-libs/libbytesize dev-libs/libdnet dev-libs/libev dev-libs/libevent dev-libs/libffi dev-libs/libgcrypt dev-libs/libgpg-error -dev-libs/libgudev dev-libs/libksba dev-libs/liblinear dev-libs/libltdl @@ -655,7 +652,6 @@ sys-fs/multipath-tools sys-fs/quota sys-fs/squashfs-tools sys-fs/squashfs-tools-ng -sys-fs/udisks sys-fs/xfsprogs sys-fs/zfs sys-fs/zfs-kmod @@ -667,7 +663,6 @@ sys-libs/cracklib sys-libs/efivar sys-libs/gdbm sys-libs/ldb -sys-libs/libblockdev sys-libs/libcap sys-libs/libcap-ng sys-libs/libnvme diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/Manifest deleted file mode 100644 index fc6fc6b74d9..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802 -DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild deleted file mode 100644 index 7b059d00c0c..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks" -HOMEPAGE="https://salsa.debian.org/utopia-team/libatasmart" -SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p*}.orig.tar.xz - mirror://debian/pool/main/liba/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="static-libs" - -RDEPEND="virtual/libudev:=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${P/_p*}" - -src_prepare() { - # https://bugs.gentoo.org/470874 - local d="${WORKDIR}/debian/patches" - sed -i -e '/#/d' \ - -e "s|^|${d}/|" "${d}"/series || die - eapply $(<"${d}"/series) - eapply_user -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_compile() { - if tc-is-cross-compiler; then - tc-export_build_env - emake -C strpool strpool \ - CFLAGS="${BUILD_CFLAGS}" \ - CPPFLAGS="${BUILD_CPPFLAGS}" \ - LDFLAGS="${BUILD_LDFLAGS}" - fi - emake -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/metadata.xml deleted file mode 100644 index d0b58801b31..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libatasmart/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - freedesktop-bugs@gentoo.org - - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/Manifest deleted file mode 100644 index e261756d779..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST libbytesize-2.10.tar.gz 458804 BLAKE2B 413a45bebf8394e0557c2e1ef7e1f4348fa6dfa52c697599886d70292ea8b2e1b17402e787afaeb8fecd84e3a37a6c0c39440fa22a556dcaba3f419ee17e1b0e SHA512 9e52b9a756a5b4ee6e23a7a20fd0c6ca2a65ff31f38ddc7545d6838fe9a3da0ee0bd7491cb268f071c950fbeb8d65c707423d285cc3548038b3a2d3aa7f0de48 -DIST libbytesize-2.11.tar.gz 459631 BLAKE2B f15b260f3abfdd876a45157281e7a3dbc33227ef0fa8096a07b254b5edf7378af0653b43b54d0d1ac780ad900644039bd73a0bc9a5c6a111fb45d69e4065cbdc SHA512 eb539c878cc0f857772b07aac4aca2732d3298fa649011f3f8a95fce83b1cc5b5b7001f6bb0c168ed47b7886d34c2e139ded9e66994a9a10784f9f7944475190 -DIST libbytesize-2.9.tar.gz 458737 BLAKE2B d2e47b520cf2669131816f069d8ebeb946be02bc04acc676579f12e798fcb2aa176fd25e6bb77dd1e6b274ec0762498df5df18d88c627653accc426a7e268f36 SHA512 6def6bebe33344e6d6ce1a636bcd200a9d28ed5c4e5ce5dfbfd94c4d92ba37512ef1ee4f12716af0d6a402d5285e60df1ee629ecf31cf7d0b59990c524384fd1 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch deleted file mode 100644 index 827bebe3ec9..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/files/libbytesize-2.4-no_Werror.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/744286 - ---- libbytesize-2.4/configure.ac -+++ libbytesize-2.4/configure.ac -@@ -6,7 +6,7 @@ - # This needs to be set before initializing automake - AC_DISABLE_STATIC - --AM_INIT_AUTOMAKE([foreign -Wall -Werror -Wno-syntax -Wno-portability]) -+AM_INIT_AUTOMAKE([foreign -Wall -Wno-syntax -Wno-portability]) - AC_CONFIG_MACRO_DIR([m4]) - - # Check for the gettext programs ---- libbytesize-2.4/src/Makefile.am -+++ libbytesize-2.4/src/Makefile.am -@@ -2,7 +2,7 @@ - LDADD = $(LIBINTL) - - lib_LTLIBRARIES = libbytesize.la --libbytesize_la_CFLAGS = -Wall -Wextra -Werror -Wno-overflow -D_GNU_SOURCE -+libbytesize_la_CFLAGS = -Wall -Wextra -Wno-overflow -D_GNU_SOURCE - libbytesize_la_LIBADD = -lgmp -lmpfr $(PCRE2_LIBS) - libbytesize_la_LDFLAGS = -version-info 1:0:0 - libbytesize_la_SOURCES = bs_size.c bs_size.h gettext.h diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.10.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.10.ebuild deleted file mode 100644 index 580e892f7c2..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.10.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools python-r1 - -DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big byte sizes" -HOMEPAGE="https://github.com/storaged-project/libbytesize" -SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="doc python test tools" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - tools? ( python ) -" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpfr:= - dev-libs/libpcre2:= - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gettext - doc? ( - dev-util/gtk-doc - virtual/pkgconfig - ) - test? ( - dev-python/pocketlint[${PYTHON_USEDEP}] - dev-python/polib[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.4-no_Werror.patch" -) - -python_do() { - if use python ; then - python_foreach_impl run_in_build_dir "$@" - else - "$@" - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with doc gtk-doc) - $(use_with python python3) - $(use_with tools) - ) - local ECONF_SOURCE="${S}" - python_do econf "${myeconfargs[@]}" -} - -src_compile() { - python_do emake -} - -src_test() { - python_do emake check -} - -install_helper() { - emake DESTDIR="${D}" install - use python && python_optimize -} - -src_install() { - python_do install_helper - einstalldocs - find "${ED}" -name "*.la" -type f -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.11.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.11.ebuild deleted file mode 100644 index 54bb1d8a0ab..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.11.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -inherit autotools python-r1 - -DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big byte sizes" -HOMEPAGE="https://github.com/storaged-project/libbytesize" -SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="doc python test tools" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - tools? ( python ) -" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpfr:= - dev-libs/libpcre2:= - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gettext - doc? ( - dev-util/gtk-doc - virtual/pkgconfig - ) - test? ( - dev-python/pocketlint[${PYTHON_USEDEP}] - dev-python/polib[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.4-no_Werror.patch" -) - -python_do() { - if use python ; then - python_foreach_impl run_in_build_dir "$@" - else - "$@" - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with doc gtk-doc) - $(use_with python python3) - $(use_with tools) - ) - local ECONF_SOURCE="${S}" - python_do econf "${myeconfargs[@]}" -} - -src_compile() { - python_do emake -} - -src_test() { - python_do emake check -} - -install_helper() { - emake DESTDIR="${D}" install - use python && python_optimize -} - -src_install() { - python_do install_helper - einstalldocs - find "${ED}" -name "*.la" -type f -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.9.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.9.ebuild deleted file mode 100644 index 3a4fe952d0d..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/libbytesize-2.9.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# py3.12 blocked by the massive dependency tree of dev-python/pocketlint -PYTHON_COMPAT=( python3_{10..11} ) - -inherit autotools python-r1 - -DESCRIPTION="Tiny library providing a C \"class\" for working with arbitrary big byte sizes" -HOMEPAGE="https://github.com/storaged-project/libbytesize" -SRC_URI="https://github.com/storaged-project/libbytesize/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="doc python test tools" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - tools? ( python ) -" - -RDEPEND=" - dev-libs/gmp:= - dev-libs/mpfr:= - dev-libs/libpcre2:= - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - sys-devel/gettext - doc? ( - dev-util/gtk-doc - virtual/pkgconfig - ) - test? ( - dev-python/pocketlint[${PYTHON_USEDEP}] - dev-python/polib[${PYTHON_USEDEP}] - ) -" - -DOCS=( README.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.4-no_Werror.patch" -) - -python_do() { - if use python ; then - python_foreach_impl run_in_build_dir "$@" - else - "$@" - fi -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - $(use_with doc gtk-doc) - $(use_with python python3) - $(use_with tools) - ) - local ECONF_SOURCE="${S}" - python_do econf "${myeconfargs[@]}" -} - -src_compile() { - python_do emake -} - -src_test() { - python_do emake check -} - -install_helper() { - emake DESTDIR="${D}" install - use python && python_optimize -} - -src_install() { - python_do install_helper - einstalldocs - find "${ED}" -name "*.la" -type f -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/metadata.xml deleted file mode 100644 index aca3155bc46..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libbytesize/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Build bscalc python CLI tool - - - storaged-project/libbytesize - - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/Manifest deleted file mode 100644 index 4b42a0c9e8b..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libgudev-238.tar.xz 30548 BLAKE2B 386491e78c82081e89dad897d16ea6733430a67db3f75f2d9fdee5474b074ad6fede9f08e429f4eb6feaa9bbbb982d9d039db738aac5b5ce0ffac2d3a19430d4 SHA512 684061b4fc64a6ea3dd1ac34835279330c7eb2728fad6e3a9d34c0d501be3103d0f96c6d6866c8e257a0027e4f78a6314cb8ba81cda5ddf42ee9ea1a576ec5dc diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/files/238-clang18-export-dynamic.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/files/238-clang18-export-dynamic.patch deleted file mode 100644 index 8894f0116ed..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/files/238-clang18-export-dynamic.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a354fcbb911220965f737d38fefe700f7b941cf8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 16 Jan 2024 12:02:46 -0800 -Subject: [PATCH] meson: Pass --export-dynamic option to linker - -Bypass the compiler driver trying to comprehend and translate it for -linker, since its not clear what the right behavior should be, gcc seems -to translate it into --export-dynamic but clang 18+ rejects it - -| x86_64-yoe-linux-clang: error: unknown argument: '-export-dynamic' - -also see [1] - -This makes it work as intended across gcc and clang - -[1] https://discourse.llvm.org/t/clang-option-export-dynamic-parse-to-e-xport-dynamic-error/72454 -Signed-off-by: Khem Raj ---- - gudev/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gudev/meson.build b/gudev/meson.build -index e904203..3ed580b 100644 ---- a/gudev/meson.build -+++ b/gudev/meson.build -@@ -33,7 +33,7 @@ libgudev_c_args = [ - ] - - libgudev_link_args = [ -- '-export-dynamic', -+ '-Wl,--export-dynamic', - '-Wl,--version-script,@0@/libgudev-1.0.sym'.format(top_srcdir), - ] - --- -GitLab - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r1.ebuild deleted file mode 100644 index 5eb170e6992..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2015-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson-multilib - -DESCRIPTION="GObject bindings for libudev" -HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" -SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="introspection test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}] - >=virtual/libudev-251:=[sticky-tags(+),${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) -" -DEPEND="${RDEPEND} - test? ( dev-util/umockdev[${MULTILIB_USEDEP}] ) -" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_feature introspection) - -Dgtk_doc=false - $(meson_feature test tests) - -Dvapi=disabled - ) - meson_src_configure -} - -src_test() { - # libsandbox interferes somehow. - # There are no access violations, but tests fail. - # https://bugs.gentoo.org/805449 - local -x SANDBOX_ON=0 - meson-multilib_src_test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r2.ebuild deleted file mode 100644 index acd520e38a8..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/libgudev-238-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2015-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson-multilib - -DESCRIPTION="GObject bindings for libudev" -HOMEPAGE="https://wiki.gnome.org/Projects/libgudev" -SRC_URI="https://download.gnome.org/sources/libgudev/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="introspection test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.38.0:2[${MULTILIB_USEDEP}] - >=virtual/libudev-251:=[sticky-tags(+),${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) -" -DEPEND="${RDEPEND} - test? ( dev-util/umockdev[${MULTILIB_USEDEP}] ) -" -BDEPEND=" - dev-util/glib-utils - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PV}-clang18-export-dynamic.patch #926350 -) - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_feature introspection) - -Dgtk_doc=false - $(meson_feature test tests) - -Dvapi=disabled - ) - meson_src_configure -} - -src_test() { - # libsandbox interferes somehow. - # There are no access violations, but tests fail. - # https://bugs.gentoo.org/805449 - local -x SANDBOX_ON=0 - meson-multilib_src_test -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/metadata.xml deleted file mode 100644 index 3631e95872f..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgudev/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - - systemd@gentoo.org - - - GNOME/libgudev - - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/Manifest b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/Manifest deleted file mode 100644 index 4c50596133c..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST udisks-2.10.1.tar.bz2 1896207 BLAKE2B 41282e4dbbd93e6bda2a10a6ff2f2fb82bfc83b3ccbed9450cca7888c634cde9300fcd0b7d055e0d8e4c8fc0b431a75d5612a24132ea9b2677d194529732178d SHA512 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a -DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch deleted file mode 100644 index 39af1e0fe5b..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-BLKRRPART_harder.patch +++ /dev/null @@ -1,55 +0,0 @@ -From eb1d4a2bcbb8744074d17553bd0d55ffbd76bdeb Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Tue, 14 Nov 2023 13:16:39 +0000 -Subject: [PATCH] udiskslinuxblockobject: Try issuing BLKRRPART ioctl harder - -For some reason even after acquiring a voluntary BSD lock on -the device the BLKRRPART ioctl still fails with EBUSY. Wait -a couple of msec and everything is fine. - -So try harder, several attempts, if busy. There might be number -of things going on in the system and it's out of our control -even when holding a lock. ---- - src/udiskslinuxblockobject.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/udiskslinuxblockobject.c b/src/udiskslinuxblockobject.c -index d5da4bc4d9..33604df841 100644 ---- a/src/udiskslinuxblockobject.c -+++ b/src/udiskslinuxblockobject.c -@@ -1098,23 +1098,31 @@ udisks_linux_block_object_reread_partition_table (UDisksLinuxBlockObject *objec - } - else - { -- gint num_tries = 0; -+ gint num_tries; - - /* acquire an exclusive BSD lock to prevent udev probes. - * See also https://systemd.io/BLOCK_DEVICE_LOCKING - */ -+ num_tries = 10; - while (flock (fd, LOCK_EX | LOCK_NB) != 0) - { - g_usleep (100 * 1000); /* microseconds */ -- if (num_tries++ > 5) -+ if (num_tries-- < 0) - break; - } - -- if (ioctl (fd, BLKRRPART) != 0) -+ num_tries = 5; -+ while (ioctl (fd, BLKRRPART) != 0) - { -+ if (errno == EBUSY && num_tries-- >= 0) -+ { -+ g_usleep (200 * 1000); /* microseconds */ -+ continue; -+ } - g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), - "Error re-reading partition table (BLKRRPART ioctl) on %s: %m", device_file); - ret = FALSE; -+ break; - } - close (fd); - } diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch deleted file mode 100644 index a9b48942ab7..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-slibtool-export-dynamic.patch +++ /dev/null @@ -1,58 +0,0 @@ -Upstream: https://github.com/storaged-project/udisks/pull/1333 - -From d5f0bc5aa005d116b513992a6ae8ee1fd2dd65a1 Mon Sep 17 00:00:00 2001 -From: Violet Purcell -Date: Sat, 7 Dec 2024 16:45:40 -0500 -Subject: [PATCH] build: use -export-dynamic instead of -export_dynamic - -GNU libtool accepts either, but slibtool's option parsing is more strict -and just ends up passing -export_dynamic to the compiler, which -obviously causes an error. Use -export-dynamic to fix building with -slibtool. ---- a/modules/btrfs/Makefile.am -+++ b/modules/btrfs/Makefile.am -@@ -64,7 +64,7 @@ libudisks2_btrfs_la_CFLAGS = \ - $(NULL) - - libudisks2_btrfs_la_LDFLAGS = \ -- -export_dynamic \ -+ -export-dynamic \ - -avoid-version \ - -module \ - -no-undefined \ ---- a/modules/iscsi/Makefile.am -+++ b/modules/iscsi/Makefile.am -@@ -68,7 +68,7 @@ libudisks2_iscsi_la_CFLAGS = \ - $(NULL) - - libudisks2_iscsi_la_LDFLAGS = \ -- -export_dynamic \ -+ -export-dynamic \ - -avoid-version \ - -module \ - -no-undefined \ ---- a/modules/lsm/Makefile.am -+++ b/modules/lsm/Makefile.am -@@ -62,7 +62,7 @@ libudisks2_lsm_la_CFLAGS = \ - $(NULL) - - libudisks2_lsm_la_LDFLAGS = \ -- -export_dynamic \ -+ -export-dynamic \ - -avoid-version \ - -module \ - -no-undefined \ ---- a/modules/lvm2/Makefile.am -+++ b/modules/lvm2/Makefile.am -@@ -67,7 +67,7 @@ libudisks2_lvm2_la_CFLAGS = \ - $(NULL) - - libudisks2_lvm2_la_LDFLAGS = \ -- -export_dynamic \ -+ -export-dynamic \ - -avoid-version \ - -module \ - -no-undefined \ --- -2.47.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch deleted file mode 100644 index e40f136dfe2..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-targetcli_config.json_netif_timeout.patch +++ /dev/null @@ -1,38 +0,0 @@ -From acae6bf4594f80da57855343ab325f87386178c4 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 3 Nov 2023 16:40:54 +0100 -Subject: [PATCH] tests: Fix targetcli_config.json - -Not all attributes are available anymore in newer kernel versions. ---- - src/tests/dbus-tests/targetcli_config.json | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/tests/dbus-tests/targetcli_config.json b/src/tests/dbus-tests/targetcli_config.json -index 3be9eac2be..f50bf7d4d2 100644 ---- a/src/tests/dbus-tests/targetcli_config.json -+++ b/src/tests/dbus-tests/targetcli_config.json -@@ -331,7 +331,6 @@ - "demo_mode_write_protect": 0, - "generate_node_acls": 1, - "login_timeout": 15, -- "netif_timeout": 2, - "prod_mode_write_protect": 0, - "t10_pi": 0, - "tpg_enabled_sendtargets": 1 -@@ -393,7 +392,6 @@ - "demo_mode_write_protect": 1, - "generate_node_acls": 0, - "login_timeout": 15, -- "netif_timeout": 2, - "prod_mode_write_protect": 0, - "t10_pi": 0, - "tpg_enabled_sendtargets": 1 -@@ -479,7 +477,6 @@ - "demo_mode_write_protect": 1, - "generate_node_acls": 0, - "login_timeout": 15, -- "netif_timeout": 2, - "prod_mode_write_protect": 0, - "t10_pi": 0, - "tpg_enabled_sendtargets": 1 diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch deleted file mode 100644 index 9acd8bd1033..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxblock_survive_missing_fstab.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8f62f7c6888659f3b66d5861d46fb9b3a34ff169 Mon Sep 17 00:00:00 2001 -From: Marius Vollmer -Date: Thu, 22 Feb 2024 16:49:24 +0200 -Subject: [PATCH] udiskslinuxblock: Survive a missing /etc/fstab - -This is similar to b79f6840ca82551e672156153b7e13328f0ba19d, which -solved the same problem for /etc/crypttab. ---- - src/udiskslinuxblock.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c -index 829dd5f78..a3fa183be 100644 ---- a/src/udiskslinuxblock.c -+++ b/src/udiskslinuxblock.c -@@ -1541,7 +1541,15 @@ add_remove_fstab_entry (UDisksBlock *block, - &contents, - NULL, - error)) -- goto out; -+ { -+ if (g_error_matches (*error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) -+ { -+ contents = g_strdup (""); -+ g_clear_error (error); -+ } -+ else -+ goto out; -+ } - - lines = g_strsplit (contents, "\n", 0); - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch deleted file mode 100644 index 3157b10f8c8..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.10.1-udiskslinuxmanager_use_after_free.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 3dc036fb5045fc068c6abfbe4e62d0871d7ca82a Mon Sep 17 00:00:00 2001 -From: xinpeng wang -Date: Thu, 21 Sep 2023 13:57:40 +0800 -Subject: [PATCH] udiskslinuxmanager:use dbus interface after free - -In handle_get_block_devices, call get_block_objects to obtain iface_block_device -of all current UDisksLinuxBlockObject, and then obtain the corresponding -UDisksLinuxBlockObject's object_path through iface_block_device.iface_block_device -is a GDBusInterfaceSkeleton, which saves the object through -g_dbus_interface_skeleton_set_object. g_object_add_weak_pointer is used here. This -function is not thread-safe.At this time, if other threads are releasing the object, -the program will crash. -This scene can be reproduced by quickly plugging and unplugging the USB disk. -The core is as follows (the redundant stack is omitted): -When accessing object in thread 1, the object is released by thread 2 -info threads - Id Target Id Frame -* 1 Thread 0x7f80979e70 (LWP 24559) 0x0000007f8a48dda0 in -g_dbus_object_get_object_path (object=0x0) at ../../../gio/gdbusobject.c:109 - 2 Thread 0x7f88a43010 (LWP 1159) 0x0000007f8a0a6ae8 in __GI___libc_free -(mem=0x556a919c80) at malloc.c:3093 - -thread 1 -(gdb) bt -0 0x0000007f8a48dda0 in g_dbus_object_get_object_path (object=0x0) at -../../../gio/gdbusobject.c:109 -1 0x000000556a56911c in handle_get_block_devices (object=0x7f7c007ed0, invocation= -0x7f74016f20 [GDBusMethodInvocation], arg_options=) - at udiskslinuxmanager.c:1063 - -(gdb) p ((GObject*)(blocks_p->data))->ref_count -$3 = 1 -(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data)) -$6 = {parent_instance = {g_type_instance = {g_class = 0x556a64e740 -[g_type: UDisksLinuxBlock/UDisksBlockSkeleton/GDBusInterfaceSkeleton]}, ref_count = 1, -qdata = 0x0}, priv = 0x7f7c004ac0} -(gdb) p *((GDBusInterfaceSkeleton*)(blocks_p->data))->priv -$7 = {lock = {p = 0x0, i = {0, 0}}, object = 0x0, -flags = G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD, -connections = 0x0, object_path = 0x0, hooked_vtable = 0x556a62b9f0} - -thread 2 -(gdb) bt -0 0x0000007f8a0a6ae8 in __GI___libc_free (mem=0x556a919c80) at malloc.c:3093 -1 0x0000007f89ff1224 in () at /lib/aarch64-linux-gnu/libudev.so.1 -2 0x0000007f89ff1348 in () at /lib/aarch64-linux-gnu/libudev.so.1 -3 0x0000007f89ff5520 in () at /lib/aarch64-linux-gnu/libudev.so.1 -4 0x0000007f89fff878 in udev_device_unref () at /lib/aarch64-linux-gnu/libudev.so.1 -5 0x0000007f8a7aeb74 in () at /lib/aarch64-linux-gnu/libgudev-1.0.so.0 -6 0x0000007f8a3193f8 in g_object_unref (_object=) at -../../../gobject/gobject.c:3346 -7 0x0000007f8a3193f8 in g_object_unref (_object=0x7f680038a0) at -../../../gobject/gobject.c:3238 -8 0x000000556a57700c in udisks_linux_device_finalize (object=0x7f5c005730 -[UDisksLinuxDevice]) at udiskslinuxdevice.c:75 -9 0x0000007f8a3193f8 in g_object_unref (_object=) at -../../../gobject/gobject.c:3346 -10 0x0000007f8a3193f8 in g_object_unref (_object=0x7f5c005730) at -../../../gobject/gobject.c:3238 -11 0x000000556a55d0fc in udisks_linux_drive_object_uevent - (object=object@entry=0x556a5df370 [UDisksLinuxDriveObject], -action=action@entry=0x556a87b120 -"remove",device=device@entry=0x7f74007610 [UDisksLinuxDevice]) - at udiskslinuxdriveobject.c:715 -12 0x000000556a54840c in handle_block_uevent_for_drive - (provider=provider@entry=0x556a5c8200 [UDisksLinuxProvider], -action=action@entry=0x556a87b120 "remove",device=device@entry=0x7f74007610 -[UDisksLinuxDevice]) at udiskslinuxprovider.c:1035 -13 0x000000556a548ab8 in handle_block_uevent (device=0x7f74007610 [UDisksLinuxDevice], -action=0x556a87b120 "remove", provider=0x556a5c8200 [UDisksLinuxProvider]) at -udiskslinuxprovider.c:1349 -14 0x000000556a548ab8 in udisks_linux_provider_handle_uevent - (provider=0x556a5c8200 [UDisksLinuxProvider], action=0x556a87b120 "remove", -device=0x7f74007610 [UDisksLinuxDevice]) at udiskslinuxprovider.c:1399 -15 0x000000556a548cac in on_idle_with_probed_uevent (user_data=0x556a7e65a0) at -udiskslinuxprovider.c:230 ---- - src/udiskslinuxmanager.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/udiskslinuxmanager.c b/src/udiskslinuxmanager.c -index 5bfeec103..491edb92b 100644 ---- a/src/udiskslinuxmanager.c -+++ b/src/udiskslinuxmanager.c -@@ -1196,8 +1196,11 @@ handle_get_block_devices (UDisksManager *object, - blocks = get_block_objects (object, &num_blocks); - block_paths = g_new0 (const gchar *, num_blocks + 1); - -- for (i = 0,blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next, i++) -- block_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data))); -+ for (blocks_p = blocks; blocks_p != NULL; blocks_p = blocks_p->next) { -+ GDBusObject * block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (blocks_p->data)); -+ if (block_object) -+ block_paths[i++] = g_dbus_object_get_object_path (block_object); -+ } - - udisks_manager_complete_get_block_devices (object, - invocation, -@@ -1284,9 +1287,11 @@ handle_resolve_device (UDisksManager *object, - } - - ret_paths = g_new0 (const gchar *, num_found + 1); -- for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next, i++) -+ for (i = 0,ret_p = ret; ret_p != NULL; ret_p = ret_p->next) - { -- ret_paths[i] = g_dbus_object_get_object_path (g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data))); -+ GDBusObject *block_object = g_dbus_interface_get_object (G_DBUS_INTERFACE (ret_p->data)); -+ if (block_object) -+ ret_paths[i++] = g_dbus_object_get_object_path (block_object); - } - - udisks_manager_complete_resolve_device (object, diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.9.4-undefined.patch deleted file mode 100644 index 271a5271e3c..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/files/udisks-2.9.4-undefined.patch +++ /dev/null @@ -1,143 +0,0 @@ -Upstream-PR: https://github.com/storaged-project/udisks/pull/978 -Upstream-PR: https://github.com/storaged-project/udisks/pull/979 -Upstream-Commit: 362cc8f1613193f8e68d13a416421bb36fd7f713 -Upstream-Commit: 6cbce6602ce447127cb4f77706870b6706bf1c5f -Upstream-Commit: 97bb17425e52ee6b2f11b13b3764d0dd6e8cfc97 -From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001 -From: orbea -Date: Tue, 10 May 2022 09:29:10 -0700 -Subject: [PATCH 1/3] modules/btrfs: Add missing dependency - -When building udisks with --enable-btrfs using slibtool instead of GNU -libtool the build will fail with undefined references. - -This is because of a missing dependency for libudisks2_btrfs_la_LIBADD -and GNU libtool will hide this issue by silently ignoring -no-undefined -while slibtool does not. - -Gentoo Bug: https://bugs.gentoo.org/782061 ---- - modules/btrfs/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/btrfs/Makefile.am b/modules/btrfs/Makefile.am -index ac8c941849..f96cd16186 100644 ---- a/modules/btrfs/Makefile.am -+++ b/modules/btrfs/Makefile.am -@@ -73,6 +73,7 @@ libudisks2_btrfs_la_LDFLAGS = \ - $(NULL) - - libudisks2_btrfs_la_LIBADD = \ -+ $(top_builddir)/src/libudisks-daemon.la \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(GUDEV_LIBS) \ - -From 6cbce6602ce447127cb4f77706870b6706bf1c5f Mon Sep 17 00:00:00 2001 -From: orbea -Date: Wed, 11 May 2022 07:55:13 -0700 -Subject: [PATCH 2/3] modules/bcache: Add missing dependency - ---- - modules/bcache/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/bcache/Makefile.am b/modules/bcache/Makefile.am -index 571541a6d4..7509205ba2 100644 ---- a/modules/bcache/Makefile.am -+++ b/modules/bcache/Makefile.am -@@ -71,6 +71,7 @@ libudisks2_bcache_la_LDFLAGS = \ - $(NULL) - - libudisks2_bcache_la_LIBADD = \ -+ $(top_builddir)/src/libudisks-daemon.la \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(GUDEV_LIBS) \ - -From 97bb17425e52ee6b2f11b13b3764d0dd6e8cfc97 Mon Sep 17 00:00:00 2001 -From: orbea -Date: Wed, 11 May 2022 07:55:25 -0700 -Subject: [PATCH 3/3] modules/lvm2: Add missing dependency - ---- - modules/lvm2/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am -index 3342ad8e9b..67b8aa6b3f 100644 ---- a/modules/lvm2/Makefile.am -+++ b/modules/lvm2/Makefile.am -@@ -76,6 +76,7 @@ libudisks2_lvm2_la_LDFLAGS = \ - $(NULL) - - libudisks2_lvm2_la_LIBADD = \ -+ $(top_builddir)/src/libudisks-daemon.la \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(GUDEV_LIBS) \ -From 663f8194eeac75ec26fbfbd8855c5873315c495c Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 13 May 2022 17:04:52 +0200 -Subject: [PATCH 1/3] modules/iscsi: Add missing linker dependency - ---- - modules/iscsi/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/iscsi/Makefile.am b/modules/iscsi/Makefile.am -index 05af5ece29..2cecc300e9 100644 ---- a/modules/iscsi/Makefile.am -+++ b/modules/iscsi/Makefile.am -@@ -77,6 +77,7 @@ libudisks2_iscsi_la_LDFLAGS = \ - $(NULL) - - libudisks2_iscsi_la_LIBADD = \ -+ $(top_builddir)/src/libudisks-daemon.la \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(GUDEV_LIBS) \ - -From 8ff2214d740f9819d6ede02534d7d0f23d6a3818 Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 13 May 2022 17:05:26 +0200 -Subject: [PATCH 2/3] modules/lsm: Add missing linker dependency - ---- - modules/lsm/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/lsm/Makefile.am b/modules/lsm/Makefile.am -index 2193115417..b77a9013fa 100644 ---- a/modules/lsm/Makefile.am -+++ b/modules/lsm/Makefile.am -@@ -71,6 +71,7 @@ libudisks2_lsm_la_LDFLAGS = \ - $(NULL) - - libudisks2_lsm_la_LIBADD = \ -+ $(top_builddir)/src/libudisks-daemon.la \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(GUDEV_LIBS) \ - -From 4f59e7fd5b9ad94091230713c28f6a818269d48c Mon Sep 17 00:00:00 2001 -From: Tomas Bzatek -Date: Fri, 13 May 2022 17:05:43 +0200 -Subject: [PATCH 3/3] modules/zram: Add missing linker dependency - ---- - modules/zram/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/zram/Makefile.am b/modules/zram/Makefile.am -index 9e5e9a6315..40f929583d 100644 ---- a/modules/zram/Makefile.am -+++ b/modules/zram/Makefile.am -@@ -78,6 +78,7 @@ libudisks2_zram_la_LDFLAGS = \ - $(NULL) - - libudisks2_zram_la_LIBADD = \ -+ $(top_builddir)/src/libudisks-daemon.la \ - $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(GUDEV_LIBS) \ diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/metadata.xml deleted file mode 100644 index 8e19b03530b..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - freedesktop-bugs@gentoo.org - - - Build the system daemon, not just the client tool - Use sys-auth/elogind for session tracking - Add support for Logical Volume Management via sys-fs/lvm2. - Support sys-apps/systemd's logind - Enable Virtual Data Optimizer support. - Enable ZRAM support (requires sys-apps/systemd). - - - storaged-project/udisks - - diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild deleted file mode 100644 index 80826755a29..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1-r1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2" - -LICENSE="LGPL-2+ GPL-2+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86" -IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd" - -REQUIRED_USE=" - ?? ( elogind systemd ) - elogind? ( daemon ) - systemd? ( daemon ) -" - -# See configure.ac file for the required min version -BLOCKDEV_MIN_VER="3.0" - -COMMON_DEPEND=" - >=sys-auth/polkit-0.114[daemon] - >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme] - virtual/udev - acl? ( virtual/acl ) - daemon? ( - >=dev-libs/glib-2.68:2 - >=dev-libs/libatasmart-0.19 - >=dev-libs/libgudev-165:= - ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) - lvm? ( sys-fs/lvm2 ) - systemd? ( >=sys-apps/systemd-209 ) -" -# util-linux -> mount, umount, swapon, swapoff (see also #403073) -RDEPEND="${COMMON_DEPEND} - >=sys-block/parted-3 - >=sys-apps/util-linux-2.30 - selinux? ( sec-policy/selinux-devicekit ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.1 -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - >=dev-util/gdbus-codegen-2.32 - >=dev-build/gtk-doc-am-1.3 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.8 ) - dev-libs/gobject-introspection-common - dev-build/autoconf-archive -" -# If adding a eautoreconf, then these might be needed at buildtime: -# dev-libs/gobject-introspection-common -# dev-build/autoconf-archive - -DOCS=( AUTHORS HACKING NEWS README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-BLKRRPART_harder.patch - "${FILESDIR}"/${P}-targetcli_config.json_netif_timeout.patch - "${FILESDIR}"/${P}-udiskslinuxmanager_use_after_free.patch - "${FILESDIR}"/${P}-udiskslinuxblock_survive_missing_fstab.patch - - "${FILESDIR}"/${PN}-2.10.1-slibtool-export-dynamic.patch -) - -pkg_setup() { - # Listing only major arch's here to avoid tracking kernel's defconfig - if use amd64 || use arm || use ppc || use ppc64 || use x86; then - CONFIG_CHECK="~!IDE" #319829 - CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377 - CONFIG_CHECK+=" ~NLS_UTF8" #425562 - kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 - linux-info_pkg_setup - fi -} - -src_prepare() { - xdg_environment_reset - default - - if ! use systemd ; then - sed -i -e 's:libsystemd-login:&disable:' configure || die - fi - - # Added for bug # 782061 - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-btrfs - --disable-gtk-doc - --disable-static - --localstatedir="${EPREFIX}"/var - --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html - --with-modprobedir="${EPREFIX}"/lib/modprobe.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-udevdir="${EPREFIX}$(get_udevdir)" - $(use_enable acl) - $(use_enable daemon) - $(use_enable debug) - $(use_enable introspection) - $(use_enable lvm lvm2) - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - keepdir /var/lib/udisks2 #383091 - - rm -rf "${ED}"/usr/share/bash-completion - dobashcomp data/completions/udisksctl -} - -pkg_preinst() { - # Remove gtk-doc symlink, #597628 - if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then - rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die - fi -} - -pkg_postinst() { - udev_reload - - # TODO: obsolete with tmpfiles_process? - # mkdir -p "${EROOT}"/run #415987 - - tmpfiles_process udisks2.conf - - # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync? - if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1.ebuild deleted file mode 100644 index a9eb67d39bd..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.10.1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2" - -LICENSE="LGPL-2+ GPL-2+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86" -IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd" - -REQUIRED_USE=" - ?? ( elogind systemd ) - elogind? ( daemon ) - systemd? ( daemon ) -" - -# See configure.ac file for the required min version -BLOCKDEV_MIN_VER="3.0" - -COMMON_DEPEND=" - >=sys-auth/polkit-0.114[daemon] - >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}:=[cryptsetup,lvm?,nvme] - virtual/udev - acl? ( virtual/acl ) - daemon? ( - >=dev-libs/glib-2.68:2 - >=dev-libs/libatasmart-0.19 - >=dev-libs/libgudev-165:= - ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) - lvm? ( sys-fs/lvm2 ) - systemd? ( >=sys-apps/systemd-209 ) -" -# util-linux -> mount, umount, swapon, swapoff (see also #403073) -RDEPEND="${COMMON_DEPEND} - >=sys-block/parted-3 - >=sys-apps/util-linux-2.30 - selinux? ( sec-policy/selinux-devicekit ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.1 -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - >=dev-util/gdbus-codegen-2.32 - >=dev-build/gtk-doc-am-1.3 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.8 ) - dev-libs/gobject-introspection-common - dev-build/autoconf-archive -" -# If adding a eautoreconf, then these might be needed at buildtime: -# dev-libs/gobject-introspection-common -# dev-build/autoconf-archive - -DOCS=( AUTHORS HACKING NEWS README.md ) - -pkg_setup() { - # Listing only major arch's here to avoid tracking kernel's defconfig - if use amd64 || use arm || use ppc || use ppc64 || use x86; then - CONFIG_CHECK="~!IDE" #319829 - CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377 - CONFIG_CHECK+=" ~NLS_UTF8" #425562 - kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 - linux-info_pkg_setup - fi -} - -src_prepare() { - xdg_environment_reset - default - - if ! use systemd ; then - sed -i -e 's:libsystemd-login:&disable:' configure || die - fi - - # Added for bug # 782061 - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-btrfs - --disable-gtk-doc - --disable-static - --localstatedir="${EPREFIX}"/var - --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html - --with-modprobedir="${EPREFIX}"/lib/modprobe.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-udevdir="${EPREFIX}$(get_udevdir)" - $(use_enable acl) - $(use_enable daemon) - $(use_enable debug) - $(use_enable introspection) - $(use_enable lvm lvm2) - $(use_enable nls) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - keepdir /var/lib/udisks2 #383091 - - rm -rf "${ED}"/usr/share/bash-completion - dobashcomp data/completions/udisksctl -} - -pkg_preinst() { - # Remove gtk-doc symlink, #597628 - if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then - rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die - fi -} - -pkg_postinst() { - udev_reload - - # TODO: obsolete with tmpfiles_process? - # mkdir -p "${EROOT}"/run #415987 - - tmpfiles_process udisks2.conf - - # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync? - if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.9.4-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.9.4-r3.ebuild deleted file mode 100644 index 62c47f6d28c..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-fs/udisks/udisks-2.9.4-r3.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2" - -LICENSE="LGPL-2+ GPL-2+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram" - -REQUIRED_USE=" - ?? ( elogind systemd ) - elogind? ( daemon ) - systemd? ( daemon ) - zram? ( systemd ) -" - -# See configure.ac file for the required min version -BLOCKDEV_MIN_VER="2.25" - -# mount, umount, swapon, swapoff (see also #403073) -RDEPEND="${COMMON_DEPEND} - >=sys-block/parted-3 - >=sys-apps/util-linux-2.30 - selinux? ( sec-policy/selinux-devicekit ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.1 -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - >=dev-util/gdbus-codegen-2.32 - >=dev-build/gtk-doc-am-1.3 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.8 ) -" -# If adding a eautoreconf, then these might be needed at buildtime: -# dev-libs/gobject-introspection-common -# dev-build/autoconf-archive - -DOCS=( AUTHORS HACKING NEWS README.md ) - -PATCHES=( - "${FILESDIR}/${P}-undefined.patch" # 782061 -) - -pkg_setup() { - # Listing only major arch's here to avoid tracking kernel's defconfig - if use amd64 || use arm || use ppc || use ppc64 || use x86; then - CONFIG_CHECK="~!IDE" #319829 - CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377 - CONFIG_CHECK+=" ~NLS_UTF8" #425562 - kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 - linux-info_pkg_setup - fi -} - -src_prepare() { - xdg_environment_reset - default - - if ! use systemd ; then - sed -i -e 's:libsystemd-login:&disable:' configure || die - fi - - # Added for bug # 782061 - eautoreconf -} - -src_configure() { - local myeconfargs=( - --enable-btrfs - --disable-gtk-doc - --disable-static - --localstatedir="${EPREFIX}"/var - --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html - --with-modprobedir="${EPREFIX}"/lib/modprobe.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d - --with-udevdir="${EPREFIX}$(get_udevdir)" - $(use_enable acl) - $(use_enable daemon) - $(use_enable debug) - $(use_enable introspection) - $(use_enable lvm lvm2) - $(use_enable lvm lvmcache) - $(use_enable nls) - $(use_enable vdo) - $(use_enable zram) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - keepdir /var/lib/udisks2 #383091 - - rm -rf "${ED}"/usr/share/bash-completion - dobashcomp data/completions/udisksctl -} - -pkg_preinst() { - # Remove gtk-doc symlink, #597628 - if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then - rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die - fi -} - -pkg_postinst() { - udev_reload - - # TODO: obsolete with tmpfiles_process? - # mkdir -p "${EROOT}"/run #415987 - - tmpfiles_process udisks2.conf - - # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync? - if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi -} - -pkg_postrm() { - udev_reload -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/Manifest b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/Manifest deleted file mode 100644 index 48a35a4524c..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST libblockdev-2.28.tar.gz 925698 BLAKE2B 63ac7ab5bd02c1ef1848d0b252e09fe721cfe86258f063b7bab616766cbc56311707dcb2dd3a1fadf0e0840187f121aa178fd5959500cd590b846238a9d3e36e SHA512 9e01c41db4f728c8e81e710c6bb4725bbe34b3a7de25ff7f57b7b88ca6b7b5debbe858947585d314770036b2c3c533f9f8ff3d038b7ca50eee3d18f9fbe0d392 -DIST libblockdev-2.29.tar.gz 935117 BLAKE2B 774062459602a6f3730ac6e694b3f535daf0258cc5f509ff138bb8c15f44ff46bdc08e32ae1957909b51a191726cf5e9cb418c0317e5178300687947704cf5e0 SHA512 0d9637800b189f3824483010d2ff079da11b15ed0b42c578352a0d3cd9c35dab4e5945a3cc31c17ea6f88637548151fc7cf237ac8e9c98edfc7b7bce1a756e01 -DIST libblockdev-3.1.1.tar.gz 1056270 BLAKE2B b3dbdc7226524d544193b609ced8a9fee725268ba2201b639c22103fcae6d047c94fb1b848e489525300242cb235d688934193894a06279a4dc0e0b33dff6e96 SHA512 44628d9e68a467f8a5d5e65e12d5d6ffb4d9b953c846acd9f6da257eab5ccd79309651d6b20092fa700fb4340f1f718ceef11141203da676d088824aa9d03481 diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch deleted file mode 100644 index 2fbeaf49f23..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-2.28-sh_tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -bash is fine with "test . == ." but e.g. dash fails on not having -the two dots quoted as strings. - ---- a/docs/Makefile.am -+++ b/docs/Makefile.am -@@ -2,7 +2,7 @@ - - html-doc.stamp: ${srcdir}/libblockdev-docs.xml ${srcdir}/libblockdev-sections.txt $(wildcard ${srcdir}/../src/plugins/*.[ch]) $(wildcard ${srcdir}/../src/lib/*.[ch]) $(wildcard ${srcdir}/../src/utils/*.[ch]) - touch ${builddir}/html-doc.stamp -- test ${builddir} == ${srcdir} || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir} -+ test "${builddir}" == "${srcdir}" || cp ${srcdir}/libblockdev-sections.txt ${srcdir}/libblockdev-docs.xml ${builddir} - gtkdoc-scan --rebuild-types --module=libblockdev --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ - gtkdoc-mkdb --module=libblockdev --output-format=xml --source-dir=${srcdir}/../src/plugins/ --source-dir=${srcdir}/../src/lib/ --source-dir=${srcdir}/../src/utils/ --source-suffixes=c,h - test -d ${builddir}/html || mkdir ${builddir}/html -@@ -13,7 +13,7 @@ - -rm -rf ${builddir}/html - -rm -rf ${builddir}/xml - test ! -f ${builddir}/html-doc.stamp || rm ${builddir}/html-doc.stamp -- test ${builddir} == ${srcdir} || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml -+ test "${builddir}" == "${srcdir}" || rm -f ${builddir}/libblockdev-sections.txt ${builddir}/libblockdev-docs.xml - - install-data-local: - test -d ${DESTDIR}${datadir}/gtk-doc/html/libblockdev || mkdir -p ${DESTDIR}${datadir}/gtk-doc/html/libblockdev diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch deleted file mode 100644 index 5625478c608..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/files/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ec8cab726abe60ba5c7ffcce07905b29c5376163 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Mon, 13 Nov 2023 16:21:44 +0200 -Subject: [PATCH] Add non-systemd method to get distro name and version - ---- a/tests/utils.py -+++ b/tests/utils.py -@@ -514,10 +514,16 @@ def get_version(): - """ Try to get distro and version - """ - -- bus = dbus.SystemBus() -+ try: -+ bus = dbus.SystemBus() -+ -+ # get information about the distribution from systemd (hostname1) -+ sys_info = bus.get_object("org.freedesktop.hostname1", "/org/freedesktop/hostname1") -+ except dbus.exceptions.DBusException: -+ import platform -+ info = platform.freedesktop_os_release() -+ return (info["NAME"], info["VERSION_ID"]) - -- # get information about the distribution from systemd (hostname1) -- sys_info = bus.get_object("org.freedesktop.hostname1", "/org/freedesktop/hostname1") - cpe = str(sys_info.Get("org.freedesktop.hostname1", "OperatingSystemCPEName", dbus_interface=dbus.PROPERTIES_IFACE)) - - if cpe: --- -2.42.1 - diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild deleted file mode 100644 index f584e52cc4c..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.28-r1.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit autotools python-single-r1 xdg-utils - -DESCRIPTION="A library for manipulating block devices" -HOMEPAGE="https://github.com/storaged-project/libblockdev" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git" - BDEPEND=" - dev-build/autoconf-archive - " -else - MY_PV="${PV}-1" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -fi -LICENSE="LGPL-2+" -SLOT="0/2" # subslot is SOVERSION -IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" -# Tests require root. In a future release, we may be able to run a smaller -# subset with new run_tests.py arguments. -RESTRICT="!test? ( test ) test" - -RDEPEND=" - >=dev-libs/glib-2.42.2 - dev-libs/libbytesize - >=sys-apps/kmod-19 - >=sys-apps/util-linux-2.27 - >=sys-block/parted-3.1 - cryptsetup? ( - escrow? ( - >=dev-libs/nss-3.18.0 - dev-libs/volume_key - ) - >=sys-fs/cryptsetup-1.6.7:= - ) - device-mapper? ( sys-fs/lvm2 ) - dmraid? ( - sys-fs/dmraid - sys-fs/lvm2 - ) - lvm? ( - sys-fs/lvm2 - virtual/udev - ) - vdo? ( dev-libs/libyaml ) - ${PYTHON_DEPS} -" - -DEPEND=" - ${RDEPEND} -" - -# TODO: relax libbytesize condition once it has gained py3.11 support -BDEPEND+=" - dev-build/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) - test? ( - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - ' python3_{9..10} ) - sys-block/targetcli-fb - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28-sh_tests.patch -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset #623992 - default - - # https://bugs.gentoo.org/744289 - find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ - | xargs --null sed "s@ -Werror@@" -i || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --with-python3 - --without-mpath - --without-nvdimm - --without-python2 - $(use_enable introspection) - $(use_enable test tests) - $(use_with bcache) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with dmraid) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with kbd) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with tools) - $(use_with vdo) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # See http://storaged.org/libblockdev/ch03.html - # The 'check' target just does Pylint. - # ... but it needs root. - emake test -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - # This is installed even with USE=-lvm, but libbd_lvm are omitted so it - # doesn't work at all. - if ! use lvm ; then - rm -f "${ED}"/usr/bin/lvm-cache-stats || die - fi - python_optimize #718576 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.29.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.29.ebuild deleted file mode 100644 index c74fe5ee52e..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-2.29.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools python-single-r1 xdg-utils - -DESCRIPTION="A library for manipulating block devices" -HOMEPAGE="https://github.com/storaged-project/libblockdev" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git" - BDEPEND=" - dev-build/autoconf-archive - " -else - MY_PV="${PV}-1" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi -LICENSE="LGPL-2+" -SLOT="0/2" # subslot is SOVERSION -IUSE="bcache +cryptsetup device-mapper dmraid escrow gtk-doc introspection lvm kbd test +tools vdo" -# Tests require root. In a future release, we may be able to run a smaller -# subset with new run_tests.py arguments. -RESTRICT="!test? ( test ) test" - -RDEPEND=" - >=dev-libs/glib-2.42.2 - dev-libs/libbytesize - >=sys-apps/kmod-19 - >=sys-apps/util-linux-2.27 - >=sys-block/parted-3.1 - cryptsetup? ( - escrow? ( - >=dev-libs/nss-3.18.0 - dev-libs/volume_key - ) - >=sys-fs/cryptsetup-1.6.7:= - ) - device-mapper? ( sys-fs/lvm2 ) - dmraid? ( - sys-fs/dmraid - sys-fs/lvm2 - ) - lvm? ( - sys-fs/lvm2 - virtual/udev - ) - vdo? ( dev-libs/libyaml ) - ${PYTHON_DEPS} -" - -DEPEND=" - ${RDEPEND} -" - -BDEPEND+=" - dev-build/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) - test? ( - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - ') - sys-block/targetcli-fb - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.28-sh_tests.patch -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset #623992 - default - - # https://bugs.gentoo.org/744289 - find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ - | xargs --null sed "s@ -Werror@@" -i || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --with-python3 - --without-mpath - --without-nvdimm - --without-python2 - $(use_enable introspection) - $(use_enable test tests) - $(use_with bcache) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with dmraid) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with kbd) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with tools) - $(use_with vdo) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # See http://storaged.org/libblockdev/ch03.html - # The 'check' target just does Pylint. - # ... but it needs root. - emake test -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - # This is installed even with USE=-lvm, but libbd_lvm are omitted so it - # doesn't work at all. - if ! use lvm ; then - rm -f "${ED}"/usr/bin/lvm-cache-stats || die - fi - python_optimize #718576 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-3.1.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-3.1.1.ebuild deleted file mode 100644 index b4747c3f7f9..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/libblockdev-3.1.1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools python-single-r1 xdg-utils - -DESCRIPTION="A library for manipulating block devices" -HOMEPAGE="https://github.com/storaged-project/libblockdev" -if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/storaged-project/libblockdev.git" - BDEPEND=" - dev-build/autoconf-archive - " -else - MY_PV="${PV}-1" - SRC_URI="https://github.com/storaged-project/${PN}/releases/download/${MY_PV}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -fi -LICENSE="LGPL-2+" -SLOT="0/3" # subslot is SOVERSION -IUSE="+cryptsetup device-mapper escrow gtk-doc introspection lvm +nvme test +tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.42.2 - dev-libs/libbytesize - sys-apps/gptfdisk - >=sys-apps/kmod-19 - >=sys-apps/util-linux-2.27 - >=sys-block/parted-3.1 - cryptsetup? ( - escrow? ( - >=dev-libs/nss-3.18.0 - dev-libs/volume_key - ) - >=sys-apps/keyutils-1.5.0:= - >=sys-fs/cryptsetup-2.3.0:= - ) - device-mapper? ( sys-fs/lvm2 ) - lvm? ( - sys-fs/lvm2 - virtual/udev - ) - nvme? ( sys-libs/libnvme ) - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') -" - -DEPEND="${RDEPEND}" - -BDEPEND+=" - dev-build/gtk-doc-am - gtk-doc? ( dev-util/gtk-doc ) - introspection? ( >=dev-libs/gobject-introspection-1.3.0 ) - test? ( - $(python_gen_cond_dep ' - dev-libs/libbytesize[python,${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - ') - sys-apps/lsb-release - sys-block/targetcli-fb - ) -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - escrow? ( cryptsetup ) - test? ( introspection lvm ) -" - -PATCHES=( - "${FILESDIR}/libblockdev-3.0.4-add-non-systemd-method-for-distro-info.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - xdg_environment_reset #623992 - default - - # https://bugs.gentoo.org/744289 - find -type f \( -name "Makefile.am" -o -name "configure.ac" \) -print0 \ - | xargs --null sed "s@ -Werror@@" -i || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-btrfs - --with-fs - --with-part - --with-python3 - --without-mpath - --without-nvdimm - $(use_enable introspection) - $(use_enable test tests) - $(use_with cryptsetup crypto) - $(use_with device-mapper dm) - $(use_with escrow) - $(use_with gtk-doc) - $(use_with lvm lvm) - $(use_with lvm lvm-dbus) - $(use_with nvme) - $(use_with tools) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # See http://storaged.org/libblockdev/ch03.html - # Largest subset which doesn't require root priviledges - ${EPYTHON} tests/run_tests.py --include-tags extradeps sourceonly || die -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - # This is installed even with USE=-lvm, but libbd_lvm are omitted so it - # doesn't work at all. - if ! use lvm ; then - rm -f "${ED}"/usr/bin/lvm-cache-stats || die - fi - python_optimize #718576 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/metadata.xml deleted file mode 100644 index 9480156e873..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-libs/libblockdev/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Enable block device cache support. - Enable sys-fs/cryptsetup support - Enable support for device-mapper from sys-fs/lvm2 - Support for dmraid devices, also known as ATA-RAID, or Fake RAID. - Support for building crypto plugin with escrow device support - Enable kernel block device support. - Enable support for Logical Volume Management via sys-fs/lvm2. - Add nvme support via sys-libs/libnvme - Build tools - Enable Virtual Data Optimizer support. - - - storaged-project/libblockdev - - From 5ac607cb954f5cc20bdc2deb0fbc42a0c366fb71 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:43:47 +0100 Subject: [PATCH 07/13] dev-libs/liblinear: Drop unused package --- .../workflows/portage-stable-packages-list | 1 - .../dev-libs/liblinear/Manifest | 2 - .../dev-libs/liblinear/liblinear-243.ebuild | 59 ------------------ .../dev-libs/liblinear/liblinear-246.ebuild | 61 ------------------- .../dev-libs/liblinear/metadata.xml | 11 ---- 5 files changed, 134 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/liblinear/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-243.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-246.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/liblinear/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index f984bcaf83a..92c282a2ee4 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -239,7 +239,6 @@ dev-libs/libffi dev-libs/libgcrypt dev-libs/libgpg-error dev-libs/libksba -dev-libs/liblinear dev-libs/libltdl dev-libs/libmspack dev-libs/libnl diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/Manifest deleted file mode 100644 index 51d7295908e..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST liblinear-2.46.tar.gz 569001 BLAKE2B d1f9019717b47414c11611a253ca9185d80cb5860e53462f9b4a6f95c99b0d39502ba91827d8afca6e98d279b50ce44cdcfde9a3629f2c5d4773eeb93e17de76 SHA512 94b892a51f85246cad36562f1e4870a22e73c0c6bf237dfcdc50467e93212a6e88a8f7ba36cfd691c031d8ced9ad663f592ef94e309df764d56095cfff7835ce -DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-243.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-243.ebuild deleted file mode 100644 index 46a695603b9..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-243.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit multilib toolchain-funcs - -DESCRIPTION="A Library for Large Linear Classification" -HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear" -SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/4" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -src_prepare() { - default - - sed -i \ - -e '/^AR/s|=|?=|g' \ - -e '/^RANLIB/s|=|?=|g' \ - -e '/^CFLAGS/d;/^CXXFLAGS/d' \ - blas/Makefile || die - sed -i \ - -e 's|make|$(MAKE)|g' \ - -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \ - -e '/^CFLAGS/d;/^CXXFLAGS/d' \ - -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \ - Makefile || die - - # fix install_name on Darwin - sed -i \ - -e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \ - -e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \ - Makefile || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CFLAGS} -fPIC" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ - AR="$(tc-getAR) rcv" \ - RANLIB="$(tc-getRANLIB)" \ - lib all -} - -src_install() { - dolib.so ${PN}$(get_libname 4) - dosym ${PN}$(get_libname 4) /usr/$(get_libdir)/${PN}$(get_libname) - - newbin predict ${PN}-predict - newbin train ${PN}-train - - doheader linear.h - - dodoc README -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-246.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-246.ebuild deleted file mode 100644 index b782407efb5..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/liblinear-246.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib toolchain-funcs - -MY_PV="${PV:0:1}.${PV:1}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="A Library for Large Linear Classification" -HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear" -SRC_URI="https://www.csie.ntu.edu.tw/~cjlin/liblinear/${MY_P}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="BSD" -SLOT="0/5" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" - -src_prepare() { - default - - sed -i \ - -e '/^CFLAGS/d;/^CXXFLAGS/d' \ - blas/Makefile || die - sed -i \ - -e 's|make|$(MAKE)|g' \ - -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \ - -e '/^CFLAGS/d;/^CXXFLAGS/d' \ - -e 's|$(SHARED_LIB_FLAG)|& $(LDFLAGS)|g' \ - Makefile || die - - # fix install_name on Darwin - sed -i \ - -e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \ - -e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \ - Makefile || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CFLAGS} -fPIC" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - lib all -} - -src_install() { - dolib.so ${PN}$(get_libname ${SLOT#*/}) - dosym ${PN}$(get_libname ${SLOT#*/}) /usr/$(get_libdir)/${PN}$(get_libname) - - newbin predict ${PN}-predict - newbin train ${PN}-train - - doheader linear.h - - dodoc README -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/metadata.xml deleted file mode 100644 index 7db6a7125e6..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/liblinear/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sam@gentoo.org - Sam James - - - cjlin1/liblinear - - From a972510ba7e89340a7826a5e82e280ab1e769a83 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:46:07 +0100 Subject: [PATCH 08/13] portage-stable: Drop unused perl packages --- .../workflows/portage-stable-packages-list | 7 -- .../File-Slurp/File-Slurp-9999.320.0.ebuild | 33 --------- .../dev-perl/File-Slurp/Manifest | 1 - .../dev-perl/File-Slurp/metadata.xml | 12 ---- .../File-Temp/File-Temp-0.231.100-r1.ebuild | 21 ------ .../perl-core/File-Temp/Manifest | 1 - .../File-Temp-0.230.0-symlink-safety.patch | 37 ---------- ...31.100-pathconf-_PC_CHOWN_RESTRICTED.patch | 68 ------------------- .../perl-core/File-Temp/metadata.xml | 13 ---- .../virtual/perl-Carp/metadata.xml | 9 --- .../perl-Carp/perl-Carp-1.540.0-r1.ebuild | 15 ---- .../virtual/perl-Exporter/metadata.xml | 9 --- .../perl-Exporter-5.780.0.ebuild | 15 ---- .../virtual/perl-File-Spec/metadata.xml | 9 --- .../perl-File-Spec-3.900.0-r1.ebuild | 15 ---- .../perl-File-Spec-3.910.0.ebuild | 15 ---- .../virtual/perl-File-Temp/metadata.xml | 9 --- .../perl-File-Temp-0.231.100-r1.ebuild | 15 ---- .../virtual/perl-IO/metadata.xml | 9 --- .../virtual/perl-IO/perl-IO-1.550.0.ebuild | 15 ---- 20 files changed, 328 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/File-Temp/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.231.100-pathconf-_PC_CHOWN_RESTRICTED.patch delete mode 100644 sdk_container/src/third_party/portage-stable/perl-core/File-Temp/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Carp/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-IO/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.550.0.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 92c282a2ee4..3e63d7a82af 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -274,7 +274,6 @@ dev-libs/userspace-rcu dev-libs/xmlsec dev-libs/yajl -dev-perl/File-Slurp dev-perl/Parse-Yapp dev-python/autocommand @@ -539,7 +538,6 @@ net-nds/rpcbind net-vpn/wireguard-tools -perl-core/File-Temp perl-core/Getopt-Long profiles @@ -702,15 +700,10 @@ virtual/openssh virtual/os-headers virtual/package-manager virtual/pager -virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode -virtual/perl-Exporter virtual/perl-ExtUtils-MakeMaker -virtual/perl-File-Spec -virtual/perl-File-Temp virtual/perl-Getopt-Long -virtual/perl-IO virtual/perl-Unicode-Collate virtual/pkgconfig virtual/resolvconf diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild deleted file mode 100644 index 7fbfbf5a03f..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/File-Slurp-9999.320.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DIST_AUTHOR=CAPOEIRAB -DIST_VERSION=9999.32 -inherit perl-module - -DESCRIPTION="Simple and Efficient Reading/Writing/Modifying of Complete Files" - -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - virtual/perl-Carp - >=virtual/perl-Exporter-5.570.0 - >=virtual/perl-File-Spec-3.10.0 - virtual/perl-File-Temp - virtual/perl-IO -" -BDEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - >=virtual/perl-Scalar-List-Utils-1.0.0 - virtual/perl-Socket - virtual/perl-Test-Simple - ) -" - -mydoc="extras/slurp_article.pod" diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/Manifest b/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/Manifest deleted file mode 100644 index 765f1646b1a..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST File-Slurp-9999.32.tar.gz 34574 BLAKE2B d75d7253945908328124ef46f53d86fba7ba0751e87ae493f071b03844d17b969371d1b26fddbc94f4b788475b09b5ee76c3d2c0b6f1c0c64959da0be95dd0f0 SHA512 413337e0257e95e8e8d2aabf684bec81e746000a741809935b058490b8c42b494064f724e618b250330d8bb67a0a7a2a5adad17e3e6c96d4b193531a192a4d56 diff --git a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/metadata.xml deleted file mode 100644 index b2c96bcc19b..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-perl/File-Slurp/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - File-Slurp - File::Slurp - - diff --git a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild deleted file mode 100644 index c115814898a..00000000000 --- a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/File-Temp-0.231.100-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DIST_AUTHOR=ETHER -DIST_VERSION=0.2311 -inherit perl-module - -DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way" - -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="" - -PATCHES=( - # bug #390719 - "${FILESDIR}/${PN}-0.230.0-symlink-safety.patch" - # bug #930949 - "${FILESDIR}/${PN}-0.231.100-pathconf-_PC_CHOWN_RESTRICTED.patch" -) diff --git a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/Manifest b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/Manifest deleted file mode 100644 index 49f6f62e18e..00000000000 --- a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST File-Temp-0.2311.tar.gz 76988 BLAKE2B d867a5c391fb8bdf1534469ad67f3e122666fd857c3cabda67fcc216896159cb95b31a4885ee47c803e147fa246defc12608780e7814ede8e5662c8f8ffd3d0e SHA512 2db3f03f4d25013c60585cd3e6aa7e68fe9bb26f1957adf6674e9cae9e963a41c559d36862943703f567d116c82747b4fae0612253a784addeb53d7867a232d1 diff --git a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch deleted file mode 100644 index d6a3a717c70..00000000000 --- a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.230.0-symlink-safety.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: John Lightsey -Date: Mon, 27 Jun 2011 13:07:44 -0500 -Subject: [PATCH] symlink safety - -Add check for unsafe symbolic links to _is_safe() directory check. - - -diff -ruN File-Temp-0.23.orig/lib/File/Temp.pm File-Temp-0.23/lib/File/Temp.pm ---- File-Temp-0.23.orig/lib/File/Temp.pm 2013-03-14 22:56:59.000000000 +0100 -+++ File-Temp-0.23/lib/File/Temp.pm 2014-10-15 23:46:29.894611586 +0200 -@@ -672,7 +672,25 @@ - my $err_ref = shift; - - # Stat path -- my @info = stat($path); -+ my @info = lstat($path); -+ my $symlink_test_path = $path; -+ my $symlink_loop_count = 0; -+ while (-l _) { -+ if (++$symlink_loop_count >= 50) { -+ $$err_ref = "50 levels of symlinks encountered at $path"; -+ return 0; -+ } -+ if ( $info[4] <= File::Temp->top_system_uid() || $info[4] == $>) { -+ # safe to traverse -+ $symlink_test_path = readlink($symlink_test_path); -+ @info = lstat($symlink_test_path); -+ } -+ else { -+ $$err_ref = "Unsafe symlink at $path"; -+ return 0; -+ } -+ } -+ - unless (scalar(@info)) { - $$err_ref = "stat(path) returned no values"; - return 0; diff --git a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.231.100-pathconf-_PC_CHOWN_RESTRICTED.patch b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.231.100-pathconf-_PC_CHOWN_RESTRICTED.patch deleted file mode 100644 index f8e56f8ae1c..00000000000 --- a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/files/File-Temp-0.231.100-pathconf-_PC_CHOWN_RESTRICTED.patch +++ /dev/null @@ -1,68 +0,0 @@ -https://bugs.gentoo.org/930949 -https://github.com/Perl-Toolchain-Gang/File-Temp/issues/36 -https://github.com/Perl-Toolchain-Gang/File-Temp/pull/41 -https://github.com/Perl/perl5/pull/22156 -https://github.com/Perl/perl5/pull/22161 - -From 2de518ab67bf3c5be2525ea0a5d78f39de50074f Mon Sep 17 00:00:00 2001 -From: Lukas Mai -Date: Thu, 18 Apr 2024 20:12:06 +0200 -Subject: [PATCH] use pathconf() to get _PC_CHOWN_RESTRICTED flag - -The _PC_* constants are only meaningful in pathconf(); conversely, -sysconf() only understands _SC_* constants. - -Previously, this code didn't do anything meaningful. For example, on x64 -Linux _PC_CHOWN_RESTRICTED is 6, which sysconf() would have interpreted -as _SC_TZNAME_MAX (also 6). ---- - lib/File/Temp.pm | 16 +++++++--------- - 2 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/lib/File/Temp.pm b/lib/File/Temp.pm -index ef34f6c..563efeb 100644 ---- a/lib/File/Temp.pm -+++ b/lib/File/Temp.pm -@@ -718,7 +718,7 @@ sub _is_safe { - - # Internal routine to check whether a directory is safe - # for temp files. Safer than _is_safe since it checks for --# the possibility of chown giveaway and if that is a possibility -+# the possibility of chown giveaway and if that is a possibility, - # checks each directory in the path to see if it is safe (with _is_safe) - - # If _PC_CHOWN_RESTRICTED is not set, does the full test of each -@@ -737,18 +737,16 @@ sub _is_verysafe { - - my $err_ref = shift; - -- # Should Get the value of _PC_CHOWN_RESTRICTED if it is defined -- # and If it is not there do the extensive test -+ # Should get the value of _PC_CHOWN_RESTRICTED if it is defined -+ # and if it is not there, do the extensive test - local($@); -- my $chown_restricted; -- $chown_restricted = &POSIX::_PC_CHOWN_RESTRICTED() -- if eval { &POSIX::_PC_CHOWN_RESTRICTED(); 1}; -+ my $chown_restricted = eval { POSIX::_PC_CHOWN_RESTRICTED() }; - -- # If chown_resticted is set to some value we should test it -+ # If chown_restricted is set to some value, we should test it - if (defined $chown_restricted) { - - # Return if the current directory is safe -- return _is_safe($path,$err_ref) if POSIX::sysconf( $chown_restricted ); -+ return _is_safe($path, $err_ref) if POSIX::pathconf( $path, $chown_restricted ); - - } - -@@ -2367,7 +2365,7 @@ for sticky bit. - - In addition to the MEDIUM security checks, also check for the - possibility of ``chown() giveaway'' using the L --sysconf() function. If this is a possibility, each directory in the -+pathconf() function. If this is a possibility, each directory in the - path is checked in turn for safeness, recursively walking back to the - root directory. - - diff --git a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/metadata.xml b/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/metadata.xml deleted file mode 100644 index acaf45390ad..00000000000 --- a/sdk_container/src/third_party/portage-stable/perl-core/File-Temp/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - File-Temp - File::Temp - File::Temp::Dir - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/metadata.xml deleted file mode 100644 index 1a0d0fb9a80..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0-r1.ebuild deleted file mode 100644 index 62ce4eb5f21..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Carp/perl-Carp-1.540.0-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for ${PN#perl-}" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.40* =dev-lang/perl-5.38* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/metadata.xml deleted file mode 100644 index 1a0d0fb9a80..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild deleted file mode 100644 index 022f82abdd3..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-Exporter/perl-Exporter-5.780.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for ${PN#perl-}" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/metadata.xml deleted file mode 100644 index 1a0d0fb9a80..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild deleted file mode 100644 index 23e2902520f..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.900.0-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for ${PN#perl-}" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.40.0* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild deleted file mode 100644 index 9851c5b6a5e..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Spec/perl-File-Spec-3.910.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for ${PN#perl-}" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.40.1* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/metadata.xml deleted file mode 100644 index 1a0d0fb9a80..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild deleted file mode 100644 index 95fe522c31b..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-File-Temp/perl-File-Temp-0.231.100-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for ${PN#perl-}" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - ~perl-core/${PN#perl-}-${PV} - dev-lang/perl:= -" - -# this is the dev-lang/perl-5.34 and dev-lang/perl-5.36 and dev-lang/perl-5.38 and dev-lang/perl-5.40 version but we want the security patch diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/metadata.xml deleted file mode 100644 index 1a0d0fb9a80..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - perl@gentoo.org - Gentoo Perl Project - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.550.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.550.0.ebuild deleted file mode 100644 index 022f82abdd3..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/perl-IO/perl-IO-1.550.0.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for ${PN#perl-}" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - || ( =dev-lang/perl-5.40* ~perl-core/${PN#perl-}-${PV} ) - dev-lang/perl:= - !perl-core/${PN#perl-}-${PV}-r999 -" From 804b221d8fbb14cd9aa501e0db403351f56db4cb Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:48:49 +0100 Subject: [PATCH 09/13] portage-stable: Drop unused python dependencies --- .../workflows/portage-stable-packages-list | 3 -- .../dev-python/autocommand/Manifest | 1 - .../autocommand/autocommand-2.2.2.ebuild | 29 -------------- ...autocommand-2.2.2-setuptools-license.patch | 26 ------------- .../dev-python/autocommand/metadata.xml | 13 ------- .../dev-python/ordered-set/Manifest | 1 - .../dev-python/ordered-set/metadata.xml | 23 ----------- .../ordered-set/ordered-set-4.1.0.ebuild | 20 ---------- .../dev-python/tenacity/Manifest | 1 - .../dev-python/tenacity/metadata.xml | 24 ------------ .../dev-python/tenacity/tenacity-9.0.0.ebuild | 39 ------------------- 11 files changed, 180 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/autocommand/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/autocommand/files/autocommand-2.2.2-setuptools-license.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/autocommand/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/ordered-set/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/ordered-set/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tenacity/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tenacity/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/tenacity/tenacity-9.0.0.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 3e63d7a82af..7a704fee431 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -276,7 +276,6 @@ dev-libs/yajl dev-perl/Parse-Yapp -dev-python/autocommand dev-python/backports-tarfile dev-python/cachecontrol dev-python/certifi @@ -318,7 +317,6 @@ dev-python/mdurl dev-python/more-itertools dev-python/msgpack dev-python/olefile -dev-python/ordered-set dev-python/packaging dev-python/pathspec dev-python/pefile @@ -340,7 +338,6 @@ dev-python/setuptools dev-python/setuptools-scm dev-python/six dev-python/snakeoil -dev-python/tenacity dev-python/tomli dev-python/tree-sitter dev-python/trove-classifiers diff --git a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/autocommand/Manifest deleted file mode 100644 index df6173d5be6..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST autocommand-2.2.2.gh.tar.gz 22188 BLAKE2B 757fd96d0505466e7d3e371e13e931d0dd20d9b02da3e88c2bf85b1b946ef6c67fb14366856fe66c23adab5d635c4bd08d51acc7e55830636cce5aa0a0c265bc SHA512 5ed109db16a0e309ed5107b26db0b70ed8669d73817e82eb5a219650d29f53785aa1f9471b2ac71d21dbffc9f0a13ea0fdf69e63ab534fd84407a1d6741cf5b5 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild deleted file mode 100644 index 09ee8050724..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/autocommand-2.2.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Library to create a command-line program from a function" -HOMEPAGE=" - https://github.com/Lucretiel/autocommand/ - https://pypi.org/project/autocommand/ -" -SRC_URI=" - https://github.com/Lucretiel/autocommand/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="LGPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2.2-setuptools-license.patch -) - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/files/autocommand-2.2.2-setuptools-license.patch b/sdk_container/src/third_party/portage-stable/dev-python/autocommand/files/autocommand-2.2.2-setuptools-license.patch deleted file mode 100644 index b0d6fdd5a2f..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/files/autocommand-2.2.2-setuptools-license.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/917754 -https://github.com/Lucretiel/autocommand/issues/28 -https://github.com/Lucretiel/autocommand/pull/31 - -From cf98b8bc024f536565a67369a9f9a506fe67b942 Mon Sep 17 00:00:00 2001 -From: Ben Greiner -Date: Fri, 22 Dec 2023 14:15:46 +0100 -Subject: [PATCH] License is dynamic - ---- - pyproject.toml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pyproject.toml b/pyproject.toml -index aa30b35..5221f65 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -18,6 +18,7 @@ classifiers = [ - "Topic :: Software Development :: Libraries", - "Topic :: Software Development :: Libraries :: Python Modules", - ] -+dynamic = [ "license" ] - - [project.urls] - "Homepage" = "https://github.com/Lucretiel/autocommand" - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/autocommand/metadata.xml deleted file mode 100644 index 4e5fea0f0d7..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/autocommand/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - python@gentoo.org - Python - - - - autocommand - Lucretiel/autocommand - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/Manifest deleted file mode 100644 index 8eac0eb2cdd..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ordered-set-4.1.0.tar.gz 12826 BLAKE2B 8e1d1510fec429c002062584cadb1dd64a1131889345629cb73f6fbc7dbd1ab06a4f97d43ae54c8dc1f21bb243ab0706cefe33cf4fd634fc5af28b10806cee1e SHA512 f12d19f7d9cf0ebcc414d97798f0959ff69a77146839cc6a9067c864f9e0be795795c4d648f736fd7448ddf89666ce37f23e7380d1c9b1678a4787961e4e1e79 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/metadata.xml deleted file mode 100644 index 69152c36610..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - python@gentoo.org - - - sci@gentoo.org - Gentoo Science Project - - - gentoo@denoncin.fr - David Denoncin - - - proxy-maint@gentoo.org - Proxy Maintainers - - - rspeer/ordered-set - ordered-set - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild deleted file mode 100644 index 2461f74a99f..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/ordered-set/ordered-set-4.1.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# please keep this ebuild at EAPI 7 -- sys-apps/portage dep -EAPI=7 - -DISTUTILS_USE_PEP517=flit -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="A mutable set that remembers the order of its entries" -HOMEPAGE="https://github.com/rspeer/ordered-set" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - -distutils_enable_tests pytest diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tenacity/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/tenacity/Manifest deleted file mode 100644 index 462ea2468fa..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/tenacity/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tenacity-9.0.0.tar.gz 47421 BLAKE2B f263af6be0c2d3f26969884d0f211111c68d28dc0cdeddc4ff03791cb5344e60a481a80321d6946bbc9982fac61d0b6084e299766e620893cc30fdc8dae39a8d SHA512 c6236e7630d46048c7c8fb60213591b3489576b8a4413f0bc2d692751f456882c177bdbc425d5921d7679a019dd39371dfa5cd1210e68a3faefd5beb799961ea diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tenacity/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/tenacity/metadata.xml deleted file mode 100644 index 11b2fc29861..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/tenacity/metadata.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - prometheanfire@gentoo.org - Matthew Thode - - - openstack@gentoo.org - Openstack - - - python@gentoo.org - Python - - - Tenacity is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about anything. It originates from a fork of Retrying. - - - - tenacity - jd/tenacity - - diff --git a/sdk_container/src/third_party/portage-stable/dev-python/tenacity/tenacity-9.0.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/tenacity/tenacity-9.0.0.ebuild deleted file mode 100644 index 751826b00e2..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/tenacity/tenacity-9.0.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="General-purpose retrying library" -HOMEPAGE=" - https://github.com/jd/tenacity/ - https://pypi.org/project/tenacity/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ppc ppc64 ~riscv ~sparc x86" - -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/tornado-6.4-r1[${PYTHON_USEDEP}] - dev-python/typeguard[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_test() { - local EPYTEST_DESELECT=( - # fragile to timing - tests/test_asyncio.py::TestContextManager::test_sleeps - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -} From 7476b2be29284a522b35aeefd224e58434e5ec0f Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:50:23 +0100 Subject: [PATCH 10/13] portage-stable: Drop unused dev-util packages --- .../workflows/portage-stable-packages-list | 2 - .../portage-stable/dev-util/cmocka/Manifest | 1 - .../dev-util/cmocka/cmocka-1.1.5-r1.ebuild | 45 ----------------- .../dev-util/cmocka/metadata.xml | 8 ---- .../dev-util/desktop-file-utils/Manifest | 2 - .../desktop-file-utils-0.27-r1.ebuild | 23 --------- .../desktop-file-utils-0.27.ebuild | 48 ------------------- .../desktop-file-utils-0.28.ebuild | 23 --------- .../files/50desktop-file-utils-gentoo.el | 5 -- .../dev-util/desktop-file-utils/metadata.xml | 7 --- 10 files changed, 164 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmocka/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/cmocka/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el delete mode 100644 sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 7a704fee431..64b2d9874b6 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -350,8 +350,6 @@ dev-python/wheel dev-util/bpftool dev-util/catalyst dev-util/checkbashisms -dev-util/cmocka -dev-util/desktop-file-utils dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/cmocka/Manifest deleted file mode 100644 index 06a150ece92..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild deleted file mode 100644 index 77088157ae3..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/cmocka-1.1.5-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="Unit testing framework for C" -HOMEPAGE="https://cmocka.org/" -SRC_URI="https://cmocka.org/files/$(ver_cut 1-2)/${P}.tar.xz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs test" -RESTRICT="!test? ( test )" - -BDEPEND="doc? ( app-text/doxygen[dot] )" - -multilib_src_configure() { - append-lfs-flags - - local mycmakeargs=( - -DWITH_EXAMPLES=$(usex examples) - -DWITH_STATIC_LIB=$(usex static-libs) - -DUNIT_TESTING=$(usex test) - $(multilib_is_native_abi && cmake_use_find_package doc Doxygen \ - || echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON) - ) - - cmake_src_configure -} - -multilib_src_compile() { - cmake_src_compile - multilib_is_native_abi && use doc && cmake_src_compile docs -} - -multilib_src_install() { - if multilib_is_native_abi && use doc; then - local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) - fi - - cmake_src_install -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/cmocka/metadata.xml deleted file mode 100644 index d70c4f64899..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/cmocka/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - kde@gentoo.org - Gentoo KDE Project - - diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest deleted file mode 100644 index d2b8b0b2023..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST desktop-file-utils-0.27.tar.xz 80808 BLAKE2B 66708cd11d5f81824cad814846cdeac6c339e8e93a7f1dceaeed545d9dc1940523fd64ae890e54632b3d32cc91b258aabd41d6d467081539f978ae2993fdfb22 SHA512 81356239a92fb17885aa85a5192c84c2757ebb2e540920d0d41d07035795f08f4162f41b1a87bb2bfcf70ec61f19f1f158e4395a359f46b46f68cb9e24f259a8 -DIST desktop-file-utils-0.28.tar.xz 81620 BLAKE2B c5ef35ad1a7b8cebee72d512ea660546730624b95c22af6e0429976076bcc8ad9572d7ccf529363ac24846df7bfe447628c8da09f9efdf46b3177a9c73cc3985 SHA512 1024172fcd37ace0660fd58195c0562b47f1ef8ed37f662b88048c295a388d1458d01f86799b34ec9e8b27a7ea441f98665f0d641c29cb5ecc3abd7da41230f0 diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild deleted file mode 100644 index 7afca699af8..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Command line utilities to work with desktop menu entries" -HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/" -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" - -RDEPEND=">=dev-libs/glib-2.12:2" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild deleted file mode 100644 index 15ba42829bf..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.27.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit elisp-common meson - -DESCRIPTION="Command line utilities to work with desktop menu entries" -HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/" -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" -IUSE="emacs" - -RDEPEND=">=dev-libs/glib-2.12:2" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) -" - -SITEFILE="50${PN}-gentoo.el" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) - -src_compile() { - meson_src_compile - use emacs && elisp-compile misc/desktop-entry-mode.el -} - -src_install() { - meson_src_install - if use emacs; then - elisp-install ${PN} misc/*.el misc/*.elc || die - elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild deleted file mode 100644 index b516fba32bc..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/desktop-file-utils-0.28.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Command line utilities to work with desktop menu entries" -HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils/" -SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos ~x64-solaris" - -RDEPEND=">=dev-libs/glib-2.26:2" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog HACKING NEWS README ) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el deleted file mode 100644 index 546947a0b37..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/files/50desktop-file-utils-gentoo.el +++ /dev/null @@ -1,5 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(autoload 'desktop-entry-mode "desktop-entry-mode" "Desktop Entry mode" t) -(add-to-list 'auto-mode-alist - '("\\.desktop\\(\\.in\\)?$" . desktop-entry-mode)) -(add-hook 'desktop-entry-mode-hook 'turn-on-font-lock) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/metadata.xml deleted file mode 100644 index d43581a9ab0..00000000000 --- a/sdk_container/src/third_party/portage-stable/dev-util/desktop-file-utils/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -freedesktop-bugs@gentoo.org - - From dcd06de935133d41d57f0e2b6d5c92e4c4d2a98c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:55:51 +0100 Subject: [PATCH 11/13] sys-apps/makedev: Remove unused package --- .../workflows/portage-stable-packages-list | 1 - .../portage-stable/sys-apps/makedev/Manifest | 1 - .../files/makedev-3.23.1-headers.patch | 25 -------- .../sys-apps/makedev/makedev-3.23.1-r3.ebuild | 62 ------------------- .../sys-apps/makedev/metadata.xml | 8 --- 5 files changed, 97 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1-r3.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/makedev/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 64b2d9874b6..1b07e80de72 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -579,7 +579,6 @@ sys-apps/less sys-apps/locale-gen sys-apps/lsb-release sys-apps/lshw -sys-apps/makedev sys-apps/man-db sys-apps/man-pages sys-apps/miscfiles diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest deleted file mode 100644 index c0e06474bb5..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch deleted file mode 100644 index 981a80b14ed..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/files/makedev-3.23.1-headers.patch +++ /dev/null @@ -1,25 +0,0 @@ -http://bugs.gentoo.org/339674 - ---- a/sel.h -+++ b/sel.h -@@ -18,6 +18,7 @@ - */ - - #ifdef MAKEDEV_SELINUX -+#include - #include - static char secontextname[PATH_MAX + 2]; - static char secontextflag[PATH_MAX + 7]; - -https://bugs.gentoo.org/580500 - ---- a/MAKEDEV.c -+++ b/MAKEDEV.c -@@ -17,6 +17,7 @@ - * - */ - -+#include - #include - #include - #include diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1-r3.ebuild deleted file mode 100644 index 0a6f4cc21dd..00000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/makedev/makedev-3.23.1-r3.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_PN="MAKEDEV" -MY_VER=${PV%.*} -MY_REL=${PV#${MY_VER}.} -MY_P="${MY_PN}-${MY_VER}" - -DESCRIPTION="Program used for creating device files in /dev" -HOMEPAGE="https://people.redhat.com/nalin/MAKEDEV/" -SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz" -S="${WORKDIR}"/${MY_P} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="build selinux" - -GROUP_DEPEND=" - acct-group/disk - acct-group/floppy - acct-group/kmem - acct-group/lp - acct-group/tty - acct-group/uucp -" -IDEPEND="build? ( ${GROUP_DEPEND} )" -RDEPEND="${GROUP_DEPEND} - ! - - - - base-system@gentoo.org - Gentoo Base System - - From 1e9ed6156cc379a6b3f192243ae0c98eb8772f64 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 12:58:32 +0100 Subject: [PATCH 12/13] virtual/rust: Drop unused package Mentions of virtual/rust in some scripts were replaced with dev-lang/rust-bin. These were usually about skipping the update/build of the package, and these already contained dev-lang/rust, so added the -bin variant for completeness. --- .../workflows/portage-stable-packages-list | 1 - build_dev_binpkgs | 2 +- build_library/catalyst.sh | 2 +- .../portage-stable/virtual/rust/metadata.xml | 25 ------------------- .../virtual/rust/rust-1.71.1-r2.ebuild | 23 ----------------- .../virtual/rust/rust-1.74.1-r1.ebuild | 23 ----------------- .../virtual/rust/rust-1.75.0-r1.ebuild | 23 ----------------- .../virtual/rust/rust-1.77.1.ebuild | 23 ----------------- .../virtual/rust/rust-1.79.0.ebuild | 23 ----------------- .../virtual/rust/rust-1.80.1.ebuild | 23 ----------------- .../virtual/rust/rust-1.81.0-r1.ebuild | 20 --------------- .../virtual/rust/rust-1.82.0.ebuild | 20 --------------- 12 files changed, 2 insertions(+), 206 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index 1b07e80de72..ca3b1fb0387 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -701,7 +701,6 @@ virtual/perl-Getopt-Long virtual/perl-Unicode-Collate virtual/pkgconfig virtual/resolvconf -virtual/rust virtual/service-manager virtual/ssh virtual/tmpfiles diff --git a/build_dev_binpkgs b/build_dev_binpkgs index 8c64e3678b2..a3fdfe6b7f9 100755 --- a/build_dev_binpkgs +++ b/build_dev_binpkgs @@ -13,7 +13,7 @@ packages_default=( "coreos-devel/board-packages" ) # Packages that are rdeps of the above but should not be included. # (mostly large packages, e.g. programming languages etc.) -skip_packages_default="dev-lang/rust,virtual/rust,dev-lang/go,dev-lang/go-bootstrap,dev-go/go-md2man" +skip_packages_default="dev-lang/rust,dev-lang/rust-bin,dev-lang/go,dev-lang/go-bootstrap,dev-go/go-md2man" # Developer-visible flags. diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh index 83d94d1a4b8..d7d16f4e081 100644 --- a/build_library/catalyst.sh +++ b/build_library/catalyst.sh @@ -105,7 +105,7 @@ cat < - - - - randy@electronsweatshop.com - Randy Barlow - - - navi@vlhl.dev - Anna Figueiredo Gomes - - - matoro_gentoo@matoro.tk - Matoro Mahri - - - rust@gentoo.org - Rust Project - - - Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts) - Install rustfmt, Rust code formatter - - - diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild deleted file mode 100644 index 62393a5d36f..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.71.1-r2.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-16" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="profiler rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-r1.ebuild deleted file mode 100644 index 4e9f43e5561..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.74.1-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-17" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="profiler rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.0-r1.ebuild deleted file mode 100644 index 4e9f43e5561..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.75.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-17" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="profiler rustfmt" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler(-)?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.ebuild deleted file mode 100644 index 516aad0fc87..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.77.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-17" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt profiler" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild deleted file mode 100644 index 8806d910b76..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.79.0.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-18" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt profiler" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild deleted file mode 100644 index 8806d910b76..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.80.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -LICENSE="" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-18" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt profiler" - -BDEPEND="" -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild deleted file mode 100644 index 332a8b70f29..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.81.0-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-18" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="rustfmt profiler" - -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)" diff --git a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild b/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild deleted file mode 100644 index 2f9c39eae88..00000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/rust/rust-1.82.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Virtual for Rust language compiler" - -# adjust when rust upstream bumps internal llvm -# we do not allow multiple llvm versions in dev-lang/rust for -# neither system nor bundled, so we just hardcode it here. -SLOT="0/llvm-19" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="rustfmt profiler" - -RDEPEND="|| ( - ~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}] - ~dev-lang/rust-${PV}[profiler?,rustfmt?,${MULTILIB_USEDEP}] -)" From 64f1595ae7c51fa1a9a6140346bcc46a44b51fac Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Jan 2025 13:01:24 +0100 Subject: [PATCH 13/13] portage-stable: Drop unused x11 packages --- .../workflows/portage-stable-packages-list | 3 - .../x11-base/xorg-proto/Manifest | 1 - .../x11-base/xorg-proto/metadata.xml | 11 - .../xorg-proto/xorg-proto-2024.1.ebuild | 51 ---- .../xorg-proto/xorg-proto-9999.ebuild | 51 ---- .../x11-misc/shared-mime-info/Manifest | 5 - ...d-mime-info-2.3-clang-string-literal.patch | 38 --- ...shared-mime-info-2.3-fsync-detection.patch | 55 ---- .../files/shared-mime-info-2.3-wformat.patch | 282 ------------------ .../shared-mime-info-2.4-libxml2.12.patch | 20 -- .../x11-misc/shared-mime-info/metadata.xml | 10 - .../shared-mime-info-2.2.ebuild | 93 ------ .../shared-mime-info-2.3-r1.ebuild | 100 ------- .../shared-mime-info-2.4-r1.ebuild | 98 ------ 14 files changed, 818 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2024.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/metadata.xml delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index ca3b1fb0387..a45f5c4c476 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -706,9 +706,6 @@ virtual/ssh virtual/tmpfiles virtual/udev -x11-base/xorg-proto - x11-libs/pixman x11-misc/makedepend -x11-misc/shared-mime-info diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest deleted file mode 100644 index 117bd582acc..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xorgproto-2024.1.tar.xz 760500 BLAKE2B a3850f8594e8b4240f731dce696c3ab8310c3b2419117dea3141a093a690d9bc16652e64eb5516073145309c65327bd14be2eaa8843c04de25c8eff6c46d3c1d SHA512 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml deleted file mode 100644 index 403bdb59286..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - x11@gentoo.org - X11 - - - xorg/proto/xorgproto - - diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2024.1.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2024.1.ebuild deleted file mode 100644 index d0942ea4d44..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-2024.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) - -MY_PN="${PN/xorg-/xorg}" -MY_P="${MY_PN}-${PV}" - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson python-any-r1 - -DESCRIPTION="X.Org combined protocol headers" -HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - $(python_gen_any_dep ' - dev-python/libevdev[${PYTHON_USEDEP}] - ') - ) -" - -python_check_deps() { - python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_install() { - meson_src_install - - mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die -} diff --git a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild b/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild deleted file mode 100644 index 2568914aaeb..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-base/xorg-proto/xorg-proto-9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) - -MY_PN="${PN/xorg-/xorg}" -MY_P="${MY_PN}-${PV}" - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson python-any-r1 - -DESCRIPTION="X.Org combined protocol headers" -HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - $(python_gen_any_dep ' - dev-python/libevdev[${PYTHON_USEDEP}] - ') - ) -" - -python_check_deps() { - python_has_version "dev-python/libevdev[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_install() { - meson_src_install - - mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die -} diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/Manifest b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/Manifest deleted file mode 100644 index 58da0a861bb..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e -DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762 -DIST shared-mime-info-2.4.tar.bz2 7096347 BLAKE2B 25ff086e4962f5ab0cb2b7155df02be4af7af63dd0267500b2b12b802680bbae04b9ed252ef5a004d0175f6b48956c5e4b9738af9ab5d2fa76a7a0b6eac067ad SHA512 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb -DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10 -DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8 diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch deleted file mode 100644 index fe868ad709f..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-clang-string-literal.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/915859 -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c - -From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001 -From: Tobias Mayer -Date: Sun, 8 Oct 2023 00:11:49 +0200 -Subject: [PATCH] Fix string literal concatenation - -Clang is not able to disambiguate between multiple string literatals -and C++11 user defined literals. Spaces help. ---- - src/update-mime-database.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp -index 733ba063..29d82a9d 100644 ---- a/src/update-mime-database.cpp -+++ b/src/update-mime-database.cpp -@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) - - env = getenv("XDG_DATA_DIRS"); - if (!env) -- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; -+ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; - dirs = g_strsplit(env, PATH_SEPARATOR, 0); - g_return_if_fail(dirs != NULL); - for (n = 0; dirs[n]; n++) -@@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path) - dirs[n] = g_build_filename(g_get_home_dir(), ".local", - "share", NULL); - n++; -- -+ - for (i = 0; i < n; i++) - { - if (stat(dirs[i], &dir_info) == 0 && --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch deleted file mode 100644 index abf766c07f8..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-fsync-detection.patch +++ /dev/null @@ -1,55 +0,0 @@ -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/7499ac1a85b2487b94e315e6b55c34bcf220295f - -From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001 -From: Tobias Mayer -Date: Sat, 7 Oct 2023 23:45:47 +0200 -Subject: [PATCH] Fix false positive fdatasync detection on darwin - -The `has_function` feature in meson uses different detection methods -depending on the contents of the `prefix` kwarg [1]: - - * if it contains `#include` directives it will copy the prefix into - the test code and check if it compiles - * if it doesn't contain an include or isn't specified, `has_function` - will forward declare the function and test for it's existence by - trying to link it to the default libraries - -The latter approach wrongly succeeds for `fdatasync` on darwin because -the linker binds the function to a system call of the same name. Note -that this result really is wrong because that system call has not -the expected semantics of `fdatasync`. - -By adding an include for `unistd.h` we can get meson to use the -first approach and the detection fails. - -Note that this has gone unnoticed so far because only recent versions -of clang (the default compiler on darwin) started to treat implicit -function declarations as an error. - -[1] https://github.com/mesonbuild/meson/blob/583d2815d1a130227f0f4db47e4ab2e80ebb6a61/mesonbuild/compilers/mixins/clike.py#L839-L846 - -Fixes #211 ---- - meson.build | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index 1780c443..7998a51b 100644 ---- a/meson.build -+++ b/meson.build -@@ -49,12 +49,7 @@ endif - ############################################################################### - # Dependencies - --check_functions = [ -- 'fdatasync', --] --foreach function : check_functions -- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) --endforeach -+config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include ')) - - - if get_option('build-translations') --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch deleted file mode 100644 index 18470b3ced2..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.3-wformat.patch +++ /dev/null @@ -1,282 +0,0 @@ -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/157c16b09f54741aefbc4be6a3507455f0378389 - -From 157c16b09f54741aefbc4be6a3507455f0378389 Mon Sep 17 00:00:00 2001 -From: Biswapriyo Nath -Date: Sun, 8 Oct 2023 13:26:43 +0000 -Subject: [PATCH] Fix missing sentinel warning with clang - -This fixes the compiler warnings similar as following. - -../src/update-mime-database.cpp:393:50: warning: missing sentinel in function call [-Wsentinel] - 393 | g_strconcat(namespaceURI, " ", localName, NULL), - | ^ - | , nullptr ---- - src/update-mime-database.cpp | 58 ++++++++++++++++++------------------ - 1 file changed, 29 insertions(+), 29 deletions(-) - -diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp -index 29d82a9d..7838a0eb 100644 ---- a/src/update-mime-database.cpp -+++ b/src/update-mime-database.cpp -@@ -390,7 +390,7 @@ static void add_namespace(Type *type, const char *namespaceURI, - } - - g_hash_table_insert(namespace_hash, -- g_strconcat(namespaceURI, " ", localName, NULL), -+ g_strconcat(namespaceURI, " ", localName, nullptr), - type); - } - -@@ -1023,7 +1023,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data) - char *lower; - - lower = g_ascii_strdown(type->media, -1); -- media = g_strconcat(mime_dir, "/", lower, NULL); -+ media = g_strconcat(mime_dir, "/", lower, nullptr); - g_free(lower); - #ifdef _WIN32 - fs::create_directory(media); -@@ -1032,7 +1032,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data) - #endif - - lower = g_ascii_strdown(type->subtype, -1); -- filename = g_strconcat(media, "/", lower, ".xml.new", NULL); -+ filename = g_strconcat(media, "/", lower, ".xml.new", nullptr); - g_free(lower); - g_free(media); - media = NULL; -@@ -1622,7 +1622,7 @@ static Magic *magic_new(xmlNode *node, Type *type, GError **error) - magic_free(magic); - magic = NULL; - (*error)->message = g_strconcat( -- _("Error in element: "), old, NULL); -+ _("Error in element: "), old, nullptr); - g_free(old); - } else if (magic->matches == NULL) { - magic_free(magic); -@@ -1843,7 +1843,7 @@ static TreeMagic *tree_magic_new(xmlNode *node, Type *type, GError **error) - tree_magic_free(magic); - magic = NULL; - (*error)->message = g_strconcat( -- _("Error in element: "), old, NULL); -+ _("Error in element: "), old, nullptr); - g_free(old); - } - } -@@ -1960,7 +1960,7 @@ static void delete_old_types(const gchar *mime_dir) - - for (i = 0; i < G_N_ELEMENTS(media_types); i++) - { -- const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], NULL); -+ const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], nullptr); - - if (!fs::is_directory(fs::status(media_dir))) - continue; -@@ -1973,13 +1973,13 @@ static void delete_old_types(const gchar *mime_dir) - continue; - - char *type_name = g_strconcat(media_types[i], "/", -- dir_entry.path().filename().string().c_str(), NULL); -+ dir_entry.path().filename().string().c_str(), nullptr); - type_name[strlen(type_name) - 4] = '\0'; - if (!g_hash_table_lookup(types, type_name)) - { - char *path; - path = g_strconcat(mime_dir, "/", -- type_name, ".xml", NULL); -+ type_name, ".xml", nullptr); - #if 0 - g_warning("Removing old info for type %s", - path); -@@ -2002,7 +2002,7 @@ static void add_ns(gpointer key, gpointer value, gpointer data) - Type *type = (Type *) value; - - g_ptr_array_add(lines, g_strconcat(ns, " ", type->media, -- "/", type->subtype, "\n", NULL)); -+ "/", type->subtype, "\n", nullptr)); - } - - /* Write all the collected namespace rules to 'XMLnamespaces' */ -@@ -2038,7 +2038,7 @@ static void write_subclass(gpointer key, gpointer value, gpointer data) - - for (l = list; l; l = l->next) - { -- line = g_strconcat (static_cast(key), " ", l->data, "\n", NULL); -+ line = g_strconcat (static_cast(key), " ", l->data, "\n", nullptr); - fwrite(line, 1, strlen(line), stream); - g_free (line); - } -@@ -2061,7 +2061,7 @@ static void add_alias(gpointer key, gpointer value, gpointer data) - - g_ptr_array_add(lines, g_strconcat(alias, " ", type->media, - "/", type->subtype, "\n", -- NULL)); -+ nullptr)); - } - - /* Write all the collected aliases */ -@@ -2092,7 +2092,7 @@ static void add_type(gpointer key, gpointer value, gpointer data) - { - GPtrArray *lines = (GPtrArray *) data; - -- g_ptr_array_add(lines, g_strconcat((char *)key, "\n", NULL)); -+ g_ptr_array_add(lines, g_strconcat((char *)key, "\n", nullptr)); - } - - /* Write all the collected types */ -@@ -2127,7 +2127,7 @@ static void write_one_icon(gpointer key, gpointer value, gpointer data) - FILE *stream = (FILE *)data; - char *line; - -- line = g_strconcat (mimetype, ":", iconname, "\n", NULL); -+ line = g_strconcat (mimetype, ":", iconname, "\n", nullptr); - fwrite(line, 1, strlen(line), stream); - g_free (line); - } -@@ -2168,7 +2168,7 @@ static void check_in_path_xdg_data(const char *mime_path) - dirs[n] = g_strdup(env); - else - dirs[n] = g_build_filename(g_get_home_dir(), ".local", -- "share", NULL); -+ "share", nullptr); - n++; - - for (i = 0; i < n; i++) -@@ -3588,7 +3588,7 @@ newest_mtime(const char *packagedir) - while ((name = g_dir_read_name(dir))) { - char *path; - -- path = g_build_filename(packagedir, name, NULL); -+ path = g_build_filename(packagedir, name, nullptr); - retval = g_stat(path, &statbuf); - g_free(path); - if (retval < 0) -@@ -3609,7 +3609,7 @@ is_cache_up_to_date (const char *mimedir, const char *packagedir) - char *mimeversion; - int retval; - -- mimeversion = g_build_filename(mimedir, "/version", NULL); -+ mimeversion = g_build_filename(mimedir, "/version", nullptr); - retval = g_stat(mimeversion, &version_stat); - g_free(mimeversion); - if (retval < 0) -@@ -3694,7 +3694,7 @@ int main(int argc, char **argv) - } - } - -- package_dir = g_strconcat(mime_dir, "/packages", NULL); -+ package_dir = g_strconcat(mime_dir, "/packages", nullptr); - - if (!fs::exists(mime_dir) && !fs::is_directory(fs::status(mime_dir))) - { -@@ -3747,7 +3747,7 @@ int main(int argc, char **argv) - - g_hash_table_foreach(globs_hash, collect_glob2, &glob_list); - glob_list = g_list_sort(glob_list, (GCompareFunc)compare_glob_by_weight); -- globs_path = g_strconcat(mime_dir, "/globs.new", NULL); -+ globs_path = g_strconcat(mime_dir, "/globs.new", nullptr); - globs = fopen_gerror(globs_path, error); - if (!globs) - goto out; -@@ -3761,7 +3761,7 @@ int main(int argc, char **argv) - goto out; - g_free(globs_path); - -- globs_path = g_strconcat(mime_dir, "/globs2.new", NULL); -+ globs_path = g_strconcat(mime_dir, "/globs2.new", nullptr); - globs = fopen_gerror(globs_path, error); - if (!globs) - goto out; -@@ -3782,7 +3782,7 @@ int main(int argc, char **argv) - FILE *stream; - char *magic_path; - int i; -- magic_path = g_strconcat(mime_dir, "/magic.new", NULL); -+ magic_path = g_strconcat(mime_dir, "/magic.new", nullptr); - stream = fopen_gerror(magic_path, error); - if (!stream) - goto out; -@@ -3807,7 +3807,7 @@ int main(int argc, char **argv) - FILE *stream; - char *ns_path; - -- ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", NULL); -+ ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", nullptr); - stream = fopen_gerror(ns_path, error); - if (!stream) - goto out; -@@ -3823,7 +3823,7 @@ int main(int argc, char **argv) - FILE *stream; - char *path; - -- path = g_strconcat(mime_dir, "/subclasses.new", NULL); -+ path = g_strconcat(mime_dir, "/subclasses.new", nullptr); - stream = fopen_gerror(path, error); - if (!stream) - goto out; -@@ -3839,7 +3839,7 @@ int main(int argc, char **argv) - FILE *stream; - char *path; - -- path = g_strconcat(mime_dir, "/aliases.new", NULL); -+ path = g_strconcat(mime_dir, "/aliases.new", nullptr); - stream = fopen_gerror(path, error); - if (!stream) - goto out; -@@ -3855,7 +3855,7 @@ int main(int argc, char **argv) - FILE *stream; - char *path; - -- path = g_strconcat(mime_dir, "/types.new", NULL); -+ path = g_strconcat(mime_dir, "/types.new", nullptr); - stream = fopen_gerror(path, error); - if (!stream) - goto out; -@@ -3871,7 +3871,7 @@ int main(int argc, char **argv) - FILE *stream; - char *icon_path; - -- icon_path = g_strconcat(mime_dir, "/generic-icons.new", NULL); -+ icon_path = g_strconcat(mime_dir, "/generic-icons.new", nullptr); - stream = fopen_gerror(icon_path, error); - if (!stream) - goto out; -@@ -3887,7 +3887,7 @@ int main(int argc, char **argv) - FILE *stream; - char *icon_path; - -- icon_path = g_strconcat(mime_dir, "/icons.new", NULL); -+ icon_path = g_strconcat(mime_dir, "/icons.new", nullptr); - stream = fopen_gerror(icon_path, error); - if (!stream) - goto out; -@@ -3903,7 +3903,7 @@ int main(int argc, char **argv) - FILE *stream; - char *path; - int i; -- path = g_strconcat(mime_dir, "/treemagic.new", NULL); -+ path = g_strconcat(mime_dir, "/treemagic.new", nullptr); - stream = fopen_gerror(path, error); - if (!stream) - goto out; -@@ -3928,7 +3928,7 @@ int main(int argc, char **argv) - FILE *stream; - char *path; - -- path = g_strconcat(mime_dir, "/mime.cache.new", NULL); -+ path = g_strconcat(mime_dir, "/mime.cache.new", nullptr); - stream = fopen_gerror(path, error); - if (!stream) - goto out; -@@ -3944,7 +3944,7 @@ int main(int argc, char **argv) - FILE *stream; - char *path; - -- path = g_strconcat(mime_dir, "/version.new", NULL); -+ path = g_strconcat(mime_dir, "/version.new", nullptr); - stream = fopen_gerror(path, error); - if (!stream) - goto out; --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch deleted file mode 100644 index 22d2349053f..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/files/shared-mime-info-2.4-libxml2.12.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/917561 -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219 -https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573 - -From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sun, 19 Nov 2023 11:18:11 +0100 -Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 - -Fixes #219 ---- a/src/test-subclassing.c -+++ b/src/test-subclassing.c -@@ -1,4 +1,5 @@ - #include -+#include - #include - #include - --- -GitLab diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/metadata.xml b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/metadata.xml deleted file mode 100644 index b133711a480..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - freedesktop-bugs@gentoo.org - - - xdg/shared-mime-info - - diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild deleted file mode 100644 index a85a462fc7d..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson toolchain-funcs xdg-utils - -# Keep an eye on https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25! -# xdgmime is used for tests but doesn't make releases nowadays; do what -# Fedora does and use a snapshot so we can run the test suite. -MY_XDGMIME_COMMIT="92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7" -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" -SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.gz" -SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.gz )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING.md NEWS README.md ) - -src_prepare() { - default - - if use test ; then - # Drop empty dir (it's a submodule in upstream git repo) - rm -r "${S}"/xdgmime || die - # Lead Meson to our snapshot - ln -s "${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} xdgmime || die - # Don't break parallel make - sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die - fi -} - -src_configure() { - # We have to trick Meson into thinking it's there now so that - # we can run meson then emake to build xdgmime later, rather than - # building before running meson which would mean doing something - # unexpected in src_configure. - if use test ; then - # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 - touch xdgmime/src/{print,test}-mime{,-data} || die - chmod +x xdgmime/src/{print,test}-mime{,-data} || die - fi - - local emesonargs=( - -Dbuild-tools=true - -Dupdate-mimedb=false - ) - - meson_src_configure -} - -src_compile() { - if use test ; then - tc-export CC - - # xdgmime only has a homebrew Makefile - emake -C xdgmime - fi - - meson_src_compile -} - -src_install() { - meson_src_install - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild deleted file mode 100644 index 5cc1ae8a2b3..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.3-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg-utils - -# xdgmime is used for tests but doesn't make releases nowadays; do what -# Fedora does and use a snapshot so we can run the test suite. -MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7" -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" -SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2" -SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING.md NEWS README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-clang-string-literal.patch - "${FILESDIR}"/${P}-fsync-detection.patch - "${FILESDIR}"/${P}-wformat.patch -) - -src_prepare() { - default - - if use test ; then - # Drop empty dir (it's a submodule in upstream git repo) - rm -r "${S}"/xdgmime || die - # Lead Meson to our snapshot - mkdir "${WORKDIR}"/xdgmime_build || die - ln -s "${WORKDIR}"/xdgmime_build xdgmime || die - # Don't break parallel make - #sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die - fi -} - -src_configure() { - # We have to trick Meson into thinking it's there now so that - # we can run meson then emake to build xdgmime later, rather than - # building before running meson which would mean doing something - # unexpected in src_configure. - if use test ; then - # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 - mkdir xdgmime/src || die - touch xdgmime/src/{print,test}-mime{,-data} || die - chmod +x xdgmime/src/{print,test}-mime{,-data} || die - - BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure - fi - - local emesonargs=( - -Dbuild-tools=true - -Dupdate-mimedb=false - $(meson_use test build-tests) - ) - - meson_src_configure -} - -src_compile() { - if use test ; then - meson_src_compile -C "${WORKDIR}"/xdgmime_build - fi - - meson_src_compile -} - -src_install() { - meson_src_install - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -} diff --git a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild deleted file mode 100644 index 10149dc9a0e..00000000000 --- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-2.4-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson xdg-utils - -# xdgmime is used for tests but doesn't make releases nowadays; do what -# Fedora does and use a snapshot so we can run the test suite. -MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7" -DESCRIPTION="The Shared MIME-info Database specification" -HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info" -SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2" -SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/xmlto - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 -" -DEPEND="${RDEPEND}" - -DOCS=( HACKING.md NEWS README.md ) - -PATCHES=( - "${FILESDIR}"/${P}-libxml2.12.patch -) - -src_prepare() { - default - - if use test ; then - # Drop empty dir (it's a submodule in upstream git repo) - rm -r "${S}"/xdgmime || die - # Lead Meson to our snapshot - mkdir "${WORKDIR}"/xdgmime_build || die - ln -s "${WORKDIR}"/xdgmime_build xdgmime || die - # Don't break parallel make - #sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die - fi -} - -src_configure() { - # We have to trick Meson into thinking it's there now so that - # we can run meson then emake to build xdgmime later, rather than - # building before running meson which would mean doing something - # unexpected in src_configure. - if use test ; then - # Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29 - mkdir xdgmime/src || die - touch xdgmime/src/{print,test}-mime{,-data} || die - chmod +x xdgmime/src/{print,test}-mime{,-data} || die - - BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure - fi - - local emesonargs=( - -Dbuild-tools=true - -Dupdate-mimedb=false - $(meson_use test build-tests) - ) - - meson_src_configure -} - -src_compile() { - if use test ; then - meson_src_compile -C "${WORKDIR}"/xdgmime_build - fi - - meson_src_compile -} - -src_install() { - meson_src_install - - # in prefix, install an env.d entry such that prefix patch is used/added - if use prefix; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die - doenvd "${T}"/50mimeinfo - fi -} - -pkg_postinst() { - use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share - xdg_mimeinfo_database_update -}