commit:     8ec33f629aadbc3c0b36554f9e32ade6c26cdc49
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 21 11:55:16 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 15:38:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec33f62

app-office/texmacs: add 2.1, drop 1.99.11

Mind you, this version STILL requires guile-1.8 so it remains masked.

For the record, upstream Web site does support HTTPS but as of
2021-07-21, their Let's Encrypt host certificate is signed by the old
root CA which is no longer accepted by wget.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-office/texmacs/Manifest                        |   2 +-
 .../texmacs-1.99-remove-new-declaration.patch      |  19 --
 .../texmacs/files/texmacs-1.99.2-desktop.patch     |  23 --
 .../files/texmacs-1.99.6-guile-size_t.patch        |  21 --
 .../texmacs/files/texmacs-1.99.6-math_util.patch   |  15 --
 .../texmacs-1.99.9-guile-remove-deprecated.patch   | 295 ---------------------
 .../{texmacs-1.99.11.ebuild => texmacs-2.1.ebuild} |  27 +-
 7 files changed, 8 insertions(+), 394 deletions(-)

diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 0d23679db96..837b2711ad2 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1 +1 @@
-DIST TeXmacs-1.99.11-src.tar.gz 32798336 BLAKE2B 
352e333b51fbf27589377f638dda4f4fa09ca6aee6d0016a103ef3b4ba71b766930b7202f6fc3d060f72e4ccbbf311f438975317844587461880f99c7dff596d
 SHA512 
3f3481834baeeee93afc2c2de1666297b8c02d7dc5223b00ee93120e175503c91bdcc3d9ff4d8df498033064b2e67b12ffd47af9e8b95ad5eee12b47ec076855
+DIST TeXmacs-2.1-src.tar.gz 35851289 BLAKE2B 
e29cf78d4c0f8b9d8bf89fd448775979efceaecd409c407bf66622cfa0e0aa166fe9a0abc146a282d71d989cdf03b21a8e17545a93196b868190ecb5fff3e993
 SHA512 
9e33bfb0a74ca6f6947cfa632adc162776083ae5e5ab46bc85fc8dac5e531457a2f888da5e552d6da39db16e543849a7b86f0fc6918b62e911d35ff725e47a2b

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 45b08226f65..00000000000
--- 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 275f5571ebd..00000000000
--- 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 3068169618f..00000000000
--- 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 006c92c2be3..00000000000
--- 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 183c771804f..00000000000
--- 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
similarity index 65%
rename from app-office/texmacs/texmacs-1.99.11.ebuild
rename to app-office/texmacs/texmacs-2.1.ebuild
index f2326cb3e65..e0775e24248 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() {

Reply via email to