Diff emacs-26.1-r3 with a emacs-26.2

/usr/portage/app-editors/emacs/emacs-26.2.ebuild 2019-10-11 18:40:00.000000000 +0300
7 7

  
8 8
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
9 9
HOMEPAGE="https://www.gnu.org/software/emacs/"
10
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
11
	https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz"
10
SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
12 11

  
13 12
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
14 13
SLOT="26"
15
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
14
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
16 15
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
17 16
REQUIRED_USE="?? ( aqua X )"
18 17

  
......
114 113
S="${WORKDIR}/emacs-${FULL_VERSION}"
115 114

  
116 115
src_prepare() {
117
	eapply ../patch
116
	#eapply ../patch
118 117
	eapply_user
119 118

  
120 119
	# Fix filename reference in redirected man page
121
	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
122
		|| die "unable to sed ctags.1"
120
	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
123 121

  
124
	AT_M4DIR=m4 eautoreconf
122
	#AT_M4DIR=m4 eautoreconf
125 123
}
126 124

  
127 125
src_configure() {
......
136 134
		replace-flags "-O[3-9]" -O2
137 135
	fi
138 136

  
139
	# Don't trigger a floating point exception for NaNs on alpha
140
	use alpha && append-flags -mieee
141

  
142 137
	local myconf
143 138

  
144 139
	if use alsa; then
......
230 225

  
231 226
	econf \
232 227
		--program-suffix="-${EMACS_SUFFIX}" \
228
		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
233 229
		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
234 230
		--localstatedir="${EPREFIX}"/var \
235 231
		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
......
263 259
src_install () {
264 260
	emake DESTDIR="${D}" NO_BIN_LINK=t install
265 261

  
266
	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
267
		|| die "moving emacs executable failed"
268
	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
269
		|| die "moving emacs man page failed"
262
	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
263
	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
264
	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
270 265

  
271 266
	# move info dir to avoid collisions with the dir file generated by portage
272
	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
273
		|| die "moving info dir failed"
267
	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
274 268
	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
275 269
	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
276 270

  
......
355 349
	# move Info dir file to correct name
356 350
	local infodir=/usr/share/info/${EMACS_SUFFIX} f
357 351
	if [[ -f ${ED}${infodir}/dir.orig ]]; then
358
		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
352
		mv "${ED}"${infodir}/dir{.orig,} || die
359 353
	elif [[ -d "${ED}"${infodir} ]]; then
360 354
		# this should not happen in EAPI 4
361 355
		ewarn "Regenerating Info directory index in ${infodir} ..."
362 356
		rm -f "${ED}"${infodir}/dir{,.*}
363 357
		for f in "${ED}"${infodir}/*; do
364 358
			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
365
				install-info --info-dir="${ED}"${infodir} "${f}" \
366
					|| die "install-info failed"
359
				install-info --info-dir="${ED}"${infodir} "${f}" || die
367 360
			fi
368 361
		done
369 362
	fi
Thank you!