gentoo resync : 29.12.2022

6 files changed, 91 insertions, 71 deletions

diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index cb84ff2ba5ec..bc1ee5862fc8 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -5,16 +5,15 @@ AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcb
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82
-AUX singular-4.3.0-includes.patch 764 BLAKE2B 19c83711d2f7eb0d0971a7259f4b0ed9234204bd2ee45d0f3ffd6de18de8d71bccd00b186edae1af180a36a24fef8e72a4a8bc8371eaef1059ec51dcfec0c116 SHA512 dc775f69280f2194f6fca2a7005ab9363a8feabad3d66d0e285cd76a70da5fd9ad6cbb3e95732cf32f9c55b30a0c201260e4bef56830f498016b6554a7230f53
-AUX singular-4.3.0-slibtool.patch 1511 BLAKE2B 495d226fdd4114468364bdbee0add287d70c3d7c991e81a86c03023c2b73c85936365ebfe254b9a3e45f2043d4f9a6e385d40d4546437f34b4c6478f4f02ada3 SHA512 e62f40e51879709c1d5a409d2ff5fea49ac5b37d73b6e5fc6041756143882fd9ab2bdc4e5ec68ab1626109a27d4b8c7e361e88080ed2a3c62c7f0a1e591c69cf
+AUX singular-4.3.0_p1-gcc12.patch 2670 BLAKE2B a7dcbe6a6b93baa53ffddf5f25fbf2cea54be1fa453854ddec7b177a132ab38ec5b8cb93078c2183e43896f342231866095dbf2e453fa1952e4215abfdf82baa SHA512 7d3f80e6e2a4980872f5bbc2a41c7925f6fac7dd6184df372375bb959c098203d5551f8c5e0bcaae2bb8ff498515135c8ca2859f43b86eeb5b950e64a6d8d2fd
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
-DIST singular-4.3.0.tar.gz 15098830 BLAKE2B 9d99683c23e0fe031866807a7f24888d8e759b93ce8f454db702fee2b5200942957360edb1563f832715837f7908dbc3f37aa2a3bd1224dcf7eaa8594fc0a51f SHA512 b765536fc929f2445a3f7bea73a6a351ff98fe3326b9f3ba99c5b1cec3bfb494ed957725aad548e349a2a3f8a4058ef350ab11e7153091c9b0233f201008bbb2
+DIST singular-4.3.0p1.tar.gz 15097535 BLAKE2B 0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062 SHA512 af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
 EBUILD singular-4.2.1.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
 EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
