[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2024-03-09 Thread Mats Lidell
commit: 0ef62beae1cf2ee152c613d7c68372b2e6316faf
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Mar  9 15:20:33 2024 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Mar  9 15:26:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ef62bea

app-editors/xemacs: drop 21.5.34-r12, 21.5.34-r13

Signed-off-by: Mats Lidell  gentoo.org>

 app-editors/xemacs/Manifest|   1 -
 app-editors/xemacs/files/xemacs-21.5.34-ar.patch   |  74 --
 .../xemacs/files/xemacs-21.5.34-as-needed.patch|  25 --
 .../xemacs-21.5.34-autoloads-parallell-make.patch  | 184 ---
 .../xemacs-21.5.34-configure-libc-version.patch|  24 --
 app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch |  35 ---
 .../xemacs/files/xemacs-21.5.34-glibc-macro.patch  |  32 ---
 .../files/xemacs-21.5.34-module-autoloads.patch| 115 -
 .../files/xemacs-21.5.34-ncurses-tinfo.patch   |  13 -
 .../xemacs-21.5.34-no-lock-on-finder-inf.patch |  99 
 .../files/xemacs-21.5.34-process-test-qa.patch |  11 -
 .../xemacs/files/xemacs-21.5.34-strsignal.patch|  92 
 app-editors/xemacs/xemacs-21.5.34-r12.ebuild   | 259 
 app-editors/xemacs/xemacs-21.5.34-r13.ebuild   | 261 -
 14 files changed, 1225 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 71147468cac4..d30897871d36 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,4 +1,3 @@
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 
7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea
 SHA512 
611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B 
d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10
 SHA512 
b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
-DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B 
e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d
 SHA512 
b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B 
efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3
 SHA512 
e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
deleted file mode 100644
index fff6f5578733..
--- a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -r 3ca291c0f7e3 configure
 a/configureSun Jul 28 10:17:08 2019 +0100
-+++ b/configureSun Apr 19 18:46:45 2020 +0200
-@@ -778,6 +778,5 @@
- INSTALL_SCRIPT
- INSTALL_PROGRAM
- RANLIB
--AR
- lib_gcc
- ld
-@@ -10296,47 +10307,6 @@
- fi
- 
- 
--# Extract the first word of "ar", so it can be a program name with args.
--set dummy ar; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_AR+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$AR"; then
--  ac_cv_prog_AR="$AR" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--ac_cv_prog_AR="ar"
--$as_echo "$as_me:${as_lineno-$LINENO}: found 
$as_dir/$ac_word$ac_exec_ext" >&5
--break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found"
--fi
--fi
--AR=$ac_cv_prog_AR
--if test -n "$AR"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
--$as_echo "$AR" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test "$AR" = "not_found"; then
--  { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; }
--fi
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a 
program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-diff -r 3ca291c0f7e3 configure.ac
 a/configure.ac Sun Jul 28 10:17:08 2019 +0100
-+++ b/configure.ac Sun Apr 19 18:46:45 2020 +0200
-@@ -2557,12 +2557,6 @@
- dnl should make an entry in src/config.h, do not forget to add an
- dnl #undef clause to src/config.h.in for 

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2022-06-16 Thread Mats Lidell
commit: b89aa72248232d5b4245610784d17147122d9341
Author: Mats Lidell  gentoo  org>
AuthorDate: Thu Jun 16 21:09:29 2022 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Thu Jun 16 21:16:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b89aa722

app-editors/xemacs: patch for make problem in xemacs-21.5.34

Upstream found a problem that could explain the issues seen with
builds on tinderboxes with highly parallel builds.

Bug: https://bugs.gentoo.org/843236
Signed-off-by: Mats Lidell  gentoo.org>

 .../xemacs-21.5.34-autoloads-parallell-make.patch  | 184 +
 app-editors/xemacs/xemacs-21.5.34-r9.ebuild|   1 +
 2 files changed, 185 insertions(+)

diff --git 
a/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
new file mode 100644
index ..9a86046be992
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-autoloads-parallell-make.patch
@@ -0,0 +1,184 @@
+--- a/lisp/update-elc-2.el.orig2022-06-16 21:58:48.748641021 +0200
 b/lisp/update-elc-2.el 2022-06-16 21:58:48.748641021 +0200
+@@ -137,37 +137,10 @@
+   (let ((dir (car command-line-args-left)))
+ ;; don't depend on being able to autoload `update-autoload-files'!
+ (load "autoload")
+-(autoload 'cl-compile-time-init "cl-macs")
+ (load "bytecomp")
+ (load "byte-optimize")
+-;;  the API used here is deprecated, convert to one with explicit
+-;; arguments when it is available
+-;; update-elc.el signals us to rebuild the autoloads when necessary.
+-;; in some cases it will rebuild the autoloads itself, but doing it this
+-;; way is slow, so we avoid it when possible.
+-(when (file-exists-p (expand-file-name "REBUILD_AUTOLOADS"
+- invocation-directory))
+-  ;; if we were instructed to rebuild the autoloads, force the file
+-  ;; to be touched even w/o changes; otherwise, we won't ever stop
+-  ;; being told to rebuild them.
+-  (update-autoload-files dir "auto" nil t)
+-  (byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0)
+-  (when (featurep 'mule)
+-  (let ((muledir (expand-file-name "../lisp/mule" (file-truename dir
+-;; force here just like above.
+-(update-autoload-files muledir "mule" nil t)
+-(byte-recompile-file (expand-file-name "auto-autoloads.el" dir) 0
+-(when (featurep 'modules)
+-  (let* ((moddir (expand-file-name "../modules" (file-truename dir)))
+-   (autofile (expand-file-name "auto-autoloads.el" moddir)))
+-  (update-autoload-files 
+-   (delete (concat (file-name-as-directory moddir) ".")
+-   (delete (concat (file-name-as-directory moddir) "..")
+-   (directory-files moddir t nil nil 0)))
+-   "modules" autofile)
+-  (byte-recompile-file autofile 0)))
+-;; now load the (perhaps newly rebuilt) autoloads; we were called with
+-;; -no-autoloads so they're not already loaded.
++;; now load the autoloads; we were called with -no-autoloads so they're 
not
++;; already loaded.
+ (load (expand-file-name "auto-autoloads" lisp-directory))
+ (when (featurep 'mule)
+   (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
+@@ -175,6 +148,8 @@
+ ;; there may be dependencies between one .el and another (even across
+ ;; directories), and we don't want to load an out-of-date .elc while
+ ;; byte-compiling a file.
++(when (featurep 'modules)
++  (load (expand-file-name "auto-autoloads" module-directory)))
+ (message "Removing old or spurious .elcs in directory tree `%s'..." dir)
+ (do-update-elc-2 dir nil nil)
+ (message "Removing old or spurious .elcs in directory tree `%s'...done"
+--- a/lisp/update-elc.el.orig  2022-06-16 21:58:48.748641021 +0200
 b/lisp/update-elc.el   2022-06-16 21:58:48.748641021 +0200
+@@ -54,8 +54,11 @@
+ (defvar update-elc-files-to-compile nil)
+ (defvar need-to-rebuild-autoloads nil)
+ (defvar need-to-rebuild-mule-autoloads nil)
++(defvar need-to-rebuild-module-autoloads nil)
+ (defvar need-to-recompile-autoloads nil)
+ (defvar need-to-recompile-mule-autoloads nil)
++(defvar need-to-recompile-module-autoloads nil)
++
+ (defvar exe-target nil)
+ (defvar dump-target nil)
+ (defvar dump-target-out-of-date-wrt-dump-files nil)
+@@ -84,10 +87,14 @@
+ 
+ (defvar source-lisp-mule (expand-file-name "mule" source-lisp))
+ (defvar source-directory (expand-file-name ".." source-lisp))
++(defconst module-directory (expand-file-name "modules" source-directory))
++
+ (defvar aa-lisp (expand-file-name "auto-autoloads.el" source-lisp))
+ (defvar aac-lisp (expand-file-name "auto-autoloads.elc" source-lisp))
+ (defvar aa-lisp-mule (expand-file-name "auto-autoloads.el" source-lisp-mule))
+ (defvar aac-lisp-mule (expand-file-name "auto-autoloads.elc" 

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2020-08-30 Thread Mats Lidell
commit: aa0f2ac8fe28b871da7d7b91844d7313daef909f
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Aug 29 20:41:37 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Aug 30 18:11:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0f2ac8

app-editors/xemacs: Compile on >=glibc-2.32

Use strsignal to compile on >=glibc-2.32.

Closes: https://bugs.gentoo.org/738396
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mats Lidell  gentoo.org>

 .../xemacs/files/xemacs-21.5.34-strsignal.patch| 92 ++
 app-editors/xemacs/xemacs-21.5.34-r5.ebuild|  1 +
 2 files changed, 93 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch
new file mode 100644
index 000..464c6a542e8
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch
@@ -0,0 +1,92 @@
+diff -r 3ca291c0f7e3 configure
+--- a/configureSun Jul 28 10:17:08 2019 +0100
 b/configureThu Aug 27 00:15:50 2020 +0200
+@@ -18090,7 +18090,7 @@
+ esac
+ 
+ 
+-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime 
ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit 
gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random 
readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock 
sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask 
usleep vlimit vsnprintf waitpid wcscmp wcslen
++for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime 
ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit 
gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random 
readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock 
sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset 
ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+diff -r 3ca291c0f7e3 configure.ac
+--- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
 b/configure.ac Thu Aug 27 00:15:50 2020 +0200
+@@ -4563,7 +4563,7 @@
+ dnl Check for POSIX functions.
+ dnl 
+ 
+-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime 
ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit 
gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random 
readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock 
sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask 
usleep vlimit vsnprintf waitpid wcscmp wcslen)
++AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime 
ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit 
gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random 
readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock 
sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset 
ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen)
+ 
+ dnl getaddrinfo() is borked under hpux11
+ if test "$ac_cv_func_getaddrinfo" != "no" ; then
+diff -r 3ca291c0f7e3 src/config.h.in
+--- a/src/config.h.in  Sun Jul 28 10:17:08 2019 +0100
 b/src/config.h.in  Thu Aug 27 00:15:50 2020 +0200
+@@ -417,6 +417,7 @@
+ #undef HAVE_SNPRINTF
+ #undef HAVE_STRERROR
+ #undef HAVE_STRLWR
++#undef HAVE_STRSIGNAL
+ #undef HAVE_STRUPR
+ #undef HAVE_SYMLINK
+ #undef HAVE_TZSET
+diff -r 3ca291c0f7e3 src/process.c
+--- a/src/process.cSun Jul 28 10:17:08 2019 +0100
 b/src/process.cThu Aug 27 00:15:50 2020 +0200
+@@ -1646,7 +1646,11 @@
+ signal_name (int signum)
+ {
+   if (signum >= 0 && signum < NSIG)
++#ifdef HAVE_STRSIGNAL
++return strsignal (signum);
++#else
+ return (const char *) sys_siglist[signum];
++#endif
+ 
+   return (const char *) GETTEXT ("unknown signal");
+ }
+diff -r 3ca291c0f7e3 src/s/linux.h
+--- a/src/s/linux.hSun Jul 28 10:17:08 2019 +0100
 b/src/s/linux.hThu Aug 27 00:15:50 2020 +0200
+@@ -36,10 +36,6 @@
+ 
+ /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */
+ 
+-/* This is needed for sysdep.c */
+-
+-#define HAVE_SYS_SIGLIST
+-
+ /* #define POSIX -- not used in XEmacs */
+ 
+ /* Deleted TERM stuff -- probably hugely obsolete */
+diff -r 3ca291c0f7e3 src/sysdep.c
+--- a/src/sysdep.c Sun Jul 28 10:17:08 2019 +0100
 b/src/sysdep.c Thu Aug 27 00:15:50 2020 +0200
+@@ -3520,7 +3520,7 @@
+ /*   Strings corresponding to defined signals   */
+ //
+ 
+-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined 
(HAVE_SYS_SIGLIST)
++#if !defined(HAVE_STRSIGNAL) && 

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2020-01-12 Thread Mats Lidell
commit: c878f5c46146e6946846aba86b9c7ece66e2
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Jan 12 18:00:12 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Jan 12 19:14:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c878f5c4

app-editors/xemacs: Convert iso-8859-1 texi files to utf-8

Convert iso-8859-1 files instead of patching since QA checks
don't like binary patch files.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mats Lidell  gentoo.org>

 .../xemacs/files/xemacs-21.4.24-makeinfo.patch | 65 --
 app-editors/xemacs/xemacs-21.4.24-r2.ebuild|  7 ++-
 2 files changed, 6 insertions(+), 66 deletions(-)

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch 
b/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
deleted file mode 100644
index 511e2b146a3..000
--- a/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -r e2da872593c0 man/lispref/ldap.texi
 a/man/lispref/ldap.texiTue Mar 24 22:15:53 2015 -0400
-+++ b/man/lispref/ldap.texiWed Jan 01 22:53:19 2020 +0100
-@@ -105,7 +105,7 @@
- library XEmacs was compiled with, they may include @code{simple},
- @code{krbv41} and @code{krbv42}.
- @item base
--The base for the search. This may look like @samp{c�, o�me}, see
-+The base for the search. This may look like @samp{cÿ, o¬me}, see
- RFC 1779 for syntax details.
- @item scope
- One of the symbols @code{base}, @code{onelevel} or @code{subtree}
-diff -r e2da872593c0 man/xemacs-faq.texi
 a/man/xemacs-faq.texi  Tue Mar 24 22:15:53 2015 -0400
-+++ b/man/xemacs-faq.texi  Wed Jan 01 22:53:19 2020 +0100
-@@ -1,4 +1,4 @@
--\input texinfo.tex  @c -*- mode: texinfo; coding: iso-2022-8 -*-
-+\input texinfo.tex  @c -*- mode: texinfo; coding: utf-8 -*-
- @c %**start of header
- @setfilename ../info/xemacs-faq.info
- @settitle Frequently asked questions about XEmacs
-@@ -2831,7 +2831,7 @@
- all of the ISO 8859 family, the Indic languages, Thai, and so on), and
- SKK, for Japanese.  (SKK also supports an interface to an external
- "dictionary server" process.)  Quail supports both typical "dead-key"
--methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces �, LATIN
-+methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
- SMALL LETTER A WITH DIAERESIS), and the complex dictionary-based phonetic
- methods used for Asian ideographic languages like Chinese.
- 
-@@ -2877,7 +2877,7 @@
- Wnn and SJ3 use the @code{egg} user interface.  The interface for Canna
- is specialized to Canna.
- 
--Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Ky�to
-+Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
- University. It is a powerful and complex system.  Wnn4 is free and Wnn6
- is not.  Wnn uses grammatical hints and probability of word association,
- so in principle Wnn can be cleverer than other methods.
-@@ -4800,10 +4800,10 @@
- @node Q3.0.6, Q3.0.7, Q3.0.5, Editing
- @unnumberedsubsec Q3.0.6: How can you type in special characters in XEmacs?
- One way is to use the package @code{x-compose}.  Then you can use
--sequences like @kbd{Compose " a} to get �, etc.
-+sequences like @kbd{Compose " a} to get ä, etc.
- 
- Another way is to use the @code{iso-insert} package. Then you can use
--sequences like @kbd{C-x 8 " a} to get �, etc.
-+sequences like @kbd{C-x 8 " a} to get ä, etc.
- 
- @email{glynn@@sensei.co.uk, Glynn Clements} writes:
- 
-@@ -4826,9 +4826,9 @@
- 
- Once you have Multi_key defined, you can use e.g.
- @example
--Multi a '   => �
--Multi e "   => �
--Multi c ,   => �
-+Multi a '   => á
-+Multi e "   => ë
-+Multi c ,   => ç
- @end example
- 
- etc.

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 7364c9f7242..1f2018514ed 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -65,7 +65,12 @@ src_prepare() {
eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
# see bug 615544
eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-   eapply "${FILESDIR}"/xemacs-21.4.24-makeinfo.patch
+
+   # Convert to utf-8
+   iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp 
man/xemacs-faq.texi \
+ && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
+   iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp 
man/lispref/ldap.texi \
+ && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
 
eapply_user
 



[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2020-01-11 Thread Mats Lidell
commit: 5af69d7aa4d3b0169eb11d5b38dd5262b753aa80
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Jan 11 16:47:07 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Jan 11 16:47:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af69d7a

app-editors/xemacs: Use EAPI=7 and use utf-8 for info

Use utf-8 in info files to allow use of texinfo 6.7

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mats Lidell  gentoo.org>

 .../xemacs/files/xemacs-21.4.24-makeinfo.patch |  65 ++
 app-editors/xemacs/xemacs-21.4.24-r2.ebuild| 246 +
 2 files changed, 311 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch 
b/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
new file mode 100644
index 000..511e2b146a3
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-makeinfo.patch
@@ -0,0 +1,65 @@
+diff -r e2da872593c0 man/lispref/ldap.texi
+--- a/man/lispref/ldap.texiTue Mar 24 22:15:53 2015 -0400
 b/man/lispref/ldap.texiWed Jan 01 22:53:19 2020 +0100
+@@ -105,7 +105,7 @@
+ library XEmacs was compiled with, they may include @code{simple},
+ @code{krbv41} and @code{krbv42}.
+ @item base
+-The base for the search. This may look like @samp{c�, o�me}, see
++The base for the search. This may look like @samp{cÿ, o¬me}, see
+ RFC 1779 for syntax details.
+ @item scope
+ One of the symbols @code{base}, @code{onelevel} or @code{subtree}
+diff -r e2da872593c0 man/xemacs-faq.texi
+--- a/man/xemacs-faq.texi  Tue Mar 24 22:15:53 2015 -0400
 b/man/xemacs-faq.texi  Wed Jan 01 22:53:19 2020 +0100
+@@ -1,4 +1,4 @@
+-\input texinfo.tex  @c -*- mode: texinfo; coding: iso-2022-8 -*-
++\input texinfo.tex  @c -*- mode: texinfo; coding: utf-8 -*-
+ @c %**start of header
+ @setfilename ../info/xemacs-faq.info
+ @settitle Frequently asked questions about XEmacs
+@@ -2831,7 +2831,7 @@
+ all of the ISO 8859 family, the Indic languages, Thai, and so on), and
+ SKK, for Japanese.  (SKK also supports an interface to an external
+ "dictionary server" process.)  Quail supports both typical "dead-key"
+-methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces �, LATIN
++methods (eg, in the "latin-1-prefix" method, @kbd{" a} produces ä, LATIN
+ SMALL LETTER A WITH DIAERESIS), and the complex dictionary-based phonetic
+ methods used for Asian ideographic languages like Chinese.
+ 
+@@ -2877,7 +2877,7 @@
+ Wnn and SJ3 use the @code{egg} user interface.  The interface for Canna
+ is specialized to Canna.
+ 
+-Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Ky�to
++Wnn supports Japanese, Chinese and Korean. It is made by OMRON and Kyôto
+ University. It is a powerful and complex system.  Wnn4 is free and Wnn6
+ is not.  Wnn uses grammatical hints and probability of word association,
+ so in principle Wnn can be cleverer than other methods.
+@@ -4800,10 +4800,10 @@
+ @node Q3.0.6, Q3.0.7, Q3.0.5, Editing
+ @unnumberedsubsec Q3.0.6: How can you type in special characters in XEmacs?
+ One way is to use the package @code{x-compose}.  Then you can use
+-sequences like @kbd{Compose " a} to get �, etc.
++sequences like @kbd{Compose " a} to get ä, etc.
+ 
+ Another way is to use the @code{iso-insert} package. Then you can use
+-sequences like @kbd{C-x 8 " a} to get �, etc.
++sequences like @kbd{C-x 8 " a} to get ä, etc.
+ 
+ @email{glynn@@sensei.co.uk, Glynn Clements} writes:
+ 
+@@ -4826,9 +4826,9 @@
+ 
+ Once you have Multi_key defined, you can use e.g.
+ @example
+-Multi a '   => �
+-Multi e "   => �
+-Multi c ,   => �
++Multi a '   => á
++Multi e "   => ë
++Multi c ,   => ç
+ @end example
+ 
+ etc.

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
new file mode 100644
index 000..7364c9f7242
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application 
development system"
+HOMEPAGE="http://www.xemacs.org/;
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+   berkdb? ( sys-libs/db:= )
+   gdbm? ( 

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2019-07-09 Thread Mats Lidell
commit: 2db8cd966b9535468497485a2075b031549aac0a
Author: Mats Lidell  gentoo  org>
AuthorDate: Tue Jul  9 08:16:51 2019 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Tue Jul  9 08:16:51 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db8cd96

app-editors/xemacs: Fix configure problem

libneXtaw was not found. This was caused by libs not being linked in
the right order which is required when '--as-needed' is used.

Bug: https://bugs.gentoo.org/689176
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Mats Lidell  gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.16

 .../xemacs/files/xemacs-21.5.34-as-needed.patch| 25 ++
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild|  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
new file mode 100644
index 000..542ce14c36a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
@@ -0,0 +1,25 @@
+diff -r 30910ee1cf8c configure
+--- a/configureTue Jun 18 10:37:46 2019 +0100
 b/configureMon Jul 08 20:38:49 2019 +0200
+@@ -16668,7 +16668,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$athena_variant  $LIBS"
++LIBS="-l$athena_variant $libs_x $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+diff -r 30910ee1cf8c configure.ac
+--- a/configure.ac Tue Jun 18 10:37:46 2019 +0100
 b/configure.ac Mon Jul 08 20:38:49 2019 +0200
+@@ -4068,7 +4068,8 @@
+   athena_lib=Xaw;
+   AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
+ ],
+-[AC_MSG_WARN([Could not find a 3d Athena widget library that looked 
like $athena_variant.])]))
++[AC_MSG_WARN([Could not find a 3d Athena widget library that looked 
like $athena_variant.])]),
++$libs_x)
+   fi
+ 
+   dnl Now we locate the Athena headers that we need.

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 9747f72b358..28f843bc94a 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -66,6 +66,7 @@ src_prepare() {
epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
epatch "${FILESDIR}/${P}-gcc5.patch"
epatch "${FILESDIR}/${P}-glibc-macro.patch"
+   epatch "${FILESDIR}/${P}-as-needed.patch"
 
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).



[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2017-03-31 Thread Mats Lidell
commit: 5657e6d9c4d2e095ef880479e8daf5b9f3478fc0
Author: Mats Lidell  gentoo  org>
AuthorDate: Fri Mar 31 19:58:38 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Fri Mar 31 20:01:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5657e6d9

app-editors/xemacs: Use system malloc (bug 609110)

Move to EAPI=5, patch for glibc macro deprecation

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Manifest-Sign-Key: 0x377034660A5828DE!

 app-editors/xemacs/Manifest| 45 ++
 .../xemacs/files/xemacs-21.5.34-glibc-macro.patch  | 32 +++
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild| 12 +++---
 3 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index ba31b4f2285..bd49e82b84e 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,6 +1,51 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA256
+
+AUX README.Gentoo 1426 SHA256 
9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92 SHA512 
0576235fb09ea9ad5fbe5b1bbaa41dd37913603ab40773f2c476b72e147eac9b8de62f600717d06d5366184deadb55e0002e79b9987ba215bad5ebee41fdfbb1
 WHIRLPOOL 
a0687729c64ac2323d3b2d3fb8db9a68368553a3188725ade8d2a1d2b5c09ae32e3f8079037edc9c1f1e933894b9d287dd0c24fa8feb5dde953df9490a5403de
+AUX xemacs-21.4.19-db.patch 3157 SHA256 
c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022 SHA512 
b4987784295c5d2335440dccca4e157d5ccece510d97fc131e33f701fc2dc48bd01080df577c6e588d926703f7b461a347d0d3e3f99931e10cdb8b11592b35be
 WHIRLPOOL 
0ff39c8a7ba863194636a71e55831d145c79c2f45463c21705763618bcf4e2092ee2cef3ae485de8d8eb335dbe66d2d560674cf3028d29b23de1f1c358a0c122
+AUX xemacs-21.4.19-texi.patch 1107 SHA256 
9f7af4de522d03c9e78076c4801db775ce919d30b27f4f84c8b055d17f476ae5 SHA512 
8b032464dfdeed928c1d4fc566657762fa791e64a3b255a2725edf0d244b76c928c9dcc643584debbaa5b8c1d3c53f635950905ab30900f6d758ed5951d3c219
 WHIRLPOOL 
6aff14b5206492c5f519bd199927a438ecfc754527196e96f2106eaa2b5e416e09ee3e1313b93a53435249c5a44a626d37c1ab299a66927a9532ee5f04b394ba
+AUX xemacs-21.4.21-vcdiff.patch 476 SHA256 
adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c SHA512 
89d8c8ba5af0467057506b9e2b974fa5d09432e7375dcd0517007ad4d28fee8019895667bc4291fe500b1a039fbeef0b82d2318995ca41ed7045327dff860f85
 WHIRLPOOL 
0c0343e962bad880f328b292c73240dade407b60dea93c400101f9c3db76d92a0b4cd3a891647df390ba6cace35e1d1050961f576364f5478833d5ec411df4d5
+AUX xemacs-21.4.22-deprecated-ldap.patch 516 SHA256 
41100c6c9fc45d90aa4618e9e9897f229854fbea60ba34fb0e6b82e8e8a37a7b SHA512 
4761f5759741f733518668fededec21ab2e9ec1cb883a363ca23669e1c82d9d44c03126a758da02c21cad8a810c3f83f0516f2bad4103fbea2cf73b00516b388
 WHIRLPOOL 
ae9da77b267b96e8fc3c87e3498f1bee86fd0a2629be4083da84a3ddf50651c18d32c9e6af552cb3fa569f944b58e559a23c38554e27af4e6cd3b2ae94ad3dfa
+AUX xemacs-21.4.22-large-images.patch 4695 SHA256 
bde9b13e2e57f25564d732213fa5cb5f2bef17ce8580f8d18e81975febade3f8 SHA512 
b1e03d7824d0fed82eff4fc6e5d6cd7e9f1b94e6eeec5d429b8a66027a9fc95943318c4c010bbb0f57d59b31a90bab94360a41bb0858735da59ffcfb75d59319
 WHIRLPOOL 
391d95c4fb41fb2a9fe40fb90973a7475fe69079e8199345a0a3029d08d08b6f593452e3ecc44805bd505f8790344be834ddc9fc12d85d587d76716854b7316b
+AUX xemacs-21.4.22-libpng15.patch 2593 SHA256 
d2e1b5a1410cd6394f055092db591caba3c615f6bb26d4c8f1ff6507b0d70a69 SHA512 
f026634a164e4d34eb10a4fa60da3a86743f9cd8bda8e760a7ad206fa4056a4e4c2236c9e8a4ac92d70883b5838086e48e5d5647979a3692c15da0a765aa2e1e
 WHIRLPOOL 
ec21ac2290415f0c6c475e4628be241a0f73301453cbd5e8d82a655882165e9b92b37084216d4f7eabf82676859e6b7c306aff0fccbbe739a5f5d4846b818f13
+AUX xemacs-21.4.22-texinfo-5.patch 12752 SHA256 
282a8291a1e9c7436ffbfb86c6b458d5b80ab4154131bf783e4c97aa1685ca12 SHA512 
0817a882ca75d99537865a23a4565e9f8b21af75b1cb90f951ee672b0ad6485542d10b28c5c7532267b07e1fae973879e40f174a1dac40ef7dc305f34a575637
 WHIRLPOOL 
e6528655da5439f66e7f43d67cd19ea539af9d7ed87e136e59a54f40e02cf9d458ffb3b05bcc157dff3adfdbe3c6c98b4e3fd6f0ad5d28baa8a4c9b0d242f22a
+AUX xemacs-21.4.24-gcc5.patch 1132 SHA256 
5a2ec81e20914af91ade0c80a4683783a46d4dd2ee993eaea2b138287ca15458 SHA512 
1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749
 WHIRLPOOL 
05b61799c344e581fd23621ebc10743b9b5652c820c74432d219b4614b7e4fb84de9c344f023ba524dd94539c2559ce237245b23ee80ef585af37a7d06ab1f2e
+AUX xemacs-21.5.29-optimization-bug.patch 371 SHA256 
14c5d9ddab865a9e4a1c6d4f64ed44e4b16e0eccb9fdcef94cedfaa30948863c SHA512 
a955379e9abe736bdc17eeb9e924b9bf292bf4c9b2f59ca6221a09de8dafa020350ff5466732779bbb01f05152e8a823e333b9c967a6ec2fb5c1f2c9d7f694da
 WHIRLPOOL 
9405db9d2dc618310f30e6a257a95667dfb94782db0f7ec3f5a7c702a210e9293bbe04cec5b8a1c59ec94a35b4960b1a03fbf3ce0892e29c3657fa93bbf97150
+AUX xemacs-21.5.33-no-mule-build.patch 1393 SHA256 

[gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/, app-editors/xemacs/files/

2016-04-02 Thread Mats Lidell
commit: a7e28a58e95bb7540eafb21353b18345749bc215
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Apr  2 23:57:47 2016 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Apr  2 23:58:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e28a58

app-editors/xemacs: gcc-5.3 patch. See bug 576512.

Package-Manager: portage-2.2.26

 app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch | 32 ++
 app-editors/xemacs/xemacs-21.4.24.ebuild   |  7 -
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch 
b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
new file mode 100644
index 000..494fc51
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-gcc5.patch
@@ -0,0 +1,32 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in Tue Mar 24 22:15:53 2015 -0400
 b/configure.in Sun Mar 13 13:48:24 2016 +0100
+@@ -1939,6 +1939,8 @@
+ CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes"
+ dnl Yuck, bad compares have been worth at least 3 crashes!
+ CFLAGS="$CFLAGS -Wsign-compare"
++dnl Use old gnu inline semantics until we fix the source
++CFLAGS="$CFLAGS -fgnu89-inline"
+ dnl XEmacs is known not to be strict-aliasing-safe.
+ case "`gcc -v --help 2>&1`" in
+   *-fstrict-aliasing* ) CFLAGS="$CFLAGS -fno-strict-aliasing" ;;
+diff -r e2da872593c0 src/lisp.h
+--- a/src/lisp.h   Tue Mar 24 22:15:53 2015 -0400
 b/src/lisp.h   Sun Mar 13 13:48:24 2016 +0100
+@@ -193,6 +193,8 @@
+ # endif /* GNUC */
+ #endif
+ 
++#ifndef _GCC_MAX_ALIGN_T
++#define _GCC_MAX_ALIGN_T
+ /* No type has a greater alignment requirement than max_align_t.
+(except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -202,6 +204,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ #ifndef ALIGNOF
+ # if defined (__GNUC__) && (__GNUC__ >= 2)

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 97f68ae..9ffda4d 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -9,7 +9,7 @@
 EAPI="5"
 
 WANT_AUTOCONF="2.1"
-inherit autotools eutils toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="http://www.xemacs.org/;
@@ -62,6 +62,8 @@ src_unpack() {
 src_prepare() {
# see bug 58350, 102540 and 143580
epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
+   # see bug 576512
+   epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
 
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).
@@ -168,6 +170,9 @@ src_configure() {
 
einfo "${myconf}"
 
+   # see bug 576512
+   append-cflags -std=gnu89
+
# Don't use econf because it uses options which this configure
# script does not understand (like --host).
./configure ${myconf} ${EXTRA_ECONF} \