Diff xemacs-21.5.34-r13 with a xemacs-21.5.35

/usr/portage/app-editors/xemacs/xemacs-21.5.35.ebuild 2023-10-09 14:52:28.668368329 +0300
6 6

  
7 7
EAPI=8
8 8

  
9
inherit flag-o-matic xdg-utils desktop
9
inherit flag-o-matic xdg-utils desktop autotools
10 10

  
11 11
DESCRIPTION="highly customizable open source text editor and application development system"
12 12
HOMEPAGE="https://www.xemacs.org/"
13
SRC_URI="http://ftp.xemacs.org/xemacs-$(ver_cut 1-2)/${P}.tar.gz
13

  
14
SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz
14 15
	neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )"
15 16

  
16 17
LICENSE="GPL-3+"
17 18
SLOT="0"
18
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
19
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"
19
KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
20
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"
20 21

  
21 22
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
22 23

  
......
44 45
	jpeg? ( media-libs/libjpeg-turbo:= )
45 46
	freewnn? ( app-i18n/freewnn )
46 47
	>=sys-libs/ncurses-5.2:=
47
	>=app-eselect/eselect-emacs-1.15"
48
	>=app-eselect/eselect-emacs-1.15
49
	bignum? ( dev-libs/openssl )"
48 50

  
49 51
DEPEND="${RDEPEND}
50 52
	virtual/pkgconfig"
51 53

  
52 54
PDEPEND="app-xemacs/xemacs-base
53
	mule? ( app-xemacs/mule-base )"
55
	app-xemacs/mule-base"
54 56

  
55 57
src_unpack() {
56 58
	default_src_unpack
......
59 61
src_prepare() {
60 62
	use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/
61 63
	find "${S}"/lisp -name '*.elc' -exec rm {} \; || die
62
	eapply "${FILESDIR}/${P}-ncurses-tinfo.patch"
63
	eapply "${FILESDIR}/${P}-gcc5.patch"
64
	eapply "${FILESDIR}/${P}-glibc-macro.patch"
65
	eapply "${FILESDIR}/${P}-as-needed.patch"
66
	eapply "${FILESDIR}/${P}-configure-libc-version.patch"
67
	eapply "${FILESDIR}/${P}-ar.patch"
68
	eapply "${FILESDIR}/${P}-strsignal.patch"
69
	eapply "${FILESDIR}/${P}-process-test-qa.patch"
70
	eapply "${FILESDIR}/${P}-autoloads-parallell-make.patch"
71
	eapply "${FILESDIR}/${P}-no-lock-on-finder-inf.patch"
72
	eapply "${FILESDIR}/${P}-module-autoloads.patch"
64
	eapply "${FILESDIR}/${P}-configure.patch"
65
	eapply "${FILESDIR}/${P}-mule-tests.patch"
73 66

  
74 67
	eapply_user
75 68

  
69
	eautoconf
70

  
76 71
	# Some binaries and man pages are installed under suffixed names
77 72
	# to avoid collions with their GNU Emacs counterparts (see below).
78 73
	# Fix internal filename references.
......
131 126
			--with-gif=no"
132 127
	fi
133 128

  
134
	if use mule ; then
135
		myconf="${myconf} --with-mule"
136

  
137
		if use xim ; then
138
			if use motif ; then
139
				myconf="${myconf} --with-xim=motif"
140
			else
141
				myconf="${myconf} --with-xim=xlib"
142
			fi
129
	if use xim ; then
130
		if use motif ; then
131
			myconf="${myconf} --with-xim=motif"
143 132
		else
144
			myconf="${myconf} --with-xim=no"
133
		myconf="${myconf} --with-xim=xlib"
145 134
		fi
146

  
147
		myconf="${myconf} $(use_with freewnn wnn )"
135
	else
136
	  myconf="${myconf} --with-xim=no"
148 137
	fi
149 138

  
139
	myconf="${myconf} $(use_with freewnn wnn )"
140

  
150 141
	# This determines the type of sounds we are playing
151 142
	local soundconf="native"
152 143

  
......
168 159
	use debug && myconf="${myconf} --with-debug" ||
169 160
		myconf="${myconf} --with-optimization --with-cflags-debugging="
170 161

  
162
	use bignum && myconf="${myconf} --with-bignum=openssl" ||
163
		myconf="${myconf} --with-bignum=no"
164

  
171 165
	use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn"
172 166

  
173 167
	econf ${myconf} \
......
177 171
		$(use_with ldap ) \
178 172
		$(use_with pop ) \
179 173
		--prefix=/usr \
174
		--with-mule \
175
		--with-unicode-internal \
180 176
		--without-canna \
181 177
		--with-ncurses \
182 178
		--with-msw=no \
183 179
		--with-mail-locking=flock \
184 180
		--with-site-lisp=yes \
185 181
		--with-site-modules=yes \
186
		--with-system-malloc \
187 182
		--enable-option-checking=no \
188 183
		--with-last-packages=/usr/lib/xemacs
189 184
}
......
218 213
	dodir /usr/lib/xemacs/site-packages/
219 214
	dodir /usr/lib/xemacs/site-modules/
220 215
	dodir /usr/lib/xemacs/site-lisp/
221

  
222
	if use mule;
223
	then
224
		dodir /usr/lib/xemacs/mule-packages
225
	fi
216
	dodir /usr/lib/xemacs/mule-packages
226 217

  
227 218
	# remove extraneous info files
228 219
	cd "${ED}"/usr/share/info
Thank you!