gentoo resync : 25.09.2019

20 files changed, 63 insertions, 562 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 91f7432538d4..da08244a0ca7 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
index 89e5501dbcc7..3f8244701e68 100644
--- a/app-editors/adie/Manifest
+++ b/app-editors/adie/Manifest
@@ -1,3 +1,3 @@
 DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
 EBUILD adie-1.7.54.ebuild 347 BLAKE2B 909982a7bb692feb5260227ad7970ec7e3ce22fedfd3fdb1b066fc737d95188031bcc1b72cc9616f08ca13360cc52d819427668947d4f0dd82366c890b570ef3 SHA512 5dd43892dfee84b23db51c8d7a62d6c01dc830afcda09e5a5d6017d08eb7d658065d0da46600673ed9cf7137d510e4f4f2fccfe398fc4fd9840420940d7a811b
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-editors/adie/metadata.xml b/app-editors/adie/metadata.xml
index c1744fe7fc5b..7a38bb900964 100644
--- a/app-editors/adie/metadata.xml
+++ b/app-editors/adie/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index c0b5fd1d7af5..eaa0b08c46fd 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,5 @@
-DIST emacs-26.2.90.tar.xz 44412120 BLAKE2B 72eab92b3144e3807a612a1a4c87da23181ab9b42b12692401f666eae7fbdb3e832d4f5d9dbc6473df8de9af6046ad94bbb0874a57747b594dbae62435fe5357 SHA512 66e53ae2a6d89505111e7bc9b7a6e6324a9a5577d1ad8905244dbc8619b21ea410b20bd8bab0442ec226f7a0d5f2292e01171189517736e4fa5e0e15eba51074
 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
