gentoo resync : 03.03.2021

7 files changed, 37 insertions, 43 deletions

diff --git a/sci-mathematics/euler/Manifest b/sci-mathematics/euler/Manifest
index 11dbf5512c48..7dba9978c72f 100644
--- a/sci-mathematics/euler/Manifest
+++ b/sci-mathematics/euler/Manifest
@@ -1,8 +1,8 @@
-AUX command-gcc4-gentoo.patch 341 BLAKE2B f3880734a2720b99bb7aa617cb0ac622ba9c315f535f4b0f130c441c1a5139cbe840e7ebd457976459f9db80515845aa5e6be98b71a57934e9025cc6069ab094 SHA512 a7fc90f924798faba502568e0fa44bef3717bf7d6ff4039d2379d837cd820fc05d51bc1ceadb985ec32c87a9f706789c726d9c833f087d5696e3573da0364276
-AUX configure-gentoo.patch 884 BLAKE2B 52fae006d897ed3db8cad20ef018365ba4d0ff78e99f7e9b4c5474df3f16774a7603c096fc24992f2dd520855831ccf67c1c218484f79771b48b433bbd2784e3 SHA512 f5be6b7214c1898dd203b0c3b5cfe7edc7e6e7f47e7c4a39e85113d1affbd740f8cc413d38ace42672a4ac2224ce248092432beda91c0423f8726ac0b0fbd72a
-AUX euler-fortify.patch 1150 BLAKE2B 94766f5131b6e923af72c17b13c246604fa8c544439f76023177eecc0c010e243e32cde4c2fc71dc341873ff583a5aec09a08ee44fbaeab4970c89189e32b0ec SHA512 2ae0d856f4147a29f2cfd0e615c9ae39ed48ee765599527f529465b2f42ad64e7c2adb6a5ac4e25c72f09f0ee50ae6f09282d0f6af6cd976ecaecede847c2854
-AUX euler-glibc-2.4-gentoo.patch 349 BLAKE2B 7fbc314cc2e61054ef406551cff1ca83960286a097ec69e79b834f3f108f2d9b0b7dab09d79bdfbdb4d29506f5627613601bb2f141c926ac42d110b36c60f92e SHA512 34cef14fb232a3156f84df23a9132392c03b30677cd067ffcabb866c938a6a0b43d431e8da2295ee431701d232cc6e05f30acecc901dcd4f19fa6424b185d463
-AUX euler-xdg.patch 918 BLAKE2B fada00e324a8fb25facc14ba1db087cd03039c64d6ffa3f417879b23f2a22a7c5a0eef2b1936ea0f99f6b19e384adbdd446d3afc98dd5115839426b690ceccab SHA512 fdb89244a2365845857a11682d1499ea03ed37d01aedd4cf8c8869b8f0023fd58d7818ccb771924bc265bd518ba518637a11b2c80ea4e39ffee22431a7ca7ab6
+AUX command-gcc4-gentoo.patch 174 BLAKE2B aa9928069a324907052d451ea41f4fbd0433d8dc9db7dbacd2995c766afe8571f0c3261511614128a44d3b8894a3a8f3a45b82f1f491f3a3df414593e7fb5c49 SHA512 a44fb6cabf979ed578cd112871c66198220eda51cb2d5eeb83549bf3e7b71ecba17202c5287431002e8989f44330b93b32d84acceaf5af8ba4c6ffd5a7a1f837
+AUX configure-gentoo.patch 548 BLAKE2B 4bcc5f15ade8eac9dabe510a90bc7c8a0f99630acc44a1d1d196dea37403081a3f66e0ff9e1cfdb54257d877c32792323fe73593812293bcb7f915dded25f263 SHA512 b8b7fab9880f732a86db2138062ed7ce6a510ce89619a25aa697feb95b63d0218d107031ff1a7bfc013f9a127e4448b0b17874d6a092c80f5d74494d6f2e5239
+AUX euler-fortify.patch 658 BLAKE2B 4674ab1f332464315c81ffe01cb5d0f58fcebdb5c50898145c0810831d82ad238e2475a95f22a0347e26f7835754ca664fd56d31f6d7d31546577d3fef5bba99 SHA512 1dc6ecee975b25b2af7299f7b01caabefbdbd4a865c01959cbbc50a13c63fc8784b16ab8bdb3c6a8160a1defaae391d66fa6dbc9602c537ed1c40b99351c0a46
+AUX euler-glibc-2.4-gentoo.patch 280 BLAKE2B 1f668caf8685d97bd88f542fafe75d8632d75736438cbb3e58e60b66874b55ff5cab4ed4cfabb28a3d54e087e2808b45c467990a53691fdf497ec148d7e7a931 SHA512 714f03c3d249d9a0d001d905f68d0b48306b99f7ad1438418356101c2c87a59c6f628dab0d4626f564e657234f10903a0160cb2a00f8fbaefb532d0393bc14c9
+AUX euler-xdg.patch 772 BLAKE2B 382625847e68c23d5bac02b744caea00eb61a637eef1a7465dcb58ca81623ab3edccc90c67fab50328b2711dc6e6b3be86669f858aec8035b8e4b9ff3d82e39d SHA512 725f3243b92d7c7d5064e227eb0b6d15c39fa5a23586cd4ccd62977dd334a943108ee29e7cf06c7591b7af9f1322a6d27ac72016ce951b5e0bb7552021af069f
 DIST euler-1.61.0.tgz 1202485 BLAKE2B b886d483f5bcb8e1a953b7eda43c1f4d4b5dc2ad1606be48da60f9e4fdbdf02a42e30c862f14f4d2d182ac93c29fc7e234f7132500c695cd8d5b693ca48e599b SHA512 f8b9b0c6aa5aea4bd42bd33fff986a52c624c268ede11b83c2c53293a5acbda45317ecc719c12f377b236460c7ff0dba1d110ee8e90b526fc70af03ed0327b27
