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

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

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

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

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

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

diff --git a/app-editors/xemacs/xemacs-21.4.24-r2.ebuild 
b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
new file mode 100644
index 00000000000..7364c9f7242
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application 
development system"
+HOMEPAGE="http://www.xemacs.org/";
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+       http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule 
motif freewnn canna xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+       berkdb? ( sys-libs/db:= )
+       gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+       >=sys-libs/zlib-1.1.4
+       >=dev-libs/openssl-0.9.6:0
+       >=media-libs/audiofile-0.2.3
+       gpm? ( >=sys-libs/gpm-1.19.6 )
+       postgres? ( dev-db/postgresql:= )
+       ldap? ( net-nds/openldap )
+       nas? ( media-libs/nas )
+       X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+       dnd? ( x11-libs/dnd )
+       motif? ( >=x11-libs/motif-2.3:0 )
+       athena? ( x11-libs/libXaw )
+       Xaw3d? ( x11-libs/libXaw3d )
+       neXt? ( x11-libs/neXtaw )
+       xface? ( media-libs/compface )
+       tiff? ( media-libs/tiff:0 )
+       png? ( >=media-libs/libpng-1.2:0 )
+       jpeg? ( virtual/jpeg:0 )
+       canna? ( app-i18n/canna )
+       !amd64? ( freewnn? ( app-i18n/freewnn ) )
+       >=sys-libs/ncurses-5.2:=
+       >=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+       >=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+       mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+       unpack ${P}.tar.gz
+       use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+       # see bug 58350, 102540 and 143580
+       eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
+       # see bug 576512
+       eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+       eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+       # see bug 615544
+       eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
+       eapply "${FILESDIR}"/xemacs-21.4.24-makeinfo.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
+
+       # Run autoconf. XEmacs tries to be smart by providing a stub
+       # configure.ac file for autoconf 2.59 but this throws our
+       # autotools eclass so it must be removed first.
+       rm "${S}"/configure.ac || die
+       eautoconf
+
+       use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* 
"${S}"/etc/toolbar/
+}
+
+src_configure() {
+       local myconf=""
+
+       # Can't build with pie. See bug #75028
+       test-flags -no-pie >/dev/null && append-flags -no-pie
+       filter-flags -pie
+
+       if use X; then
+
+               myconf="${myconf} --with-widgets=athena"
+               myconf="${myconf} --with-dialogs=athena"
+               myconf="${myconf} --with-menubars=lucid"
+               myconf="${myconf} --with-scrollbars=lucid"
+               if use motif ; then
+                       myconf="--with-widgets=motif"
+                       myconf="${myconf} --with-dialogs=motif"
+                       myconf="${myconf} --with-scrollbars=motif"
+                       myconf="${myconf} --with-menubars=lucid"
+               fi
+               if use athena ; then
+                       myconf="--with-scrollbars=athena"
+               fi
+
+               if use Xaw3d; then
+                       myconf="${myconf} --with-athena=3d"
+               elif use neXt; then
+                       myconf="${myconf} --with-athena=next"
+               else
+                       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
+
+       # 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-system-malloc \
+               --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
+       xdg_desktop_database_update
+}
+
+pkg_postrm() {
+       eselect emacs update ifunset
+       eselect gnuclient update ifunset
+       xdg_desktop_database_update
+}

Reply via email to