public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2015-10-08 12:03 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2015-10-08 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f477575082960a9612844415a2a7fdf7cac8c4ce
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  8 11:52:22 2015 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 11:52:22 2015 +0000
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 0000000..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 0000000..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/db-4 )
+	gdbm? ( >=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 -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" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with canna )"
+		myconf="${myconf} $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+	use alsa && soundconf="${soundconf},alsa"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm   && mydb="gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	use debug && myconf="${myconf} --with-debug" ||
+		myconf="${myconf} --with-optimization"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-newgc \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs \
+		|| die "configuration failed"
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+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 \
+		install || die
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# 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"
+	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"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${D}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+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"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2017-04-03 20:56 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2017-04-03 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     7bb54c579bb0a67bd3b5ea74fb676a74bed29f32
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  2 22:37:29 2017 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Mon Apr  3 20:53:24 2017 +0000
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 00000000000..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 00000000000..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 '/^\.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=""
+
+	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
+			myconf="${myconf} --with-athena=xaw"
+		fi
+
+		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+
+		myconf="${myconf} $(use_with tiff ) $(use_with png )"
+		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm && mydb="gdbm"
+
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		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"
+
+	einfo "${myconf}"
+
+	# see bug 576512
+	append-cflags -fgnu89-inline
+
+	# Don't use econf because it uses options which this configure
+	# script does not understand (like --host).
+	./configure ${myconf} ${EXTRA_ECONF} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--compiler=$(tc-getCC) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-msw=no \
+		--mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		|| die "The configure script failed to run properly"
+}
+
+src_install() {
+	emake prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man/man1 \
+		infodir="${D}"/usr/share/info \
+		install gzip-el || die "emake install failed"
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# packages (emacs) can't clobber the actual applications.
+	# Addresses bug #62991.
+	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
+		mv "${D}"/usr/bin/${i} "${D}"/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"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${D}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2017-04-17 20:12 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2017-04-17 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     1d26ca1814811aca0463644dc3ebe920470a9357
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 20:07:36 2017 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 20:08:08 2017 +0000
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 00000000000..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).


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2017-12-28 16:15 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2017-12-28 16:15 UTC (permalink / raw
  To: gentoo-commits

commit:     13b62d718ed4593bc8cff1d7da0d75cad678c0eb
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 16:14:33 2017 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 16:15:00 2017 +0000
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..00000000000
--- 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..00000000000
--- 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.000000000 +0100
-+++ lib-src/vcdiff	2008-04-09 08:20:36.000000000 +0200
-@@ -79,14 +79,14 @@
- 	case $f in
- 	s.* | */s.*)
- 		if
--			rev1=/tmp/geta$$
-+			rev1=`mktemp /tmp/geta.XXXXXXXX`
- 			get -s -p -k $sid1 "$f" > $rev1 &&
- 			case $sid2 in
- 			'')
- 				workfile=`expr " /$f" : '.*/s.\(.*\)'`
- 				;;
- 			*)
--				rev2=/tmp/getb$$
-+				rev2=`mktemp /tmp/getb.XXXXXXXX`
- 				get -s -p -k $sid2 "$f" > $rev2
- 				workfile=$rev2
- 			esac

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch b/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
deleted file mode 100644
index aceae530bcb..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-deprecated-ldap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to include depracated LDAP symbols, specifically
-ldap_open. Without the proper prototype the call will almost surely
-lead to crashes on 64-bit arches otherwise. Thanks to hwoareng for the
-initial bug report.
-
-Not reported upstream since bug tracker is down.
-
---- src/eldap.h.~1~	2001-04-12 20:23:36.000000000 +0200
-+++ src/eldap.h	2010-09-28 19:53:34.148472315 +0200
-@@ -21,6 +21,8 @@
- #ifndef INCLUDED_eldap_h_
- #define INCLUDED_eldap_h_
- 
-+#define LDAP_DEPRECATED 1
-+
- #include <lber.h>
- #include <ldap.h>
- 

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch b/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch
deleted file mode 100644
index a03af3ccfa3..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-large-images.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-PATCH 21.4
-
-Here is the 21.4 version of the previous patch.  The lisp.h hunk is a
-little ugly.  Recommendations on how to deal with the absence of
-UINT_64_T in 21.4 are welcome.
-
-Index: src/glyphs-eimage.c
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-eimage.c,v
-retrieving revision 1.9.2.5
-diff -d -u -r1.9.2.5 glyphs-eimage.c
---- src/glyphs-eimage.c	2007/08/20 19:52:28	1.9.2.5
-+++ src/glyphs-eimage.c	2009/07/01 22:36:04
-@@ -407,6 +407,7 @@
-    */
-
-   {
-+    UINT_64_BIT pixels_sq;
-     int jpeg_gray = 0;		/* if we're dealing with a grayscale */
-     /* Step 4: set parameters for decompression.   */
-
-@@ -429,7 +430,10 @@
-     jpeg_start_decompress (&cinfo);
-
-     /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/
--
-+    pixels_sq =
-+      (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height;
-+    if (pixels_sq > ((size_t) -1) / 3)
-+      signal_image_error ("JPEG image too large to instantiate", instantiator);
-     unwind.eimage = (unsigned char*) xmalloc (cinfo.output_width * cinfo.output_height * 3);
-     if (!unwind.eimage)
-       signal_image_error("Unable to allocate enough memory for image", instantiator);
-@@ -671,6 +675,7 @@
-   {
-     ColorMapObject *cmo = unwind.giffile->SColorMap;
-     int i, j, row, pass, interlace, slice;
-+    UINT_64_BIT pixels_sq;
-     unsigned char *eip;
-     /* interlaced gifs have rows in this order:
-        0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ...  */
-@@ -679,6 +684,9 @@
-
-     height = unwind.giffile->SHeight;
-     width = unwind.giffile->SWidth;
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount))
-+      signal_image_error ("GIF image too large to instantiate", instantiator);
-     unwind.eimage = (unsigned char*)
-       xmalloc (width * height * 3 * unwind.giffile->ImageCount);
-     if (!unwind.eimage)
-@@ -937,11 +945,15 @@
-   {
-     int y;
-     unsigned char **row_pointers;
-+    UINT_64_BIT pixels_sq;
-     height = info_ptr->height;
-     width = info_ptr->width;
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq > ((size_t) -1) / 3)
-+      signal_image_error ("PNG image too large to instantiate", instantiator);
-
-     /* Wow, allocate all the memory.  Truly, exciting. */
--    unwind.eimage = xnew_array_and_zero (unsigned char, width * height * 3);
-+    unwind.eimage = xnew_array_and_zero (unsigned char, pixels_sq * 3);
-     /* libpng expects that the image buffer passed in contains a
-        picture to draw on top of if the png has any transparencies.
-        This could be a good place to pass that in... */
-@@ -994,7 +1006,7 @@
-       png_set_expand (png_ptr);
-     /* send grayscale images to RGB too */
-     if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
--        info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-       png_set_gray_to_rgb (png_ptr);
-     /* we can't handle alpha values */
-     if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-@@ -1268,6 +1280,7 @@
-
-     uint32 *raster;
-     unsigned char *ep;
-+    UINT_64_BIT pixels_sq;
-
-     assert (!NILP (data));
-
-@@ -1290,12 +1303,15 @@
-
-     TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width);
-     TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height);
--    unwind.eimage = (unsigned char *) xmalloc (width * height * 3);
-+    pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-+    if (pixels_sq >= 1 << 29)
-+      signal_image_error ("TIFF image too large to instantiate", instantiator);
-+    unwind.eimage = (unsigned char *) xmalloc (pixels_sq * 3);
-
-     /* #### This is little more than proof-of-concept/function testing.
-        It needs to be reimplemented via scanline reads for both memory
-        compactness. */
--    raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32));
-+    raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32)));
-     if (raster != NULL)
-       {
- 	int i,j;
-Index: src/lisp.h
-===================================================================
-RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
-retrieving revision 1.45.2.10
-diff -d -u -r1.45.2.10 lisp.h
---- src/lisp.h	2005/02/01 03:55:02	1.45.2.10
-+++ src/lisp.h	2009/07/01 22:36:05
-@@ -265,6 +265,11 @@
- /*#define REGISTER register*/
- /*#endif*/
-
-+#if SIZEOF_LONG == 8
-+#define UINT_64_BIT unsigned long
-+#elif SIZEOF_LONG_LONG == 8
-+#define UINT_64_BIT unsigned long long
-+#endif
-
- /* EMACS_INT is the underlying integral type into which a Lisp_Object must fit.
-    In particular, it must be large enough to contain a pointer.

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch b/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
deleted file mode 100644
index 0143e375d74..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-libpng15.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur xemacs-21.4.22.orig/src/glyphs-eimage.c xemacs-21.4.22/src/glyphs-eimage.c
---- xemacs-21.4.22.orig/src/glyphs-eimage.c	2011-09-26 19:44:57.889720996 +0300
-+++ xemacs-21.4.22/src/glyphs-eimage.c	2011-09-26 19:48:07.026226254 +0300
-@@ -946,8 +946,8 @@
-     int y;
-     unsigned char **row_pointers;
-     UINT_64_BIT pixels_sq;
--    height = info_ptr->height;
--    width = info_ptr->width;
-+    height = png_get_image_height(png_ptr, info_ptr);
-+    width = png_get_image_width(png_ptr, info_ptr);
-     pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height;
-     if (pixels_sq > ((size_t) -1) / 3)
-       signal_image_error ("PNG image too large to instantiate", instantiator);
-@@ -1002,22 +1002,22 @@
-     /* Now that we're using EImage, ask for 8bit RGB triples for any type
-        of image*/
-     /* convert palette images to full RGB */
--    if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
-+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
-       png_set_expand (png_ptr);
-     /* send grayscale images to RGB too */
--    if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
--	info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-+    if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
-+	png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
-       png_set_gray_to_rgb (png_ptr);
-     /* we can't handle alpha values */
--    if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
-+    if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
-       png_set_strip_alpha (png_ptr);
-     /* tell libpng to strip 16 bit depth files down to 8 bits */
--    if (info_ptr->bit_depth == 16)
-+    if (png_get_bit_depth(png_ptr, info_ptr) == 16)
-       png_set_strip_16 (png_ptr);
-     /* if the image is < 8 bits, pad it out */
--    if (info_ptr->bit_depth < 8)
-+    if (png_get_bit_depth(png_ptr, info_ptr) < 8)
-       {
--	if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
-+	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
- 	  png_set_expand (png_ptr);
- 	else
- 	  png_set_packing (png_ptr);
-@@ -1036,16 +1036,18 @@
-      */
-     {
-       int i;
-+      png_textp text;
-+      int num_text;
- 
--      for (i = 0 ; i < info_ptr->num_text ; i++)
-+      for (i = 0 ; i < num_text ; i++)
- 	{
- 	  /* How paranoid do I have to be about no trailing NULLs, and
- 	     using (int)info_ptr->text[i].text_length, and strncpy and a temp
- 	     string somewhere? */
- 
- 	  warn_when_safe (Qpng, Qinfo, "%s - %s",
--			  info_ptr->text[i].key,
--			  info_ptr->text[i].text);
-+			  text[i].key,
-+			  text[i].text);
- 	}
-     }
- #endif

diff --git a/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch b/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch
deleted file mode 100644
index 05dda3974a6..00000000000
--- a/app-editors/xemacs/files/xemacs-21.4.22-texinfo-5.patch
+++ /dev/null
@@ -1,437 +0,0 @@
---- xemacs-21.4.22-orig/man/custom.texi
-+++ xemacs-21.4.22/man/custom.texi
-@@ -60,7 +60,7 @@
- 
- @node Declaring Groups, Declaring Variables, Top, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Groups
-+@chapter Declaring Groups
- 
- Use @code{defgroup} to declare new customization groups.
- 
-@@ -92,7 +92,7 @@
- 
- @node Declaring Variables, Declaring Faces, Declaring Groups, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Variables
-+@chapter Declaring Variables
- 
- Use @code{defcustom} to declare user editable variables.
- 
-@@ -176,7 +176,7 @@
- 
- @node Declaring Faces, Usage for Package Authors, Declaring Variables, Top
- @comment  node-name,  next,  previous,  up
--@section Declaring Faces
-+@chapter Declaring Faces
- 
- Faces are declared with @code{defface}.
- 
-@@ -228,7 +228,7 @@
- 
- @node Usage for Package Authors, Utilities, Declaring Faces, Top
- @comment  node-name,  next,  previous,  up
--@section Usage for Package Authors
-+@chapter Usage for Package Authors
- 
- The recommended usage for the author of a typical emacs lisp package is
- to create one group identifying the package, and make all user options
-@@ -244,7 +244,7 @@
- 
- @node  Utilities, The Init File, Usage for Package Authors, Top
- @comment  node-name,  next,  previous,  up
--@section Utilities
-+@chapter Utilities
- 
- These utilities can come in handy when adding customization support.
- 
-@@ -276,7 +276,7 @@
- 
- @node The Init File, Wishlist, Utilities, Top
- @comment  node-name,  next,  previous,  up
--@section The Init File
-+@chapter The Init File
- 
- Customizations are saved to the file specified by @code{custom-file}, as
- calls to @code{custom-set-variables} and @code{custom-set-faces}.
-@@ -299,7 +299,7 @@
- 
- @node Wishlist,  , The Init File, Top
- @comment  node-name,  next,  previous,  up
--@section Wishlist
-+@chapter Wishlist
- 
- @itemize @bullet
- @item
---- xemacs-21.4.22-orig/man/info.texi
-+++ xemacs-21.4.22/man/info.texi
-@@ -543,6 +543,10 @@
- @c If a menu appears at the end of this node, remove it.
- @c It is an accident of the menu updating command.
- 
-+@menu
-+* Help-Cross::
-+@end menu
-+
- @node Help-Cross,  ,  , Help-Adv
- @subsection The node reached by the cross reference in Info
- 
---- xemacs-21.4.22-orig/man/lispref/edebug-inc.texi
-+++ xemacs-21.4.22/man/lispref/edebug-inc.texi
-@@ -1103,7 +1103,7 @@
- Here is a table of the possibilities for @var{specification} and how each
- directs processing of arguments.
- 
--@table @bullet
-+@table @asis
- 
- @item @code{t}
- All arguments are instrumented for evaluation.
---- xemacs-21.4.22-orig/man/lispref/packaging.texi
-+++ xemacs-21.4.22/man/lispref/packaging.texi
-@@ -600,7 +600,7 @@
- Does most of the work.  Builds the elcs, infos at a minimum.
- @end table
- 
--@subsection The targets that most people would be interested in would be:
-+@section The targets that most people would be interested in would be:
- 
- @itemize @bullet
- @item @code{all}
---- xemacs-21.4.22-orig/man/term.texi
-+++ xemacs-21.4.22/man/term.texi
-@@ -4,7 +4,7 @@
- 
- @titlepage
- @sp 6
--@center @titlefont(Notes about Emacs TERM Mode)
-+@center @titlefont{Notes about Emacs TERM Mode}
- @end titlepage
- 
- @ifinfo
---- xemacs-21.4.22-orig/man/widget.texi
-+++ xemacs-21.4.22/man/widget.texi
-@@ -38,7 +38,7 @@
- 
- @node  Introduction, User Interface, Top, Top
- @comment  node-name,  next,  previous,  up
--@section Introduction
-+@chapter Introduction
- 
- Most graphical user interface toolkits, such as Motif and XView, provide
- a number of standard user interface controls (sometimes known as
-@@ -129,7 +129,7 @@
- 
- @node User Interface, Programming Example, Introduction, Top
- @comment  node-name,  next,  previous,  up
--@section User Interface
-+@chapter User Interface
- 
- A form consists of read only text for documentation and some fields,
- where each of the fields contains two parts, a tag and a value.  The
-@@ -175,7 +175,7 @@
- a form, namely editing the editable text fields and activating the
- buttons.
- 
--@subsection Editable Text Fields
-+@section Editable Text Fields
- 
- In the example, the value for the @samp{Name} is most likely displayed
- in an editable text field, and so are values for each of the members of
-@@ -194,7 +194,7 @@
- Face used for other editing fields.
- @end deffn
- 
--@subsection Buttons
-+@section Buttons
- 
- Some portions of the buffer have an associated @dfn{action}, which can
- be @dfn{invoked} by a standard key or mouse command.  These portions
-@@ -259,7 +259,7 @@
- Face used for buttons when the mouse pointer is above it.
- @end defopt
- 
--@subsection Navigation
-+@section Navigation
- 
- You can use all the normal Emacs commands to move around in a form
- buffer, plus you will have these additional commands:
-@@ -277,7 +277,7 @@
- 
- @node Programming Example, Setting Up the Buffer, User Interface, Top
- @comment  node-name,  next,  previous,  up
--@section Programming Example
-+@chapter Programming Example
- 
- Here is the code to implement the user interface example (see @ref{User
- Interface}).
-@@ -369,7 +369,7 @@
- 
- @node Setting Up the Buffer, Basic Types, Programming Example, Top
- @comment  node-name,  next,  previous,  up
--@section Setting Up the Buffer
-+@chapter Setting Up the Buffer
- 
- Widgets are created with @code{widget-create}, which returns a
- @dfn{widget} object.  This object can be queried and manipulated by
-@@ -422,7 +422,7 @@
- 
- @node Basic Types, Sexp Types, Setting Up the Buffer, Top
- @comment  node-name,  next,  previous,  up
--@section Basic Types
-+@chapter Basic Types
- 
- The syntax of a type specification is given below:
- 
-@@ -635,7 +635,7 @@
- 
- @node link, url-link, Basic Types, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{link} Widget
-+@section The @code{link} Widget
- 
- Syntax:
- 
-@@ -659,7 +659,7 @@
- 
- @node url-link, info-link, link, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{url-link} Widget
-+@section The @code{url-link} Widget
- 
- Syntax:
- 
-@@ -672,7 +672,7 @@
- 
- @node info-link, push-button, url-link, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{info-link} Widget
-+@section The @code{info-link} Widget
- 
- Syntax:
- 
-@@ -685,7 +685,7 @@
- 
- @node  push-button, editable-field, info-link, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{push-button} Widget
-+@section The @code{push-button} Widget
- 
- Syntax:
- 
-@@ -709,7 +709,7 @@
- 
- @node editable-field, text, push-button, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{editable-field} Widget
-+@section The @code{editable-field} Widget
- 
- Syntax:
- 
-@@ -753,7 +753,7 @@
- 
- @node text, menu-choice, editable-field, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{text} Widget
-+@section The @code{text} Widget
- 
- This is just like @code{editable-field}, but intended for multiline text
- fields.  The default @code{:keymap} is @code{widget-text-keymap}, which
-@@ -761,7 +761,7 @@
- 
- @node menu-choice, radio-button-choice, text, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{menu-choice} Widget
-+@section The @code{menu-choice} Widget
- 
- Syntax:
- 
-@@ -796,7 +796,7 @@
- 
- @node radio-button-choice, item, menu-choice, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{radio-button-choice} Widget
-+@section The @code{radio-button-choice} Widget
- 
- Syntax:
- 
-@@ -856,7 +856,7 @@
- 
- @node item, choice-item, radio-button-choice, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{item} Widget
-+@section The @code{item} Widget
- 
- Syntax:
- 
-@@ -870,7 +870,7 @@
- 
- @node choice-item, toggle, item, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{choice-item} Widget
-+@section The @code{choice-item} Widget
- 
- Syntax:
- 
-@@ -886,7 +886,7 @@
- 
- @node toggle, checkbox, choice-item, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{toggle} Widget
-+@section The @code{toggle} Widget
- 
- Syntax:
- 
-@@ -914,7 +914,7 @@
- 
- @node checkbox, checklist, toggle, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{checkbox} Widget
-+@section The @code{checkbox} Widget
- 
- The widget has two possible states, `selected' and `unselected', which
- corresponds to a @code{t} or @code{nil} value.
-@@ -927,7 +927,7 @@
- 
- @node checklist, editable-list, checkbox, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{checklist} Widget
-+@section The @code{checklist} Widget
- 
- Syntax:
- 
-@@ -978,7 +978,7 @@
- 
- @node editable-list, group, checklist, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{editable-list} Widget
-+@section The @code{editable-list} Widget
- 
- Syntax:
- 
-@@ -1030,7 +1030,7 @@
- 
- @node group,  , editable-list, Basic Types
- @comment  node-name,  next,  previous,  up
--@subsection The @code{group} Widget
-+@section The @code{group} Widget
- 
- This widget simply groups other widgets together.
- 
-@@ -1044,7 +1044,7 @@
- 
- @node Sexp Types, Widget Properties, Basic Types, Top
- @comment
--@section Sexp Types
-+@chapter Sexp Types
- 
- A number of widgets for editing s-expressions (lisp types) are also
- available.  These basically fall in the following categories.
-@@ -1058,7 +1058,7 @@
- 
- @node constants, generic, Sexp Types, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection The Constant Widgets.
-+@section The Constant Widgets.
- 
- The @code{const} widget can contain any lisp expression, but the user is
- prohibited from editing it, which is mainly useful as a component of one
-@@ -1094,7 +1094,7 @@
- 
- @node generic, atoms, constants, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection Generic Sexp Widget.
-+@section Generic Sexp Widget.
- 
- The @code{sexp} widget can contain any lisp expression, and allows the
- user to edit it inline in the buffer.
-@@ -1115,7 +1115,7 @@
- 
- @node atoms, composite, generic, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection Atomic Sexp Widgets.
-+@section Atomic Sexp Widgets.
- 
- The atoms are s-expressions that does not consist of other
- s-expressions.  A string is an atom, while a list is a composite type.
-@@ -1192,7 +1192,7 @@
- 
- @node composite,  , atoms, Sexp Types
- @comment  node-name,  next,  previous,  up
--@subsection Composite Sexp Widgets.
-+@section Composite Sexp Widgets.
- 
- The syntax for the composite are
- 
-@@ -1265,7 +1265,7 @@
- 
- @node Widget Properties, Defining New Widgets, Sexp Types, Top
- @comment  node-name,  next,  previous,  up
--@section Properties
-+@chapter Properties
- 
- You can examine or set the value of a widget by using the widget object
- that was returned by @code{widget-create}.
-@@ -1353,7 +1353,7 @@
- 
- @node Defining New Widgets, Widget Browser, Widget Properties, Top
- @comment  node-name,  next,  previous,  up
--@section Defining New Widgets
-+@chapter Defining New Widgets
- 
- You can define specialized widgets with @code{define-widget}.  It allows
- you to create a shorthand for more complex widgets.  This includes
-@@ -1565,7 +1565,7 @@
- 
- @node Widget Browser, Widget Minor Mode, Defining New Widgets, Top
- @comment  node-name,  next,  previous,  up
--@section Widget Browser
-+@chapter Widget Browser
- 
- There is a separate package to browse widgets.  This is intended to help
- programmers who want to examine the content of a widget.  The browser
-@@ -1589,7 +1589,7 @@
- 
- @node  Widget Minor Mode, Utilities, Widget Browser, Top
- @comment  node-name,  next,  previous,  up
--@section Widget Minor Mode
-+@chapter Widget Minor Mode
- 
- There is a minor mode for manipulating widgets in major modes that
- doesn't provide any support for widgets themselves.  This is mostly
-@@ -1606,7 +1606,7 @@
- 
- @node  Utilities, Widget Wishlist, Widget Minor Mode, Top
- @comment  node-name,  next,  previous,  up
--@section Utilities.
-+@chapter Utilities.
- 
- @defun widget-prompt-value widget prompt [ value unbound ]
- Prompt for a value matching @var{widget}, using @var{prompt}.@*
-@@ -1621,7 +1621,7 @@
- 
- @node Widget Wishlist, Widget Internals, Utilities, Top
- @comment  node-name,  next,  previous,  up
--@section Wishlist
-+@chapter Wishlist
- 
- @itemize @bullet
- @item 
-@@ -1693,7 +1693,7 @@
- @end itemize
- 
- @node Widget Internals, , Widget Wishlist, Top
--@section Internals
-+@chapter Internals
- 
- This (very brief!) section provides a few notes on the internal
- structure and implementation of Emacs widgets.  Avoid relying on this
-@@ -1701,7 +1701,7 @@
- To the extent that it actually describes APIs, the information will be
- moved to appropriate sections of the manual in due course.
- 
--@subsection The @dfn{Widget} and @dfn{Type} Structures
-+@section The @dfn{Widget} and @dfn{Type} Structures
- 
- Widgets and types are currently both implemented as lists.
- 

diff --git a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild b/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
deleted file mode 100644
index 5c1ab8b2827..00000000000
--- a/app-editors/xemacs/xemacs-21.4.22-r4.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# 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 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 ~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"
-
-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}"
-
-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() {
-	epatch "${FILESDIR}"/xemacs-21.4.19-texi.patch
-
-	# see bug 58350, 102540 and 143580
-	epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
-
-	# Security bug #216880
-	epatch "${FILESDIR}"/xemacs-21.4.21-vcdiff.patch
-
-	# Security bug #275397
-	epatch "${FILESDIR}"/${P}-large-images.patch
-
-	# Make sure to include deprecated LDAP symbols to avoid runtime
-	# crashes.
-	epatch "${FILESDIR}"/${P}-deprecated-ldap.patch
-
-	# Fix compilation with libpng 1.5, bug 384461
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	# Add texinfo-5.1 compatibility
-	epatch "${FILESDIR}"/${P}-texinfo-5.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=""
-
-	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
-			myconf="${myconf} --with-athena=xaw"
-		fi
-
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
-
-		myconf="${myconf} $(use_with tiff ) $(use_with png )"
-		myconf="${myconf} $(use_with jpeg ) $(use_with xface )"
-	else
-		myconf="${myconf}
-			--without-x
-			--without-xpm
-			--without-dragndrop
-			--with-gif=no"
-	fi
-
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
-		else
-			myconf="${myconf} --with-xim=no"
-		fi
-
-		myconf="${myconf} $(use_with canna ) $(use_with freewnn wnn )"
-	fi
-
-	# This determines the type of sounds we are playing
-	local soundconf="native"
-
-	# This determines how these sounds should be played
-	use nas	&& soundconf="${soundconf},nas"
-
-	myconf="${myconf} --with-sound=${soundconf}"
-
-	if use gdbm || use berkdb ; then
-		use gdbm && mydb="gdbm"
-
-		use berkdb && mydb="${mydb},berkdb"
-
-		myconf="${myconf} --with-database=${mydb}"
-	else
-		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"
-
-	# fixes #552044, deprecation warnings fools header detection in configure
-	myconf="${myconf} --cppflags=-Wno-cpp"
-
-	einfo "${myconf}"
-
-	# Don't use econf because it uses options which this configure
-	# script does not understand (like --host).
-	./configure ${myconf} ${EXTRA_ECONF} \
-		$(use_with gif ) \
-		$(use_with gpm ) \
-		$(use_with postgres postgresql ) \
-		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
-		$(use_with pop ) \
-		--compiler=$(tc-getCC) \
-		--prefix=/usr \
-		--with-ncurses \
-		--with-msw=no \
-		--mail-locking=flock \
-		--with-site-lisp=yes \
-		--with-site-modules=yes \
-		|| die "The configure script failed to run properly"
-}
-
-src_install() {
-	emake prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man/man1 \
-		infodir="${D}"/usr/share/info \
-		install gzip-el || die "emake install failed"
-
-	# Rename some applications installed in bin so that it is clear
-	# which application installed them and so that conflicting
-	# packages (emacs) can't clobber the actual applications.
-	# Addresses bug #62991.
-	for i in b2m ctags etags rcs-checkin gnuclient gnudoit gnuattach; do
-		mv "${D}"/usr/bin/${i} "${D}"/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"
-	done
-
-	# install base packages directories
-	dodir /usr/lib/xemacs/xemacs-packages/
-	dodir /usr/lib/xemacs/site-packages/
-	dodir /usr/lib/xemacs/site-modules/
-	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
-
-	# remove extraneous info files
-	cd "${D}"/usr/share/info
-	rm -f dir info.info texinfo* termcap* standards*
-
-	cd "${S}"
-	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
-
-	domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-	eselect gnuclient update ifunset
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2020-03-07 12:52 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2020-03-07 12:52 UTC (permalink / raw
  To: gentoo-commits

commit:     de1c268b82e4bd5c4781231f6359ad1afe6ba672
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  7 12:51:37 2020 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Mar  7 12:51:37 2020 +0000
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 <matsl <AT> 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 00000000000..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/configure	Sun Jul 28 10:17:08 2019 +0100
++++ b/configure	Fri 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 00000000000..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/db-4 )
+	gdbm? ( >=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 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 )"
+		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" ||
+			myconf="${myconf} --with-xft=no"
+
+	else
+		myconf="${myconf}
+			--without-x
+			--without-xpm
+			--without-dragndrop
+			--with-xft=no
+			--with-gif=no"
+	fi
+
+	if use mule ; then
+		myconf="${myconf} --with-mule"
+
+		if use xim ; then
+			if use motif ; then
+				myconf="${myconf} --with-xim=motif"
+			else
+				myconf="${myconf} --with-xim=xlib"
+			fi
+		else
+			myconf="${myconf} --with-xim=no"
+		fi
+
+		myconf="${myconf} $(use_with canna )"
+		myconf="${myconf} $(use_with freewnn wnn )"
+	fi
+
+	# This determines the type of sounds we are playing
+	local soundconf="native"
+
+	# This determines how these sounds should be played
+	use nas	&& soundconf="${soundconf},nas"
+	use alsa && soundconf="${soundconf},alsa"
+
+	myconf="${myconf} --with-sound=${soundconf}"
+
+	if use gdbm || use berkdb ; then
+		use gdbm   && mydb="gdbm"
+		use berkdb && mydb="${mydb},berkdb"
+
+		myconf="${myconf} --with-database=${mydb}"
+	else
+		myconf="${myconf} --without-database"
+	fi
+
+	use debug && myconf="${myconf} --with-debug" ||
+		myconf="${myconf} --with-optimization"
+
+	econf ${myconf} \
+		$(use_with gif ) \
+		$(use_with gpm ) \
+		$(use_with postgres postgresql ) \
+		$(use_with ldap ) \
+		$(use_with eolconv file-coding ) \
+		$(use_with pop ) \
+		--prefix=/usr \
+		--with-ncurses \
+		--with-msw=no \
+		--with-mail-locking=flock \
+		--with-site-lisp=yes \
+		--with-site-modules=yes \
+		--with-newgc \
+		--with-system-malloc \
+		--enable-option-checking=no \
+		--with-last-packages=/usr/lib/xemacs
+}
+
+src_compile() {
+	emake EMACSLOADPATH="${S}"/lisp
+}
+
+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 \
+		install
+
+	# Rename some applications installed in bin so that it is clear
+	# which application installed them and so that conflicting
+	# 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"
+	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"
+	done
+
+	# install base packages directories
+	dodir /usr/lib/xemacs/xemacs-packages/
+	dodir /usr/lib/xemacs/site-packages/
+	dodir /usr/lib/xemacs/site-modules/
+	dodir /usr/lib/xemacs/site-lisp/
+
+	if use mule;
+	then
+		dodir /usr/lib/xemacs/mule-packages
+	fi
+
+	# remove extraneous info files
+	cd "${D}"/usr/share/info
+	rm -f dir info.info texinfo* termcap* standards*
+
+	cd "${S}"
+	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
+
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+
+	domenu "${FILESDIR}"/${PN}.desktop
+}
+
+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:"
+	einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5"
+	einfo "- The X resource class has changed from Emacs to XEmacs,"
+	einfo "  settings in your .Xdefaults file should be updated accordingly."
+
+	if use xft;
+	then
+	  einfo "You have enabled Xft font support. Xft requires font names to be provided"
+	  einfo "in a different way, so you may need to adjust your .Xdefaults accordingly."
+	fi
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+	eselect gnuclient update ifunset
+	xdg_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2020-04-19 20:24 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2020-04-19 20:24 UTC (permalink / raw
  To: gentoo-commits

commit:     88ee8f5dfbe66da1c7f170299f6877f4f40ddd61
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 20:21:10 2020 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 20:23:57 2020 +0000
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 <matsl <AT> 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 00000000000..fff6f557873
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch
@@ -0,0 +1,74 @@
+diff -r 3ca291c0f7e3 configure
+--- a/configure	Sun Jul 28 10:17:08 2019 +0100
++++ b/configure	Sun 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
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2020-08-31 18:30 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2020-08-31 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     5813a1933243715679ae314ad771ab5a881f2f67
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 18:29:46 2020 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 18:30:40 2020 +0000
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 <matsl <AT> 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 00000000000..a44b925ccdd
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-strsignal.patch
@@ -0,0 +1,89 @@
+diff -r ab1558b934ff configure
+--- a/configure	Sun Aug 30 22:05:05 2020 +0200
++++ b/configure	Sun 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.c	Sun Aug 30 22:05:05 2020 +0200
++++ b/src/process.c	Sun 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.h	Sun Aug 30 22:05:05 2020 +0200
++++ b/src/s/linux.h	Sun 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 NSIG (SIGUSR2+1) /* guess how many elements are in sys_siglist... */
+ #endif
+ 
+-/* SYS_SIGLIST_DECLARED is determined by configure.  On Linux, it seems,
+-   configure incorrectly fails to find it, so s/linux.h defines
+-   HAVE_SYS_SIGLIST. */
+-#if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
++/* Systems that have sys_siglist but do not declare it. */
++#if !defined(HAVE_STRSIGNAL) && !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
+ extern const char *sys_siglist[];
+ #endif
+ 

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
index 1276e477e5f..5eb8d525db8 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -65,6 +65,7 @@ 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-strsignal.patch
 
 	# Convert to utf-8
 	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2021-01-16 16:13 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2021-01-16 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     6dbd335b119c144b07f0146c8421f8166d7d900e
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 16:12:00 2021 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 16:13:26 2021 +0000
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 <matsl <AT> 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 00000000000..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
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2022-06-27 21:40 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2022-06-27 21:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a5dbc32a6e327775a55eba8583262d7bb761ec3a
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 21:33:34 2022 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 21:39:26 2022 +0000
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 <matsl <AT> 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 000000000000..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 <kehoea@parhasard.net>
+# 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  <kehoea@parhasard.net>
+
+	* 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  <kehoea@parhasard.net>
+
+	* 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) $(LISP)/finder-inf.el
+ 	$(XEMACS_BATCH)	-eval "(setq finder-compile-keywords-quiet t)" \
+ 		-eval "(setq lisp-directory \"$(LISP)\")" \
+ 		-l finder -f finder-compile-keywords

diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index e0099ac478ba..cbf425e1c83b 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -68,6 +68,7 @@ src_prepare() {
 	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_user
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2022-07-06 20:27 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2022-07-06 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     542b80446e7846c7b1e997787178a0773e24ae1d
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 20:06:16 2022 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 20:25:29 2022 +0000
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 <matsl <AT> 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 000000000000..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 need-to-rebuild-module-autoloads t)))
++	     (directory-files full-dir t "\\.c$" nil t)))
++   (directory-files source-modules t nil t 'subdirs))
+ 
+   (if dump-target-out-of-date-wrt-dump-files
+       (condition-case nil
+@@ -346,9 +344,22 @@ If any of these files are changed, we need to redump.")
+ 	(if need-to-rebuild-mule-autoloads
+ 	    (list "-f" "batch-update-directory-autoloads"
+ 		  "mule" source-lisp-mule))
+-        (if need-to-rebuild-module-autoloads
+-            (list "-f" "batch-update-directory-autoloads"
+-                  "auto" module-directory))
++	(if need-to-rebuild-module-autoloads
++	    (list "-eval"
++		  (concat
++		   "(update-autoload-files '("
++		   (mapconcat #'prin1-to-string
++			      (mapcan
++			       #'(lambda (full-dir)
++				   (unless (member*
++					    (file-name-nondirectory full-dir)
++					    '("." "..") :test #'equal)
++				     (directory-files full-dir
++						      t "\\.c$" nil t)))
++			       (directory-files source-modules
++						t nil t 'subdirs))
++			      " ")
++		   ") \"modules\" " (prin1-to-string aa-modules) ")")))
+ 	(if need-to-recompile-autoloads
+ 	    (list "-f" "batch-byte-compile-one-file"
+ 		  aa-lisp))

diff --git a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
index cbf425e1c83b..e6c5da2b2155 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r9.ebuild
@@ -69,6 +69,7 @@ src_prepare() {
 	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
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2023-06-18 20:35 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2023-06-18 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     0d940b13d0983b98342398b594b2bd581d1dc092
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 20:32:52 2023 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 20:32:52 2023 +0000
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 <matsl <AT> 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.9999.ebuild => xemacs-21.5.35.ebuild} |  54 ++++-----
 app-editors/xemacs/xemacs-21.5.9999.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 000000000000..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 <X11/xpm.h>
++    AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/xpm.h>
+     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 <X11/xpm.h>],[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 <time.h>
+-#if STDC_HEADERS
+-# include <stdlib.h>
+-#endif
++#include <stdlib.h>
+ extern char **environ;
+ unset_TZ ()
+ {
+@@ -4733,6 +4730,8 @@
+ void *alloca ();
+ #endif /* C_ALLOCA */
+ #endif /* !defined (alloca) */
++#include <string.h>
++#include <stdlib.h>
+ 
+ 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 000000000000..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 #x40000000, (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 #x200000)))
++;; Crashes XEmacs ...
++;; (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 #x40000000, (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 #x200000)))
+  
+ (defun unicode-code-point-to-utf-8-string (code-point)
+   "Convert a Unicode code point to the equivalent UTF-8 string. 
+@@ -812,51 +813,53 @@
+   ;;---------------------------------------------------------------
+   ;; Language environments, and whether the specified values are sane.
+   ;;---------------------------------------------------------------
+-  (loop
+-    for language in (mapcar #'car language-info-alist)
+-    with language-input-method = nil
+-    with native-coding-system = nil
+-    with original-language-environment = current-language-environment
+-    do
+-    ;; s-l-e can call #'require, which says "Loading ..."
+-    (Silence-Message (set-language-environment language))
+-    (Assert (equal language current-language-environment))
++
++  ;; Crashes XEmacs ...
++  ;; (loop
++  ;;   for language in (mapcar #'car language-info-alist)
++  ;;   with language-input-method = nil
++  ;;   with native-coding-system = nil
++  ;;   with original-language-environment = current-language-environment
++  ;;   do
++  ;;   ;; s-l-e can call #'require, which says "Loading ..."
++  ;;   (Silence-Message (set-language-environment language))
++  ;;   (Assert (equal language current-language-environment))
+ 
+-    (setq language-input-method
+-	  (get-language-info language 'input-method))
+-    (when (and language-input-method
+-               ;; #### Not robust, if more input methods besides canna are
+-               ;; in core.  The intention of this is that if *any* of the
+-               ;; packages' input methods are available, we check that *all*
+-               ;; of the language environments' input methods actually
+-               ;; exist, which goes against the spirit of non-monolithic
+-               ;; packages. But I don't have a better approach to this.
+-               (> (length input-method-alist) 1))
+-      (Assert (assoc language-input-method input-method-alist))
+-      (Skip-Test-Unless
+-       (assoc language-input-method input-method-alist)
+-       "input method unavailable"
+-       (format "check that IM %s can be activated" language-input-method)
+-       ;; s-i-m can load files.
+-       (Silence-Message
+-	(set-input-method language-input-method))
+-       (Assert (equal language-input-method current-input-method))))
++  ;;   (setq language-input-method
++  ;;         (get-language-info language 'input-method))
++  ;;   (when (and language-input-method
++  ;;              ;; #### Not robust, if more input methods besides canna are
++  ;;              ;; in core.  The intention of this is that if *any* of the
++  ;;              ;; packages' input methods are available, we check that *all*
++  ;;              ;; of the language environments' input methods actually
++  ;;              ;; exist, which goes against the spirit of non-monolithic
++  ;;              ;; packages. But I don't have a better approach to this.
++  ;;              (> (length input-method-alist) 1))
++  ;;     (Assert (assoc language-input-method input-method-alist))
++  ;;     (Skip-Test-Unless
++  ;;      (assoc language-input-method input-method-alist)
++  ;;      "input method unavailable"
++  ;;      (format "check that IM %s can be activated" language-input-method)
++  ;;      ;; s-i-m can load files.
++  ;;      (Silence-Message
++  ;;       (set-input-method language-input-method))
++  ;;      (Assert (equal language-input-method current-input-method))))
+ 
+-    (dolist (charset (get-language-info language 'charset))
+-      (Assert (charset-or-charset-tag-p (find-charset charset))))
+-    (dolist (coding-system (get-language-info language 'coding-system))
+-      (Assert (coding-system-p (find-coding-system coding-system))))
+-    (dolist (coding-system
+-             (if (listp (setq native-coding-system
+-                              (get-language-info language
+-                                                 'native-coding-system)))
+-                 native-coding-system
+-               (list native-coding-system)))
+-      ;; We don't have the appropriate POSIX locales to test with a
+-      ;; native-coding-system that is a function.
+-      (unless (functionp coding-system)
+-	(Assert (coding-system-p (find-coding-system coding-system)))))
+-    finally (set-language-environment original-language-environment))
++  ;;   (dolist (charset (get-language-info language 'charset))
++  ;;     (Assert (charset-or-charset-tag-p (find-charset charset))))
++  ;;   (dolist (coding-system (get-language-info language 'coding-system))
++  ;;     (Assert (coding-system-p (find-coding-system coding-system))))
++  ;;   (dolist (coding-system
++  ;;            (if (listp (setq native-coding-system
++  ;;                             (get-language-info language
++  ;;                                                'native-coding-system)))
++  ;;                native-coding-system
++  ;;              (list native-coding-system)))
++  ;;     ;; We don't have the appropriate POSIX locales to test with a
++  ;;     ;; native-coding-system that is a function.
++  ;;     (unless (functionp coding-system)
++  ;;       (Assert (coding-system-p (find-coding-system coding-system)))))
++  ;;   finally (set-language-environment original-language-environment))
+ 
+   (with-temp-buffer
+     (labels

diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index ae715cbedf7b..b96ffa800d92 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -13,5 +13,6 @@
     <flag name="mule">Add multi-language support to XEmacs</flag>
     <flag name="pop">Support POP for mail retrieval</flag>
     <flag name="xim">Enable X11 XiM input method</flag>
+    <flag name="bignum">Support for OpenSSL bignum implementation</flag>
   </use>
 </pkgmetadata>

diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.35.ebuild
similarity index 87%
copy from app-editors/xemacs/xemacs-21.5.9999.ebuild
copy to app-editors/xemacs/xemacs-21.5.35.ebuild
index f2e01acd2ca1..02b39304cbe9 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35.ebuild
@@ -6,18 +6,18 @@
 
 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"
-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"
+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"
 
@@ -45,26 +45,29 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
+	>=app-eselect/eselect-emacs-1.15
+	bignum? ( dev-libs/openssl )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
+	app-xemacs/mule-base"
 
 src_unpack() {
-	mercurial_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
+	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}-configure.patch"
+	eapply "${FILESDIR}/${P}-mule-tests.patch"
 
 	eapply_user
 
+	eautoconf
+
 	# Some binaries and man pages are installed under suffixed names
 	# to avoid collions with their GNU Emacs counterparts (see below).
 	# Fix internal filename references.
@@ -123,22 +126,18 @@ src_configure() {
 			--with-gif=no"
 	fi
 
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
+	if use xim ; then
+		if use motif ; then
+			myconf="${myconf} --with-xim=motif"
 		else
-			myconf="${myconf} --with-xim=no"
+		myconf="${myconf} --with-xim=xlib"
 		fi
-
-		myconf="${myconf} $(use_with freewnn wnn )"
+	else
+	  myconf="${myconf} --with-xim=no"
 	fi
 
+	myconf="${myconf} $(use_with freewnn wnn )"
+
 	# This determines the type of sounds we are playing
 	local soundconf="native"
 
@@ -160,6 +159,9 @@ src_configure() {
 	use debug && myconf="${myconf} --with-debug" ||
 		myconf="${myconf} --with-optimization --with-cflags-debugging="
 
+	use bignum && myconf="${myconf} --with-bignum=openssl" ||
+		myconf="${myconf} --with-bignum=no"
+
 	use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
 
 	econf ${myconf} \
@@ -169,6 +171,8 @@ src_configure() {
 		$(use_with ldap ) \
 		$(use_with pop ) \
 		--prefix=/usr \
+		--with-mule \
+		--with-unicode-internal \
 		--without-canna \
 		--with-ncurses \
 		--with-msw=no \
@@ -209,11 +213,7 @@ src_install() {
 	dodir /usr/lib/xemacs/site-packages/
 	dodir /usr/lib/xemacs/site-modules/
 	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
+	dodir /usr/lib/xemacs/mule-packages
 
 	# remove extraneous info files
 	cd "${ED}"/usr/share/info

diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index f2e01acd2ca1..15945ea32285 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -17,7 +17,7 @@ EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-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"
+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"
 
@@ -45,13 +45,14 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	freewnn? ( app-i18n/freewnn )
 	>=sys-libs/ncurses-5.2:=
-	>=app-eselect/eselect-emacs-1.15"
+	>=app-eselect/eselect-emacs-1.15
+	bignum? ( dev-libs/openssl )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PDEPEND="app-xemacs/xemacs-base
-	mule? ( app-xemacs/mule-base )"
+	app-xemacs/mule-base"
 
 src_unpack() {
 	mercurial_src_unpack
@@ -62,6 +63,7 @@ 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}/${PN}-21.5.35-mule-tests.patch"
 
 	eapply_user
 
@@ -123,22 +125,18 @@ src_configure() {
 			--with-gif=no"
 	fi
 
-	if use mule ; then
-		myconf="${myconf} --with-mule"
-
-		if use xim ; then
-			if use motif ; then
-				myconf="${myconf} --with-xim=motif"
-			else
-				myconf="${myconf} --with-xim=xlib"
-			fi
+	if use xim ; then
+		if use motif ; then
+			myconf="${myconf} --with-xim=motif"
 		else
-			myconf="${myconf} --with-xim=no"
+			myconf="${myconf} --with-xim=xlib"
 		fi
-
-		myconf="${myconf} $(use_with freewnn wnn )"
+	else
+		myconf="${myconf} --with-xim=no"
 	fi
 
+	myconf="${myconf} $(use_with freewnn wnn )"
+
 	# This determines the type of sounds we are playing
 	local soundconf="native"
 
@@ -160,6 +158,9 @@ src_configure() {
 	use debug && myconf="${myconf} --with-debug" ||
 		myconf="${myconf} --with-optimization --with-cflags-debugging="
 
+	use bignum && myconf="${myconf} --with-bignum=openssl" ||
+		myconf="${myconf} --with-bignum=no"
+
 	use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
 
 	econf ${myconf} \
@@ -169,6 +170,8 @@ src_configure() {
 		$(use_with ldap ) \
 		$(use_with pop ) \
 		--prefix=/usr \
+		--with-mule \
+		--with-unicode-internal \
 		--without-canna \
 		--with-ncurses \
 		--with-msw=no \
@@ -209,11 +212,7 @@ src_install() {
 	dodir /usr/lib/xemacs/site-packages/
 	dodir /usr/lib/xemacs/site-modules/
 	dodir /usr/lib/xemacs/site-lisp/
-
-	if use mule;
-	then
-		dodir /usr/lib/xemacs/mule-packages
-	fi
+	dodir /usr/lib/xemacs/mule-packages
 
 	# remove extraneous info files
 	cd "${ED}"/usr/share/info


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/
@ 2024-03-12 11:08 Mats Lidell
  0 siblings, 0 replies; 12+ messages in thread
From: Mats Lidell @ 2024-03-12 11:08 UTC (permalink / raw
  To: gentoo-commits

commit:     a3dc67052d5a266a8ed044a76913bea30efbac63
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 11:06:23 2024 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 11:06:23 2024 +0000
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 <matsl <AT> gentoo.org>

 .../xemacs-21.5.35-configure-libc-version.patch    | 73 ++++++++++++++++++++++
 ...s-21.5.9999.ebuild => xemacs-21.5.35-r1.ebuild} | 31 +++++----
 app-editors/xemacs/xemacs-21.5.9999.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 000000000000..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.9999.ebuild b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild
similarity index 90%
copy from app-editors/xemacs/xemacs-21.5.9999.ebuild
copy to app-editors/xemacs/xemacs-21.5.35-r1.ebuild
index 15945ea32285..505fb03625a3 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.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 @@ PDEPEND="app-xemacs/xemacs-base
 	app-xemacs/mule-base"
 
 src_unpack() {
-	mercurial_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
+	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}/${PN}-21.5.35-mule-tests.patch"
+	eapply "${FILESDIR}/${P}-configure.patch"
+	eapply "${FILESDIR}/${P}-mule-tests.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
 
 	eapply_user
 
+	eautoconf
+
 	# Some binaries and man pages are installed under suffixed names
 	# to avoid collions with their GNU Emacs counterparts (see below).
 	# Fix internal filename references.
@@ -129,10 +131,10 @@ src_configure() {
 		if use motif ; then
 			myconf="${myconf} --with-xim=motif"
 		else
-			myconf="${myconf} --with-xim=xlib"
+		myconf="${myconf} --with-xim=xlib"
 		fi
 	else
-		myconf="${myconf} --with-xim=no"
+	  myconf="${myconf} --with-xim=no"
 	fi
 
 	myconf="${myconf} $(use_with freewnn wnn )"
@@ -155,8 +157,13 @@ src_configure() {
 		myconf="${myconf} --without-database"
 	fi
 
-	use debug && myconf="${myconf} --with-debug" ||
+	if use debug ; then
+		myconf="${myconf} --with-debug"
+		# bug #924339
+		append-flags -fno-strict-aliasing
+	else
 		myconf="${myconf} --with-optimization --with-cflags-debugging="
+	fi
 
 	use bignum && myconf="${myconf} --with-bignum=openssl" ||
 		myconf="${myconf} --with-bignum=no"

diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 15945ea32285..172643503b1d 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.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,7 +6,7 @@
 
 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/"
@@ -64,9 +64,12 @@ src_prepare() {
 	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
 	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
 	eapply "${FILESDIR}/${PN}-21.5.35-mule-tests.patch"
+	eapply "${FILESDIR}/${PN}-21.5.35-configure-libc-version.patch"
 
 	eapply_user
 
+	eautoconf
+
 	# Some binaries and man pages are installed under suffixed names
 	# to avoid collions with their GNU Emacs counterparts (see below).
 	# Fix internal filename references.
@@ -155,8 +158,13 @@ src_configure() {
 		myconf="${myconf} --without-database"
 	fi
 
-	use debug && myconf="${myconf} --with-debug" ||
+	if use debug ; then
+		myconf="${myconf} --with-debug"
+		# bug #924339
+		append-flags -fno-strict-aliasing
+	else
 		myconf="${myconf} --with-optimization --with-cflags-debugging="
+	fi
 
 	use bignum && myconf="${myconf} --with-bignum=openssl" ||
 		myconf="${myconf} --with-bignum=no"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-03-12 11:08 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-03 20:56 [gentoo-commits] repo/gentoo:master commit in: app-editors/xemacs/files/, app-editors/xemacs/ Mats Lidell
  -- strict thread matches above, loose matches on Subject: below --
2024-03-12 11:08 Mats Lidell
2023-06-18 20:35 Mats Lidell
2022-07-06 20:27 Mats Lidell
2022-06-27 21:40 Mats Lidell
2021-01-16 16:13 Mats Lidell
2020-08-31 18:30 Mats Lidell
2020-04-19 20:24 Mats Lidell
2020-03-07 12:52 Mats Lidell
2017-12-28 16:15 Mats Lidell
2017-04-17 20:12 Mats Lidell
2015-10-08 12:03 Mats Lidell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox