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

["Mats Lidell" <matsl@gentoo.org>]

commit:     6de20154d8222e5a4087641d13655d658e6973b0
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 20 23:06:53 2024 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 23:15:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de20154

app-editors/xemacs: patch ootags to upstream tip

Drop globally masked xemacs[dnd] flag.

Closes: https://bugs.gentoo.org/943999
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>

 app-editors/xemacs/Manifest                        |  1 +
 ...s-21.5.9999.ebuild => xemacs-21.5.35-r5.ebuild} | 30 ++++++++++++----------
 app-editors/xemacs/xemacs-21.5.9999.ebuild         |  5 +---
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 376833f275e8..737cccccb761 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,2 +1,3 @@
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
+DIST xemacs-21.5.35-ootags-boolint.patch.xz 7660 BLAKE2B 9567cebeea7828dd7a207e627c4a21d49ef129ea7cf92defde67c068aab6694d0c7f70d90648b9177cea8b6ea3fc3734e1f65f1821b5e4c820df507bb6d6835b SHA512 f43656a5e4c9781e2250fca7f8750bbc131223f4a252dfdfc6315e06ac578974877ac0bbc695f957ade5a7960c4257b090ee34199965110da28851e58986e985
 DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019

diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.35-r5.ebuild
similarity index 88%
copy from app-editors/xemacs/xemacs-21.5.9999.ebuild
copy to app-editors/xemacs/xemacs-21.5.35-r5.ebuild
index 8ce245bf3a87..b96d774099ab 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r5.ebuild
@@ -10,14 +10,15 @@ 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
+	https://dev.gentoo.org/~matsl/${P}-ootags-boolint.patch.xz
+	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 motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -33,7 +34,6 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/motif-2.3:0[xft=] )
 	athena? ( x11-libs/libXaw )
 	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
@@ -56,16 +56,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}/${PN}-21.5.35-configure-libc-version.patch"
+	eapply "${FILESDIR}/${P}-configure.patch"
+	eapply "${FILESDIR}/${P}-mule-tests.patch"
+	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
+	eapply "${FILESDIR}/${P}-which.patch"
+	eapply "${FILESDIR}/${P}-misalignment.patch"
+	eapply "${FILESDIR}/${P}-va_args.patch"
+	eapply "${FILESDIR}/${P}-linker-flags.patch"
+	eapply "${WORKDIR}/${P}-ootags-boolint.patch"
 
 	eapply_user
 
@@ -110,8 +114,6 @@ src_configure() {
 			myconf="${myconf} --with-athena=xaw"
 		fi
 
-		use dnd && myconf="${myconf} --with-dragndrop"
-
 		myconf="${myconf} $(use_with tiff )"
 		myconf="${myconf} $(use_with png )"
 		myconf="${myconf} $(use_with jpeg )"
@@ -133,10 +135,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} --without-wnn"

diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 8ce245bf3a87..43b49b662f80 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 motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
+IUSE="alsa debug gif gpm pop postgres ldap xface nas X jpeg tiff png motif xft xim athena neXt Xaw3d gdbm berkdb +bignum"
 
 X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
@@ -33,7 +33,6 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	nas? ( media-libs/nas )
 	X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) )
-	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/motif-2.3:0[xft=] )
 	athena? ( x11-libs/libXaw )
 	Xaw3d? ( x11-libs/libXaw3d[unicode(+)] )
@@ -110,8 +109,6 @@ src_configure() {
 			myconf="${myconf} --with-athena=xaw"
 		fi
 
-		use dnd && myconf="${myconf} --with-dragndrop"
-
 		myconf="${myconf} $(use_with tiff )"
 		myconf="${myconf} $(use_with png )"
 		myconf="${myconf} $(use_with jpeg )"