-EBUILD emacs-vcs-26.2.90.ebuild 12934 BLAKE2B d2ac2d402670ca155d84437590b4fab759e8c3250b62dd76c291a1ba629395aa759f18d61bf1f41914c07bcfb9449b0e35c1f8c449aa527df5f2a9f5196300f4 SHA512 d2561c4a74cad55050ed0aa606401ec6f90073ebe5dbc4386bc6325dd177443ae47e24151bae079372bd978802069f8e85c32b98b02518be8f94d01c175760d3
-EBUILD emacs-vcs-26.2.9999.ebuild 12934 BLAKE2B d2ac2d402670ca155d84437590b4fab759e8c3250b62dd76c291a1ba629395aa759f18d61bf1f41914c07bcfb9449b0e35c1f8c449aa527df5f2a9f5196300f4 SHA512 d2561c4a74cad55050ed0aa606401ec6f90073ebe5dbc4386bc6325dd177443ae47e24151bae079372bd978802069f8e85c32b98b02518be8f94d01c175760d3
-EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13079 BLAKE2B 2d6c435f2898f70c81dc16849a5294c128a29c62ee22f935cbbd3cb6636fa3a5014e9969e92858716b3cd0b8a033063db7432c1956152b52e39a55debdef6111 SHA512 f325fd2c7a35f0a925c13ba98ae0885a8a3e2e83c581b4b4f76493e9bccca1129292694088b822b614103a16c44116f1db8ff5007415454e99bca9adb1ce13ed
-EBUILD emacs-vcs-27.0.9999.ebuild 13113 BLAKE2B a3ff35971446518b9cff7ec48d423dcece188447d3b1df6410be1e200bfa9eb9a7aa51b604100db36d14d127372a703afd3cd110e861de5e10a96c8d7e194d34 SHA512 1747c3c003cdc85c752568019eb3ec0511124e3a0515646c11d7d226356ab513730337681acf5dcad01d61a6cb2663bcb7f8efbe817a920071445cfc32caf0b8
+EBUILD emacs-vcs-26.3.9999.ebuild 13154 BLAKE2B 6b980e670978f7fd071371f8aa1e183866b693940fbd22097ec623cf296b4f3af659c833e464d2b3f92487d1d420f9a5ddc30eb96aa97720f867de2e49c2b717 SHA512 7d032f2208854f6de28b972cf3fae3640654c6886c30e297bed32693dc5f1c546d65567378ba7a35e6192e3751fec81f4a3ed64481731f9745618ef85d4f6d4e
+EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13047 BLAKE2B de9c8b6f6d1d70ab0c5d2c1b1550c601596746f75b0409b9e99febea199b496295b22e3b37db168c4931285da3b2b61dc30b85a499c229e9ec543abba6221a9c SHA512 0e1233b711510e42a0d2d43ac80a00e5da52b9d5483e299f678a7d2a8db26d407b93d759ea7b6fb8889abf9418044edd80ea175b8a014ced87ea40c11791bace
+EBUILD emacs-vcs-27.0.9999.ebuild 13364 BLAKE2B b263d41f52ea74503cede2d8e49a5ce26f2640a56dcc1aa5a9cd3a9553b517418de5b810831e185282398f6be2374a2188cc5bd2a5650bc5f08cb6051c88fe2d SHA512 d55512c0891e7631d6f9aaa3f6f4e1908d08ce9183188f9b0f346c30a248c27c201081fa363a066a3df28903bcb9ad0949c5d861877621101300dc5718f168ba
 MISC metadata.xml 2990 BLAKE2B 226689581e5cdf7452a5b43b9b2a7ec05f4e4080e1b95f8ea0857223e074f6d05abd21c8c996ce77d33ce68f50146d99f63f7e6a64bda02f8c9317b8fa424faf SHA512 e70def35534dbc3b2803d60c5d1913a1f455b47e3f3e93a199f84b832e97eb87b9a1a43f5d2c3398496c1178437e9a2b70d18ed9802332f130b7950fdcdb71fb
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild
deleted file mode 100644
index 728af76b902b..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild
+++ /dev/null
@@ -1,409 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
-
-if [[ ${PV##*.} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
-	EGIT_BRANCH="emacs-26"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
-	S="${EGIT_CHECKOUT_DIR}"
-else
-	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-	[[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="26"
-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"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0=
-	>=app-eselect/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	games? ( acct-group/gamestat )
-	gpm? ( sys-libs/gpm )
-	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
-	kerberos? ( virtual/krb5 )
-	lcms? ( media-libs/lcms:2 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	mailutils? ( net-mail/mailutils[clients] )
-	!mailutils? ( net-libs/liblockfile )
-	selinux? ( sys-libs/libselinux )
-	ssl? ( net-libs/gnutls:0= )
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXinerama
-		x11-libs/libXrandr
-		x11-libs/libxcb
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib:0= )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff:0 )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
-			<media-gfx/imagemagick-7:0= )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			x11-libs/libXrender
-			cairo? ( >=x11-libs/cairo-1.12.18 )
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk2? ( x11-libs/gtk+:2 )
-			!gtk2? (
-				x11-libs/gtk+:3
-				xwidgets? (
-					net-libs/webkit-gtk:4=
-					x11-libs/libXcomposite
-				)
-			)
-		)
-		!gtk? (
-			motif? (
-				>=x11-libs/motif-2.3:0
-				x11-libs/libXpm
-				x11-libs/libXmu
-				x11-libs/libXt
-			)
-			!motif? (
-				Xaw3d? (
-					x11-libs/libXaw3d
-					x11-libs/libXmu
-					x11-libs/libXt
-				)
-				!Xaw3d? ( athena? (
-					x11-libs/libXaw
-					x11-libs/libXmu
-					x11-libs/libXt
-				) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-BDEPEND="virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
-
-if [[ ${PV##*.} = 9999 ]]; then
-	BDEPEND="${BDEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EGIT_BRANCH}"
-		einfo "Commit: ${EGIT_VERSION}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	eapply_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -pie					#526948
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with cairo)"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-cairo"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use cairo && ewarn \
-				"USE flag \"cairo\" has no effect if \"xft\" is not set."
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f line
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			while read line; do ewarn "${line}"; done <<-EOF
-				Your version of GTK+ will have problems with closing open
-				displays. This is no problem if you just use one display, but
-				if you use more than one and close one of them Emacs may crash.
-				See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-				If you intend to use more than one display, then it is strongly
-				recommended that you compile Emacs with the Athena/Lucid or the
-				Motif toolkit instead.
-			EOF
-			if use gtk2; then
-				myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
-				use xwidgets && ewarn \
-					"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
-			else
-				myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
-			fi
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-		if ! use gtk; then
-			use gtk2 && ewarn \
-				"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
-			use xwidgets && ewarn \
-				"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--without-compress-install \
-		--without-hesiod \
-		--without-pop \
-		--with-file-notification=$(usev inotify || usev gfile || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with dynamic-loading modules) \
-		$(use_with games gameuser ":gamestat") \
-		$(use_with gpm) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with lcms lcms2) \
-		$(use_with libxml2 xml2) \
-		$(use_with mailutils) \
-		$(use_with selinux) \
-		$(use_with ssl gnutls) \
-		$(use_with systemd libsystemd) \
-		$(use_with threads) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	# Disable sandbox when dumping. For the unbelievers, see bug #131505
-	emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
-	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
-	rm -rf "${ED}/usr/$(get_libdir)"
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	# remove COPYING file (except for etc/COPYING used by describe-copying)
-	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS CONTRIBUTE
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.2.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
index 728af76b902b..a9c9305621bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.2.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.3.9999.ebuild
@@ -67,8 +67,7 @@ RDEPEND="sys-libs/ncurses:0=
 		svg? ( >=gnome-base/librsvg-2.0 )
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0=
-			<media-gfx/imagemagick-7:0= )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
 			media-libs/fontconfig
 			media-libs/freetype
@@ -117,7 +116,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
 	BDEPEND="${BDEPEND}
@@ -305,6 +303,15 @@ src_install () {
 	# remove COPYING file (except for etc/COPYING used by describe-copying)
 	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
 
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
 	if use gzip-el; then
 		# compress .el files when a corresponding .elc exists
 		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
index 02b971c88d68..872a1e4ef91d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
@@ -119,7 +119,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
 	BDEPEND="${BDEPEND}
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index cb262d172dd2..dec6aa315d1d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -120,7 +120,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
 	BDEPEND="${BDEPEND}
@@ -311,6 +310,15 @@ src_install () {
 	# remove COPYING file (except for etc/COPYING used by describe-copying)
 	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
 
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
 	if use gzip-el; then
 		# compress .el files when a corresponding .elc exists
 		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 31dcdbe07f22..82bab4fd5eb1 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -12,10 +12,10 @@ DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25
 DIST emacs-26.2.tar.xz 44406808 BLAKE2B 23c23958b177f032082fc5e71ebccc4a88c10b19258ec22608d7bade37dc58d5f8aa4a74e86114c72ea8be8fc299b6c9af5af283f28bd7e965830e587f1bdc93 SHA512 c223ff5c51ca8bdf887bacb2dc37b08a637d39ed6f887cc24f67397e46fe5fdb68f33f21b97300b985c749f32aa09080d33103271637ed4ce5d9f2ea34ce9fe1
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 EBUILD emacs-18.59-r12.ebuild 4418 BLAKE2B 232057c210d2ee4c20148d3dcd61ea9a9204a14d1e1f83c40c3c206750c4d594298eeb5cf112d9dbb697f33ca73b3e92d8f224c5dbad55f252a110effbc50b63 SHA512 2c502c95939a0bde3617f0341867d6156f2317fe4a84dff0e178d6c16edf41868df905e5711e090eea81c850cae77db6adb2d8a3d7935ec3d1db5b53006e44cd
-EBUILD emacs-23.4-r18.ebuild 11554 BLAKE2B 36ff7c5e18ea36d5ced82ce6414c9030fccfb54062340521f500d0b49c552afe47b7e7c8e09c5b4833a17a87e17481ceda99b0f1100ce72f6de01ffbd3c7f42c SHA512 84cda67a463ddb930356fd76fd1c9351577c0ab0ccabc6184a7f8f9c6ac0c6d4e44a547c08e8b56d1f8cb85b54c38f4728a954e2ffd6bf8120eb1db7ae8312b4
-EBUILD emacs-24.5-r7.ebuild 11364 BLAKE2B f712a1af218f3e495b6c3cfc91850d2a6c31b348635609adde23943c453bb17ad9d34ea571e96fac7bd749704beec72ebeb1ccc2b6aec6b8cab438c780f24313 SHA512 7f8a2c542d85c0125212d13a86dd690cf45c92379f269e5be69772e4d3c0735facc0774ec976190fd7b6f04893220ea3c662d1c7001249c6e9d1b8f26e88eaa4
-EBUILD emacs-25.3-r6.ebuild 11662 BLAKE2B ceef7af0a3b0462e6c57bf27e4138aad675fc7a11d707a6241852cfabd7bfa72dd52654b929b7959f9a6ee39a8bd56d693b046465c97841d9eefd35703333227 SHA512 7a5b76fdb49c0d661cd3b74cb3ff365b8a96391a28ef444a676fec7e4b18eaf804a39afc395f92972ce72cac1cecb0382897ce02adc8d2e7d1f672777b4ac69a
-EBUILD emacs-26.1-r3.ebuild 12308 BLAKE2B dd36d96063583e6190a2a38af7859cb81b769d887b03f25ca39dbcc29c0f42a6fbb6344fd31f598c5f7c95674abb04fa5efd48c163c31c1f324abb7c686de5da SHA512 0a950af2d726d01dbe4803be7f8bcfc06c27c0acd900ad505bdacdd39a9bfead921d6e12f6e8f439816f160a336074eebcb8a3ef14e7b25bca6297ccfe84fc96
-EBUILD emacs-26.2.ebuild 12112 BLAKE2B 53f5681592f916e3d291511eea74cfce3a74b611b471ee65d9bac9229012572ea9922b9d02d298b0618b26da5d109318f7cffcbbdae581edf6c8d532a976e849 SHA512 98f31f2b0de5f1a588f9e459786c2d2d1b86908a7f451ebdc0ededdcef3d5b3622202f52a70a5b46bfd1351ed44ab13cc8452e63fd7dd628525b8375ed4851e1
-EBUILD emacs-26.3.ebuild 12122 BLAKE2B 00d5725bcbd0fe0f49e95690aebf3fdd9fe0ccd50fb6474a9a37c2f643a603fbc39e203257baeeda4e2540aa157f1ea09f9ddc9270ef4da57e3977968a1b0c84 SHA512 d6f9cf99cd551ea87266ea104c50fa1935a3f1a8f3d770e5cf0d458e5b9b938241a7c8b33d86e33d6fe2a49cb3bb60d09726d388e6b76efaa011082973de14a0
+EBUILD emacs-23.4-r18.ebuild 11522 BLAKE2B d0dc95d2f279b155f82ecb1d938a761d849398c3ed16291a913a9a7190241a2e70f55cc8aa388c833d25febc11cb6b3c31cc9c541a0540ef9e1e47bea7c49ba5 SHA512 ebf32bcb58382e7a2c72d7da1bfe7fe37daece2356514834dba1f27e5f24a0b214e34f19dc057e8b9bd995dcae8f4cb4304c4eb661a0ce4517f206e23b9f6588
+EBUILD emacs-24.5-r7.ebuild 11332 BLAKE2B d45a7555a37f2e3561538be85fea7cd202a866d9080a4ef929f8b5ed94bfcd5f9d9b414008159391cf94b8cd2e3c7ba420a8223f4e7dcd1e119214f136c241a3 SHA512 eed96c5330a721cf4f3712a03bf9dd83da0ede6bc3dfb248fbd35d95d6a0fb57d08ac13197524e7aac1ae2810f8da82ea0d325af54ee6431c8b2a85f772a9e27
+EBUILD emacs-25.3-r6.ebuild 11630 BLAKE2B 012a8919e279c4fc3b8a58fcf6fcafb5a4cf72c6e0900b2100180c1783501ef158940d8f28fb710fe68742dd898b811fc7871ea0aa04b12add67617fc610f317 SHA512 be527b0a8c99f2f9c17b131cd8d042bccda67f477d523075806f3651691b44ccd6c73213f6b0b768b7697e437e246058e8603f404b696e3db35979867093ad2b
+EBUILD emacs-26.1-r3.ebuild 12276 BLAKE2B 06e2d835d77c2c880496d15a816d4b8a40c20975a84ca17dba65e3eab9e74f0d00a36aa0f107ef79d16215688b44ac2c76fd6011d0ba4ed9232d0194c894fc4c SHA512 62dcd801c4809b01f7ff63de196b7a5d7e823343a361439872c3aa5d8c1a018b43215bd5938633fa1286293dd110a327bfe666c4510904ca06aee97028010d37
+EBUILD emacs-26.2.ebuild 12080 BLAKE2B a5ac2c342732eb3efebcef48281c60df8b816511650d3e563e91a83af370918948e7848fb8634f67ce6dc68bf5db5068e65293c4fb45f88e98aaae812436698f SHA512 99ce6986d95ca8ca441d48010c4482c978553e0649b09afbe73d48f02fb5791fedeb38a899109d413913e6e224659c6c03df7860a62472b4bb88289375357efc
+EBUILD emacs-26.3-r1.ebuild 12373 BLAKE2B 06378a95dda2daef4b95f0630acb91e348a615f011d10cd45ee9c6013857dadb625d695a561a2ab7f426bbf30561d4ee92246fc3e8a158bf70003c65d1152df1 SHA512 a42c16addda1301d01fbc5a81984dfb0039805455b101ee372845087608cbf436a8f15da92c1aa4d1693f3b09628b1170be088563474c62052bdb6a77b64a46b
 MISC metadata.xml 2741 BLAKE2B 9f945f7d777f555676d0c51648822627a3320b98832d9a8dfb93574a2361a3c439f54c8a94f033bd6ea936625764190b5863e727bf518aafd99da389337932be SHA512 6b81f609c0834d10cbdd807e7bf60fa95e23531795bcb6b4a0f854299e3a7498a412fa2864a40b285701c4151ee8473cda9d4b8295b1d60f4b29b66dcb55e11d
diff --git a/app-editors/emacs/emacs-23.4-r18.ebuild b/app-editors/emacs/emacs-23.4-r18.ebuild
index 146b89d291c9..994df7eb14c6 100644
--- a/app-editors/emacs/emacs-23.4-r18.ebuild
+++ b/app-editors/emacs/emacs-23.4-r18.ebuild
@@ -81,7 +81,6 @@ BDEPEND="alsa? ( virtual/pkgconfig )
 	dbus? ( virtual/pkgconfig )
 	X? ( virtual/pkgconfig )
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 9fd6f8a9d669..d041d067b740 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -89,7 +89,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index 4460ba42b16b..d601f758d0e1 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -92,7 +92,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-26.1-r3.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
index 6d608a10706c..d64e5e88fa9a 100644
--- a/app-editors/emacs/emacs-26.1-r3.ebuild
+++ b/app-editors/emacs/emacs-26.1-r3.ebuild
@@ -101,7 +101,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 09eef1b54817..e9e7c28c4a2b 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.ebuild
@@ -100,7 +100,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-26.3.ebuild b/app-editors/emacs/emacs-26.3-r1.ebuild
index 0e312adbbbb7..a1a4299b9897 100644
--- a/app-editors/emacs/emacs-26.3.ebuild
+++ b/app-editors/emacs/emacs-26.3-r1.ebuild
@@ -100,7 +100,6 @@ DEPEND="${RDEPEND}
 
 BDEPEND="virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )"
-#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
@@ -281,6 +280,15 @@ src_install () {
 	# remove COPYING file (except for etc/COPYING used by describe-copying)
 	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
 
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
 	if use gzip-el; then
 		# compress .el files when a corresponding .elc exists
 		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest
index b8f1c3857d04..8764bb754b59 100644
--- a/app-editors/kakoune/Manifest
+++ b/app-editors/kakoune/Manifest
@@ -1,4 +1,4 @@
 DIST kakoune-0_pre20171120.tar.gz 460659 BLAKE2B 443583e5d766b227f678f9adec76f06a0dfe6a29e2d6f38896b20a911e08e933e1e631d1018e1510a49fbb71b4b0258029fd33ece8c478bd228ef67b6fae939a SHA512 0208fd932dcf6cef3fac3338dfc15f0ba36ed4e3fa282cc5ffac5ad823f91b553a8c34747ff33ec4382257a1eb71f21181b63595031f9f237cba3bc8eeda3626
 EBUILD kakoune-0_pre20171120.ebuild 1096 BLAKE2B c6ceef7195ed877fa4d6de7e905f41f5fac78eedd1824d03cc3e5552f0ac21b77de241128e214c3821a9d71c786d2e00bd9b2a881d70247129d344b5bc73040b SHA512 92f13420ab2324095b41b0b1a29df3779dc9328ee5ccf3ab576f46765b9c6104e4ad097fcbd0347192b60fb907097ce040c33dbd7f95a036db575dfe8d563c8d
 EBUILD kakoune-9999.ebuild 1013 BLAKE2B 9255ed63a1c4b7923e77f4edb2b2fe209937e5b5ffe8339933a017c66ab178d8253f33b46e5138a9ce3b47bc236b6727f92a1c4fbc86ef9ea4559a27c9f8ed8f SHA512 87f9ecc92473631e9b3c835aaf310411ec1892571c83f4a87593de1aa976fdc44b4946c982b1cd8e54663c1e83df2db5558980d1b5e0007ad0b7042cad372931
-MISC metadata.xml 461 BLAKE2B 10780dda95d0505d21c847f6bde5e370588d4f935145f7cf12a879f0798bdfb9bd61285521fb2be8227c19efe17c408498b9860069bba5be496887c263eeb8f9 SHA512 36c7ce23f0c5259e7bec75c2506aaabcdac43c71b34479824976dbcfecc42c96d3144ce6def550c79f92b7f02c97a1e053532626142818dc05641a4ea2974c97
+MISC metadata.xml 245 BLAKE2B cc6e199e8d1ff374bdb7d8a466333d0b9b4bab77b928756235369130ee369e7da62755bf02a0eae323aff90ea39af9f63667448a0c6f9f0098665f515041ef7b SHA512 785c49f9d46f2e7f05705e108b98bbd80f2a241d72a00ab9a698c837d0644bb651d708ff9a21dbe53314e838d1c3dd114b76dc8241378d29ca942923c9ff20bc
diff --git a/app-editors/kakoune/metadata.xml b/app-editors/kakoune/metadata.xml
index 753a3985cd00..9469b5728eda 100644
--- a/app-editors/kakoune/metadata.xml
+++ b/app-editors/kakoune/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mawww/kakoune</remote-id>
 	</upstream>
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 32d4933c4ba3..8ea52feb0897 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,7 +1,5 @@
 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
-DIST neovim-0.3.4.tar.gz 9231575 BLAKE2B 92e727264442794ae27642451c90381262f9882e26d9865a2ff6c1bc4060b070ab49cd11194c3a88dafecda5bc1909963b2cc8b382198dc7c117ba056b7a4ebe SHA512 fbf22ccffbb36c082bfe9a66b3d0180a78581102732a44ab7a5417aef517c88b69406491854613a1cf347ddab6fc6e277f959887556d2c0068cf181e4d88c36b
-DIST neovim-0.3.7.tar.gz 9231661 BLAKE2B 6eade77f8654bc95170f4c052c5700a6ad42aff920889bf4036e6ff931cdeeabb908aeedb44e68efca3500beb797cf2361e09d85456a2c17431e005a64bafff4 SHA512 1d770a4643a44da65f0a03c90e18e89f337b16ec3eca20dbffa21bcab10c836062ef82974437b64bd766f7b07317cd3dc8e3e72b9d5d0911b1d4f2c528cd20c2
-EBUILD neovim-0.3.4-r1.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a
-EBUILD neovim-0.3.7.ebuild 2015 BLAKE2B 4e87d237bb7fcab7d05749b59ea83799a59c0cf57cf2fa5316703b3b93f973fa2e67482d9077a188d3494763f398b759e0d5405d0489fd81225520b31a20f55d SHA512 3a7c3e4ca89a13305d584f5bba7889d041666ede0f54e4f399e76f7f35ad11fa549a4c1e20e7cf8807342a97e6522285fc56f3249a768d0805a636790e910e0a
+DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
+EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
 EBUILD neovim-9999.ebuild 1953 BLAKE2B 628bf1d0fd2883e930722178b9530a8b391bd23fe5dd69cafcf4027bf5ebea2ef4085d2ce2e09e27e97f4ab67f8c00baafddf4759a6754c132c3b75c61992fce SHA512 964119b4ac52f276a558fc9cb01edfc585cdf6aee0be64b62344f8382db501196e06f847e34b71b7de8ae0c3510dedcd9efc281b3d7a4e54054fe97a7a8d09ef
 MISC metadata.xml 638 BLAKE2B 04414f861c324475a2884bfb4d06aee0a81bc4d934702102826c0ee7a2ec4da1a6ee40fd8369031e0d1bb8c4102d7d9ec60cc375ca83e32f895cbd5556bf06e6 SHA512 9c037165687b9a6959cdbbf9583c1ac8974a58ed0ef34b9f6ba2fdb157be895823c1956ee1bc0a6dd8cbba405399847377ce860c2d2740160f7b2475d34323b9
diff --git a/app-editors/neovim/neovim-0.3.4-r1.ebuild b/app-editors/neovim/neovim-0.3.4-r1.ebuild
deleted file mode 100644
index c3e917afd7fe..000000000000
--- a/app-editors/neovim/neovim-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Vim-fork focused on extensibility and agility."
-HOMEPAGE="https://neovim.io"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/neovim/neovim.git"
-else
-	SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="Apache-2.0 vim"
-SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
-
-CDEPEND="
-	dev-libs/libuv:0=
-	dev-libs/msgpack:0=
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? (
-		dev-lang/lua:=
-		dev-lua/LuaBitOp
-	)
-	tui? (
-		dev-libs/libtermkey
-		>=dev-libs/unibilium-2.0.0:0=
-	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-	net-libs/libnsl"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libintl
-	virtual/libiconv
-	app-eselect/eselect-vi"
-
-RDEPEND="
-	${CDEPEND}
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
-
-CMAKE_BUILD_TYPE=Release
-
-src_prepare() {
-	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
-		-i src/nvim/globals.h || die
-
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFEAT_TUI=$(usex tui)
-		-DENABLE_JEMALLOC=$(usex jemalloc)
-		-DPREFER_LUA=$(usex luajit no yes)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install a default configuration file
-	insinto /etc/vim
-	doins "${FILESDIR}"/sysinit.vim
-
-	# conditionally install a symlink for nvimpager
-	if use nvimpager; then
-		dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/neovim/neovim-0.3.7.ebuild b/app-editors/neovim/neovim-0.3.8.ebuild
index c3e917afd7fe..b22a6a5ca7c1 100644
--- a/app-editors/neovim/neovim-0.3.7.ebuild
+++ b/app-editors/neovim/neovim-0.3.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-utils xdg-utils
 
-DESCRIPTION="Vim-fork focused on extensibility and agility."
+DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
 
 if [[ ${PV} == 9999 ]]; then
@@ -20,9 +20,21 @@ LICENSE="Apache-2.0 vim"
 SLOT="0"
 IUSE="+clipboard +luajit +nvimpager python remote ruby +tui +jemalloc"
 
-CDEPEND="
+BDEPEND="
+	dev-util/gperf
+	virtual/libiconv
+	virtual/libintl
+	virtual/pkgconfig
+"
+
+DEPEND="
 	dev-libs/libuv:0=
+	<dev-libs/libvterm-0.1
 	dev-libs/msgpack:0=
+	dev-lua/lpeg[luajit=]
+	dev-lua/mpack[luajit=]
+	net-libs/libnsl
+	jemalloc? ( dev-libs/jemalloc )
 	luajit? ( dev-lang/luajit:2 )
 	!luajit? (
 		dev-lang/lua:=
@@ -32,36 +44,24 @@ CDEPEND="
 		dev-libs/libtermkey
 		>=dev-libs/unibilium-2.0.0:0=
 	)
-	dev-libs/libvterm
-	dev-lua/lpeg[luajit=]
-	dev-lua/mpack[luajit=]
-	jemalloc? ( dev-libs/jemalloc )
-	net-libs/libnsl"
-
-DEPEND="
-	${CDEPEND}
-	dev-util/gperf
-	virtual/libintl
-	virtual/libiconv
-	app-eselect/eselect-vi"
+"
 
 RDEPEND="
-	${CDEPEND}
+	${DEPEND}
+	app-eselect/eselect-vi
 	python? ( dev-python/neovim-python-client )
 	ruby? ( dev-ruby/neovim-ruby-client )
 	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )"
+	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
+"
 
 CMAKE_BUILD_TYPE=Release
 
 src_prepare() {
 	# use our system vim dir
-	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die
 
-	# add eclass to bash filetypes
-	sed -e 's|*.ebuild|*.ebuild,*.eclass|' -i runtime/filetype.vim || die
-
 	cmake-utils_src_prepare
 }