gentoo resync : 13.05.2018

8 files changed, 417 insertions, 9 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a9490d71eba0..54de3e9b4e33 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index b948c2f64886..0790e8e991ca 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -9,6 +9,7 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907
 EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c
 EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf
 EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589
+EBUILD gvim-8.0.1699-r1.ebuild 10448 BLAKE2B c8002b9f8669abd503875a20cc9064210201c6dd88525290264395f8ac3f94bd9bbe25b2af0a6cd22105e380eada731c524c7cc53aca1a3943dd2de6345134ea SHA512 e5918d554625e921f081a536646075100ffceaefc67c610c6948f154f3a3e69a37cdee9bd87acdb9774df58ecdaa4213ab0ecdc09756d9a15f7bce523a672ad0
 EBUILD gvim-8.0.1699.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
 EBUILD gvim-9999.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35
 MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126
diff --git a/app-editors/gvim/gvim-8.0.1699-r1.ebuild b/app-editors/gvim/gvim-8.0.1699-r1.ebuild
new file mode 100644
index 000000000000..5cc2db95231c
--- /dev/null
+++ b/app-editors/gvim/gvim-8.0.1699-r1.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( ${RUBY_DEPS} )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home || die
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]]; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i -e \
+		'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
+		"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
+	    >> "${S}"/src/feature.h || die "echo failed"
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i -e \
+		's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i -e \
+		's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c; do
+	    echo >> "$c" || die "echo failed"
+	done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]]; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile || die
+	fi
+
+	cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	sed -i -e \
+		"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
+		"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i -e \
+		's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -v src/auto/configure || die "rm failed"
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	local file
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
+		if [[ -e ${file} ]]; then
+			addwrite $file
+		fi
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope; then
+		sed -i -e \
+			'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Call eselect vi update with --if-unset
+# to respect user's choice (bug 187449)
+eselect_vi_update() {
+	einfo "Calling eselect vi update..."
+	eselect vi update --if-unset
+	eend $?
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
+		die "echo failed"
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Call eselect vi update
+	eselect_vi_update
+}
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index 89ada676c0d5..028dc5cf2b6b 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,5 +1,5 @@
 DIST kile-2.9.91_p20171209.tar.gz 3624273 BLAKE2B d6e4798869b8f5be7a2a6b00b1b067957245373f560a7485334ce1f3f932670a0cb8ef0b551fde2eea1d54a6114e8405025dbd3daea587a2d30b74fe614d332e SHA512 b7e4a6e434057cf04e8712f543cdd74a40659843b1e2777d0a031b5a665e1de34e36ec9b3f5d9bd3bf9202f9dca8595fcee9a81ab4875bc4b6da3a2fb449b2c6
-DIST kile-2.9.91_p20180419.tar.gz 3635059 BLAKE2B 1f7c20e8881bcdd20f3230e8a8608dd816a5f00435734941280c4da75ca6460514a1c3dc0f3962d684f3e0a458ae427772cdf1cafbbe8f44be7a9e804ffcec05 SHA512 bb50f169d6e9630cc463f4615af06826608b640a7e43d5d671477fad6a199fcdc02c38138c8a211ce563f4e1f82ddd7cceea29a3e60b43e35c52076958818721
+DIST kile-2.9.92.tar.bz2 8556142 BLAKE2B dd18ece7394439de3c0037fbea7c66316c5ee457bd4ad8c35f8519713f917e1c1641c806290303c26dd9e31e2f39346bc35091b211ca23a2d342332388d18c3f SHA512 e3af0c2cb1a0970428e2d772ef5025ead67aee94cdc03b6ec173de5628e8d4619f74296a1734eac8241939d40a05b805b8bd33bb4c27a1c19ad47fb35087cf7d
 EBUILD kile-2.9.91_p20171209.ebuild 1706 BLAKE2B ec74f5a929c6175221729fe36f1510134f2b08a66c9cc189a6f318d1f53b514028597b52ba049f8086a34cb503cba44a87489eee7311f6136314ee1c7b0ff2d4 SHA512 82aed7dc966deb239c17ddcd4b4b62a5a8f5e50c36d6fb544f4cec206732be514f69d59852fc8b0cdee3290ea22a981c1a7466a56a8954738d969096e176520a
-EBUILD kile-2.9.91_p20180419.ebuild 1727 BLAKE2B 3e30121a7035370c16fe65fed63805b6ee9eabf5fd0a3f05c0c15d2754d271ac9bbaecd83f88ab8121b045fe94b7d6e490dce2a54b9a114c833c2e8b05814e5b SHA512 7a392ccd88660b5d83758f12023e71dbdaa07052836fe714530b68f4927db3e04e7377590b0d9ce0ad7d46ad14acd71444a1c93469775bd384c57253be54b1e2
+EBUILD kile-2.9.92.ebuild 1643 BLAKE2B e247e731f83bd111839f6b685006547021616cf6f2cce1e9ed84892f76aef8ad8905b8064a68537c57c66d15de8f22d86a716eba476c51ba5d487a095da75054 SHA512 bad45bafdecb059e9d9e890d186e766473d91932d72c2b0798af7132aceb490a125d40e66a45ac2a8a6c9c0811147aa075b5357f0739f6d831a563e51b802d31
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/kile-2.9.91_p20180419.ebuild b/app-editors/kile/kile-2.9.92.ebuild
index db8abd6b9d12..d6cfdab6acca 100644
--- a/app-editors/kile/kile-2.9.91_p20180419.ebuild
+++ b/app-editors/kile/kile-2.9.92.ebuild
@@ -3,13 +3,12 @@
 
 EAPI=6
 
-COMMIT=f87c242a61292ea254fed10f3e215a8d3e4b862a
 KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
 HOMEPAGE="https://kile.sourceforge.io/"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="FDL-1.2 GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -56,8 +55,6 @@ RDEPEND="${DEPEND}
 
 DOCS=( kile-remote-control.txt )
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_prepare() {
 	kde5_src_prepare
 
diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest
index 029c14acad03..cbe35ad693ca 100644
--- a/app-editors/moe/Manifest
+++ b/app-editors/moe/Manifest
@@ -1,6 +1,8 @@
-AUX moe-1.6-tinfo.patch 375 BLAKE2B e8b97ac32fe114eaa2522cfa88b5c17eb31c9a4f13a79afd0657ec1557ae3589d3b2429ae0f610a1b0bf4c1870aba20ff1405265edbe71eb8f3459e1b1df7a28 SHA512 38e64527e1970f8586ae94e15295d79fdb427daa21e079c6bf6434e515285bc3de35cb7d966eecfd0cbc33b73bcc1550cdd8d29646c373e710553f26f32ced5b
+AUX moe-1.6-tinfo.patch 379 BLAKE2B 4b2b0b895181d98b742c5abe5bab3690a9f37d987e0b63123d2b0288ec0f0980df3bb9cc654e5cfcabcaeee69714aec7e3e99974bab4a8fbc36105c071b2a988 SHA512 8fa0661bce445d585aa37d845a4b41a0d1ed08aeab4117f6f1c6bdac346d7d774dfe38253dc11f0be7bd68c136eaac5aa889e174e0556f036fbdaf2e8b06373f
 DIST moe-1.6.tar.lz 75108 BLAKE2B 0d675ceecea6670fe24e860d030ef43905add64334d0769d24a57fb3b0cc421e7065c6d36df7e2c154db66936ab8849f9bf42288767810aec34db4261fef23f6 SHA512 0aa717c865d41f73adccddbb158ae67b611a64f24258bcce5a68fea8175d28d6db55a0fb356fb294bfe3106c0973607b1fcc76ceee17d360e30eb80650ec043b
 DIST moe-1.7.tar.lz 79644 BLAKE2B e4e353d1daba8b40842d86a0821c8a0668bbe9e6875b988190f870b8fd637ee3f0006ca088f9aeb1dedcc69b17c45ced4167ffb248adb429531516b64229caee SHA512 e961291c55e5b2af09e3b5cb0d07b557b0af1f6143339390e5b06f4bdebace888f7c3866ec936bd20f25b23cc96fdfdb7bd3da6690e684ec24513b106ae53b49
+DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
 EBUILD moe-1.6.ebuild 704 BLAKE2B df78a79db97d09095063227346f7377faaf250c7846fadc680765627f6d9214ae670b9083befd78e190c07baaeda416e0eaeb4f8e8c6cb11bda40248d6c5b708 SHA512 9136ed57d5fe7a7991588f2194ce04969d4be94dac8c5ccd0258264bda052c1cd7d1d34dad1cdd29cb7aabc08547be354d014e1781f2216715cb12ddff22c86b
 EBUILD moe-1.7.ebuild 712 BLAKE2B 439fd6f1a4dd14bfbf693fbf2c0a5be8889bc857be448f0daa47fa4675b6e091ec6e8f8bbe22cfd9d993220af39ec472041b082348124f4d6afe2ffcdd0bc0fe SHA512 15fb3c954ad0c81e9ee9e191c6b96b9b0f494875d8415b30fc997aedcb691961bf546573147afa8ae2f87f2851df23b4e44195ad10cc690df8306e97de90e00d
+EBUILD moe-1.9.ebuild 705 BLAKE2B eecb3509f0e4b13520434fa0f8610855695c24e5e37ecee76ad848d03ca40b7015008e5ff498fdfef18d6d30d8f44a141b26e004b4692ba245518eb175695408 SHA512 fa237dcff35bf6f48994b6a394dc086c22296bcd7315b54772b693e0a6c2187b9ca41c7ff51ebb2aceb67835513b827e5d3ccfcc25ffeb5f3a68517eca19e882
 MISC metadata.xml 247 BLAKE2B 94608f4bda5b60a090b18717a5d81d90defbb5e482043059dcb7a41d39a21b9192e6f58a1ebdb83cc8cfaa9fe85ced13c40e6e43c110e0e21b2cb6a36f6dc852 SHA512 1196d40f8c6a3b2e5d0c0590c2f56b53ead40ec8d9eb2c125094eb961b092558c51baa89f237fda24cf1050e85c78dd7419e1d217c2feceb32c6296990ac54c3
diff --git a/app-editors/moe/files/moe-1.6-tinfo.patch b/app-editors/moe/files/moe-1.6-tinfo.patch
index 6b91460e8e53..5a94ec599e89 100644
--- a/app-editors/moe/files/moe-1.6-tinfo.patch
+++ b/app-editors/moe/files/moe-1.6-tinfo.patch
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2014-11-03 00:33:57.152593136 +0300
-+++ Makefile.in	2014-11-03 00:34:21.121592519 +0300
+--- a/Makefile.in.orig	2014-11-03 00:33:57.152593136 +0300
++++ b/Makefile.in	2014-11-03 00:34:21.121592519 +0300
 @@ -4,7 +4,7 @@
  INSTALL_PROGRAM = $(INSTALL) -m 755
  INSTALL_DATA = $(INSTALL) -m 644
diff --git a/app-editors/moe/moe-1.9.ebuild b/app-editors/moe/moe-1.9.ebuild
new file mode 100644
index 000000000000..c511c32637fa
--- /dev/null
+++ b/app-editors/moe/moe-1.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs unpacker
+
+DESCRIPTION="A powerful and user-friendly console text editor"
+HOMEPAGE="https://www.gnu.org/software/moe/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	$(unpacker_src_uri_depends)
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	tc-export CXX PKG_CONFIG
+	sed -i \
+		-e "/^CXXFLAGS=/d" \
+		-e "/^LDFLAGS=/d" \
+		-e  "/^CXX=/d" \
+		configure || die "sed on configure failed"
+
+	eapply_user
+
+	eapply "${FILESDIR}/${PN}-1.6-tinfo.patch"
+}