-EBUILD singular-4.3.0.ebuild 2499 BLAKE2B b03d3c8a01eeeafea83d23c3cd6979239b2be9febabd42b81774676ae44d8df64144f734e3d202e2f916d1a186e9ce1b5e38ce844358d373cd56cd68ac73245d SHA512 27bf7a713bbbb23046a05961e91c2249c7a3240ef37925b4d9873f2def8ec8d9ac5f92f92d893ea9cbb036c0de462347d20c262be1e3bc6a6412a3442d101aee
-MISC metadata.xml 510 BLAKE2B 54fa3549c356ab3cb45b859dda337a25959bee37acf1210704b79de849e5b9861b9f0d85639d11db461995074ca00c91fb0dce8459231ef42f76257c8f0a6e51 SHA512 d2f4ec93fe340097a9a09845fffcd4a385434fb267350bb8dce9eae9248487b87cb3b68e0e1e05a1c78ad956a48548f47663a2f4db84af0d68ade02327df1268
+EBUILD singular-4.3.0_p1.ebuild 2442 BLAKE2B 414fb3fe1752c58e0eb776e337ce3c8fb1f36488856a1f103d71a52495b9200b83bf73c3bca369681584ba65642cb54ba7996c0362f54791d242077ef5cb14e8 SHA512 e9d0287082cfcd5143858033dff722ec98d48091cb21145b7bbc5cfd66c4eca745e73033134a3c23e3a7c9081a9b489aac1c0ef8d1cea7d52403fc7f27a3e2ee
+MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
deleted file mode 100644
index 07df5c0cc068..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Wed, 19 Jan 2022 15:02:14 +0100
-Subject: [PATCH] fix: missing includes
-
----
- kernel/oswrapper/feread.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc
-index ccdd272285..5491007478 100644
---- a/kernel/oswrapper/feread.cc
-+++ b/kernel/oswrapper/feread.cc
-@@ -7,6 +7,7 @@
- 
- #include "kernel/mod2.h"
- #include <errno.h>
-+#include <stdio.h>
- 
- // ----------------------------------------
- // system settings:
-@@ -21,6 +22,7 @@
- #include "misc/options.h"
- 
- #include "kernel/oswrapper/feread.h"
-+#include "reporter/reporter.h"
- 
- #if defined(HAVE_DYN_RL)
- #include <unistd.h>
diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
deleted file mode 100644
index 72d88979e870..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index ba7d911..346602f 100644
---- a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -88,6 +88,7 @@ AC_CANONICAL_HOST
- 
- case $host_os in
-   *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
-+  *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version -flat_namespace],[P_PROCS_MODULE_LDFLAGS]);;
- esac
- 
- dnl INCLUDES=""
-diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
-index 23f216e..119c4ef 100644
---- a/libpolys/polys/Makefile.am
-+++ b/libpolys/polys/Makefile.am
-@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
- 
--P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -flat_namespace
--
--p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
- 
- P_PROCS = templates/p_Procs_Lib.cc
- 
diff --git a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
new file mode 100644
index 000000000000..570d0be87a29
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
@@ -0,0 +1,76 @@
+diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc
+index fa42bf5e28..aefa661600 100644
+--- a/kernel/oswrapper/vspace.cc
++++ b/kernel/oswrapper/vspace.cc
+@@ -197,7 +197,11 @@ static void print_freelists() {
+ 
+ void vmem_free(vaddr_t vaddr) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr -= (sizeof(vaddr_t)*2);
++  #else
+   vaddr -= offsetof(Block, data);
++  #endif
+   vmem.ensure_is_mapped(vaddr);
+   size_t segno = vmem.segment_no(vaddr);
+   VSeg seg = vmem.segment(vaddr);
+@@ -245,7 +249,11 @@ void vmem_free(vaddr_t vaddr) {
+ 
+ vaddr_t vmem_alloc(size_t size) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  size_t alloc_size = size + (sizeof(vaddr_t)*2);
++  #else
+   size_t alloc_size = size + offsetof(Block, data);
++  #endif
+   int level = find_level(alloc_size);
+   int flevel = level;
+   while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -275,7 +283,11 @@ vaddr_t vmem_alloc(size_t size) {
+   assert(vmem.freelist[level] != VADDR_NULL);
+   Block *block = vmem.block_ptr(vmem.freelist[level]);
+   vaddr_t vaddr = vmem.freelist[level];
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++  #else
+   vaddr_t result = vaddr + offsetof(Block, data);
++  #endif
+   vmem.freelist[level] = block->next;
+   if (block->next != VADDR_NULL)
+     vmem.block_ptr(block->next)->prev = VADDR_NULL;
+@@ -751,7 +763,11 @@ static void print_freelists() {
+ 
+ void vmem_free(vaddr_t vaddr) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr -= (sizeof(vaddr_t)*2);
++  #else
+   vaddr -= offsetof(Block, data);
++  #endif
+   vmem.ensure_is_mapped(vaddr);
+   size_t segno = vmem.segment_no(vaddr);
+   VSeg seg = vmem.segment(vaddr);
+@@ -799,7 +815,11 @@ void vmem_free(vaddr_t vaddr) {
+ 
+ vaddr_t vmem_alloc(size_t size) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  size_t alloc_size = size +  (sizeof(vaddr_t)*2);
++  #else
+   size_t alloc_size = size + offsetof(Block, data);
++  #endif
+   int level = find_level(alloc_size);
+   int flevel = level;
+   while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -829,7 +849,11 @@ vaddr_t vmem_alloc(size_t size) {
+   assert(vmem.freelist[level] != VADDR_NULL);
+   Block *block = vmem.block_ptr(vmem.freelist[level]);
+   vaddr_t vaddr = vmem.freelist[level];
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++  #else
+   vaddr_t result = vaddr + offsetof(Block, data);
++  #endif
+   vmem.freelist[level] = block->next;
+   if (block->next != VADDR_NULL)
+     vmem.block_ptr(block->next)->prev = VADDR_NULL;
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 0477525e4c04..0deaba87eadc 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
index e2ccc7d6e9a3..f46ae019c973 100644
--- a/sci-mathematics/singular/singular-4.3.0.ebuild
+++ b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic
+inherit autotools elisp-common
 
 MY_PN=Singular
 MY_PV=$(ver_rs 3 '')
@@ -14,7 +14,7 @@ MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
 DESCRIPTION="Computer algebra system for polynomial computations"
 HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
 SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_DIR2}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
@@ -37,8 +37,7 @@ SITEFILE=60${PN}-gentoo.el
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
-	"${FILESDIR}/${PN}-4.3.0-slibtool.patch"
-	"${FILESDIR}/${PN}-4.3.0-includes.patch"
+	"${FILESDIR}/${PN}-4.3.0_p1-gcc12.patch"
 )
 
 src_prepare() {