Diff emacs-25.3-r6 with a emacs-26.1-r3

/usr/portage/app-editors/emacs/emacs-26.1-r3.ebuild 2019-10-11 18:40:00.000000000 +0300
11 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="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"
14
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"
16
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 17
REQUIRED_USE="?? ( aqua X )"
18 18

  
19 19
RDEPEND="sys-libs/ncurses:0=
20 20
	>=app-eselect/eselect-emacs-1.16
21 21
	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
22
	net-libs/liblockfile
23 22
	acl? ( virtual/acl )
24 23
	alsa? ( media-libs/alsa-lib )
25 24
	dbus? ( sys-apps/dbus )
......
27 26
	gpm? ( sys-libs/gpm )
28 27
	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
29 28
	kerberos? ( virtual/krb5 )
29
	lcms? ( media-libs/lcms:2 )
30 30
	libxml2? ( >=dev-libs/libxml2-2.2.0 )
31
	mailutils? ( net-mail/mailutils[clients] )
32
	!mailutils? ( net-libs/liblockfile )
31 33
	selinux? ( sys-libs/libselinux )
32 34
	ssl? ( net-libs/gnutls:0= )
35
	systemd? ( sys-apps/systemd )
33 36
	zlib? ( sys-libs/zlib )
34 37
	X? (
35 38
		x11-libs/libICE
......
63 66
		)
64 67
		gtk? (
65 68
			gtk2? ( x11-libs/gtk+:2 )
66
			!gtk2? ( x11-libs/gtk+:3 )
69
			!gtk2? (
70
				x11-libs/gtk+:3
71
				xwidgets? (
72
					net-libs/webkit-gtk:4=
73
					x11-libs/libXcomposite
74
				)
75
			)
67 76
		)
68 77
		!gtk? (
69 78
			motif? (
......
113 122
		|| die "unable to sed ctags.1"
114 123

  
115 124
	AT_M4DIR=m4 eautoreconf
116
	touch src/stamp-h.in || die
117 125
}
118 126

  
119 127
src_configure() {
......
181 189
				recommended that you compile Emacs with the Athena/Lucid or the
182 190
				Motif toolkit instead.
183 191
			EOF
184
			myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)"
185
			myconf+=" --without-xwidgets"
192
			if use gtk2; then
193
				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
194
				use xwidgets && ewarn \
195
					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
196
			else
197
				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
198
			fi
186 199
			for f in motif Xaw3d athena; do
187 200
				use ${f} && ewarn \
188 201
					"USE flag \"${f}\" has no effect if \"gtk\" is set."
......
201 214
			einfo "Configuring to build with no toolkit"
202 215
			myconf+=" --with-x-toolkit=no"
203 216
		fi
204
		! use gtk && use gtk2 && ewarn \
205
			"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
217
		if ! use gtk; then
218
			use gtk2 && ewarn \
219
				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
220
			use xwidgets && ewarn \
221
				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
222
		fi
206 223
	elif use aqua; then
207 224
		einfo "Configuring to build with Nextstep (Cocoa) support"
208 225
		myconf+=" --with-ns --disable-ns-self-contained"
......
216 233
		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
217 234
		--localstatedir="${EPREFIX}"/var \
218 235
		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
219
		--with-gameuser=":gamestat" \
220 236
		--without-compress-install \
221 237
		--without-hesiod \
238
		--without-pop \
222 239
		--with-file-notification=$(usev inotify || usev gfile || echo no) \
223 240
		$(use_enable acl) \
224 241
		$(use_with dbus) \
225 242
		$(use_with dynamic-loading modules) \
243
		$(use_with games gameuser ":gamestat") \
226 244
		$(use_with gpm) \
227 245
		$(use_with kerberos) $(use_with kerberos kerberos5) \
246
		$(use_with lcms lcms2) \
228 247
		$(use_with libxml2 xml2) \
248
		$(use_with mailutils) \
229 249
		$(use_with selinux) \
230 250
		$(use_with ssl gnutls) \
251
		$(use_with systemd libsystemd) \
252
		$(use_with threads) \
231 253
		$(use_with wide-int) \
232 254
		$(use_with zlib) \
233 255
		${myconf}
......
255 277
	# avoid collision between slots, see bug #169033 e.g.
256 278
	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
257 279
	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
280
	rm -rf "${ED}/usr/$(get_libdir)"
258 281
	rm -rf "${ED}"/var
259 282

  
260 283
	# remove unused <version>/site-lisp dir
Thank you!