-EBUILD euler-1.61.0.ebuild 1014 BLAKE2B 29987f82895a7e3d77c851853dd06b38341b824ae110b8f8277abbaee4952aa9155124354a7660a0af60346799970f7abd425221f638a07a78a6aa4ac9d81038 SHA512 7d3f85e9ddf1abc0bb5a34729bba84aee784f60c00de7b808d26e8c584f08a209a5d0354c129fb7af739be0d4aff60c0db422e0c46600a60664f9870ab882dd6
+EBUILD euler-1.61.0-r1.ebuild 945 BLAKE2B a1c853ca2dd0703f85917c32c11107579227b1b638a914695d8aeaafe8de53b3711fd6a3eccf1ade59161aa7e171367679b4fafedad43cffc40cd0eadbc0103b SHA512 2d8251d04f060fdb6ae8bdc6b9f8feee5fb4a9a8cabd52c5259131125d5115c6e3b39d562fedd5daaf758de072f5882b93eba9904f9802d59e2c3fa8abee920c
 MISC metadata.xml 344 BLAKE2B 6b7298a1ef9586f8a111b3f89a8234db2918b9501bb4348d8d1e400bc73cedbe570db845537543159e6c4495e1ce604306d721092fb8c23afaaeb4ff3a305e8b SHA512 77983d74c782fcccc0b146e8687f29657387bbe048af00078f8decb3c84c1e288f48c8f29c35bf8c606e6a9306d3d258697f8e2ff07129fb59551d05c694cd82
diff --git a/sci-mathematics/euler/euler-1.61.0.ebuild b/sci-mathematics/euler/euler-1.61.0-r1.ebuild
index a938c5786928..b54a13030b48 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 c405d65bd76e..08c6c8dcd632 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 e1e7c6ef1e6b..b2c93ce03503 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 efb366e2cc04..dd68408879ed 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 da377bd5f3ba..ddbb01a25986 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 cb1bf54a2bbb..89edad38f97f 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