From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/euler/, sci-mathematics/euler/files/
Date: Sun, 21 Feb 2021 04:03:58 +0000 (UTC) [thread overview]
Message-ID: <1613878881.31cb4a3e3f5d166a4682f47aad7d2f6517b7b0e4.sam@gentoo> (raw)
commit: 31cb4a3e3f5d166a4682f47aad7d2f6517b7b0e4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 03:41:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 03:41:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31cb4a3e
sci-mathematics/euler: port to EAPI 7
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
...{euler-1.61.0.ebuild => euler-1.61.0-r1.ebuild} | 26 +++++++++++-----------
.../euler/files/command-gcc4-gentoo.patch | 5 ++---
sci-mathematics/euler/files/configure-gentoo.patch | 10 ++++-----
sci-mathematics/euler/files/euler-fortify.patch | 15 +++++--------
.../euler/files/euler-glibc-2.4-gentoo.patch | 4 ++--
sci-mathematics/euler/files/euler-xdg.patch | 8 +++----
6 files changed, 31 insertions(+), 37 deletions(-)
diff --git a/sci-mathematics/euler/euler-1.61.0.ebuild b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
similarity index 75%
rename from sci-mathematics/euler/euler-1.61.0.ebuild
rename to sci-mathematics/euler/euler-1.61.0-r1.ebuild
index a938c578692..b54a13030b4 100644
--- a/sci-mathematics/euler/euler-1.61.0.ebuild
+++ b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
@@ -1,12 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils
+inherit autotools
DESCRIPTION="Mathematical programming environment"
HOMEPAGE="http://euler.sourceforge.net/"
@@ -14,13 +11,13 @@ SRC_URI="mirror://sourceforge/euler/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc -sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="x11-libs/gtk+:2
- virtual/pkgconfig"
-RDEPEND="x11-libs/gtk+:2
- x11-misc/xdg-utils"
+BDEPEND="virtual/pkgconfig"
+DEPEND="x11-libs/gtk+:2"
+RDEPEND="
+ ${DEPEND}
+ x11-misc/xdg-utils
+"
PATCHES=(
"${FILESDIR}"/configure-gentoo.patch
@@ -31,6 +28,8 @@ PATCHES=(
)
src_prepare() {
+ default
+
# gentoo specific stuff
sed -i -e '/COPYING/d' -e '/INSTALL/d' Makefile.am || die
sed -i \
@@ -38,5 +37,6 @@ src_prepare() {
Makefile.am docs/Makefile.am \
docs/*/Makefile.am docs/*/images/Makefile.am src/main.c \
|| die "sed for docs failed"
- autotools-utils_src_prepare
+
+ eautoreconf
}
diff --git a/sci-mathematics/euler/files/command-gcc4-gentoo.patch b/sci-mathematics/euler/files/command-gcc4-gentoo.patch
index c405d65bd76..08c6c8dcd63 100644
--- a/sci-mathematics/euler/files/command-gcc4-gentoo.patch
+++ b/sci-mathematics/euler/files/command-gcc4-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur euler-1.61.0/src/command.c euler-1.61.0-new/src/command.c
---- euler-1.61.0/src/command.c 2005-10-24 00:38:24.000000000 +0000
-+++ euler-1.61.0-new/src/command.c 2006-02-08 23:30:43.000000000 +0000
+--- a/src/command.c
++++ b/src/command.c
@@ -732,7 +732,7 @@
}
diff --git a/sci-mathematics/euler/files/configure-gentoo.patch b/sci-mathematics/euler/files/configure-gentoo.patch
index e1e7c6ef1e6..b2c93ce0350 100644
--- a/sci-mathematics/euler/files/configure-gentoo.patch
+++ b/sci-mathematics/euler/files/configure-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur euler-1.61.0/configure.in euler-1.61.0-new/configure.in
---- euler-1.61.0/configure.in 2005-10-30 16:40:27.000000000 +0000
-+++ euler-1.61.0-new/configure.in 2006-02-08 23:38:54.000000000 +0000
+--- a/configure.in
++++ b/configure.in
@@ -8,8 +8,6 @@
AM_CONFIG_HEADER(config.h)
@@ -21,9 +20,8 @@ diff -Naur euler-1.61.0/configure.in euler-1.61.0-new/configure.in
dnl Checks for header files.
-diff -Naur euler-1.61.0/src/Makefile.am euler-1.61.0-new/src/Makefile.am
---- euler-1.61.0/src/Makefile.am 2005-10-30 22:48:35.000000000 +0000
-+++ euler-1.61.0-new/src/Makefile.am 2006-02-08 23:41:32.000000000 +0000
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -7,10 +7,6 @@
INCLUDES = \
$(GTK_CFLAGS)
diff --git a/sci-mathematics/euler/files/euler-fortify.patch b/sci-mathematics/euler/files/euler-fortify.patch
index efb366e2cc0..dd68408879e 100644
--- a/sci-mathematics/euler/files/euler-fortify.patch
+++ b/sci-mathematics/euler/files/euler-fortify.patch
@@ -1,6 +1,5 @@
-diff -Nur euler-1.61.0.orig/src/command.c euler-1.61.0/src/command.c
---- euler-1.61.0.orig/src/command.c 2010-11-19 17:50:54.000000000 +0000
-+++ euler-1.61.0/src/command.c 2010-11-19 18:23:11.000000000 +0000
+--- a/src/command.c
++++ b/src/command.c
@@ -606,7 +606,7 @@
void do_help (void)
{ char name[256];
@@ -10,9 +9,8 @@ diff -Nur euler-1.61.0.orig/src/command.c euler-1.61.0/src/command.c
char *p,*end,*pnote;
builtintyp *b;
scan_space();
-diff -Nur euler-1.61.0.orig/src/stack.h euler-1.61.0/src/stack.h
---- euler-1.61.0.orig/src/stack.h 2010-11-19 17:50:54.000000000 +0000
-+++ euler-1.61.0/src/stack.h 2010-11-19 18:19:23.000000000 +0000
+--- a/src/stack.h
++++ b/src/stack.h
@@ -63,7 +63,7 @@
#endif
} dims;
@@ -22,9 +20,8 @@ diff -Nur euler-1.61.0.orig/src/stack.h euler-1.61.0/src/stack.h
typedef struct { header hd; double val; } realtyp;
-diff -Nur euler-1.61.0.orig/src/udf.c euler-1.61.0/src/udf.c
---- euler-1.61.0.orig/src/udf.c 2010-11-19 17:50:54.000000000 +0000
-+++ euler-1.61.0/src/udf.c 2010-11-19 18:21:20.000000000 +0000
+--- a/src/udf.c
++++ b/src/udf.c
@@ -334,7 +334,7 @@
{ char name[16];
header *hd;
diff --git a/sci-mathematics/euler/files/euler-glibc-2.4-gentoo.patch b/sci-mathematics/euler/files/euler-glibc-2.4-gentoo.patch
index da377bd5f3b..ddbb01a2598 100644
--- a/sci-mathematics/euler/files/euler-glibc-2.4-gentoo.patch
+++ b/sci-mathematics/euler/files/euler-glibc-2.4-gentoo.patch
@@ -1,7 +1,7 @@
# patch to fix missing CLK_TCK in glibc 2.4
---- src/main.c. 2006-04-04 15:05:34.000000000 +0200
-+++ src/main.c 2006-04-04 15:09:20.000000000 +0200
+--- a/src/main.c
++++ b/src/main.c
@@ -439,7 +439,7 @@
gettimer(TIMEOFDAY,&t);
return (t.tv_sec+t.tv_nsec/1000000000.0);
diff --git a/sci-mathematics/euler/files/euler-xdg.patch b/sci-mathematics/euler/files/euler-xdg.patch
index cb1bf54a2bb..89edad38f97 100644
--- a/sci-mathematics/euler/files/euler-xdg.patch
+++ b/sci-mathematics/euler/files/euler-xdg.patch
@@ -1,5 +1,5 @@
---- docs/doc.html.orig 2008-01-07 23:11:25.490634852 +0000
-+++ docs/doc.html 2008-01-07 23:13:57.652980222 +0000
+--- a/docs/doc.html
++++ b/docs/doc.html
@@ -184,7 +184,8 @@
<div align=center><img src="images/pref3.gif"></div>
@@ -10,8 +10,8 @@
You can also reset the preferences to the default values.</p>
<div align=center><img src="images/pref4.gif"></div>
---- src/rc.h.orig 2008-01-07 23:15:36.617118688 +0000
-+++ src/rc.h 2008-01-07 23:15:54.097371330 +0000
+--- a/src/rc.h
++++ b/src/rc.h
@@ -26,7 +26,7 @@
#define E_GSTACK_DEFAULT 4*1024l
#define E_GLINES_DEFAULT 40
reply other threads:[~2021-02-21 4:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1613878881.31cb4a3e3f5d166a4682f47aad7d2f6517b7b0e4.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox