subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: app\-editors\/xemacs\/"

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

2024-03-12 Thread Mats Lidell

commit: a3dc67052d5a266a8ed044a76913bea30efbac63
Author: Mats Lidell  gentoo  org>
AuthorDate: Tue Mar 12 11:06:23 2024 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Tue Mar 12 11:06:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3dc6705

app-editors/xemacs: Set no-strict-aliasing on debug

Reintroduce patch to disable broken libc version check.

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

 .../xemacs-21.5.35-configure-libc-version.patch| 73 ++
 ...s-21.5..ebuild => xemacs-21.5.35-r1.ebuild} | 31 +
 app-editors/xemacs/xemacs-21.5..ebuild | 14 -
 3 files changed, 103 insertions(+), 15 deletions(-)

diff --git 
a/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch 
b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch
new file mode 100644
index ..e744d3952b10
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch
@@ -0,0 +1,73 @@
+diff -r 3761ed745bc6 configure.ac
+--- a/configure.ac Sat Mar 02 17:26:00 2024 +0100
 b/configure.ac Fri Mar 08 22:25:23 2024 +0100
+@@ -2192,7 +2192,6 @@
+ 
+ compiler_version=""
+ gcc_compiler_specs=""
+-libc_version=""
+ 
+ AC_MSG_CHECKING([for compiler version information])
+ 
+@@ -2255,53 +2254,6 @@
+ fi
+ AC_MSG_RESULT([$compiler_version])
+ 
+-AC_MSG_CHECKING(for standard C library version information)
+-
+-case "$ac_cv_build" in
+-  *-*-linux*)
+-dnl  who would ever _not_ be running the distro's libc?
+-dnl Maybe it would be better to get/augment this info with ldd?
+-if test -f /etc/redhat-release ; then
+-  libc_version=`rpm -q glibc`
+-elif test -f /etc/debian_version ; then
+-  libc_version=`dpkg-query --showformat='${version}' --show libc6`
+-  libc_version="GNU libc $libc_version (Debian)"
+-dnl need SuSE et al checks here...
+-fi
+-dnl  Tested on Debian, does this actually work elsewhere?  ;-)
+-  if test -z "$libc_version"; then
+-  libc_version=`ls /lib/libc-*.so | sed -e 
's,/lib/libc-\(.*\)\.so,\1,'`
+-  fi
+-  ;;
+-
+-  *-*-aix*)
+-libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" 
+-  ;;
+-
+-  *-*-solaris*)
+-libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'`
+-libc_version="SUNWcsl $libc"
+-
+-  ;;
+-
+-  mips-sgi-irix*)
+-libc_version="IRIX libc `uname -sRm`"
+-  ;;
+-
+-  alpha*-dec-osf*)
+-  dnl Another ugly case
+-(cd /usr/.smdb.;
+-  libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print 
$12}' | tr '\n' ','`
+-)
+-  ;;
+-esac
+-
+-dnl Awww, shucks.
+-if test -z "libc_version"; then
+-  libc_version="detection failed (please report this)"
+-fi
+-AC_MSG_RESULT([$libc_version])
+-
+ dnl -
+ dnl These directories are used to search for include subdirs.
+ dnl -
+@@ -6122,7 +6074,6 @@
+ echo "  WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully."
+   fi
+ fi
+-echo "  libc version:  $libc_version"
+ echo "  Relocating allocator for buffers:  $with_rel_alloc"
+ echo "
+ Package Search (a 'root' contains '{xemacs,mule,site}-packages'):"

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild
similarity index 90%
copy from app-editors/xemacs/xemacs-21.5..ebuild
copy to app-editors/xemacs/xemacs-21.5.35-r1.ebuild
index 15945ea32285..505fb03625a3 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -6,17 +6,17 @@
 
 EAPI=8
 
-inherit flag-o-matic xdg-utils desktop
+inherit flag-o-matic xdg-utils desktop autotools
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="https://www.xemacs.org/;
-SRC_URI="neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz 
)"
 
-inherit mercurial
-EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs;
+SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
+   neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
 LICENSE="GPL-3+"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif 
freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
@@ -55,18 +55,20 @@

[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/

2023-08-19 Thread Sam James

commit: f68e656fc0b419d63bfffc63cca056475ffd502a
Author: Sam James  gentoo  org>
AuthorDate: Sun Aug 20 05:41:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Aug 20 05:41:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68e656f

app-editors/xemacs: Stabilize 21.5.35 amd64, #912595

Signed-off-by: Sam James  gentoo.org>

 app-editors/xemacs/xemacs-21.5.35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild 
b/app-editors/xemacs/xemacs-21.5.35.ebuild
index 18244f7564f0..81c8ab501cb5 100644
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 
1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif 
freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2023-08-19 Thread Arthur Zamarin

commit: 8152559249221cf8ba06dbdf98b882d366592ba4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 19 16:09:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 19 16:09:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81525592

app-editors/xemacs: Stabilize 21.5.35 ppc, #912595

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/xemacs/xemacs-21.5.35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild 
b/app-editors/xemacs/xemacs-21.5.35.ebuild
index 90b73b548166..18244f7564f0 100644
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 
1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif 
freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2023-08-19 Thread Arthur Zamarin

commit: 5fc789d1fee18fe75afa53c3465cb71532d9c2f3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 19 16:08:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 19 16:08:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fc789d1

app-editors/xemacs: Stabilize 21.5.35 ppc64, #912595

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/xemacs/xemacs-21.5.35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild 
b/app-editors/xemacs/xemacs-21.5.35.ebuild
index 861bbd25dcc3..90b73b548166 100644
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 
1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif 
freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2023-08-19 Thread Arthur Zamarin

commit: 752d75ce196a1b628df4235a2a55bddb98352aaf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 19 16:06:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 19 16:06:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=752d75ce

app-editors/xemacs: Stabilize 21.5.35 x86, #912595

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/xemacs/xemacs-21.5.35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild 
b/app-editors/xemacs/xemacs-21.5.35.ebuild
index a0b40992234a..861bbd25dcc3 100644
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 
1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif 
freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2023-08-19 Thread Arthur Zamarin

commit: 79ed650998565d2c1ae5f59d9db515f2c4699a9a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Aug 19 15:55:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Aug 19 15:55:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ed6509

app-editors/xemacs: Stabilize 21.5.35 arm64, #912595

Signed-off-by: Arthur Zamarin  gentoo.org>

 app-editors/xemacs/xemacs-21.5.35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild 
b/app-editors/xemacs/xemacs-21.5.35.ebuild
index 02b39304cbe9..a0b40992234a 100644
--- a/app-editors/xemacs/xemacs-21.5.35.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 
1-2)/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif 
freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2023-06-18 Thread Mats Lidell

commit: 0d940b13d0983b98342398b594b2bd581d1dc092
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Jun 18 20:32:52 2023 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Jun 18 20:32:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d940b13

app-editors/xemacs: add 21.5.35

Drop mule use flag and make mule default with unicode-internal.
Add bignum use flag with openssl, default on.

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

 app-editors/xemacs/Manifest|   1 +
 .../xemacs/files/xemacs-21.5.35-configure.patch|  42 +++
 .../xemacs/files/xemacs-21.5.35-mule-tests.patch   | 124 +
 app-editors/xemacs/metadata.xml|   1 +
 ...macs-21.5..ebuild => xemacs-21.5.35.ebuild} |  54 -
 app-editors/xemacs/xemacs-21.5..ebuild |  39 ---
 6 files changed, 214 insertions(+), 47 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 793589c73091..71147468cac4 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,3 +1,4 @@
 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.35-configure.patch 
b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch
new file mode 100644
index ..5648e0a38fcf
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch
@@ -0,0 +1,42 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
 b/configure.ac
