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

/usr/portage/app-editors/emacs/emacs-25.3-r6.ebuild 2020-05-02 12:39:00.000000000 +0300
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 ~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 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=">=app-emacs/emacs-common-gentoo-1.5[games?,X?]
......
35 35
		x11-libs/libSM
36 36
		x11-libs/libX11
37 37
		x11-libs/libXext
38
		x11-libs/libXfixes
38 39
		x11-libs/libXinerama
39 40
		x11-libs/libXrandr
41
		x11-libs/libxcb
40 42
		x11-misc/xbitmaps
41 43
		gconf? ( >=gnome-base/gconf-2.26.2 )
42 44
		gsettings? ( >=dev-libs/glib-2.28.6 )
......
52 54
			media-libs/freetype
53 55
			x11-libs/libXft
54 56
			x11-libs/libXrender
57
			cairo? ( >=x11-libs/cairo-1.12.18 )
55 58
			m17n-lib? (
56 59
				>=dev-libs/libotf-0.9.4
57 60
				>=dev-libs/m17n-lib-1.5.1
......
91 94
	gzip-el? ( app-arch/gzip )"
92 95

  
93 96
RDEPEND="${RDEPEND}
97
	!<app-editors/emacs-vcs-${PV}
94 98
	app-eselect/eselect-emacs"
95 99

  
96 100
EMACS_SUFFIX="emacs-${SLOT}"
......
116 120
src_configure() {
117 121
	strip-flags
118 122
	filter-flags -pie					#526948
119
	append-ldflags $(test-flags -no-pie)	#639570
120 123

  
121 124
	if use ia64; then
122 125
		replace-flags "-O[2-9]" -O1		#325373
......
152 155

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

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

  
250 259
	# remove unused <version>/site-lisp dir
......
291 300
	EOF
292 301
	elisp-site-file-install "${T}/${SITEFILE}" || die
293 302

  
294
	dodoc README BUGS
303
	dodoc README BUGS CONTRIBUTE
295 304

  
296 305
	if use aqua; then
297 306
		dodir /Applications/Gentoo
Thank you!