gentoo resync : 24.07.2021

7 files changed, 9 insertions, 400 deletions

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 9be74cf17db9..c8c665de86b5 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,8 +1,3 @@
-AUX texmacs-1.99-remove-new-declaration.patch 842 BLAKE2B d460a29e2c25467083f3dce164bc194aa49b7621188a701b057918a99ed377cd3467e8eec6b0c6988269454950a8750498fe0bb0bbf001eaf434221cfbe695cb SHA512 2296a42b907577f44e3b498ffa95cf1a1cc1dc729e340d3238b1e19796854d7405fbab888910f1f305a87477cdd40648a7bd2c5651f65bc642273ef4310df9a9
-AUX texmacs-1.99.2-desktop.patch 632 BLAKE2B cecbcf2b6cd731ef6e710d6e361af138a7ecc3f799fa1a046239319f481eac5a7ad4a7c40ab77e4c18809b9d80e51cb3b4815465e29d7e4597cbba1575fca885 SHA512 b523cde99001915ea83b1dfc644f1d4189b7c04ca11d7504e4f63dad1c19c6bb23af1d6b028ff9635594146c7263730a843b833cd77bf9a91023102f68e7cac3
-AUX texmacs-1.99.6-guile-size_t.patch 777 BLAKE2B de238311e50465a7644cd2b38dcdab093e7607edfb1b256b691a440c10254417c57c1cabcab694ff2e2001fe7772d23f0fbc0d75bd89807434805030adc60c5f SHA512 646123b545eb64c5af8041c0d93498ea8f984a6ac6c9820288c3e9a0e78a4dc3ef85665839aa48af02078aa41cf3ff60af6d759f5e16ad3a85f1a0dcf964c1ec
-AUX texmacs-1.99.6-math_util.patch 635 BLAKE2B 6846fbfc616937f09588520a0ea4a495edaeb93698068c3fd17c6705b3e70f571f28fb51e62e9568b22c77b8f20a59253bc9d994b890f555cf30ab58df84bf89 SHA512 9bc920c80ad5e68bf2262c1f808ac71b04fdeb301f0daa884ee1049c668f80151c4ab94972f902ec7417f6fed3057e5373673c0507597dcacc97b932bdf8ced5
-AUX texmacs-1.99.9-guile-remove-deprecated.patch 10877 BLAKE2B 7c33d89229e419958ebfd82a0b60680df04a12c84aa08d8e4a7e568f3dd2c70465244a295ef6457ef2ae21ffff7ee5be89be87ab2eefb7d7c79114054274e069 SHA512 0ce486bd51b382de80f12d08976d660d4b25d403488cc33534baee563e2641eaddd34009e13c514c5f36913ab31e3b05350f37ac470dce71052fc1d2399ed1d6
-DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d SHA512 3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
-EBUILD texmacs-1.99.11.ebuild 1696 BLAKE2B 0c256b8601bd9bf1e378fabc1264892b499f49cd188d9dcb5b4fa196ec2e45438cc8bc6e31e28b437767389071d670e68fee1cda679fa939cd06f697a9fb757b SHA512 116cd26a0a76b281073a86077a4630c51445d7f55bd2122cf75602849228866057f0129ff8e63593e67d74d37c1a0f1103e141f24d754f841cbcefe549cac37d
+DIST TeXmacs-2.1-src.tar.gz 35851289 BLAKE2B e29cf78d4c0f8b9d8bf89fd448775979efceaecd409c407bf66622cfa0e0aa166fe9a0abc146a282d71d989cdf03b21a8e17545a93196b868190ecb5fff3e993 SHA512 9e33bfb0a74ca6f6947cfa632adc162776083ae5e5ab46bc85fc8dac5e531457a2f888da5e552d6da39db16e543849a7b86f0fc6918b62e911d35ff725e47a2b
+EBUILD texmacs-2.1.ebuild 1332 BLAKE2B 2ce4ee726959e8db244b9494aa089ab6e8882d099e1b4a4ca0725c6a43d5b9562bd1c48325d38399f0770b479fed49f0b429ddad7dd48778875dbe55afd9fe2b SHA512 51d17a346aee52357286f949f4355e7772115ad1eb91ca5f8abf3690673b429082345154943437908415f7da71c57ff3e00a56ed0112e082b1eb4b52fa800458
 MISC metadata.xml 549 BLAKE2B fcf79150a49b13b5028b10439ea4c753fc3309dfe50a72d4a6953c47661ce5a27af0968bc186a1b412dabd2789fe108a12fadfad40b81c015f738765cfd1b45b SHA512 d3e0fb9a7a228d68910cf405d34eba1ffeff3f437a4d93dcea10a1871814140e1fc85508e9c7dfb06b8babbf3fef4ad70dc45ab5ec0a264b04898c73480df5b9