+@@ -3792,8 +3792,7 @@
+ XE_PREPEND("$libpath_xpm", LDFLAGS)
+ AC_MSG_CHECKING(for Xpm - no older than 3.4f)
+ xe_check_libs="$libname_xpm"
+-AC_RUN_IFELSE([AC_LANG_SOURCE([#define XPM_NUMBERS
+-#include 
++AC_RUN_IFELSE([AC_LANG_SOURCE([#include 
+ int main(int c, char **v) {
+ return c == 1 ? 0 :
+   XpmIncludeVersion != XpmLibraryVersion() ? 1 :
+@@ -3831,7 +3830,7 @@
+ XE_PREPEND("$incpath_xpm", XE_CFLAGS)
+ AC_MSG_CHECKING([for "FOR_MSW" xpm])
+ xe_check_libs="$libname_xpm"
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([],[XpmCreatePixmapFromData();])],
++AC_LINK_IFELSE([AC_LANG_PROGRAM([#include 
],[XpmCreatePixmapFromData(0, 0, 0, 0, 0, 0);])],
+ [xpm_for_msw=no],
+ [xpm_for_msw=yes])
+ xe_check_libs=
+@@ -4620,9 +4619,7 @@
+ AC_CACHE_VAL(emacs_cv_localtime_cache,
+ [if test "$ac_cv_func_tzset" = "yes"; then
+ AC_RUN_IFELSE([AC_LANG_SOURCE([#include 
+-#if STDC_HEADERS
+-# include 
+-#endif
++#include 
+ extern char **environ;
+ unset_TZ ()
+ {
+@@ -4733,6 +4730,8 @@
+ void *alloca ();
+ #endif /* C_ALLOCA */
+ #endif /* !defined (alloca) */
++#include 
++#include 
+ 
+ void
+ f1 (double a, void *ptr, int b)

diff --git a/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch 
b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch
new file mode 100644
index ..d650d86e6944
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch
@@ -0,0 +1,124 @@
+diff --git a/tests/automated/mule-tests.el b/tests/automated/mule-tests.el
+--- a/tests/automated/mule-tests.el
 b/tests/automated/mule-tests.el
+@@ -85,14 +85,15 @@
+   (insert string)
+   (assert (equal (buffer-string) string))
+ 
+-(when (compiled-function-p (symbol-function 'test-chars))
+-  ;; Run #'test-chars in byte-compiled mode only.
+-  (test-chars t
+-;; unicode-internal has a value of #x4000, (expt 2 30), for
+-;; char-code-limit and even re-writing the above to avoid
+-;; allocating the list and the string means I run out of memory
+-;; when I attempt to run this.
+-(min char-code-limit #x20)))
++;; Crashes XEmacs ...
++;; (when (compiled-function-p (symbol-function 'test-chars))
++;;   ;; Run

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

2023-05-10 Thread Mats Lidell

commit: 61270ab31f594d9b8a697012ff99aece9f1c3a83
Author: Mats Lidell  gentoo  org>
AuthorDate: Wed May 10 21:02:01 2023 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Wed May 10 21:09:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61270ab3

app-editors/xemacs: use freewnn with gcc-13

Closes: https://bugs.gentoo.org/905434
Signed-off-by: Mats Lidell  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r10.ebuild | 4 +++-
 app-editors/xemacs/xemacs-21.5.34-r13.ebuild | 4 +++-
 app-editors/xemacs/xemacs-21.5..ebuild   | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
index cf1b3d10906b..7d1252abe2f3 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -175,6 +175,8 @@ src_configure() {
# see bug 576512
append-cflags -fgnu89-inline
 
+   use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
+
# Don't use econf because it uses options which this configure
# script does not understand (like --host).
./configure ${myconf} ${EXTRA_ECONF} \

diff --git a/app-editors/xemacs/xemacs-21.5.34-r13.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
index d257f4c26662..51b3f8f5095c 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -168,6 +168,8 @@ src_configure() {
use debug && myconf="${myconf} --with-debug" ||
myconf="${myconf} --with-optimization --with-cflags-debugging="
 
+   use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
+
econf ${myconf} \
$(use_with gif ) \
$(use_with gpm ) \

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index c164858b40dd..f2e01acd2ca1 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -160,6 +160,8 @@ src_configure() {
use debug && myconf="${myconf} --with-debug" ||
myconf="${myconf} --with-optimization --with-cflags-debugging="
 
+   use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
+
econf ${myconf} \
$(use_with gif ) \
$(use_with gpm ) \

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

2022-12-25 Thread Mats Lidell

commit: 0d74bc064b54667e514fbc23ca2e61cc8bcd7430
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Dec 25 17:21:58 2022 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Dec 25 17:28:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d74bc06

app-editors/xemacs: update EAPI 7 -> 8

Do not add debug flag on regular builds.
Cleanup: Remove commented out patches.

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

 app-editors/xemacs/xemacs-21.5..ebuild | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index 2cfa5ff7eba1..c164858b40dd 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -4,7 +4,7 @@
 # Note: xemacs currently does not work with position independent code
 # so the build forces the use of the -no-pie option
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic xdg-utils desktop
 
@@ -62,14 +62,6 @@ src_unpack() {
 src_prepare() {
use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-   # eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
-   # eapply "${FILESDIR}/${P}-gcc5.patch"
-   # eapply "${FILESDIR}/${P}-glibc-macro.patch"
-   # eapply "${FILESDIR}/${P}-as-needed.patch"
-   # eapply "${FILESDIR}/${P}-configure-libc-version.patch"
-   # eapply "${FILESDIR}/${P}-ar.patch"
-   # eapply "${FILESDIR}/${P}-strsignal.patch"
-   # eapply "${FILESDIR}/${P}-process-test-qa.patch"
 
eapply_user
 
@@ -166,7 +158,7 @@ src_configure() {
fi
 
use debug && myconf="${myconf} --with-debug" ||
-   myconf="${myconf} --with-optimization"
+   myconf="${myconf} --with-optimization --with-cflags-debugging="
 
econf ${myconf} \
$(use_with gif ) \

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

2022-12-24 Thread Mats Lidell

commit: b8afc4de2207f735aeb4e26ba1b9a70fa040fa60
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Dec 24 13:47:16 2022 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Dec 24 15:41:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8afc4de

app-editors/xemacs: Do not add debug flag

Set ebuild to not per default add debug flags.
Use ver_cut.

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

 app-editors/xemacs/xemacs-21.5.34-r13.ebuild | 259 +++
 1 file changed, 259 insertions(+)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r13.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
new file mode 100644
index ..d257f4c26662
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r13.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2022 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=8
+
+inherit flag-o-matic xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application 
development system"
+HOMEPAGE="https://www.xemacs.org/;
+SRC_URI="http://ftp.xemacs.org/xemacs-$(ver_cut 1-2)/${P}.tar.gz
+   neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn xft 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-4:= !!=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
+   >=sys-libs/zlib-1.1.4
+   >=dev-libs/openssl-0.9.6:0=
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( net-nds/openldap:= )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:= )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( media-libs/libjpeg-turbo:= )
+   freewnn? ( app-i18n/freewnn )
+   >=sys-libs/ncurses-5.2:=
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   default_src_unpack
+}
+
+src_prepare() {
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+   eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+   eapply "${FILESDIR}/${P}-gcc5.patch"
+   eapply "${FILESDIR}/${P}-glibc-macro.patch"
+   eapply "${FILESDIR}/${P}-as-needed.patch"
+   eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+   eapply "${FILESDIR}/${P}-ar.patch"
+   eapply "${FILESDIR}/${P}-strsignal.patch"
+   eapply "${FILESDIR}/${P}-process-test-qa.patch"
+   eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
+   eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
+   eapply "${FILESDIR}/${P}-module-autoloads.patch"
+
+   eapply_user
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+}
+
+src_configure() {
+   local myconf=""
+
+   # bug #639642
+   test-flags -no-pie >/dev/null && append-flags -no-pie
+   filter-flags -pie
+
+   if use X; then
+
+   myconf="${myconf} --with-widgets=athena"
+   myconf="${myconf} --with-dialogs=athena"
+   myconf="${myconf} --with-menubars=lucid"
+   myconf="${myconf} --with-scrollbars=lucid"
+   if use motif ; then
+   myconf="--with-widgets=motif"
+   myconf="${myconf} --with-dialogs=motif"
+   myconf="${myconf} --with-scrollbars=motif"
+   myconf="${myconf} --with-menubars=lucid"
+   fi
+   if use athena or use Xaw3d ; then
+   myconf="--with-scrollbars=athena"
+   fi
+
+   if use Xaw3d; then
+

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

2022-12-17 Thread Sam James

commit: db2b3c2f526ac6937a212a3e570d31fcab04a257
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 07:15:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 07:46:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2b3c2f

app-editors/xemacs: fix revbump order

Sorry for the noise. The script didn't get ordering right
in all cases.

Fixes: 6c534857fe7787602eb85baa83a83b6343d9caf3
Signed-off-by: Sam James  gentoo.org>

 .../xemacs/{xemacs-21.4.24-r7.ebuild => xemacs-21.4.24-r10.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r7.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild
similarity index 100%
rename from app-editors/xemacs/xemacs-21.4.24-r7.ebuild
rename to app-editors/xemacs/xemacs-21.4.24-r10.ebuild

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

2022-12-15 Thread Sam James

commit: 02eb1852d17b7602a3e8a70a02e70dda44dc889f
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:27:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:29:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02eb1852

app-editors/xemacs: unrevbump 

Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)

Signed-off-by: Sam James  gentoo.org>

 .../xemacs/{xemacs-21.5.-r1.ebuild => xemacs-21.5..ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.-r1.ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
similarity index 100%
rename from app-editors/xemacs/xemacs-21.5.-r1.ebuild
rename to app-editors/xemacs/xemacs-21.5..ebuild

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

2022-08-31 Thread Mats Lidell

commit: 1a780e093f3446561539b777f545268ce4d4a461
Author: Mats Lidell  gentoo  org>
AuthorDate: Wed Aug 31 20:19:06 2022 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Wed Aug 31 20:19:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a780e09

app-editors/xemacs: drop 21.5.34-r8

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

 app-editors/xemacs/xemacs-21.5.34-r8.ebuild | 260 
 1 file changed, 260 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
deleted file mode 100644
index 61aff25cd403..
--- a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2022 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
-
-inherit autotools flag-o-matic xdg-utils desktop
-
-DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="https://www.xemacs.org/;
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn xft 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-4:= !!=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
-   >=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6:0=
-   >=media-libs/audiofile-0.2.3
-   gpm? ( >=sys-libs/gpm-1.19.6 )
-   postgres? ( dev-db/postgresql:= )
-   ldap? ( net-nds/openldap:= )
-   alsa? ( media-libs/alsa-lib )
-   nas? ( media-libs/nas )
-   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-   dnd? ( x11-libs/dnd )
-   motif? ( >=x11-libs/motif-2.3:0[xft=] )
-   athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d )
-   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
-   neXt? ( x11-libs/neXtaw )
-   xface? ( media-libs/compface )
-   tiff? ( media-libs/tiff:0 )
-   png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( media-libs/libjpeg-turbo:0= )
-   freewnn? ( app-i18n/freewnn )
-   >=sys-libs/ncurses-5.2:=
-   >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
-   mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-   default_src_unpack
-
-   use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
-   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-   eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
-   eapply "${FILESDIR}/${P}-gcc5.patch"
-   eapply "${FILESDIR}/${P}-glibc-macro.patch"
-   eapply "${FILESDIR}/${P}-as-needed.patch"
-   eapply "${FILESDIR}/${P}-configure-libc-version.patch"
-   eapply "${FILESDIR}/${P}-ar.patch"
-   eapply "${FILESDIR}/${P}-strsignal.patch"
-   eapply "${FILESDIR}/${P}-process-test-qa.patch"
-
-   eapply_user
-
-   # Some binaries and man pages are installed under suffixed names
-   # to avoid collions with their GNU Emacs counterparts (see below).
-   # Fix internal filename references.
-   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
-}
-
-src_configure() {
-   local myconf=""
-
-   # bug #639642
-   test-flags -no-pie >/dev/null && append-flags -no-pie
-   filter-flags -pie
-
-   if use X; then
-
-   myconf="${myconf} --with-widgets=athena"
-   myconf="${myconf} --with-dialogs=athena"
-   myconf="${myconf} --with-menubars=lucid"
-   myconf="${myconf} --with-scrollbars=lucid"
-   if use motif ; then
-   myconf="--with-widgets=motif"
-   myconf="${myconf} --with-dialogs=motif"
-   myconf="${myconf} --with-scrollbars=motif"
-   myconf="${myconf} --with-menubars=lucid"
-   fi
-   if use athena or use Xaw3d ; then
-   myconf="--with-scrollbars=athena"
-   fi
-
-   if use Xaw3d; then
-   myconf="${myconf} --with-athena=3d"
-   elif use neXt; then
-   myconf="${myconf} --with-athena=next"
-   else
-   myconf="${myconf} --with-athena=xaw"
-   fi
-
-

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

2022-08-27 Thread Matt Turner

commit: c271a42528a3660dcd0e46ba3c09dfca6cddf041
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Aug 27 15:25:30 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Aug 27 15:29:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c271a425

app-editors/xemacs: Add (+) to libXaw3d's unicode USE-dep

Signed-off-by: Matt Turner  gentoo.org>

 .../xemacs/{xemacs-21.4.24-r6.ebuild => xemacs-21.4.24-r7.ebuild}   | 2 +-
 .../xemacs/{xemacs-21.5.34-r9.ebuild => xemacs-21.5.34-r10.ebuild}  | 2 +-
 app-editors/xemacs/xemacs-21.5..ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r7.ebuild
similarity index 99%
rename from app-editors/xemacs/xemacs-21.4.24-r6.ebuild
rename to app-editors/xemacs/xemacs-21.4.24-r7.ebuild
index fe5170beba18..28f9bf7f9a99 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r7.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
dnd? ( x11-libs/dnd )
motif? ( >=x11-libs/motif-2.3:0 )
athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d[unicode] )
+   Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
neXt? ( x11-libs/neXtaw )
xface? ( media-libs/compface )
tiff? ( media-libs/tiff:0 )

diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r10.ebuild
similarity index 99%
rename from app-editors/xemacs/xemacs-21.5.34-r9.ebuild
rename to app-editors/xemacs/xemacs-21.5.34-r10.ebuild
index e6c5da2b2155..f3aef5bea8c6 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r10.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
dnd? ( x11-libs/dnd )
motif? ( >=x11-libs/motif-2.3:0[xft=] )
athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d[unicode] )
+   Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
neXt? ( x11-libs/neXtaw )
xface? ( media-libs/compface )

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index 646022402db0..fb2be59cf978 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -36,7 +36,7 @@ RDEPEND="
dnd? ( x11-libs/dnd )
motif? ( >=x11-libs/motif-2.3:0[xft=] )
athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d[unicode] )
+   Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
neXt? ( x11-libs/neXtaw )
xface? ( media-libs/compface )

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

2022-07-06 Thread Mats Lidell

commit: 542b80446e7846c7b1e997787178a0773e24ae1d
Author: Mats Lidell  gentoo  org>
AuthorDate: Wed Jul  6 20:06:16 2022 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Wed Jul  6 20:25:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=542b8044

app-editors/xemacs: fix emerge with modules

Use backported patch from upstream tip development branch.
bug: https://bugs.gentoo.org/855122
Signed-off-by: Mats Lidell  gentoo.org>

 .../files/xemacs-21.5.34-module-autoloads.patch| 115 +
 app-editors/xemacs/xemacs-21.5.34-r9.ebuild|   1 +
 2 files changed, 116 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
new file mode 100644
index ..8b5443dfcb10
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-module-autoloads.patch
@@ -0,0 +1,115 @@
+diff -u b/lisp/update-elc-2.el b/lisp/update-elc-2.el
+--- b/lisp/update-elc-2.el Mon Jun 27 22:14:53 2022 +0900
 b/lisp/update-elc-2.el Thu Jun 30 16:36:19 2022 +0100
+@@ -144,12 +144,12 @@
+ (load (expand-file-name "auto-autoloads" lisp-directory))
+ (when (featurep 'mule)
+   (load (expand-file-name "mule/auto-autoloads" lisp-directory)))
++(when (featurep 'modules)
++  (load (expand-file-name "auto-autoloads" module-directory)))
+ ;; We remove all the bad .elcs before any byte-compilation, because
+ ;; 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"
+unchanged:
+--- a/src/Makefile.in.in   Mon Jun 27 13:31:39 2022 +0100
 b/src/Makefile.in.in   Mon Jun 27 22:14:53 2022 +0900
+@@ -95,7 +95,12 @@
+ SHELL=/bin/sh
+ RM = rm -f
+ 
+-LISP = $(SRC)/../lisp
++## Earlier versions had $(SRC)/../lisp here, but currently ../lisp is a
++## link to $(SRC)/../lisp in out-of-source builds.  $(SRC)/../lisp breaks
++## the modules build because the autoloads end up in $(SRCMODULES), but
++## update-elc-2.el looks for them in $(BLDMODULES).
++LISP = ../lisp
++
+ ETC = $(SRC)/../etc
+ SRCMODULES = $(SRC)/../modules
+ LIB_SRC = ../lib-src
+@@ -944,10 +949,14 @@
+   -$(RM) $(RAW_EXE) $(DUMP_TARGET) $(DUMP_TARGET).dmp $(LIB_SRC)/DOC
+ ##  Remove the generated load files here; they cause lots of problems
+ ##  when they don't work right.
++##  Some older versions tried to put module load files in the SRC tree,
++##  but that breaks module builds, which expect them in the BLD tree,
++##  and that's where they belong anyway.  Clean both.
+ clean: mostlyclean versionclean
+   -$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \
+   $(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \
+-  $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el*
++  $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* \
++  $(BLDMODULES)/auto-autoloads.el* $(BLDMODULES)/custom-load.el*
+ ## This is used in making a distribution.
+ ## Do not use it on development directories!
+ distclean-noconfig: clean
+only in patch2:
+unchanged:
+--- a/lisp/update-elc.el
 b/lisp/update-elc.el
+@@ -87,8 +87,8 @@
+ 
+ (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 source-modules (expand-file-name "../modules" (file-truename 
source-lisp)))
++(defconst module-directory (expand-file-name "modules" build-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))
+@@ -280,15 +280,13 @@ If any of these files are changed, we need to redump.")
+ 
+   ;; Check for the module autoloads separately, given the need to run
+   ;; directory-files on subdirectories.
+-  (let ((autoload-file
+-(expand-file-name "auto-autoloads.el" module-directory)))
+-(mapc
+- #'(lambda (full-dir)
+-(mapc #'(lambda (full-arg)
+-  (when (file-newer-than-file-p full-arg autoload-file)
+-(setq need-to-rebuild-module-autoloads t)))
+-  (directory-files full-dir t "\\.c$" nil t)))
+- (directory-files module-directory t nil t 'subdirs)))
++  (mapc
++   #'(lambda (full-dir)
++   (mapc #'(lambda (full-arg)
++   (when (file-newer-than-file-p full-arg aa-modules)
++ (setq

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

2022-06-27 Thread Mats Lidell

commit: a5dbc32a6e327775a55eba8583262d7bb761ec3a
Author: Mats Lidell  gentoo  org>
AuthorDate: Mon Jun 27 21:33:34 2022 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Mon Jun 27 21:39:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5dbc32a

app-editors/xemacs: No lock on finder-inf creation

Patch from upstream to not use a lock file when creating finder-inf.

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

 .../xemacs-21.5.34-no-lock-on-finder-inf.patch | 99 ++
 app-editors/xemacs/xemacs-21.5.34-r9.ebuild|  1 +
 2 files changed, 100 insertions(+)

diff --git 
a/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
new file mode 100644
index ..a37fc5e95fe0
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-no-lock-on-finder-inf.patch
@@ -0,0 +1,99 @@
+# HG changeset patch
+# User Aidan Kehoe 
+# Date 1656333099 -3600
+#  Mon Jun 27 13:31:39 2022 +0100
+# Node ID c6966a009d0dc3b546c9d843141c1fb5daa89b9e
+# Parent  16e37125d7ea85048e89197ce8fe83f44b00ccc5
+Don't create a lock file when generating finder-inf.el
+
+lisp/ChangeLog addition:
+
+2022-06-27  Aidan Kehoe  
+
+   * finder.el (finder-compile-keywords):
+   Don't use the save-buffer infrastructure when generating
+   finder-inf.el, since that leads to lock files, making parallel
+   builds less likely to work. Thank you Mats Lidell and the Gentoo
+   users!
+
+src/ChangeLog addition:
+
+2022-06-27  Aidan Kehoe  
+
+   * Makefile.in.in ($(LISP)/finder-inf.el):
+   Don't remove finder-inf.el before regenerating it, Lisp will
+   overwrite it.
+
+diff -r 16e37125d7ea -r c6966a009d0d lisp/finder.el
+--- a/lisp/finder.el   Sun Jun 26 19:14:02 2022 +0300
 b/lisp/finder.el   Mon Jun 27 13:31:39 2022 +0100
+@@ -151,7 +151,7 @@
+ arguments compiles from `load-path'."
+   (save-excursion
+ ;; XEmacs change
+-(find-file (expand-file-name "finder-inf.el" lisp-directory))
++(set-buffer (generate-new-buffer "finder-inf.el"))
+ (let ((processed nil)
+ (directory-abbrev-alist
+  (append
+@@ -160,11 +160,12 @@
+  "")))
+   finder-abbreviate-directory-list)
+   directory-abbrev-alist))
+-(using-load-path))
++using-load-path second-line-marker finder-scratch)
+   (or dirs (setq dirs load-path))
+   (setq using-load-path (equal dirs load-path))
+   (erase-buffer)
+   (insert ";;; finder-inf.el --- keyword-to-package mapping\n")
++  (setq second-line-marker (point-marker))
+   (insert ";; Keywords: help\n")
+   (insert ";;; Commentary:\n")
+   (insert ";; Don't edit this file.  It's generated by finder.el\n\n")
+@@ -180,7 +181,8 @@
+   (if (not finder-compile-keywords-quiet)
+   (message "Processing %s ..." f))
+   (save-excursion
+-(set-buffer (get-buffer-create "*finder-scratch*"))
++(set-buffer (setq finder-scratch
++(get-buffer-create "*finder-scratch*")))
+ (buffer-disable-undo (current-buffer))
+ (erase-buffer)
+ (insert-file-contents (expand-file-name f d))
+@@ -210,10 +212,23 @@
+   (directory-files d nil "^[^=].*\\.el$"
+dirs)
+   (insert "))\n\n(provide 'finder-inf)\n\n;;; finder-inf.el ends here\n")
+-  (kill-buffer "*finder-scratch*")
++  (if finder-scratch (kill-buffer finder-scratch))
+   (unless noninteractive
+   (eval-current-buffer)) ; So we get the new keyword list immediately
+-  (basic-save-buffer
++  (goto-char (point-min))
++  (if (re-search-forward "[^\x00-\x7f]" nil t)
++  (progn
++(goto-char (point-min))
++(if (re-search-forward "[^\x00-\xff]" nil t)
++(progn (goto-char second-line-marker)
++   (insert ";;; -*- coding: escape-quoted -*-\n")
++   (setq buffer-file-coding-system 'iso-8859-1-unix))
++  (goto-char second-line-marker)
++  (insert ";;; -*- coding: iso-8859-1 -*-\n")
++  (setq buffer-file-coding-system 'escape-quoted-unix)))
++(setq buffer-file-coding-system 'no-conversion-unix))
++  (write-region (point-min) (point-max)
++(expand-file-name "finder-inf.el" lisp-directory)
+ 
+ (defun finder-compile-keywords-make-dist ()
+   "Regenerate `finder-inf.el' for the Emacs distribution."
+diff -r 16e37125d7ea -r c6966a009d0d src/Makefile.in.in
+--- a/src/Makefile.in.in   Sun Jun 26 19:14:02 2022 +0300
 b/src/Makefile.in.in   Mon Jun 27 13:31:39 2022 +0100
+@@ -590,7 +590,6 @@
+ 
+ $(LISP)/finder-inf.el: update-elc-2
+   @echo "Building finder database ..."
+-  $(RM)

[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/

2022-05-07 Thread Ulrich Müller

commit: 90797af0e886499d9dec24275aaf9c8928fb431c
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat May  7 08:47:09 2022 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sat May  7 08:54:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90797af0

app-editors/xemacs: Update dependency on jpeg

Use https in HOMEPAGE.

Signed-off-by: Ulrich Müller  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r5.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.4.24-r6.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.5.34-r8.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.5.34-r9.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.5..ebuild  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r5.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
index 2f9a674f7c59..9f4b8ce418b4 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
@@ -10,7 +10,7 @@ WANT_AUTOCONF="2.1"
 inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="http://www.xemacs.org/;
+HOMEPAGE="https://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;
 
@@ -40,7 +40,7 @@ RDEPEND="
xface? ( media-libs/compface )
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
>=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"

diff --git a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
index 5944c3fd65be..fe5170beba18 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
@@ -10,7 +10,7 @@ WANT_AUTOCONF="2.1"
 inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="http://www.xemacs.org/;
+HOMEPAGE="https://www.xemacs.org/;
 SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
@@ -40,7 +40,7 @@ RDEPEND="
xface? ( media-libs/compface )
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
>=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"

diff --git a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
index bef802bacbd6..61aff25cd403 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
@@ -9,7 +9,7 @@ EAPI=7
 inherit autotools flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="http://www.xemacs.org/;
+HOMEPAGE="https://www.xemacs.org/;
 SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
 
@@ -41,7 +41,7 @@ RDEPEND="
xface? ( media-libs/compface )
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
freewnn? ( app-i18n/freewnn )
>=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"

diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index e204ae47e03b..bba9dbfeb9b6 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -9,7 +9,7 @@ EAPI=8
 inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="http://www.xemacs.org/;
+HOMEPAGE="https://www.xemacs.org/;
 SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
@@ -41,7 +41,7 @@ RDEPEND="
xface? ( media-libs/compface )
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:0= )
freewnn? ( app-i18n/freewnn )
>=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index 53538cb13840..646022402db0 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -9,7 +9,7 @@ EAPI=7
 inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor

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

2022-03-22 Thread Sam James

commit: 464ea54acb8aa13e21c25806e32c761eed4620d2
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 23 00:55:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 23 00:55:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464ea54a

app-editors/xemacs: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James  gentoo.org>

 .../xemacs/{xemacs-21.4.24-r3.ebuild => xemacs-21.4.24-r5.ebuild} | 6 +++---
 .../xemacs/{xemacs-21.4.24-r4.ebuild => xemacs-21.4.24-r6.ebuild} | 6 +++---
 .../xemacs/{xemacs-21.5.34-r6.ebuild => xemacs-21.5.34-r8.ebuild} | 8 
 .../xemacs/{xemacs-21.5.34-r7.ebuild => xemacs-21.5.34-r9.ebuild} | 8 
 app-editors/xemacs/xemacs-21.5..ebuild| 8 
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
similarity index 98%
rename from app-editors/xemacs/xemacs-21.4.24-r3.ebuild
rename to app-editors/xemacs/xemacs-21.4.24-r5.ebuild
index a0b28559a0a5..2f9a674f7c59 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r5.ebuild
@@ -23,13 +23,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext 
x11-misc/xbitmaps"
 
 RDEPEND="
berkdb? ( sys-libs/db:= )
-   gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+   gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
>=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6:0
+   >=dev-libs/openssl-0.9.6:0=
>=media-libs/audiofile-0.2.3
gpm? ( >=sys-libs/gpm-1.19.6 )
postgres? ( dev-db/postgresql:= )
-   ldap? ( net-nds/openldap )
+   ldap? ( net-nds/openldap:= )
nas? ( media-libs/nas )
X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
dnd? ( x11-libs/dnd )

diff --git a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
similarity index 98%
rename from app-editors/xemacs/xemacs-21.4.24-r4.ebuild
rename to app-editors/xemacs/xemacs-21.4.24-r6.ebuild
index ad783065d393..5944c3fd65be 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r6.ebuild
@@ -23,13 +23,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext 
x11-misc/xbitmaps"
 
 RDEPEND="
berkdb? ( sys-libs/db:= )
-   gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+   gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] )
>=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6:0
+   >=dev-libs/openssl-0.9.6:0=
>=media-libs/audiofile-0.2.3
gpm? ( >=sys-libs/gpm-1.19.6 )
postgres? ( dev-db/postgresql:= )
-   ldap? ( net-nds/openldap )
+   ldap? ( net-nds/openldap:= )
nas? ( media-libs/nas )
X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
dnd? ( x11-libs/dnd )

diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
similarity index 98%
rename from app-editors/xemacs/xemacs-21.5.34-r6.ebuild
rename to app-editors/xemacs/xemacs-21.5.34-r8.ebuild
index b1ec1ecf51e1..bef802bacbd6 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -22,13 +22,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext 
x11-misc/xbitmaps"
 
 RDEPEND="
berkdb? ( >=sys-libs/db-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
+   gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] )
>=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6:0
+   >=dev-libs/openssl-0.9.6:0=
>=media-libs/audiofile-0.2.3
gpm? ( >=sys-libs/gpm-1.19.6 )
postgres? ( dev-db/postgresql:= )
-   ldap? ( net-nds/openldap )
+   ldap? ( net-nds/openldap:= )
alsa? ( media-libs/alsa-lib )
nas? ( media-libs/nas )
X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )

diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
similarity index 98%
rename from app-editors/xemacs/xemacs-21.5.34-r7.ebuild
rename to app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index 44896cf0be0a..e204ae47e03b 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -22,13 +22,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext 
x11-misc/xbitmaps"
 
 RDEPEND="
berkdb? ( >=sys-libs/db-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )

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

2022-03-19 Thread David Seifert

commit: 1e47066cd2e80fd7149100e6b4bf232164d3bebc
Author: David Seifert  gentoo  org>
AuthorDate: Sat Mar 19 23:16:42 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Mar 19 23:16:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e47066c

app-editors/xemacs: quote $(tc-*) calls

Signed-off-by: David Seifert  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r3.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.4.24-r4.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
index 9b7467a98c25..a0b28559a0a5 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -184,7 +184,7 @@ src_configure() {
$(use_with ldap ) \
$(use_with eolconv file-coding ) \
$(use_with pop ) \
-   --compiler=$(tc-getCC) \
+   --compiler="$(tc-getCC)" \
--prefix=/usr \
--without-canna \
--with-ncurses \

diff --git a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
index 53953b0528d1..ad783065d393 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -184,7 +184,7 @@ src_configure() {
$(use_with ldap ) \
$(use_with eolconv file-coding ) \
$(use_with pop ) \
-   --compiler=$(tc-getCC) \
+   --compiler="$(tc-getCC)" \
--prefix=/usr \
--without-canna \
--with-ncurses \

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

2021-12-20 Thread Yixun Lan

commit: d9b1cf799e51233094dfd08712e6e666e3dc41bc
Author: Yongxiang Liang  gmail  com>
AuthorDate: Sun Dec 19 18:58:05 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Dec 21 03:38:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9b1cf79

app-editors/xemacs: keyword ~riscv

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yongxiang Liang  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 app-editors/xemacs/xemacs-21.5.34-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
index d196a551..44896cf0be0a 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2021-12-12 Thread Mats Lidell

commit: 5952ed33e6933edb4204f2d6407bf8ec8d42d8d4
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Dec 12 13:16:40 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Dec 12 13:20:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5952ed33

app-editors/xemacs: remove configure options, bug #828785

Remove not available configure options.
Noticed in bug #828785 but affects 21.5 in general.

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

 app-editors/xemacs/xemacs-21.5.34-r7.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
index aae31d431223..d196a551 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -109,7 +109,7 @@ src_configure() {
myconf="${myconf} --with-athena=xaw"
fi
 
-   use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+   use dnd && myconf="${myconf} --with-dragndrop"
 
myconf="${myconf} $(use_with tiff )"
myconf="${myconf} $(use_with png )"
@@ -170,7 +170,6 @@ src_configure() {
$(use_with gpm ) \
$(use_with postgres postgresql ) \
$(use_with ldap ) \
-   $(use_with eolconv file-coding ) \
$(use_with pop ) \
--prefix=/usr \
--without-canna \

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

2021-12-12 Thread Mats Lidell

commit: 2d08c47c80750ae6d3c53e4262f2a04da5615ed2
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Dec 12 10:07:12 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Dec 12 13:20:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d08c47c

app-editors/xemacs: remove configure options, bug #828785

Remove not available configure options.

Closes: https://bugs.gentoo.org/828785

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

 app-editors/xemacs/xemacs-21.5..ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index aaaddef4a2f3..7b3921f0a4d4 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -17,7 +17,7 @@ EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs;
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -112,7 +112,7 @@ src_configure() {
myconf="${myconf} --with-athena=xaw"
fi
 
-   use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+   use dnd && myconf="${myconf} --with-dragndrop"
 
myconf="${myconf} $(use_with tiff )"
myconf="${myconf} $(use_with png )"
@@ -173,7 +173,6 @@ src_configure() {
$(use_with gpm ) \
$(use_with postgres postgresql ) \
$(use_with ldap ) \
-   $(use_with eolconv file-coding ) \
$(use_with pop ) \
--prefix=/usr \
--without-canna \
@@ -182,7 +181,6 @@ src_configure() {
--with-mail-locking=flock \
--with-site-lisp=yes \
--with-site-modules=yes \
-   --with-system-malloc \
--enable-option-checking=no \
--with-last-packages=/usr/lib/xemacs
 }

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

2021-12-10 Thread Mats Lidell

commit: 23a575e74b719dcb37cd704a28509dbef3c52393
Author: Mats Lidell  gentoo  org>
AuthorDate: Fri Dec 10 23:19:15 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Fri Dec 10 23:21:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a575e7

app-editors/xemacs: update SRC_URI

- load neXt only if needed

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

 app-editors/xemacs/xemacs-21.5..ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index 10c8d43ee877..aaaddef4a2f3 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -10,7 +10,7 @@ inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="http://www.xemacs.org/;
-SRC_URI="http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+SRC_URI="neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz 
)"
 
 inherit mercurial
 EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs;

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

2021-12-10 Thread Mats Lidell

commit: 1365e636cb4f00c4cce8825f262f2529ea04de67
Author: Mats Lidell  gentoo  org>
AuthorDate: Fri Dec 10 22:58:50 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Fri Dec 10 23:21:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1365e636

app-editors/xemacs: libXaw3d needs unicode

- require libXaw3d with unicode
- load neXt only if used
- unpack neXt once

Bug: https://bugs.gentoo.org/805173

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

 app-editors/xemacs/xemacs-21.5.34-r7.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
index c44dccad1aba..aae31d431223 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic 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.5/${P}.tar.gz
-   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+   neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -35,7 +35,7 @@ RDEPEND="
dnd? ( x11-libs/dnd )
motif? ( >=x11-libs/motif-2.3:0[xft=] )
athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d )
+   Xaw3d? ( x11-libs/libXaw3d[unicode] )
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
neXt? ( x11-libs/neXtaw )
xface? ( media-libs/compface )
@@ -54,8 +54,6 @@ PDEPEND="app-xemacs/xemacs-base
 
 src_unpack() {
default_src_unpack
-
-   use neXt && unpack NeXT_XEmacs.tar.gz
 }
 
 src_prepare() {

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

2021-12-10 Thread Mats Lidell

commit: b8fcbe96446fd1d29fc60ec67b74ecd0223a9987
Author: Mats Lidell  gentoo  org>
AuthorDate: Fri Dec 10 22:14:41 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Fri Dec 10 23:21:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8fcbe96

app-editors/xemacs: Revision 21.4.24-r4

- Require libXaw3d with unicode
- Only download neXt if required

Bug: https://bugs.gentoo.org/827062
Bug: https://bugs.gentoo.org/805173

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

 app-editors/xemacs/xemacs-21.4.24-r4.ebuild | 252 
 1 file changed, 252 insertions(+)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
new file mode 100644
index ..53953b0528d1
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 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 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
+   neXt? ( 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 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? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+   >=sys-libs/zlib-1.1.4
+   >=dev-libs/openssl-0.9.6:0
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( net-nds/openldap )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0 )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d[unicode] )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   !amd64? ( freewnn? ( app-i18n/freewnn ) )
+   >=sys-libs/ncurses-5.2:=
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   >=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   unpack ${P}.tar.gz
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   # see bug 58350, 102540 and 143580
+   eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
+   # see bug 576512
+   eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+   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-strsignal.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
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+
+   # Run autoconf. XEmacs tries to be smart by providing a stub
+   # configure.ac file for autoconf 2.59 but this throws our
+   # autotools eclass so it must be removed first.
+   rm "${S}"/configure.ac || die
+   eautoconf
+
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+}
+
+src_configure() {
+   local myconf=""
+
+   # Can't build with pie. See bug #75028
+   test-flags -no-pie >/dev/null && append-flags -no-pie
+   filter-flags -pie
+
+   if use X; then
+
+   myconf="${myconf} --with-widgets=athena"
+   myconf="${myconf} --with-dialogs=athena"
+   myconf="${myconf} --with-menubars=lucid"
+   myconf="${myconf} --with-scrollbars=lucid"
+   if use motif ; then
+   myconf="--with-widgets=motif"
+   myconf="${myconf} --with-dialogs=motif"
+

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

2021-11-28 Thread Mats Lidell

commit: ed6b568180cb65f7fe3da034efdc7fcae9f18d44
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Nov 28 22:49:44 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Nov 28 22:50:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6b5681

app-editors/xemacs: Re-enable neXt on xemacs-21.5.

Add built with dependency unicode on libXaw3d

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

 app-editors/xemacs/xemacs-21.5..ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
index 8445da157a67..10c8d43ee877 100644
--- a/app-editors/xemacs/xemacs-21.5..ebuild
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -10,6 +10,7 @@ inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="http://www.xemacs.org/;
+SRC_URI="http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
 
 inherit mercurial
 EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs;
@@ -35,7 +36,7 @@ RDEPEND="
dnd? ( x11-libs/dnd )
motif? ( >=x11-libs/motif-2.3:0[xft=] )
athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d )
+   Xaw3d? ( x11-libs/libXaw3d[unicode] )
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
neXt? ( x11-libs/neXtaw )
xface? ( media-libs/compface )
@@ -59,7 +60,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   # use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
# eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
# eapply "${FILESDIR}/${P}-gcc5.patch"

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

2021-11-25 Thread Mats Lidell

commit: 34ce9f72be77cce47c9fb1ee08cf6fd5c60c6357
Author: Mats Lidell  gentoo  org>
AuthorDate: Thu Nov 25 19:30:08 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Thu Nov 25 19:30:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ce9f72

app-editors/xemacs: add 21.5.

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

 app-editors/xemacs/xemacs-21.5..ebuild | 259 +
 1 file changed, 259 insertions(+)

diff --git a/app-editors/xemacs/xemacs-21.5..ebuild 
b/app-editors/xemacs/xemacs-21.5..ebuild
new file mode 100644
index ..8445da157a67
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5..ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2021 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
+
+inherit flag-o-matic xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application 
development system"
+HOMEPAGE="http://www.xemacs.org/;
+
+inherit mercurial
+EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs;
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn xft 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-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
+   >=sys-libs/zlib-1.1.4
+   >=dev-libs/openssl-0.9.6:0
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   freewnn? ( app-i18n/freewnn )
+   >=sys-libs/ncurses-5.2:=
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   mercurial_src_unpack
+
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   # use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+   # eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+   # eapply "${FILESDIR}/${P}-gcc5.patch"
+   # eapply "${FILESDIR}/${P}-glibc-macro.patch"
+   # eapply "${FILESDIR}/${P}-as-needed.patch"
+   # eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+   # eapply "${FILESDIR}/${P}-ar.patch"
+   # eapply "${FILESDIR}/${P}-strsignal.patch"
+   # eapply "${FILESDIR}/${P}-process-test-qa.patch"
+
+   eapply_user
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+}
+
+src_configure() {
+   local myconf=""
+
+   # bug #639642
+   test-flags -no-pie >/dev/null && append-flags -no-pie
+   filter-flags -pie
+
+   if use X; then
+
+   myconf="${myconf} --with-widgets=athena"
+   myconf="${myconf} --with-dialogs=athena"
+   myconf="${myconf} --with-menubars=lucid"
+   myconf="${myconf} --with-scrollbars=lucid"
+   if use motif ; then
+   myconf="--with-widgets=motif"
+   myconf="${myconf} --with-dialogs=motif"
+   myconf="${myconf} --with-scrollbars=motif"
+   myconf="${myconf} --with-menubars=lucid"
+   fi
+   if use athena or use Xaw3d ; then
+   myconf="--with-scrollbars=athena"
+   fi
+
+   if use Xaw3d; then
+   myconf="${myconf} --with-athena=3d"
+   elif use neXt; then
+   myconf="${myconf} --with-athena=next"
+   else
+   myconf="${myconf} --with-athena=xaw"
+   fi
+
+   use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+   myconf="${myconf} $(use_with tiff )"
+

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

2021-10-16 Thread Mats Lidell

commit: 227ac5778ca351f1e2e3eaf62747059858f08015
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Oct 16 17:37:31 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Oct 16 18:11:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227ac577

app-editors/xemacs: remove newgc, EAPI 8

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

 app-editors/xemacs/xemacs-21.5.34-r7.ebuild | 259 
 1 file changed, 259 insertions(+)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
new file mode 100644
index 000..c44dccad1ab
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2021 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=8
+
+inherit flag-o-matic 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.5/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn xft 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-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
+   >=sys-libs/zlib-1.1.4
+   >=dev-libs/openssl-0.9.6:0
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   freewnn? ( app-i18n/freewnn )
+   >=sys-libs/ncurses-5.2:=
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   default_src_unpack
+
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+   eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+   eapply "${FILESDIR}/${P}-gcc5.patch"
+   eapply "${FILESDIR}/${P}-glibc-macro.patch"
+   eapply "${FILESDIR}/${P}-as-needed.patch"
+   eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+   eapply "${FILESDIR}/${P}-ar.patch"
+   eapply "${FILESDIR}/${P}-strsignal.patch"
+   eapply "${FILESDIR}/${P}-process-test-qa.patch"
+
+   eapply_user
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+}
+
+src_configure() {
+   local myconf=""
+
+   # bug #639642
+   test-flags -no-pie >/dev/null && append-flags -no-pie
+   filter-flags -pie
+
+   if use X; then
+
+   myconf="${myconf} --with-widgets=athena"
+   myconf="${myconf} --with-dialogs=athena"
+   myconf="${myconf} --with-menubars=lucid"
+   myconf="${myconf} --with-scrollbars=lucid"
+   if use motif ; then
+   myconf="--with-widgets=motif"
+   myconf="${myconf} --with-dialogs=motif"
+   myconf="${myconf} --with-scrollbars=motif"
+   myconf="${myconf} --with-menubars=lucid"
+   fi
+   if use athena or use Xaw3d ; then
+   myconf="--with-scrollbars=athena"
+   fi
+
+   if use Xaw3d; then
+   myconf="${myconf} --with-athena=3d"
+   elif use neXt; then
+   myconf="${myconf} --with-athena=next"
+   else
+   myconf="${myconf} --with-athena=xaw"
+   fi
+
+   use dnd &&

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

2021-07-17 Thread David Seifert

commit: 81c70c84e7e0507df2f180cb90d3e57e3f1e2efc
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 17 11:25:16 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 17 11:25:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c70c84

app-editors/xemacs: Remove app-i18n/canna

Signed-off-by: David Seifert  gentoo.org>

 .../xemacs/{xemacs-21.4.24-r2.ebuild => xemacs-21.4.24-r3.ebuild}   | 6 +++---
 .../xemacs/{xemacs-21.5.34-r5.ebuild => xemacs-21.5.34-r6.ebuild}   | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
similarity index 97%
rename from app-editors/xemacs/xemacs-21.4.24-r2.ebuild
rename to app-editors/xemacs/xemacs-21.4.24-r3.ebuild
index 557ca34677b..9b7467a98c2 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.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"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -41,7 +41,6 @@ RDEPEND="
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0 )
jpeg? ( virtual/jpeg:0 )
-   canna? ( app-i18n/canna )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
>=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
@@ -147,7 +146,7 @@ src_configure() {
myconf="${myconf} --with-xim=no"
fi
 
-   myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+   myconf="${myconf} $(use_with freewnn wnn )"
fi
 
# This determines the type of sounds we are playing
@@ -187,6 +186,7 @@ src_configure() {
$(use_with pop ) \
--compiler=$(tc-getCC) \
--prefix=/usr \
+   --without-canna \
--with-ncurses \
--with-system-malloc \
--with-msw=no \

diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
similarity index 97%
rename from app-editors/xemacs/xemacs-21.5.34-r5.ebuild
rename to app-editors/xemacs/xemacs-21.5.34-r6.ebuild
index bcf39ec31bb..7e8c4188da8 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -42,7 +42,6 @@ RDEPEND="
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0 )
jpeg? ( virtual/jpeg:0 )
-   canna? ( app-i18n/canna )
freewnn? ( app-i18n/freewnn )
>=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
@@ -144,7 +143,6 @@ src_configure() {
myconf="${myconf} --with-xim=no"
fi
 
-   myconf="${myconf} $(use_with canna )"
myconf="${myconf} $(use_with freewnn wnn )"
fi
 
@@ -177,6 +175,7 @@ src_configure() {
$(use_with eolconv file-coding ) \
$(use_with pop ) \
--prefix=/usr \
+   --without-canna \
--with-ncurses \
--with-msw=no \
--with-mail-locking=flock \

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

2021-05-02 Thread Mikle Kolyada

commit: 14cb76ccc9e48c73dd0b5b788b6137d83f61f773
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 12:39:26 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 12:39:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14cb76cc

app-editors/xemacs: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-editors/xemacs/xemacs-21.5.34-r5.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 51534cc420b..bcf39ec31bb 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -24,8 +24,7 @@ RDEPEND="
berkdb? ( >=sys-libs/db-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
>=sys-libs/zlib-1.1.4
-   !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-   libressl? ( dev-libs/libressl )
+   >=dev-libs/openssl-0.9.6:0
>=media-libs/audiofile-0.2.3
gpm? ( >=sys-libs/gpm-1.19.6 )
postgres? ( dev-db/postgresql:= )

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

2021-01-16 Thread Mats Lidell

commit: 6dbd335b119c144b07f0146c8421f8166d7d900e
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Jan 16 16:12:00 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Jan 16 16:13:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbd335b

app-editors/xemacs: swallow output causing qa issue

Patch unit test to be silent in order to avoid qa issue.

Bug: https://bugs.gentoo.org/764809
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mats Lidell  gentoo.org>

 app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch | 11 +++
 app-editors/xemacs/xemacs-21.5.34-r5.ebuild   |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch
new file mode 100644
index 000..ff17f6b6241
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch
@@ -0,0 +1,11 @@
+--- a/tests/automated/process-tests.el 2021-01-16 15:42:20.195864978 +0100
 b/tests/automated/process-tests.el 2021-01-16 15:43:27.840426754 +0100
+@@ -49,7 +49,7 @@
+ (goto-char (point-min))
+ (Assert (looking-at "foo"))):
+ 
+-  (Assert (= 127 (shell-command "unknown_command")))
++  (Assert (= 127 (shell-command "unknown_command > /dev/null 2>&1")))
+   (Assert (= 2 (shell-command "exit 2")))
+   (Assert (equal "(Shell command failed with code 2 and no output)" 
(message-displayed-p t)))
+   

diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index accb1cfdff3..91fe80f8bfe 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -70,6 +70,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
eapply "${FILESDIR}/${P}-ar.patch"
eapply "${FILESDIR}/${P}-strsignal.patch"
+   eapply "${FILESDIR}/${P}-process-test-qa.patch"
 
eapply_user

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

2021-01-10 Thread Mats Lidell

commit: d5ddc6f5045c2446fcde073140ec85ab63fe9eef
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Jan  9 12:36:27 2021 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Jan 10 09:08:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ddc6f5

app-editors/xemacs: Remove xemacs-21.5.34-r4.ebuild

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

 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 256 
 1 file changed, 256 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
deleted file mode 100644
index 8cf979775cf..000
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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
-# so the build forces the use of the -no-pie option
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib xdg-utils
-
-DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="http://www.xemacs.org/;
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft 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-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
-   >=sys-libs/zlib-1.1.4
-   !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-   libressl? ( dev-libs/libressl )
-   >=media-libs/audiofile-0.2.3
-   gpm? ( >=sys-libs/gpm-1.19.6 )
-   postgres? ( dev-db/postgresql:= )
-   ldap? ( net-nds/openldap )
-   alsa? ( media-libs/alsa-lib )
-   nas? ( media-libs/nas )
-   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-   dnd? ( x11-libs/dnd )
-   motif? ( >=x11-libs/motif-2.3:0[xft=] )
-   athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d )
-   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
-   neXt? ( x11-libs/neXtaw )
-   xface? ( media-libs/compface )
-   tiff? ( media-libs/tiff:0 )
-   png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( virtual/jpeg:0 )
-   canna? ( app-i18n/canna )
-   freewnn? ( app-i18n/freewnn )
-   >=sys-libs/ncurses-5.2:=
-   >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-PDEPEND="app-xemacs/xemacs-base
-   mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-   default_src_unpack
-
-   use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-src_prepare() {
-   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
-   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
-   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).
-   # Fix internal filename references.
-   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
-}
-
-src_configure() {
-   local myconf=""
-
-   # bug #639642
-   test-flags -no-pie >/dev/null && append-flags -no-pie
-   filter-flags -pie
-
-   if use X; then
-
-   myconf="${myconf} --with-widgets=athena"
-   myconf="${myconf} --with-dialogs=athena"
-   myconf="${myconf} --with-menubars=lucid"
-   myconf="${myconf} --with-scrollbars=lucid"
-   if use motif ; then
-   myconf="--with-widgets=motif"
-   myconf="${myconf} --with-dialogs=motif"
-   myconf="${myconf} --with-scrollbars=motif"
-   myconf="${myconf} --with-menubars=lucid"
-   fi
-   if use athena or use Xaw3d ; then
-   myconf="--with-scrollbars=athena"
-   fi
-
-   if use Xaw3d; then
-   myconf="${myconf} --with-athena=3d"
-   elif use neXt; then
-   myconf="${myconf} --with-athena=next"
-   else
-   myconf="${myconf} --with-athena=xaw"
-   fi
-
-   use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-

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

2020-09-26 Thread Aaron Bauman

commit: da5bd136ebef770e9713e8d17553a1579a45bda2
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Sep 26 14:33:03 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Sep 26 14:33:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5bd136

app-editors/xemacs: drop old EAPI=5

Signed-off-by: Aaron Bauman  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 243 ---
 app-editors/xemacs/xemacs-21.4.24.ebuild| 245 
 2 files changed, 488 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
deleted file mode 100644
index 032b668af1e..000
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# 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="5"
-
-WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
-
-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? ( >=sys-libs/gdbm-1.8.3[berkdb] )
-   >=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6:0
-   >=media-libs/audiofile-0.2.3
-   gpm? ( >=sys-libs/gpm-1.19.6 )
-   postgres? ( dev-db/postgresql:= )
-   ldap? ( net-nds/openldap )
-   nas? ( media-libs/nas )
-   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-   dnd? ( x11-libs/dnd )
-   motif? ( >=x11-libs/motif-2.3:0 )
-   athena? ( x11-libs/libXaw )
-   Xaw3d? ( x11-libs/libXaw3d )
-   neXt? ( x11-libs/neXtaw )
-   xface? ( media-libs/compface )
-   tiff? ( media-libs/tiff:0 )
-   png? ( >=media-libs/libpng-1.2:0 )
-   jpeg? ( virtual/jpeg:0 )
-   canna? ( app-i18n/canna )
-   !amd64? ( freewnn? ( app-i18n/freewnn ) )
-   >=sys-libs/ncurses-5.2:=
-   >=app-eselect/eselect-emacs-1.15"
-
-DEPEND="${RDEPEND}
-   >=sys-apps/texinfo-5"
-
-PDEPEND="app-xemacs/xemacs-base
-   mule? ( app-xemacs/mule-base )"
-
-src_unpack() {
-   unpack ${P}.tar.gz
-   use neXt && unpack NeXT_XEmacs.tar.gz
-}
-
-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
-   epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
-   # see bug 615544
-   epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
-
-   # Some binaries and man pages are installed under suffixed names
-   # to avoid collions with their GNU Emacs counterparts (see below).
-   # Fix internal filename references.
-   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
-   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
-   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
-
-   # Run autoconf. XEmacs tries to be smart by providing a stub
-   # configure.ac file for autoconf 2.59 but this throws our
-   # autotools eclass so it must be removed first.
-   rm "${S}"/configure.ac || die
-   eautoconf
-
-   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
-}
-
-src_configure() {
-   local myconf=""
-
-   # Can't build with pie. See bug #75028
-   test-flags -no-pie >/dev/null && append-flags -no-pie
-   filter-flags -pie
-
-   if use X; then
-
-   myconf="${myconf} --with-widgets=athena"
-   myconf="${myconf} --with-dialogs=athena"
-   myconf="${myconf} --with-menubars=lucid"
-   myconf="${myconf} --with-scrollbars=lucid"
-   if use motif ; then
-   myconf="--with-widgets=motif"
-   myconf="${myconf} --with-dialogs=motif"
-   myconf="${myconf} --with-scrollbars=motif"
-   myconf="${myconf} --with-menubars=lucid"
-   fi
-   if use athena ; then
-   myconf="--with-scrollbars=athena"
-   fi
-
-   if use Xaw3d; then
-   myconf="${myconf} --with-athena=3d"
-   elif use neXt; then
-   myconf="${myconf} --with-athena=next"
-   else
-

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

2020-09-03 Thread Sam James

commit: 8f501e7bd4e1b2495c1e53c70d9c9833410f7558
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep  3 23:53:49 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  3 23:53:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f501e7b

app-editors/xemacs: ppc64 stable (bug #738268)

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 5eb8d525db8..a457fa285f9 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 sparc x86"
+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"

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

2020-08-31 Thread Mats Lidell

commit: 5813a1933243715679ae314ad771ab5a881f2f67
Author: Mats Lidell  gentoo  org>
AuthorDate: Mon Aug 31 18:29:46 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Mon Aug 31 18:30:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5813a193

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

Use strsignal to compile on >=glibc-2.32.

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

 .../xemacs/files/xemacs-21.4.24-strsignal.patch| 89 ++
 app-editors/xemacs/xemacs-21.4.24-r2.ebuild|  1 +
 2 files changed, 90 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch 
b/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
new file mode 100644
index 000..a44b925ccdd
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
@@ -0,0 +1,89 @@
+diff -r ab1558b934ff configure
+--- a/configureSun Aug 30 22:05:05 2020 +0200
 b/configureSun Aug 30 22:38:03 2020 +0200
+@@ -11333,7 +11333,7 @@
+ fi
+ 
+ 
+-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime 
getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb 
lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir 
select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf 
stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
++for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime 
getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb 
lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir 
select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf 
stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate 
umask
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:11340: checking for $ac_func" >&5
+diff -r ab1558b934ff configure.in
+--- a/configure.in Sun Aug 30 22:05:05 2020 +0200
 b/configure.in Sun Aug 30 22:38:03 2020 +0200
+@@ -4012,7 +4012,7 @@
+ dnl Check for POSIX functions.
+ dnl 
+ 
+-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime 
getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb 
lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir 
select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf 
stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask)
++AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime 
getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb 
lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir 
select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf 
stpcpy strerror strsignal tzset ulimit usleep waitpid vsnprintf fsync ftruncate 
umask)
+ 
+ dnl getaddrinfo() is borked under hpux11
+ if test "$ac_cv_func_getaddrinfo" != "no" ; then
+diff -r ab1558b934ff src/config.h.in
+--- a/src/config.h.in  Sun Aug 30 22:05:05 2020 +0200
 b/src/config.h.in  Sun Aug 30 22:38:03 2020 +0200
+@@ -346,6 +346,7 @@
+ #undef HAVE_SNPRINTF
+ #undef HAVE_STPCPY
+ #undef HAVE_STRERROR
++#undef HAVE_STRSIGNAL
+ #undef HAVE_TZSET
+ #undef HAVE_ULIMIT
+ #undef HAVE_USLEEP
+diff -r ab1558b934ff src/process.c
+--- a/src/process.cSun Aug 30 22:05:05 2020 +0200
 b/src/process.cSun Aug 30 22:38:03 2020 +0200
+@@ -1311,7 +1311,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 ab1558b934ff src/s/linux.h
+--- a/src/s/linux.hSun Aug 30 22:05:05 2020 +0200
 b/src/s/linux.hSun Aug 30 22:38:03 2020 +0200
+@@ -107,7 +107,6 @@
+ 
+ #define NO_SIOCTL_H   /* don't have sioctl.h */
+ 
+-#define HAVE_SYS_SIGLIST
+ #define HAVE_WAIT_HEADER
+ 
+ #define POSIX /* affects getpagesize.h and systty.h */
+diff -r ab1558b934ff src/sysdep.c
+--- a/src/sysdep.c Sun Aug 30 22:05:05 2020 +0200
 b/src/sysdep.c Sun Aug 30 22:38:03 2020 +0200
+@@ -3526,7 +3526,7 @@
+ /*   Strings corresponding to defined signals   */
+ //
+ 
+-#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
++#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined 
(HAVE_SYS_SIGLIST)
+ 
+ #if defined(WIN32_NATIVE) || defined(CYGWIN)
+ const char *sys_siglist[] =
+diff -r ab1558b934ff src/syssignal.h
+--- a/src/syssignal.h  Sun Aug 30 22:05:05 2020 +0200
 b/src/syssignal.h  Sun Aug 30 22:38:03 2020 +0200
+@@ -223,10 +223,8 @@
+ # define

[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/

2020-08-21 Thread Agostino Sarubbo

commit: 9152d9fc160e2ec987d7427dfb864c88790c1de0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Aug 21 15:35:09 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Aug 21 15:35:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9152d9fc

app-editors/xemacs: x86 stable wrt bug #738268

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index c28acd3a171..1276e477e5f 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
+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"

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

2020-08-21 Thread Agostino Sarubbo

commit: 858c35310956bfcf2718ab9ed4c709dfbd3cd838
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Aug 21 15:31:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Aug 21 15:31:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=858c3531

app-editors/xemacs: sparc stable wrt bug #738268

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 1fa2ab6605e..c28acd3a171 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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"

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

2020-08-21 Thread Agostino Sarubbo

commit: 7f42fcb551ac9b9a94f15eb8aa9886ec65a31ed7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Aug 21 15:25:53 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Aug 21 15:25:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f42fcb5

app-editors/xemacs: amd64 stable wrt bug #738268

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 7f388ef3579..1fa2ab6605e 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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"

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

2020-08-20 Thread Sam James

commit: c978c3b0d32e4a1f902e4f5ebac3d55e23575d37
Author: Sam James  gentoo  org>
AuthorDate: Fri Aug 21 04:39:04 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Aug 21 04:39:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c978c3b0

app-editors/xemacs: Stabilize 21.4.24-r2 arm64, #738268

Signed-off-by: Sam James  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 1f2018514ed..7f388ef3579 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+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"

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

2020-04-19 Thread Mats Lidell

commit: 88ee8f5dfbe66da1c7f170299f6877f4f40ddd61
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Apr 19 20:21:10 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Apr 19 20:23:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ee8f5d

app-editors/xemacs: Remove unused configure check on ar

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

 app-editors/xemacs/files/xemacs-21.5.34-ar.patch | 74 
 app-editors/xemacs/xemacs-21.5.34-r5.ebuild  |  1 +
 2 files changed, 75 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
new file mode 100644
index 000..fff6f557873
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
@@ -0,0 +1,74 @@
+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 autoconf to modify.
+ 
+-dnl Sun likes to hide these utilities.  Steve Baur asked that we make
+-dnl the failure occur at configure time, not at use time.
+-AC_CHECK_PROG(AR,ar,ar,not_found)
+-if test "$AR" = "not_found"; then
+-  XE_DIE(["ar not found -- is PATH set correctly?"])
+-fi
+ dnl These tests don't necessarily check that the program exists.
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL

diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index de468834210..6e6d7958c4e 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
eapply "${FILESDIR}/${P}-glibc-macro.patch"
eapply "${FILESDIR}/${P}-as-needed.patch"
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+   eapply "${FILESDIR}/${P}-ar.patch"
 
eapply_user

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

2020-04-04 Thread Sergei Trofimovich

commit: 4ceb85e6c237d804030391174db0d46e37e52a68
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Apr  4 10:10:25 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr  4 11:05:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ceb85e6

app-editors/xemacs: drop to ~hppa

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 app-editors/xemacs/xemacs-21.4.24.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index a9aedfa1795..032b668af1e 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ppc ppc64 sparc ~x86"
+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"

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 89902016197..7b39f0f4f26 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~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"

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

2020-03-26 Thread Mats Lidell

commit: 05ecd5575588a715daee2950082f401f69c5719a
Author: Mats Lidell  gentoo  org>
AuthorDate: Thu Mar 26 06:37:52 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Thu Mar 26 06:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ecd557

app-editors/xemacs: Support Gentoo Prefix

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

 app-editors/xemacs/xemacs-21.5.34-r5.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
index 3b27d36313f..de468834210 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -191,11 +191,11 @@ src_compile() {
 }
 
 src_install() {
-   emake prefix="${D}"/usr \
-   mandir="${D}"/usr/share/man/man1 \
-   infodir="${D}"/usr/share/info \
-   libdir="${D}"/usr/$(get_libdir) \
-   datadir="${D}"/usr/share \
+   emake prefix="${ED}"/usr \
+   mandir="${ED}"/usr/share/man/man1 \
+   infodir="${ED}"/usr/share/info \
+   libdir="${ED}"/usr/$(get_libdir) \
+   datadir="${ED}"/usr/share \
install
 
# Rename some applications installed in bin so that it is clear
@@ -203,12 +203,12 @@ src_install() {
# packages (emacs) can't clobber the actual applications.
# Addresses bug #62991.
for i in b2m ctags etags gnuclient gnudoit gnuattach; do
-   mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv 
${i} failed"
+   mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv 
${i} failed"
done
 
# rename man pages
for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do
-   mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 
failed"
+   mv "${ED}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv 
${i}.1 failed"
done
 
# install base packages directories
@@ -223,7 +223,7 @@ src_install() {
fi
 
# remove extraneous info files
-   cd "${D}"/usr/share/info
+   cd "${ED}"/usr/share/info
rm -f dir info.info texinfo* termcap* standards*
 
cd "${S}"

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

2020-03-07 Thread Mats Lidell

commit: de1c268b82e4bd5c4781231f6359ad1afe6ba672
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Mar  7 12:51:37 2020 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Mar  7 12:51:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de1c268b

app-editors/xemacs: Fix configure warning, EAPI bump

Patch configure to locate libc in /lib64 and bump EAPI.

bug: https://bugs.gentoo.org/711040
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mats Lidell  gentoo.org>

 .../xemacs-21.5.34-configure-libc-version.patch|  24 ++
 app-editors/xemacs/xemacs-21.5.34-r5.ebuild| 259 +
 2 files changed, 283 insertions(+)

diff --git 
a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch
new file mode 100644
index 000..fdea052fba1
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch
@@ -0,0 +1,24 @@
+diff -r 3ca291c0f7e3 configure
+--- a/configureSun Jul 28 10:17:08 2019 +0100
 b/configureFri Mar 06 21:27:48 2020 +0100
+@@ -9987,7 +9987,7 @@
+   libc_version="GNU libc $libc_version (Debian)"
+ fi
+   if test -z "$libc_version"; then
+-  libc_version=`ls /lib/libc-*.so | sed -e 
's,/lib/libc-\(.*\)\.so,\1,'`
++  libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed 
-e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'`
+   fi
+   ;;
+ 
+diff -r 3ca291c0f7e3 configure.ac
+--- a/configure.ac Sun Jul 28 10:17:08 2019 +0100
 b/configure.ac Fri Mar 06 21:27:48 2020 +0100
+@@ -2347,7 +2347,7 @@
+ fi
+ dnl  Tested on Debian, does this actually work elsewhere?  ;-)
+   if test -z "$libc_version"; then
+-  libc_version=`ls /lib/libc-*.so | sed -e 
's,/lib/libc-\(.*\)\.so,\1,'`
++  libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed 
-e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'`
+   fi
+   ;;
+ 

diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
new file mode 100644
index 000..3b27d36313f
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild
@@ -0,0 +1,259 @@
+# 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
+
+inherit autotools eutils flag-o-matic multilib 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.5/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft 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-4:= !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
+   >=sys-libs/zlib-1.1.4
+   !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+   libressl? ( dev-libs/libressl )
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   canna? ( app-i18n/canna )
+   freewnn? ( app-i18n/freewnn )
+   >=sys-libs/ncurses-5.2:=
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   default_src_unpack
+
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+   eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
+   eapply "${FILESDIR}/${P}-gcc5.patch"
+   eapply "${FILESDIR}/${P}-glibc-macro.patch"
+   eapply "${FILESDIR}/${P}-as-needed.patch"
+   eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+
+   eapply_user
+
+   # Some binaries

[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/

2019-07-27 Thread Aaron Bauman

commit: eb44a0f6e7bd6f0507127606c4f0c81950bcf3f2
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat Jul 27 12:29:07 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Jul 27 12:29:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb44a0f6

app-editors/xemacs: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 475f8682263..dfb34f7237a 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.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
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86"
+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"

[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/

2018-11-28 Thread Michał Górny

commit: cae3696d8d9a4cdbed6b940804dcaa59a04ad2fb
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov 13 12:12:21 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 28 09:58:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae3696d

app-editors/xemacs: Make USE=mule local

Signed-off-by: Michał Górny  gentoo.org>

 app-editors/xemacs/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 435eda5f867..78bf15a9cc7 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -10,6 +10,7 @@
   drag-n-drop library
 Support detection and translation of newline
   conventions
+Add multi-language support to XEmacs
 Support POP for mail retrieval
 Enable X11 XiM input method

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

2018-03-28 Thread Matt Turner

commit: c40b7baf3bd0e23871b18f1460c13e548fd60fc9
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Mar 28 18:27:27 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Mar 28 19:09:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40b7baf

app-editors/xemacs: dropped mips keywords

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 app-editors/xemacs/xemacs-21.4.24.ebuild| 2 +-
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 47c604a9a19..475f8682263 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 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"

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index a1297fa3699..08d08cdd123 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 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"

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index f6ea5f554d1..9747f72b358 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2018-03-04 Thread Tobias Klausmann

commit: b84410c734225f6d990e19858b93ed621cb20160
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Mar  4 16:22:58 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Mar  4 16:22:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84410c7

app-editors/xemacs-21.4.24-r1: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/645070

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 23a21614307..47c604a9a19 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~mips 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"

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

2018-02-11 Thread Michał Górny

commit: 636b28e9b31851e7fb6d9aa0b864f7fc025bcf88
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Feb 11 09:55:45 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 11 10:01:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636b28e9

app-editors/xemacs: Remove useless maintainer 

Remove useless/redundant maintainer . It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 app-editors/xemacs/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index eb55cb7dabc..435eda5f867 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -3,7 +3,6 @@
 
   
 xem...@gentoo.org
-Primary Maintainer
   
   
 Chooses the MIT Athena widget set

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

2018-02-05 Thread Sergei Trofimovich

commit: 6b5f861c024bd4c001232c20f546f23a1ae09305
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  5 22:36:20 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  5 22:36:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5f861c

app-editors/xemacs: stable 21.4.24-r1 for hppa, bug #645070

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 91886480deb..23a21614307 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~mips 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"

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

2018-01-27 Thread Mikle Kolyada

commit: 2f64ef848cf0114b7ae1b4ce6b5c7fe2588eaf7c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jan 27 23:29:29 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jan 27 23:29:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f64ef84

app-editors/xemacs: amd64 stable wrt bug #645070

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 1ab26788213..91886480deb 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips 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"

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

2018-01-20 Thread Sergei Trofimovich

commit: ff5160578a9edf9ff0581f88421d998e519cafeb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 20 22:20:47 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 20 22:20:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff516057

app-editors/xemacs: stable 21.4.24-r1 for ppc/ppc64, bug #645070

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 62f811bd58a..1ab26788213 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips 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"

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

2018-01-20 Thread Sergei Trofimovich

commit: b6e4c805d53b49da79a0f64ef16bb82d6d800fcf
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jan 20 20:06:53 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 20 20:10:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e4c805

app-editors/xemacs: stable 21.4.24-r1 for sparc, bug #645070

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 1afc4acebc1..62f811bd58a 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~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"

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

2018-01-13 Thread Mats Lidell

commit: b279b09b26fc823e5658a0d31599b3a71fbd780b
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Jan 13 21:13:50 2018 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Jan 13 21:13:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b279b09b

app-editors/xemacs: Add berkdb dependency to gdbm

bug: https://bugs.gentoo.org/643678
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 6975de5d429..1afc4acebc1 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -23,7 +23,7 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext 
x11-misc/xbitmaps"
 
 RDEPEND="
berkdb? ( sys-libs/db:= )
-   gdbm? ( >=sys-libs/gdbm-1.8.3 )
+   gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
>=sys-libs/zlib-1.1.4
>=dev-libs/openssl-0.9.6:0
>=media-libs/audiofile-0.2.3

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

2018-01-05 Thread David Seifert

commit: a9d7f3d4ef6a93c1598ebee9c8424d63d1cd73b0
Author: David Seifert  gentoo  org>
AuthorDate: Fri Jan  5 22:06:34 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan  5 22:06:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d7f3d4

app-editors/xemacs: [QA] Rely on default value of WANT_AUTOCONF

* Specifying WANT_AUTOCONF=2.5 is unnecessary as this will
  choose the most recent version of Autoconf anyways. It
  only impedes future bumps of Autoconf.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index c060855e592..f6ea5f554d1 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -6,7 +6,6 @@
 
 EAPI=5
 
-WANT_AUTOCONF="2.5"
 inherit eutils flag-o-matic multilib xdg-utils
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"

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

2017-12-28 Thread Mats Lidell

commit: 13b62d718ed4593bc8cff1d7da0d75cad678c0eb
Author: Mats Lidell  gentoo  org>
AuthorDate: Thu Dec 28 16:14:33 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Thu Dec 28 16:15:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b62d71

app-editors/xemacs: Remove xemacs-21.4.22-r4.ebuild and patches

xemacs-21.4.24.ebuild has been stable for a long time.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-editors/xemacs/Manifest|   1 -
 app-editors/xemacs/files/xemacs-21.4.19-texi.patch |  33 --
 .../xemacs/files/xemacs-21.4.21-vcdiff.patch   |  19 -
 .../files/xemacs-21.4.22-deprecated-ldap.patch |  18 -
 .../xemacs/files/xemacs-21.4.22-large-images.patch | 122 --
 .../xemacs/files/xemacs-21.4.22-libpng15.patch |  66 
 .../xemacs/files/xemacs-21.4.22-texinfo-5.patch| 437 -
 app-editors/xemacs/xemacs-21.4.22-r4.ebuild| 257 
 8 files changed, 953 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 810f075dcc5..793589c7309 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.22.tar.gz 8357931 BLAKE2B 
257a624f2709a883d1b5c54939b332af0ba4a993faab1c5766dd18a6a0ca0ec8d26fbc44911e234c3131b73b22da132f5e09f0593dcfdf973c6c9e62e71d0b58
 SHA512 
7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B 
d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10
 SHA512 
b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B 
e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d
 SHA512 
b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a

diff --git a/app-editors/xemacs/files/xemacs-21.4.19-texi.patch 
b/app-editors/xemacs/files/xemacs-21.4.19-texi.patch
deleted file mode 100644
index f53eb3dafd3..000
--- a/app-editors/xemacs/files/xemacs-21.4.19-texi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: emodules.texi
-===
-RCS file: /pack/xemacscvs/XEmacs/xemacs/man/emodules.texi,v
-retrieving revision 1.2.2.2
-diff -u -B -r1.2.2.2 emodules.texi
 man/emodules.texi  2002/08/20 11:35:22 1.2.2.2
-+++ man/emodules.texi  2006/12/09 14:21:22
-@@ -3,6 +3,9 @@
- @c %**start of header
- @setfilename ../info/emodules.info
- @settitle Extending Emacs using C Modules
-+@direntry
-+* Emodules: (emodules).  XEmacs dynamically loadable module support.
-+@end direntry
- @c %**end of header
- 
- @c
-Index: external-widget.texi
-===
-RCS file: /pack/xemacscvs/XEmacs/xemacs/man/external-widget.texi,v
-retrieving revision 1.3.2.1
-diff -u -B -r1.3.2.1 external-widget.texi
 man/external-widget.texi   2002/04/30 16:06:06 1.3.2.1
-+++ man/external-widget.texi   2006/12/09 14:21:22
-@@ -4,7 +4,7 @@
- @ifinfo
- @dircategory XEmacs Editor
- @direntry
--* External Widget: (external-widget) External Client Widget.
-+* External Widget: (external-widget). External Client Widget.
- @end direntry
- @end ifinfo
- 

diff --git a/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch 
b/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch
deleted file mode 100644
index 105eb549eb6..000
--- a/app-editors/xemacs/files/xemacs-21.4.21-vcdiff.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 lib-src/vcdiff.~1~ 1996-12-18 23:42:33.0 +0100
-+++ lib-src/vcdiff 2008-04-09 08:20:36.0 +0200
-@@ -79,14 +79,14 @@
-   case $f in
-   s.* | */s.*)
-   if
--  rev1=/tmp/geta$$
-+  rev1=`mktemp /tmp/geta.`
-   get -s -p -k $sid1 "$f" > $rev1 &&
-   case $sid2 in
-   '')
-   workfile=`expr " /$f" : '.*/s.\(.*\)'`
-   ;;
-   *)
--  rev2=/tmp/getb$$
-+  rev2=`mktemp /tmp/getb.`
-   get -s -p -k $sid2 "$f" > $rev2
-   workfile=$rev2
-   esac

diff --git

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

2017-12-10 Thread Mats Lidell

commit: 5607f1ebf4b7621ec053144984064609b48d87d1
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Dec 10 21:43:53 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Dec 10 21:44:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5607f1eb

app-editors/xemacs: Use xdg_desktop_database_update

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 4 +++-
 app-editors/xemacs/xemacs-21.4.24.ebuild| 4 +++-
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 980a68d80e3..6975de5d429 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -7,7 +7,7 @@
 EAPI="5"
 
 WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="http://www.xemacs.org/;
@@ -233,9 +233,11 @@ src_install() {
 pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+   xdg_desktop_database_update
 }
 
 pkg_postrm() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+   xdg_desktop_database_update
 }

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 4c1eaa52fd0..a1297fa3699 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -7,7 +7,7 @@
 EAPI="5"
 
 WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="http://www.xemacs.org/;
@@ -235,9 +235,11 @@ src_install() {
 pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+   xdg_desktop_database_update
 }
 
 pkg_postrm() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+   xdg_desktop_database_update
 }

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index d806967cce4..c060855e592 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -7,7 +7,7 @@
 EAPI=5
 
 WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
+inherit eutils flag-o-matic multilib xdg-utils
 
 DESCRIPTION="highly customizable open source text editor and application 
development system"
 HOMEPAGE="http://www.xemacs.org/;
@@ -235,6 +235,7 @@ src_install() {
 pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+   xdg_desktop_database_update
 
einfo "If you are upgrading from XEmacs 21.4 you should note the 
following"
einfo "incompatibilities:"
@@ -252,4 +253,5 @@ pkg_postinst() {
 pkg_postrm() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+   xdg_desktop_database_update
 }

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

2017-12-10 Thread Mats Lidell

commit: de27d8e5c53b1aaca10875b5fe5f5a19a7a9dcaf
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Dec 10 12:34:21 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sun Dec 10 12:35:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de27d8e5

app-editors/xemacs: Use system malloc and -no-pie

For 21.4 use system malloc on all architectures. For both 21.4 and 21.5 use 
-no-pie option
since xemacs can't be built with positions indipendent code yet. This is for 
adopting
to the 17.0 profiles which defaults to use PIE.

Bug: https://bugs.gentoo.org/639214
Bug: https://bugs.gentoo.org/639508
Bug: https://bugs.gentoo.org/639642
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 18 +++---
 app-editors/xemacs/xemacs-21.4.24.ebuild| 18 +++---
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild |  9 ++---
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 4b120d8e087..980a68d80e3 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
 
 EAPI="5"
 
@@ -86,6 +85,10 @@ src_prepare() {
 src_configure() {
local myconf=""
 
+   # Can't build with pie. See bug #75028
+   test-flags -no-pie >/dev/null && append-flags -no-pie
+   filter-flags -pie
+
if use X; then
 
myconf="${myconf} --with-widgets=athena"
@@ -156,14 +159,6 @@ src_configure() {
myconf="${myconf} --without-database"
fi
 
-   # fixes #21264, this should be fixed in 21.4.21 and has been fixed
-   # in 21.5 for sure. Now that 21.4.21 is out there is no real
-   # evidence that this indeed got fixed, so keep these exceptions
-   # for now.
-   use alpha && myconf="${myconf} --with-system-malloc"
-   use ppc64 && myconf="${myconf} --with-system-malloc"
-   use ia64  && myconf="${myconf} --with-system-malloc"
-
# Enabling modules will cause segfaults outside the XEmacs build 
directory
use ia64  && myconf="${myconf} --without-modules"
 
@@ -184,6 +179,7 @@ src_configure() {
--compiler=$(tc-getCC) \
--prefix=/usr \
--with-ncurses \
+   --with-system-malloc \
--with-msw=no \
--mail-locking=flock \
--with-site-lisp=yes \

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index daf6425d4da..4c1eaa52fd0 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
 
 EAPI="5"
 
@@ -85,6 +84,10 @@ src_prepare() {
 src_configure() {
local myconf=""
 
+   # Can't build with pie. See bug #75028
+   test-flags -no-pie >/dev/null && append-flags -no-pie
+   filter-flags -pie
+
if use X; then
 
myconf="${myconf} --with-widgets=athena"
@@ -155,14 +158,6 @@ src_configure() {
myconf="${myconf} --without-database"
fi
 
-   # fixes #21264, this should be fixed in 21.4.21 and has been fixed
-   # in 21.5 for sure. Now that 21.4.21 is out there is no real
-   # evidence that this indeed got fixed, so keep these exceptions
-   # for now.
-   use alpha && myconf="${myconf} --with-system-malloc"
-   use ppc64 && myconf="${myconf} --with-system-malloc"
-   use ia64  && myconf="${myconf} --with-system-malloc"
-
# Enabling modules will cause segfaults outside the XEmacs build 
directory
use ia64  && myconf="${myconf} --without-modules"
 
@@ -186,6 +181,7 @@ src_configure() {
--compiler=$(tc-getCC) \
--prefix=/usr \
--with-ncurses \
+   --with-system-malloc \
--with-msw=no \
--mail-locking=flock \
--with-site-lisp=yes \

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index

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

2017-11-18 Thread David Seifert

commit: 952ccad88687bd307a8bb0df235030de197d2317
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Nov 18 12:40:21 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 18 18:03:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952ccad8

app-editors/xemacs: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6225

 .../files/xemacs-21.5.29-optimization-bug.patch| 14 -
 .../files/xemacs-21.5.33-no-mule-build.patch   | 33 --
 2 files changed, 47 deletions(-)

diff --git a/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch 
b/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch
deleted file mode 100644
index 32a1a02c2ab..000
--- a/app-editors/xemacs/files/xemacs-21.5.29-optimization-bug.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Work around a GCC optimization bug as described in
-http://tracker.xemacs.org/XEmacs/its/issue354
-
 src/dumper.c.~1~   2008-01-26 09:54:11.0 +0100
-+++ src/dumper.c   2008-05-03 10:17:03.0 +0200
-@@ -2584,7 +2584,7 @@
- #endif /* !WIN32_NATIVE */
- 
- 
--static int
-+int
- pdump_file_try (Wexttext *exe_path)
- {
-   Wexttext *w = exe_path + wext_strlen (exe_path);

diff --git a/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch 
b/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch
deleted file mode 100644
index 17e572044fa..000
--- a/app-editors/xemacs/files/xemacs-21.5.33-no-mule-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -r a2912073be85 lisp/paragraphs.el
 a/lisp/paragraphs.el   Wed Jun 19 09:30:30 2013 -0600
-+++ b/lisp/paragraphs.el   Sat Jun 22 13:27:48 2013 +0200
-@@ -180,7 +180,10 @@
-   :type '(choice regexp (const :tag "Use default value" nil)))
- (put 'sentence-end 'safe-local-variable 'string-or-null-p)
- 
--(defcustom sentence-end-base "[.?!][]\"'”)}]*"
-+(defcustom sentence-end-base
-+  (concat "[.?!][]\"'"
-+(if (featurep 'mule) (string (unicode-to-char #x201D)) "")
-+")}]*")
-   "Regexp matching the basic end of a sentence, not including following 
space."
-   :group 'paragraphs
-   :type 'string
-@@ -201,14 +204,14 @@
- in between.  See Info node `(elisp)Standard Regexps'."
-   (or sentence-end
-   ;; We accept non-break space along with space.
--  (concat (if sentence-end-without-period "\\w[ \u00a0][ \u00a0]\\|")
-+  (concat (if sentence-end-without-period "\\w[ \240][ \240]\\|")
- "\\("
- sentence-end-base
-   (if sentence-end-double-space
--  "\\($\\|[ \u00a0]$\\|\t\\|[ \u00a0][ \u00a0]\\)" 
"\\($\\|[\t \u00a0]\\)")
-+  "\\($\\|[ \240]$\\|\t\\|[ \240][ \240]\\)" "\\($\\|[\t 
\240]\\)")
-   "\\|[" sentence-end-without-space "]+"
- "\\)"
--  "[ \u00a0\t\n]*")))
-+  "[ \240\t\n]*")))
- 
- (defcustom page-delimiter "^\014"
-   "*Regexp describing line-beginnings that separate pages."

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

2017-10-08 Thread Michał Górny

commit: 55416c4a89faf3995988f8da06c148decf76a0f2
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct  8 10:58:24 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct  8 11:00:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55416c4a

app-editors/xemacs: Strip empty metadata.xml elements

 app-editors/xemacs/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index efbc10c69bb..eb55cb7dabc 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -5,7 +5,6 @@
 xem...@gentoo.org
 Primary Maintainer
   
-  
   
 Chooses the MIT Athena widget set
 Enables support for the x11-libs/dnd

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

2017-08-09 Thread Anthony G. Basile

commit: 9f9ddbdbee68e2123c87292145126920d82fe62c
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Aug  9 12:12:34 2017 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Aug  9 12:12:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f9ddbdb

app-editors/xemacs: keyword ~mips

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-editors/xemacs/xemacs-21.4.22-r4.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.4.24-r1.ebuild | 2 +-
 app-editors/xemacs/xemacs-21.4.24.ebuild| 2 +-
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild 
b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
index 39bf73a8c5d..5c1ab8b2827 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with a hardened profile. If you
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips 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"

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 9f1e61beeec..4b120d8e087 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~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"

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 6f9245c0ea7..daf6425d4da 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips 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"

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 79f22fe89c6..dec26af2cdb 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2017-06-21 Thread Alexis Ballier

commit: eda01180168ffc7debaec92ca8437a1c08a516fd
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Jun 21 10:14:48 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Jun 21 10:14:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eda01180

app-editors/xemacs: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 56be74155fe..79f22fe89c6 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"

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

2017-06-17 Thread Mats Lidell

commit: 65c5640bf26eecb703fff1bf26b52835dcffe747
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Jun 17 16:16:50 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Sat Jun 17 16:24:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c5640b

app-editors/xemacs: remove banner header in einfo, bug #621634

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 app-editors/xemacs/xemacs-21.5.34-r4.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index e351b320cfe..56be74155fe 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -233,7 +233,6 @@ pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
 
-   einfo "*"
einfo "If you are upgrading from XEmacs 21.4 you should note the 
following"
einfo "incompatibilities:"
einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in 
XEmacs 21.5"

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

2017-04-17 Thread Mats Lidell

commit: 1d26ca1814811aca0463644dc3ebe920470a9357
Author: Mats Lidell  gentoo  org>
AuthorDate: Mon Apr 17 20:07:36 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Mon Apr 17 20:08:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d26ca18

app-editors/xemacs: Build with ncurses using tinfo, bug #615544

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch | 12 
 app-editors/xemacs/xemacs-21.4.24-r1.ebuild |  2 ++
 app-editors/xemacs/xemacs-21.4.24.ebuild|  4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch 
b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
new file mode 100644
index 000..19b8984db2d
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
@@ -0,0 +1,12 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in Tue Mar 24 22:15:53 2015 -0400
 b/configure.in Mon Apr 17 10:13:05 2017 +0200
+@@ -4449,7 +4449,7 @@
+ AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
+ AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
+ XE_ADD_OBJS(terminfo.o)
+-XE_PREPEND(-lncurses, LIBS)
++XE_PREPEND($(pkg-config ncurses --libs), LIBS)
+ 
+ if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+   dnl Try again, and check for the bogus ncurses/ include bug.

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index e9e6f8a04e2..9f1e61beeec 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -64,6 +64,8 @@ src_prepare() {
# see bug 576512
epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+   # see bug 615544
+   epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
 
# Some binaries and man pages are installed under suffixed names
# to avoid collions with their GNU Emacs counterparts (see below).

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 9305b8ed2eb..6f9245c0ea7 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with a hardened profile. If you
@@ -63,6 +63,8 @@ src_prepare() {
epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
# see bug 576512
epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+   # see bug 615544
+   epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.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/

2017-04-03 Thread Mats Lidell

commit: 623b145d4df33fb086859aec44fa7bef987a82dd
Author: Mats Lidell  gentoo  org>
AuthorDate: Sat Apr  1 23:12:56 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Mon Apr  3 20:53:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=623b145d

app-editors/xemacs: Remove old xemacs-21.5 ebuilds

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-editors/xemacs/Manifest |   2 -
 app-editors/xemacs/xemacs-21.5.31.ebuild| 238 --
 app-editors/xemacs/xemacs-21.5.33.ebuild| 236 --
 app-editors/xemacs/xemacs-21.5.34-r2.ebuild | 249 ---
 app-editors/xemacs/xemacs-21.5.34-r3.ebuild | 250 
 5 files changed, 975 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index ba31b4f2285..21a3c53553a 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,6 +1,4 @@
 DIST NeXT_XEmacs.tar.gz 39571 SHA256 
35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 SHA512 
611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 WHIRLPOOL 
d47aafa6fe7a11de94196dffb752c683722b8ead23979a7f4344c61964ebcd052a4f0ad6b9ab42a5d41f5551c0a543f46af59656fc8a79340257626272c1faae
 DIST xemacs-21.4.22.tar.gz 8357931 SHA256 
87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1 SHA512 
7ddd91f8d1a1b9f6d984a5bfddd98705dd6f7e3d6b4f81c1e03d971c93e33bff09b641bc2ad0a0d9d2e44170063550ad0399f3e28237dd34b8ad6200d8b197e8
 WHIRLPOOL 
f1d313aa2dee7f4238190b90c10dc951a31302563a8a098e69ed740e85f428ac360b363e44f1e618f2d97782b5532846df290e9f79f11abdc7648a1e380cb44e
 DIST xemacs-21.4.24.tar.gz 8543879 SHA256 
9016a51496d4978cf3dba75000a8e38bfc8cb4ca3a3f3e71371aa19259f26cd5 SHA512 
b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 WHIRLPOOL 
469d52341833037e22cebeb6b554435c81b3f5749f64d86ddf31c3990dfc08a57f49fab7e868ab8c2009d1cae665f4fd731813f25c942d5aafd287ad7736a049
-DIST xemacs-21.5.31.tar.gz 15802193 SHA256 
d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 
17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41
 WHIRLPOOL 
b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59
-DIST xemacs-21.5.33.tar.gz 15781151 SHA256 
448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94 SHA512 
75358b5cf2a012d23b95eb918e0ba1abf254db51d979d370f407b67871c6d09e2d59f59fe1acd46149933913222935e2c12be72cdf0314109c568f9f14438151
 WHIRLPOOL 
29d6a19d8cacc243afd3c21ed96cfabfa956531692e8ce4a454b958d32b08bb3eac47f52ada872ccfdb41082514145c602cc7ed81443bece7529365ba089f454
 DIST xemacs-21.5.34.tar.gz 15816932 SHA256 
33cc54a6a9a45224a64b6c57c8138b5a5f0f1be368951a6d9ec8c0aec5993ee5 SHA512 
b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 WHIRLPOOL 
733aabc45309ff4172ab77492dd85e71f156722f2e06d9a185c0a4260b9fbea607ff8a41dc43fc009cb8cdf3f05d4523778610a501f27a4917ab43cea03c6209

diff --git a/app-editors/xemacs/xemacs-21.5.31.ebuild 
b/app-editors/xemacs/xemacs-21.5.31.ebuild
deleted file mode 100644
index 78de2d05cb4..000
--- a/app-editors/xemacs/xemacs-21.5.31.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: xemacs currently does not work with a hardened profile. If you
-# want to use xemacs on a hardened profile then compile with the
-# -nopie flag in CFLAGS or help fix bug #75028.
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="highly customizable open source text editor and application 
development system"
-HOMEPAGE="http://www.xemacs.org/;
-SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff 
png mule motif freewnn canna xft 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-4 !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
-   >=sys-libs/zlib-1.1.4
-   >=dev-libs/openssl-0.9.6:0
-   >=media-libs/audiofile-0.2.3
-   gpm? ( >=sys-libs/gpm-1.19.6 )
-   postgres? ( dev-db/postgresql )
-   ldap? ( net-nds/openldap )
-   alsa? ( media-libs/alsa-lib )
-   nas? ( media-libs/nas )
-   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-   dnd? ( x11-libs/dnd )
-   motif? (

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

2017-04-03 Thread Mats Lidell

commit: 7bb54c579bb0a67bd3b5ea74fb676a74bed29f32
Author: Mats Lidell  gentoo  org>
AuthorDate: Sun Apr  2 22:37:29 2017 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Mon Apr  3 20:53:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb54c57

app-editors/xemacs: Bump to 21.4.24-r1.

Remove deprecation warnings. Solves bug #552044 in a better way.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../xemacs/files/xemacs-21.4.24-glibc-macro.patch  |  28 +++
 app-editors/xemacs/xemacs-21.4.24-r1.ebuild| 243 +
 2 files changed, 271 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch 
b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
new file mode 100644
index 000..62d26ccc053
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-glibc-macro.patch
@@ -0,0 +1,28 @@
+Don't define deprecated glibc symbol
+
+Avoid defining the deprecated symbols _BSD_SOURCE and _SVID_SOURCE
+that xmkmf thinks are needed to compile X programs.
+
+diff -r 09d56098ea2c -r 32a8151f8af7 configure.in
+--- a/configure.in Sat Feb 11 01:24:06 2017 +0100
 b/configure.in Sat Feb 11 01:59:40 2017 +0100
+@@ -2868,10 +2868,15 @@
+ * ) val=1 ;;
+   esac
+ dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
+-  if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+-if test "$val" = "1"
+-  then AC_DEFINE_UNQUOTED($sym)
+-  else AC_DEFINE_UNQUOTED($sym,$val)
++dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
++dnl likes us to define; ignore them if appropriate.
++  if grep "^#define $sym " confdefs.h >/dev/null  || \
++   test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \
++   test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE";
++then :; else
++if test "$val" = "1"
++  then AC_DEFINE_UNQUOTED($sym)
++  else AC_DEFINE_UNQUOTED($sym,$val)
+ fi
+   fi  ;;
+   esac

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
new file mode 100644
index 000..e9e6f8a04e2
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI="5"
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+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 ~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? ( >=sys-libs/gdbm-1.8.3 )
+   >=sys-libs/zlib-1.1.4
+   >=dev-libs/openssl-0.9.6:0
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql:= )
+   ldap? ( net-nds/openldap )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0 )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   canna? ( app-i18n/canna )
+   !amd64? ( freewnn? ( app-i18n/freewnn ) )
+   >=sys-libs/ncurses-5.2:=
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   >=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   unpack ${P}.tar.gz
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+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
+   epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+   sed -i -e

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

2017-03-31 Thread Andreas Hüttel

commit: 45057b71af5c1120fded4ce76eb0d92f35453879
Author: Andreas K. Huettel  gentoo  org>
AuthorDate: Fri Mar 31 20:45:51 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri Mar 31 20:45:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45057b71

app-editors/xemacs: Convert to thin manifest

 app-editors/xemacs/Manifest | 45 -
 1 file changed, 45 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index bd49e82b84e..ba31b4f2285 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,51 +1,6 @@
--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 
805014085e7faeacd98d7bb2a3a57e49cf6a6f991db26dfa28230373044f2809 SHA512 
2afac7a199455ad0ace5a63f6a1e2b73d8f2a8da3eb93b59975b2d654ae85acd24d206ba0d9cfe08e35fb1fdea757fc6cd3588f4b97b75991eb946885eab85b4
 WHIRLPOOL 
6d1e2d2df7059d0b8477eadccfeb8873a8dde3a129bc06ffdca4e86950c1df924070212198dcb309f00287f0a4525e230b6df1827c209bb058ae3f6d6feffa11

[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} \

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

2016-02-09 Thread Ulrich Müller

commit: 2442d976c864d81e1deb8733ab4c9233637b4af7
Author: Ulrich Müller  gentoo  org>
AuthorDate: Tue Feb  9 21:40:26 2016 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Tue Feb  9 21:40:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2442d976

app-editors/xemacs: Whitespace.

Package-Manager: portage-2.2.27

 app-editors/xemacs/xemacs-21.4.22-r4.ebuild | 4 ++--
 app-editors/xemacs/xemacs-21.4.24.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild 
b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
index b4d84d6..d7a8db2 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -180,7 +180,7 @@ src_configure() {
# Enabling modules will cause segfaults outside the XEmacs build 
directory
use ia64  && myconf="${myconf} --without-modules"
 
-   # fixes #552044, deprecation warnings fools header detection in 
configure 
+   # fixes #552044, deprecation warnings fools header detection in 
configure
myconf="${myconf} --cppflags=-Wno-cpp"
 
einfo "${myconf}"

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 24fd39c..97f68ae 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -163,7 +163,7 @@ src_configure() {
# Enabling modules will cause segfaults outside the XEmacs build 
directory
use ia64  && myconf="${myconf} --without-modules"
 
-   # fixes #552044, deprecation warnings fools header detection in 
configure 
+   # fixes #552044, deprecation warnings fools header detection in 
configure
myconf="${myconf} --cppflags=-Wno-cpp"
 
einfo "${myconf}"

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

2015-10-08 Thread Mats Lidell

commit: 01ce00f10dd5d0857cbfecb7a9c6ce67c50171b5
Author: Mats Lidell  gentoo  org>
AuthorDate: Thu Oct  8 10:05:09 2015 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Thu Oct  8 10:19:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01ce00f1

app-editors/xemacs: Add slot operator to ncurses.

Package-Manager: portage-2.2.20.1

 app-editors/xemacs/xemacs-21.4.22-r4.ebuild | 2 +-
 app-editors/xemacs/xemacs-21.4.24.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild 
b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
index e8f4a79..b4d84d6 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
canna? ( app-i18n/canna )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
-   >=sys-libs/ncurses-5.2
+   >=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
 
 DEPEND="${RDEPEND}"

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index bfc36b1..24fd39c 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
jpeg? ( virtual/jpeg:0 )
canna? ( app-i18n/canna )
!amd64? ( freewnn? ( app-i18n/freewnn ) )
-   >=sys-libs/ncurses-5.2
+   >=sys-libs/ncurses-5.2:=
>=app-eselect/eselect-emacs-1.15"
 
 DEPEND="${RDEPEND}

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

2015-10-08 Thread Mats Lidell

commit: f477575082960a9612844415a2a7fdf7cac8c4ce
Author: Mats Lidell  gentoo  org>
AuthorDate: Thu Oct  8 11:52:22 2015 +
Commit: Mats Lidell  gentoo  org>
CommitDate: Thu Oct  8 11:52:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4775750

app-editors/xemacs: Apply upstream patch for gcc5.

Package-Manager: portage-2.2.20.1

 app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch |  35 +++
 app-editors/xemacs/xemacs-21.5.34-r4.ebuild| 252 +
 2 files changed, 287 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch 
b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
new file mode 100644
index 000..025a390
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch
@@ -0,0 +1,35 @@
+diff --git a/src/lisp.h b/src/lisp.h
+--- a/src/lisp.h
 b/src/lisp.h
+@@ -1154,6 +1154,8 @@
+ 
+ /*  alignment definitions --- */
+ 
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \
++(!defined (__cplusplus) || __cplusplus < 201103L)
+ /* No type has a greater alignment requirement than max_align_t.
+(except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -1163,6 +1165,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+that data of this type must begin at a memory address which is a
+@@ -1170,7 +1173,11 @@
+as the type itself. */
+ 
+ #ifndef ALIGNOF
+-# if defined (__GNUC__) && (__GNUC__ >= 2)
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++#  define ALIGNOF(type) _Alignof(type)
++# elif defined (__cplusplus) && __cplusplus >= 201103L
++#  define ALIGNOF(type) alignof(type)
++# elif defined (__GNUC__) && (__GNUC__ >= 2)
+ /* gcc has an extension that gives us exactly what we want. */
+ #  define ALIGNOF(type) __alignof__ (type)
+ # elif ! defined (__cplusplus)
+
+

diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
new file mode 100644
index 000..4756c65
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="highly customizable open source text editor and application 
development system"
+HOMEPAGE="http://www.xemacs.org/;
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft 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-4 !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
+   >=sys-libs/zlib-1.1.4
+   !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+   libressl? ( dev-libs/libressl )
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   canna? ( app-i18n/canna )
+   freewnn? ( app-i18n/freewnn )
+   >=sys-libs/ncurses-5.2
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   default_src_unpack
+
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+   epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+   epatch "${FILESDIR}/${P}-gcc5.patch"
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed

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

2015-10-06 Thread Mikle Kolyada

commit: 9be1cd5945ec0f49aeab6cb6730d0e7e66a281d4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Oct  6 13:25:57 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Oct  6 13:26:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be1cd59

app-editors/xemacs: x86 stable wrt bug #554224

Package-Manager: portage-2.2.20.1

 app-editors/xemacs/xemacs-21.4.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 31b88c5..bfc36b1 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 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"

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

2015-10-04 Thread Julian Ospald

commit: cc2596f17dcbd45ff641a7fb6199e286bad03555
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct  4 20:58:56 2015 +
Commit: Julian Ospald  gentoo  org>
CommitDate: Sun Oct  4 21:09:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc2596f1

app-editors/xemacs: add libressl support

 app-editors/xemacs/xemacs-21.5.34-r3.ebuild | 251 
 1 file changed, 251 insertions(+)

diff --git a/app-editors/xemacs/xemacs-21.5.34-r3.ebuild 
b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
new file mode 100644
index 000..c5dfa22
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.5.34-r3.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: xemacs currently does not work with a hardened profile. If you
+# want to use xemacs on a hardened profile then compile with the
+# -nopie flag in CFLAGS or help fix bug #75028.
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="highly customizable open source text editor and application 
development system"
+HOMEPAGE="http://www.xemacs.org/;
+SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
+   http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz;
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X 
jpeg tiff png mule motif freewnn canna xft 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-4 !!=sys-libs/gdbm-1.8.3[berkdb(+)] )
+   >=sys-libs/zlib-1.1.4
+   !libressl? ( >=dev-libs/openssl-0.9.6:0 )
+   libressl? ( dev-libs/libressl )
+   >=media-libs/audiofile-0.2.3
+   gpm? ( >=sys-libs/gpm-1.19.6 )
+   postgres? ( dev-db/postgresql )
+   ldap? ( net-nds/openldap )
+   alsa? ( media-libs/alsa-lib )
+   nas? ( media-libs/nas )
+   X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+   dnd? ( x11-libs/dnd )
+   motif? ( >=x11-libs/motif-2.3:0[xft=] )
+   athena? ( x11-libs/libXaw )
+   Xaw3d? ( x11-libs/libXaw3d )
+   xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender 
>=media-libs/fontconfig-2.5.0 )
+   neXt? ( x11-libs/neXtaw )
+   xface? ( media-libs/compface )
+   tiff? ( media-libs/tiff:0 )
+   png? ( >=media-libs/libpng-1.2:0 )
+   jpeg? ( virtual/jpeg:0 )
+   canna? ( app-i18n/canna )
+   freewnn? ( app-i18n/freewnn )
+   >=sys-libs/ncurses-5.2
+   >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PDEPEND="app-xemacs/xemacs-base
+   mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+   default_src_unpack
+
+   use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+   use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+   find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
+   epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+
+   # Some binaries and man pages are installed under suffixed names
+   # to avoid collions with their GNU Emacs counterparts (see below).
+   # Fix internal filename references.
+   sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+   sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+   sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || 
die
+}
+
+src_configure() {
+   local myconf=""
+
+   if use X; then
+
+   myconf="${myconf} --with-widgets=athena"
+   myconf="${myconf} --with-dialogs=athena"
+   myconf="${myconf} --with-menubars=lucid"
+   myconf="${myconf} --with-scrollbars=lucid"
+   if use motif ; then
+   myconf="--with-widgets=motif"
+   myconf="${myconf} --with-dialogs=motif"
+   myconf="${myconf} --with-scrollbars=motif"
+   myconf="${myconf} --with-menubars=lucid"
+   fi
+   if use athena or use Xaw3d ; then
+   myconf="--with-scrollbars=athena"
+   fi
+
+   if use Xaw3d; then
+   myconf="${myconf} --with-athena=3d"
+   elif use neXt; then
+   myconf="${myconf} --with-athena=next"
+   else
+   myconf="${myconf} --with-athena=xaw"
+   fi
+
+   use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+   myconf="${myconf} $(use_with tiff )"
+   myconf="${myconf} $(use_with png )"
+   myconf="${myconf} $(use_with jpeg )"
+   myconf="${myconf} $(use_with xface )"
+
+   use xft && myconf="${myconf} 
--with-xft=emacs,tabs,menubars,gauges" ||
+

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

2015-08-10 Thread Mikle Kolyada

commit: debf170551304bf1bbc4990968aa195d2fac6c01
Author: Mikle Kolyada zlogene AT gentoo DOT org
AuthorDate: Mon Aug 10 23:51:32 2015 +
Commit: Mikle Kolyada zlogene AT gentoo DOT org
CommitDate: Mon Aug 10 23:51:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=debf1705

app-editors/xemacs: amd64 stable wrt bug #554224

Package-Manager: portage-2.2.20

 app-editors/xemacs/xemacs-21.4.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild 
b/app-editors/xemacs/xemacs-21.4.24.ebuild
index a9b17c4..31b88c5 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -18,7 +18,7 @@ SRC_URI=http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
 
 LICENSE=GPL-2+
 SLOT=0
-KEYWORDS=alpha ~amd64 hppa ppc ppc64 sparc ~x86
+KEYWORDS=alpha amd64 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

80 matches

Mail list logo