gentoo resync : 22.12.2021

4 files changed, 263 insertions, 15 deletions

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 0cb1ec5551d1..25698e6f4523 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -17,7 +17,8 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cf
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c
+EBUILD xemacs-21.4.24-r4.ebuild 7118 BLAKE2B 0b82604086f34a69a4a2b4105fd5cd4e9188ec5bf3dd3c8bac172cd755a4f254cc2b4fc39943f93ef1bee9600a12602b2bfa263baf497e0cc23557ea1125fe49 SHA512 917839337bc931d242c403c3a43c6e9e976f3b747bbb4d98b784064abbd66abe606dbb3c38c06e1d3294784a93fa71ccd804c088ad5ef94f5b6f2e582272fd96
 EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173
-EBUILD xemacs-21.5.34-r7.ebuild 7293 BLAKE2B 2d8ca8d8e740acd1ac2428a0ef6bf6f4ff4d0b7721269ac97134a998363f9785defa80ec557a1cc92d1bac30cfc8d66f8dd8a565e601883a45004ab4c8d5b889 SHA512 ac10ecd3e0ac78df8f57bdff5b32a5b9186699d03f3bc92f2333a8b757f17c8d216ed1eed38b2ec7d397906ecfb5153f25f7a3502f8bc33f3078109b350b283c
-EBUILD xemacs-21.5.9999.ebuild 7278 BLAKE2B 24b150d959a6b637fe236e8556eaed90751a9d7026e23547040dac3314f9f2eb1b2c924c01f011746c712b2e8c154fc429d9d785fd475c0dbe18875be2688800 SHA512 d59515764b97797552c7210e863dd4e5c052ff0cd10d34e64882bc2c034d7a4425e1efeb3de0d5ff5c0aed801a58d4203cb3c3f38d4ab519cdbbaa2480ff4fc0
+EBUILD xemacs-21.5.34-r7.ebuild 7214 BLAKE2B 56ad56cfc2e4de8e0921093ae9bcf99071fca3eed7c39bce28124175b93aa7d37cc8fbcd589bf0752aa274a9c38f0e7f20f3fc39cb5e1f8d5f25baa2a765c9dd SHA512 32dea813c9ba64e33a3e04d2864e7363a520adfc9e33de509607fdec57512fef3d5980f772d4a1693f3260218ef4de5c88df30f38082409a29425e5b0ee458c4
+EBUILD xemacs-21.5.9999.ebuild 7205 BLAKE2B fb003fd2ebb04236e2ca17c1a6ac7b6a99bd91ece52a54f87f6bc89e16934fc7f8ea20dfc9b3fdbf875e604490e12158a7d542b2d2d18d16d4a8d1963e7b88ff SHA512 0b69df0d74dd3e98f29ed72b40be881dec8be02cf1504f64e735d520e5e2939e46e1c23f297eaff07b80661e5cf6ea585ae7a1d96ca2ec054b284983b0a211b3
 MISC metadata.xml 683 BLAKE2B 060e4f7830a96404813a550debecf83c2de3993183d41638362ed01a3a6240bdd33a83c0db5e31a2f2e821046fb1c15199688271c27611689aac1bdf02bcde14 SHA512 176625d3c972766aaecd10125e69b4cdcbedff958b842b2ac2b6a39d728ec868b3311ef13f6854122063810c5125f48d73cd1e68083de5ddf3ef85f7f2b09cdc