diff --git a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch b/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
deleted file mode 100644
index 45b08226f652..000000000000
--- a/app-office/texmacs/files/texmacs-1.99-remove-new-declaration.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Remove new/delete declarations, which cause problems with recent GCC versions:
-* /usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/include/g++-v4/new:135:41: error: declaration of ‘void operator delete [](void*) throw ()’ has a different exception specifier
-
-See also: https://bugs.gentoo.org/show_bug.cgi?id=590002
-
---- TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
-+++ TeXmacs-1.99.5-src/src/System/Misc/fast_alloc.hpp
-@@ -384,11 +384,6 @@
- void  operator delete (register void* ptr) throw();
- void* operator new[] (register size_t s) throw(std::bad_alloc);
- void  operator delete[] (register void* ptr) throw();
--#else
--void* operator new (register size_t s);
--void  operator delete (register void* ptr);
--void* operator new[] (register size_t s);
--void  operator delete[] (register void* ptr);
- #endif
- #endif // not defined NO_FAST_ALLOC
- 
diff --git a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch b/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
deleted file mode 100644
index 275f5571ebd8..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.2-desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
- TeXmacs/misc/mime/texmacs.desktop | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/TeXmacs/misc/mime/texmacs.desktop b/TeXmacs/misc/mime/texmacs.desktop
-index 493103c..cfd66b3 100644
---- a/TeXmacs/misc/mime/texmacs.desktop
-+++ b/TeXmacs/misc/mime/texmacs.desktop
-@@ -1,14 +1,9 @@
- [Desktop Entry]
- Name=GNU TeXmacs
- Comment=A structured wysiwyg scientific text editor
--BinaryPattern=texmacs
--Protocols=
- MimeType=text/x-texmacs;text/plain;text/x-tex;
- Exec=texmacs %f
- Icon=TeXmacs
--TerminalOptions=
--Path=
- Type=Application
--Terminal=0
--MapNotify=false
-+Terminal=false
- Categories=Education;Science;Math;
diff --git a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch b/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
deleted file mode 100644
index 3068169618fb..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.6-guile-size_t.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-C compiler compiles this code for bot int-based and size_t-based
-guile. C++ compiler does not (and is what used by texmacs).
-
-https://bugs.gentoo.org/652054
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 37e9e87..5de2711 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -274,11 +274,11 @@ SET(CMAKE_REQUIRED_FLAGS "-Werror ${Guile_CFLAGS}")
- SET(CMAKE_REQUIRED_INCLUDES ${Guile_INCLUDE_DIRS})
- SET(CMAKE_REQUIRED_LIBRARIES ${Guile_LIBRARIES})
- 
- MESSAGE(STATUS "Checking the size_t of guile strings")
- 
--CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
-+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
-   #include <libguile.h>
-   void print_string (SCM s) {
-     int len_r;
-     char* r= gh_scm2newstr (s, &len_r); } int main() { return 0; }
- " _guile_str_size_test)
diff --git a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch b/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
deleted file mode 100644
index 006c92c2be33..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.6-math_util.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r -U2 TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp
---- TeXmacs-1.99.6-src.orig/src/Graphics/Types/math_util.hpp	2017-12-22 03:27:43.000000000 +0700
-+++ TeXmacs-1.99.6-src/src/Graphics/Types/math_util.hpp	2017-12-22 16:44:35.052378917 +0700
-@@ -24,11 +24,4 @@
- inline int    sign (double x) { return x>0?1:x<0?-1:0; } 
- inline bool   fnull (double x, double approx) { return norm(x) <= approx; }
--#ifndef __SUNPRO_CC
--inline double pow (double x, int n) {
--  double r= 1.0;
--  while (n > 0) { r *= x; n--; }
--  return r; }
--#endif
--
- 
- #endif // defined MATH_UTIL_H
diff --git a/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch b/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
deleted file mode 100644
index 183c771804fa..000000000000
--- a/app-office/texmacs/files/texmacs-1.99.9-guile-remove-deprecated.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-diff -Naruw TeXmacs-1.99.9-src.orig/CMakeLists.txt TeXmacs-1.99.9-src/CMakeLists.txt
---- TeXmacs-1.99.9-src.orig/CMakeLists.txt	2019-02-01 04:33:32.000000000 -0500
-+++ TeXmacs-1.99.9-src/CMakeLists.txt	2019-06-02 17:13:47.980498170 -0400
-@@ -274,7 +274,6 @@
- elseif(Guile_VERSION_STRING VERSION_LESS 3.0)
-   set(CONFIG_GUILE_SERIAL "D")
-   set(GUILE_D 1)
--  set(SCM_SIZET size_t)
- else(Guile_VERSION_STRING VERSION_LESS 1.6)
-   message(ERROR "Not Guile serial A,B,C or D???")
- endif(Guile_VERSION_STRING VERSION_LESS 1.6)
-@@ -286,7 +285,7 @@
- 
- MESSAGE(STATUS "Checking the size_t of guile strings")
- 
--CHECK_C_SOURCE_COMPILES(  "#include <guile/gh.h>
-+CHECK_CXX_SOURCE_COMPILES(  "#include <guile/gh.h>
-   #include <libguile.h>
-   void print_string (SCM s) {
-     int len_r;
-diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig TeXmacs-1.99.9-src/src/CMakeLists.txt.orig
---- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.orig	1969-12-31 19:00:00.000000000 -0500
-+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.orig	2019-06-02 17:12:44.654011478 -0400
-@@ -0,0 +1,32 @@
-+
-+add_library(texmacs_body STATIC ${TeXmacs_All_SRCS})
-+
-+add_executable (${TeXmacs_binary_name}
-+  ./Texmacs/Texmacs/texmacs.cpp
-+)
-+
-+target_link_libraries (${TeXmacs_binary_name}
-+  texmacs_body
-+  ${TeXmacs_Libraries}
-+)
-+
-+if (APPLE)
-+  set(MACOSX_BUNDLE_DISPLAY_NAME TeXmacs)
-+  set_target_properties (${TeXmacs_binary_name}
-+    PROPERTIES
-+    MACOSX_BUNDLE TRUE
-+    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in
-+    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
-+    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
-+    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
-+  )
-+else (APPLE)
-+  set_target_properties (${TeXmacs_binary_name}
-+    PROPERTIES
-+    DEBUG_OUTPUT_NAME ${TeXmacs_binary_name}${EXE_DEBUG_EXTENSION}
-+    RELEASE_OUTPUT_NAME ${TeXmacs_binary_name}
-+    RUNTIME_OUTPUT_DIRECTORY ${TEXMACS_BINARY_DIR}
-+  )
-+  install (TARGETS ${TeXmacs_binary_name} DESTINATION lib/texmacs/TeXmacs/bin)
-+endif (APPLE)
-+
-diff -Naruw TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej TeXmacs-1.99.9-src/src/CMakeLists.txt.rej
---- TeXmacs-1.99.9-src.orig/src/CMakeLists.txt.rej	1969-12-31 19:00:00.000000000 -0500
-+++ TeXmacs-1.99.9-src/src/CMakeLists.txt.rej	2019-06-02 17:12:44.654011478 -0400
-@@ -0,0 +1,19 @@
-+--- CMakeLists.txt	(revision 11761)
-++++ CMakeLists.txt	(working copy)
-+@@ -274,7 +274,6 @@
-+ elseif (Guile_VERSION_STRING VERSION_LESS 3.0)
-+   set (CONFIG_GUILE_SERIAL "D")
-+   set (GUILE_D 1)
-+-  set (SCM_SIZET size_t)
-+ else (Guile_VERSION_STRING VERSION_LESS 1.6)
-+   message (ERROR "Not Guile serial A,B,C or D???")
-+ endif (Guile_VERSION_STRING VERSION_LESS 1.6)
-+@@ -286,7 +285,7 @@
-+ 
-+ message (STATUS "Checking the size_t of guile strings")
-+ 
-+-check_c_source_compiles ("
-++check_cxx_source_compiles ("
-+ #include <guile/gh.h>
-+ #include <libguile.h>
-+ void print_string (SCM s) {
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.cpp	2018-03-23 08:44:53.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.cpp	2019-06-02 17:13:10.420604916 -0400
-@@ -85,19 +85,34 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_eval_file (char *file) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) scm_c_primitive_load, file,
-                                   (scm_t_catch_handler) TeXmacs_lazy_catcher, file);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) scm_c_primitive_load, file,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   file, 0);
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_eval_file (char *file) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
-                              (scm_t_catch_handler) TeXmacs_catcher, file);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
-+                      (scm_t_catch_handler) TeXmacs_catcher, file, NULL, NULL);
-+
-+#endif
-+
-+#else
-   return 	scm_c_primitive_load (file);										 
- #endif
- }
-@@ -121,19 +136,33 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_eval_string (char *s) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) scm_c_eval_string, s,
-                                   (scm_t_catch_handler) TeXmacs_lazy_catcher, s);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) scm_c_eval_string, s,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   s, 0);
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_eval_string (char *s) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
-                              (scm_t_catch_handler) TeXmacs_catcher, s);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
-+                      (scm_t_catch_handler) TeXmacs_catcher, s, NULL, NULL);
-+
-+#endif
-+#else
-   return  scm_c_eval_string(s);
- #endif
- }
-@@ -180,19 +209,35 @@
- #ifndef DEBUG_ON
- static SCM
- TeXmacs_lazy_call_scm (arg_list* args) {
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_lazy_catch (SCM_BOOL_T,
-                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
--                                  (scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
-+                                  (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                  (void*) args);
-+#else
-+  return scm_c_with_throw_handler (SCM_BOOL_T,
-+                                   (scm_t_catch_body) TeXmacs_call, (void*) args,
-+                                   (scm_t_catch_handler) TeXmacs_lazy_catcher,
-+                                   (void*) args, 0);
-+
-+#endif
- }
- #endif
- 
- static SCM
- TeXmacs_call_scm (arg_list *args) {
- #ifndef DEBUG_ON
-+#if (defined(GUILE_A) || defined(GUILE_B))
-   return scm_internal_catch (SCM_BOOL_T,
-                              (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
-                              (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
- #else
-+  return scm_c_catch (SCM_BOOL_T,
-+                      (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
-+                      (scm_t_catch_handler) TeXmacs_catcher, (void*) args,
-+                      NULL, NULL);
-+#endif
-+#else
-   return TeXmacs_call(args);
- #endif
- }
-@@ -443,7 +488,11 @@
-   return SCM_BOOL_F;
- }
- 
-+#ifdef GUILE_A
- static scm_sizet
-+#else
-+static size_t
-+#endif
- free_blackbox (SCM blackbox_smob) {
-   blackbox *ptr = (blackbox *) SCM_CDR (blackbox_smob);
- #ifdef DEBUG_ON
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Guile/guile_tm.hpp	2018-06-28 04:13:37.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Guile/guile_tm.hpp	2019-06-02 17:13:22.220571381 -0400
-@@ -83,8 +83,8 @@
- #define scm_is_double scm_is_real
- #define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,(scm_t_subr)r)
- #define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
--#define scm_long2scm scm_long2num
--#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
-+#define scm_long2scm scm_from_long
-+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
- #define scm_double2scm scm_from_double
- #define scm_scm2double scm_to_double
- #define scm_str2scm scm_from_locale_stringn
-@@ -103,8 +103,8 @@
- #define scm_is_double scm_is_real
- #define scm_new_procedure(name,r,a,b,c) scm_c_define_gsubr(name,a,b,c,r)
- #define scm_lookup_string(name) scm_variable_ref(scm_c_lookup(name))
--#define scm_long2scm scm_long2num
--#define scm_scm2long(x) scm_num2long(x,SCM_ARG1,"scm2long")
-+#define scm_long2scm scm_from_long
-+#define scm_scm2long(x) scm_to_long(x,SCM_ARG1,"scm2long")
- #define scm_double2scm scm_from_double
- #define scm_scm2double scm_to_double
- #define scm_str2scm scm_from_locale_stringn
-diff -Naruw TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp
---- TeXmacs-1.99.9-src.orig/src/Scheme/Tiny/tinyscheme_tm.cpp	2017-09-28 09:44:11.000000000 -0400
-+++ TeXmacs-1.99.9-src/src/Scheme/Tiny/tinyscheme_tm.cpp	2019-06-02 17:13:27.543889585 -0400
-@@ -139,22 +139,6 @@
- /******************************************************************************
-  * Evaluation of files
-  ******************************************************************************/
--#if 0
--static scm
--TeXmacs_lazy_eval_file (char *file) {
--	
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) scm_c_primitive_load, file,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, file);
--}
--
--static scm
--TeXmacs_eval_file (char *file) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_eval_file, file,
--							   (scm_t_catch_handler) TeXmacs_catcher, file);
--}
--#endif 
- scm
- eval_scheme_file (string file) {
- 	//static int cumul= 0;
-@@ -172,21 +156,6 @@
- /******************************************************************************
-  * Evaluation of strings
-  ******************************************************************************/
--#if 0
--static scm
--TeXmacs_lazy_eval_string (char *s) {
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) scm_c_eval_string, s,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, s);
--}
--
--static scm
--TeXmacs_eval_string (char *s) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_eval_string, s,
--							   (scm_t_catch_handler) TeXmacs_catcher, s);
--}
--#endif
- scm
- eval_scheme (string s) {
- 	// cout << "Eval] " << s << "\n";
-@@ -214,21 +183,7 @@
- 		}
- 	}
- }
--#if 0
--static scm
--TeXmacs_lazy_call_scm (arg_list* args) {
--	return scm_internal_lazy_catch (scm_BOOL_T,
--									(scm_t_catch_body) TeXmacs_call, (void*) args,
--									(scm_t_catch_handler) TeXmacs_lazy_catcher, (void*) args);
--}
- 
--static scm
--TeXmacs_call_scm (arg_list *args) {
--	return scm_internal_catch (scm_BOOL_T,
--							   (scm_t_catch_body) TeXmacs_lazy_call_scm, (void*) args,
--							   (scm_t_catch_handler) TeXmacs_catcher, (void*) args);
--}
--#endif
- scm
- call_scheme (scm fun) {
- 	scm a[]= { fun }; arg_list args= { 0, a };
diff --git a/app-office/texmacs/texmacs-1.99.11.ebuild b/app-office/texmacs/texmacs-2.1.ebuild
index f2326cb3e659..e0775e242482 100644
--- a/app-office/texmacs/texmacs-1.99.11.ebuild
+++ b/app-office/texmacs/texmacs-2.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 MY_P=${P/tex/TeX}-src
 
 DESCRIPTION="Wysiwyg text processor with high-quality maths"
 HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
+SRC_URI="http://www.texmacs.org/Download/ftp/tmftp/source/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -33,30 +33,17 @@ RDEPEND="
 	spell? ( app-text/aspell )
 	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
 "
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+DEPEND="${RDEPEND}"
+BDEPEND="x11-base/xorg-proto"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.99.2-desktop.patch
-
-	# remove new/delete declarations, bug 590002
-	"${FILESDIR}"/${PN}-1.99-remove-new-declaration.patch
-
-	"${FILESDIR}"/${PN}-1.99.6-math_util.patch
-
-	# fix build failure on 32-bit systems, bug #652054
-	#	"${FILESDIR}"/${PN}-1.99.6-guile-size_t.patch
-	#"${FILESDIR}"/${PN}-1.99.9-guile-remove-deprecated.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_SQLITE3=$(usex sqlite 1 0)
 		-DDEBUG_ASSERT=$(usex debug 1 0)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {