Diff emacs-24.5-r7 with a emacs-25.3-r6

/usr/portage/app-editors/emacs/emacs-25.3-r6.ebuild 2019-10-11 18:40:00.000000000 +0300
3 3

  
4 4
EAPI=7
5 5

  
6
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
6
inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
7 7

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

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

  
19 19
RDEPEND="sys-libs/ncurses:0=
......
36 36
		x11-libs/libSM
37 37
		x11-libs/libX11
38 38
		x11-libs/libXext
39
		x11-libs/libXfixes
39 40
		x11-libs/libXinerama
40 41
		x11-libs/libXrandr
42
		x11-libs/libxcb
41 43
		x11-misc/xbitmaps
42 44
		gconf? ( >=gnome-base/gconf-2.26.2 )
43 45
		gsettings? ( >=dev-libs/glib-2.28.6 )
......
53 55
			media-libs/freetype
54 56
			x11-libs/libXft
55 57
			x11-libs/libXrender
58
			cairo? ( >=x11-libs/cairo-1.12.18 )
56 59
			m17n-lib? (
57 60
				>=dev-libs/libotf-0.9.4
58 61
				>=dev-libs/m17n-lib-1.5.1
......
116 119
src_configure() {
117 120
	strip-flags
118 121
	filter-flags -pie					#526948
119
	append-ldflags $(test-flags -no-pie)	#639570
120 122

  
121 123
	if use sh; then
122 124
		replace-flags "-O[1-9]" -O0		#262359
......
154 156

  
155 157
		if use xft; then
156 158
			myconf+=" --with-xft"
159
			myconf+=" $(use_with cairo)"
157 160
			myconf+=" $(use_with m17n-lib libotf)"
158 161
			myconf+=" $(use_with m17n-lib m17n-flt)"
159 162
		else
160 163
			myconf+=" --without-xft"
164
			myconf+=" --without-cairo"
161 165
			myconf+=" --without-libotf --without-m17n-flt"
166
			use cairo && ewarn \
167
				"USE flag \"cairo\" has no effect if \"xft\" is not set."
162 168
			use m17n-lib && ewarn \
163 169
				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
164 170
		fi
......
176 182
				Motif toolkit instead.
177 183
			EOF
178 184
			myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)"
185
			myconf+=" --without-xwidgets"
179 186
			for f in motif Xaw3d athena; do
180 187
				use ${f} && ewarn \
181 188
					"USE flag \"${f}\" has no effect if \"gtk\" is set."
......
215 222
		--with-file-notification=$(usev inotify || usev gfile || echo no) \
216 223
		$(use_enable acl) \
217 224
		$(use_with dbus) \
225
		$(use_with dynamic-loading modules) \
218 226
		$(use_with gpm) \
219 227
		$(use_with kerberos) $(use_with kerberos kerberos5) \
220 228
		$(use_with libxml2 xml2) \
......
246 254

  
247 255
	# avoid collision between slots, see bug #169033 e.g.
248 256
	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
249
	rm -rf "${ED}"/usr/share/{applications,icons}
257
	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
250 258
	rm -rf "${ED}"/var
251 259

  
252 260
	# remove unused <version>/site-lisp dir
......
293 301
	EOF
294 302
	elisp-site-file-install "${T}/${SITEFILE}" || die
295 303

  
296
	dodoc README BUGS
304
	dodoc README BUGS CONTRIBUTE
297 305

  
298 306
	if use aqua; then
299 307
		dodir /Applications/Gentoo
Thank you!