diff --git a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
new file mode 100644
index 000000000000..53953b0528d1
--- /dev/null
+++ b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Note: xemacs currently does not work with position independent code
+# so the build forces the use of the -no-pie option
+
+EAPI=7
+
+WANT_AUTOCONF="2.1"
+inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop
+
+DESCRIPTION="highly customizable open source text editor and application development system"
+HOMEPAGE="http://www.xemacs.org/"
+SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz
+	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xim athena neXt Xaw3d gdbm berkdb"
+
+X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
+
+RDEPEND="
+	berkdb? ( sys-libs/db:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
+	>=sys-libs/zlib-1.1.4
+	>=dev-libs/openssl-0.9.6:0
+	>=media-libs/audiofile-0.2.3
+	gpm? ( >=sys-libs/gpm-1.19.6 )
+	postgres? ( dev-db/postgresql:= )
+	ldap? ( net-nds/openldap )
+	nas? ( media-libs/nas )
+	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
+	dnd? ( x11-libs/dnd )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	athena? ( x11-libs/libXaw )
+	Xaw3d? ( x11-libs/libXaw3d[unicode] )
+	neXt? ( x11-libs/neXtaw )
+	xface? ( media-libs/compface )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0 )
+	jpeg? ( virtual/jpeg:0 )
+	!amd64? ( freewnn? ( app-i18n/freewnn ) )
+	>=sys-libs/ncurses-5.2:=
+	>=app-eselect/eselect-emacs-1.15"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-5"
+
+PDEPEND="app-xemacs/xemacs-base
+	mule? ( app-xemacs/mule-base )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use neXt && unpack NeXT_XEmacs.tar.gz
+}
+
+src_prepare() {
+	# see bug 58350, 102540 and 143580
+	eapply "${FILESDIR}"/xemacs-21.4.19-db.patch
+	# see bug 576512
+	eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+	eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+	# see bug 615544
+	eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
+	eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch
+
+	# Convert to utf-8
+	iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \
+	      && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die
+	iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \
+	      && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die
+
+	eapply_user
+
+	# Some binaries and man pages are installed under suffixed names
+	# to avoid collions with their GNU Emacs counterparts (see below).
+	# Fix internal filename references.
+	sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die
+	sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die
+	sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die
+
+	# Run autoconf. XEmacs tries to be smart by providing a stub
+	# configure.ac file for autoconf 2.59 but this throws our
+	# autotools eclass so it must be removed first.
+	rm "${S}"/configure.ac || die
+	eautoconf
+
+	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
+}
+
+src_configure() {
+	local myconf=""
+
+	# Can't build with pie. See bug #75028
+	test-flags -no-pie >/dev/null && append-flags -no-pie
+	filter-flags -pie
+
+	if use X; then
+
+		myconf="${myconf} --with-widgets=athena"
+		myconf="${myconf} --with-dialogs=athena"
+		myconf="${myconf} --with-menubars=lucid"
+		myconf="${myconf} --with-scrollbars=lucid"
+		if use motif ; then
+			myconf="--with-widgets=motif"
+			myconf="${myconf} --with-dialogs=motif"
+			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 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 \
+		--without-canna \
+		--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
+}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
index c44dccad1aba..44896cf0be0a 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r7.ebuild
@@ -11,12 +11,12 @@ inherit flag-o-matic xdg-utils desktop
 DESCRIPTION="highly customizable open source text editor and application development system"
 HOMEPAGE="http://www.xemacs.org/"
 SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz
-	http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -35,7 +35,7 @@ RDEPEND="
 	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/motif-2.3:0[xft=] )
 	athena? ( x11-libs/libXaw )
-	Xaw3d? ( x11-libs/libXaw3d )
+	Xaw3d? ( x11-libs/libXaw3d[unicode] )
 	xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
@@ -54,8 +54,6 @@ PDEPEND="app-xemacs/xemacs-base
 
 src_unpack() {
 	default_src_unpack
-
-	use neXt && unpack NeXT_XEmacs.tar.gz
 }
 
 src_prepare() {
@@ -111,7 +109,7 @@ src_configure() {
 			myconf="${myconf} --with-athena=xaw"
 		fi
 
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+		use dnd && myconf="${myconf} --with-dragndrop"
 
 		myconf="${myconf} $(use_with tiff )"
 		myconf="${myconf} $(use_with png )"
@@ -172,7 +170,6 @@ src_configure() {
 		$(use_with gpm ) \
 		$(use_with postgres postgresql ) \
 		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
 		$(use_with pop ) \
 		--prefix=/usr \
 		--without-canna \
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 10c8d43ee877..7b3921f0a4d4 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -10,14 +10,14 @@ inherit flag-o-matic xdg-utils desktop
 
 DESCRIPTION="highly customizable open source text editor and application development system"
 HOMEPAGE="http://www.xemacs.org/"
-SRC_URI="http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz"
+SRC_URI="neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
 
 inherit mercurial
 EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -112,7 +112,7 @@ src_configure() {
 			myconf="${myconf} --with-athena=xaw"
 		fi
 
-		use dnd && myconf="${myconf} --with-dragndrop --with-offix"
+		use dnd && myconf="${myconf} --with-dragndrop"
 
 		myconf="${myconf} $(use_with tiff )"
 		myconf="${myconf} $(use_with png )"
@@ -173,7 +173,6 @@ src_configure() {
 		$(use_with gpm ) \
 		$(use_with postgres postgresql ) \
 		$(use_with ldap ) \
-		$(use_with eolconv file-coding ) \
 		$(use_with pop ) \
 		--prefix=/usr \
 		--without-canna \
@@ -182,7 +181,6 @@ src_configure() {
 		--with-mail-locking=flock \
 		--with-site-lisp=yes \
 		--with-site-modules=yes \
-		--with-system-malloc \
 		--enable-option-checking=no \
 		--with-last-packages=/usr/lib/xemacs
 }