From c650f7cf611feaa59620fd8626e78108fa3b5e51 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 11 Oct 2022 19:38:57 +0100
Subject: gentoo auto-resync : 11:10:2022 - 19:38:57

---
 sci-mathematics/otter/Manifest                     |  3 +-
 .../otter/files/otter-3.3-clang16.patch            | 23 +++++++++++
 sci-mathematics/otter/otter-3.3-r3.ebuild          | 45 --------------------
 sci-mathematics/otter/otter-3.3-r4.ebuild          | 48 ++++++++++++++++++++++
 4 files changed, 73 insertions(+), 46 deletions(-)
 create mode 100644 sci-mathematics/otter/files/otter-3.3-clang16.patch
 delete mode 100644 sci-mathematics/otter/otter-3.3-r3.ebuild
 create mode 100644 sci-mathematics/otter/otter-3.3-r4.ebuild

(limited to 'sci-mathematics/otter')

diff --git a/sci-mathematics/otter/Manifest b/sci-mathematics/otter/Manifest
index c8cbb3584fc0..a02f1e64d2eb 100644
--- a/sci-mathematics/otter/Manifest
+++ b/sci-mathematics/otter/Manifest
@@ -1,5 +1,6 @@
 AUX otter-3.3-build.patch 3072 BLAKE2B 818cced4cea1d1ded0762143c2c3a81a328426b5847fbd30a6d3bd2610c13e0c65f4ee75cb651628dd7b97cc989feab353c01dc1982e0d03d3b763edb4d7fcd7 SHA512 6f961b9fc629fd7ddc0092f12286d6361503e540dd5a9ff2e48a33b95e6122b2ac78a438e1abd765ee4d269062734c28ec2fc997a1b00011e2fdd34812dd228d
+AUX otter-3.3-clang16.patch 510 BLAKE2B 59ceadaf806a1c9e8cfd90558f0cbebf77c19b3d79badb1131fb2b7f7a44793f3578fbe6226738dd0edc606ff77d5cfb3131d40eec6234e6abb2ceef10a96dcd SHA512 6acb56dd75ccf997b5468bc550a39596a14b698abe3a3a844086f24bf03556fb0e3ec328824744611184fa166e11e6ceaa7215bf73a2b1715073ea1ccd8e1245
 AUX otter-3.3-gold.patch 503 BLAKE2B daddf108d12dfec68eb07583697982a62e68413f533ff2c1fc9e27912f3d761704849e7afa776109def5b361b246d1e7a339da496998044695d40607c4dd5dca SHA512 66e4d3f246a1d4efbfdc8b3442bd269990d9c23b90426123ba2ef04b181179fe3a20f39e49bc67c2ad9158946fb0611e4b5700825b27b1af5226ab66fdee16c8
 DIST otter-3.3.tar.gz 2809092 BLAKE2B cd98fa71a43671a4f1346cb98dd677e99bc51fcdf8ea71662ba991b84c17e732438e4e1a2ffad7a564034b735acf829d7ac4446b52d79d6b4e154fcc0baccedf SHA512 c33d0f89cec647567cb84467a0adff2cd6023d7713f207ceca1736567b40be4ed6ab98f2ded151fa8dac7184a653cd00358ef8b18cf407ac8387d200e6dc073f
-EBUILD otter-3.3-r3.ebuild 829 BLAKE2B 94ca11acd8836e36c6f4712f754d332e5990f3fa8e1cd109cc032c7331c1a577dd5982066940a20617beb1529d6a75580d3a708367c9e0c966faef2cf18ec155 SHA512 336fe09eb00c5f4d1dcfa994b93ea2d92f7cf7e9a13f3bd898b14c2327814a2c42ea3fdb2a1d759ea1e61059474c15a367244937679f865e31686db934b0c14e
+EBUILD otter-3.3-r4.ebuild 992 BLAKE2B 410795917d18c01c33afacc50eb5d5f56131d9da71307f276cd26fc38504893b41c9c607cfc11df3f43dd9956647373fbf50bb8c0d728e041e1d3be97ad07b70 SHA512 a3c84d35653d120539dc783c4c66c14b1b28c7820ea092bbd9fe07cdf3af871c29a6f786b550fe950f312faa92a0eb5541cf2a87f0273c22c3c1f772dd5b4464
 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/sci-mathematics/otter/files/otter-3.3-clang16.patch b/sci-mathematics/otter/files/otter-3.3-clang16.patch
new file mode 100644
index 000000000000..d70400e4feba
--- /dev/null
+++ b/sci-mathematics/otter/files/otter-3.3-clang16.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/863257
+https://bugs.gentoo.org/871423
+--- a/mace2/anldp.c
++++ b/mace2/anldp.c
+@@ -51,2 +51,4 @@
+ 
++#include "../source/header.h"
++
+ int First_order;        /* used by dp.c */
+--- a/source/formed/display.c
++++ b/source/formed/display.c
+@@ -588,3 +588,3 @@
+ 
+-setup_operator_pixmaps(font_string)
++void setup_operator_pixmaps(font_string)
+ char font_string[];
+--- a/source/formed/formed.c
++++ b/source/formed/formed.c
+@@ -15,3 +15,3 @@
+ 
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
diff --git a/sci-mathematics/otter/otter-3.3-r3.ebuild b/sci-mathematics/otter/otter-3.3-r3.ebuild
deleted file mode 100644
index 6eb0dc06c302..000000000000
--- a/sci-mathematics/otter/otter-3.3-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An Automated Deduction System"
-HOMEPAGE="http://www.cs.unm.edu/~mccune/otter/"
-SRC_URI="http://www.cs.unm.edu/~mccune/otter/${P}.tar.gz"
-
-LICENSE="otter"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gold.patch
-)
-
-src_configure() {
-	append-cflags -fcommon
-}
-
-src_compile() {
-	tc-export CC
-
-	emake -C source
-	emake -C mace2
-}
-
-src_install() {
-	dobin bin/* source/formed/formed
-
-	dodoc README* Legal Changelog Contents documents/*.pdf
-
-	insinto /usr/share/${PN}
-	doins -r examples examples-mace2
-}
diff --git a/sci-mathematics/otter/otter-3.3-r4.ebuild b/sci-mathematics/otter/otter-3.3-r4.ebuild
new file mode 100644
index 000000000000..edf670138134
--- /dev/null
+++ b/sci-mathematics/otter/otter-3.3-r4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="An Automated Deduction System"
+HOMEPAGE="http://www.cs.unm.edu/~mccune/otter/"
+SRC_URI="http://www.cs.unm.edu/~mccune/otter/${P}.tar.gz"
+
+LICENSE="otter"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gold.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
+src_configure() {
+	append-cflags -fcommon
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+	append-cppflags -D_GNU_SOURCE #871423 (gethostname, caddr_t)
+}
+
+src_compile() {
+	tc-export AR CC
+
+	emake -C source
+	emake -C mace2
+}
+
+src_install() {
+	dobin bin/* source/formed/formed
+
+	dodoc README* Legal Changelog Contents documents/*.pdf
+
+	insinto /usr/share/${PN}
+	doins -r examples examples-mace2
+}
-- 
cgit v1.2.3