* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/otter/
@ 2017-03-11 10:48 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-03-11 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 1a9e29c464bd733f12b95784c0b89ab9777891a8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 10:33:08 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 10:48:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9e29c4
sci-mathematics/otter: Port to EAPI 6
Package-Manager: Portage-2.3.4, Repoman-2.3.2
sci-mathematics/otter/otter-3.3-r3.ebuild | 42 +++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/sci-mathematics/otter/otter-3.3-r3.ebuild b/sci-mathematics/otter/otter-3.3-r3.ebuild
new file mode 100644
index 00000000000..891dacf1de4
--- /dev/null
+++ b/sci-mathematics/otter/otter-3.3-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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"
+IUSE=""
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-build.patch
+ "${FILESDIR}"/${P}-gold.patch
+)
+
+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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/otter/
@ 2017-03-11 10:48 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-03-11 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 91b7265ee51e2c1c9c606869215c427f0a5ec4b7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 10:34:54 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 10:48:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b7265e
sci-mathematics/otter: Remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
sci-mathematics/otter/otter-3.3-r1.ebuild | 34 ------------------------
sci-mathematics/otter/otter-3.3-r2.ebuild | 43 -------------------------------
2 files changed, 77 deletions(-)
diff --git a/sci-mathematics/otter/otter-3.3-r1.ebuild b/sci-mathematics/otter/otter-3.3-r1.ebuild
deleted file mode 100644
index e30d59979c7..00000000000
--- a/sci-mathematics/otter/otter-3.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-LICENSE="otter"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- cd source
- emake -j1 || die
- cd "${S}"/mace2
- emake -j1 || die
-}
-
-src_install() {
- dobin bin/* source/formed/formed
- dodoc README* Legal Changelog Contents documents/*.{tex,ps}
- insinto /usr/share/doc/${PF}
- doins documents/*.pdf
- dohtml index.html
- insinto /usr/share/doc/${PF}/html
- doins -r examples examples-mace2
-}
diff --git a/sci-mathematics/otter/otter-3.3-r2.ebuild b/sci-mathematics/otter/otter-3.3-r2.ebuild
deleted file mode 100644
index 97614003f48..00000000000
--- a/sci-mathematics/otter/otter-3.3-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-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"
-
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-LICENSE="otter"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-gold.patch
-}
-
-src_compile() {
- cd source
- CC=$(tc-getCC) emake
- cd "${S}"/mace2
- CC=$(tc-getCC) emake
-}
-
-src_install() {
- dobin bin/* source/formed/formed
- dodoc README* Legal Changelog Contents
- insinto /usr/share/doc/${PF}
- doins documents/*.pdf
- insinto /usr/share/${PN}/
- doins -r examples examples-mace2
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/otter/
@ 2017-03-11 10:48 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-03-11 10:48 UTC (permalink / raw
To: gentoo-commits
commit: dacb97deb5e05b5ab4ff8c2fca270d4b818a1dbe
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 10:34:09 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 10:48:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dacb97de
sci-mathematics/otter: Mark amd64 and x86 stable
Package-Manager: Portage-2.3.4, Repoman-2.3.2
sci-mathematics/otter/otter-3.3-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-mathematics/otter/otter-3.3-r3.ebuild b/sci-mathematics/otter/otter-3.3-r3.ebuild
index 891dacf1de4..eec8a1d2516 100644
--- a/sci-mathematics/otter/otter-3.3-r3.ebuild
+++ b/sci-mathematics/otter/otter-3.3-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/otter/
@ 2020-11-01 0:26 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2020-11-01 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 82987429411715840476b5425a48c1fb538e9804
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 31 19:09:56 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov 1 00:25:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82987429
sci-mathematics/otter: fix build with -fno-common
Too many definitions to bother with a patch and
dead upstream, so pass in -fcommon.
Closes: https://bugs.gentoo.org/707482
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-mathematics/otter/otter-3.3-r3.ebuild | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/otter/otter-3.3-r3.ebuild b/sci-mathematics/otter/otter-3.3-r3.ebuild
index eec8a1d2516..6eb0dc06c30 100644
--- a/sci-mathematics/otter/otter-3.3-r3.ebuild
+++ b/sci-mathematics/otter/otter-3.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="An Automated Deduction System"
HOMEPAGE="http://www.cs.unm.edu/~mccune/otter/"
@@ -12,7 +12,6 @@ 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"
-IUSE=""
RDEPEND="
x11-libs/libX11
@@ -25,6 +24,10 @@ PATCHES=(
"${FILESDIR}"/${P}-gold.patch
)
+src_configure() {
+ append-cflags -fcommon
+}
+
src_compile() {
tc-export CC
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-01 0:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-11 10:48 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/otter/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2017-03-11 10:48 David Seifert
2017-03-11 10:48 David Seifert
2020-11-01 0:26 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox