2 files changed, 107 insertions, 0 deletions
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index e6f56d1386ea..652c43bebe7e 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -4,4 +4,5 @@ AUX ft2.3-symbol-collision-fix.patch 2396 BLAKE2B a890da27b23700d2f6def41ab0a567
 DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42
 EBUILD elvis-2.2.0-r6.ebuild 2396 BLAKE2B 71087c0bd2645274858e326a156564676b8d6a02d831a6f57df66131acd789268b08ff0251cf456bff056db10ac9a81ae62a802d31df995a2c31693b4077aa3a SHA512 3c2823dd77b31453b1e06f7741f21ab31ae3f80ea5b15b4771f6ee069a7d54c7bb65fd47028cd3782bda9c1fd3ae7f4d865542a51031bd13595850cf2ca86aca
 EBUILD elvis-2.2.0-r7.ebuild 2404 BLAKE2B cddb49ebd101377d79fcccfb16a5b7a890c6aa142c243132d3098de6798d6f2b6459a42416a76a77ed41d1186ddd9195e2f8faafbb80428bede79652080349ff SHA512 a407b19a0366335de2ae650a7a2d38f9abc6b10a2c5e0e69fc73fcf75ce7cdcb19d12112dec567c2274cec2e33a1998a138b49f8477a8f0f7e847a11b7b54bfc
+EBUILD elvis-2.2.0-r8.ebuild 2484 BLAKE2B 6498d6c0aef75570cf9e4b836bfae0e0eec362cf0cb6e12512e0ad97e450d31c10b8fc0d02c0e9b13c7ec89304c0cd2f21261eca9e6e0a14d316b4ebd146b25b SHA512 f1fa68d3551262e4eda6a30ccef290419fd495845aa853292c0388a2d57ea4d062b3ca49c43b2489cda049d23188be831e3637279bcc2091e6082a61430c0608
 MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild
new file mode 100644
index 000000000000..4ac39947e0d6
--- /dev/null
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator toolchain-funcs
+
+MY_PV=$(replace_version_separator 2 '_')
+
+DESCRIPTION="A vi/ex clone"
+HOMEPAGE="http://elvis.the-little-red-haired-girl.org"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+IUSE="X doc"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	app-eselect/eselect-vi
+	X? (
+		>=x11-libs/libX11-1.0.0
+		>=x11-libs/libXt-1.0.0
+		>=x11-libs/libXpm-3.5.4.2
+		>=x11-libs/libXft-2.1.8.2
+	)"
+
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+PATCHES=(
+	"${FILESDIR}"/ft2.3-symbol-collision-fix.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-interix.patch
+)
+
+src_configure() {
+	./configure \
+		--libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${EPREFIX}"/usr/share/elvis \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		$(use_with X x) \
+		|| die
+
+	# Some Makefile fixups (must happen after configure)
+	# Use our CFLAGS
+	sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed"
+
+	# We'll install the man-pages ourselves
+	sed -i -e '/^	sh instman.sh/d' Makefile || die "sed 2 failed"
+
+	# Don't try to write to /etc
+	sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed"
+
+	# Use LDFLAGS
+	sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \
+		die "sed 4 failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodir /usr/share/elvis
+	dodir /usr/share/doc/${PF}
+	dodir /etc
+
+	local docdir="${ED}/usr/share/doc/${PF}"
+	if ! use doc; then
+		docdir="${T}/doc-discard"
+	fi
+
+	emake install \
+		PREFIX="${ED}"/usr \
+		BINDIR="${ED}"/usr/bin \
+		DATADIR="${ED}"/usr/share/elvis \
+		DOCDIR="${docdir}"
+
+	# Install the man-pages
+	mv doc/elvis.man doc/elvis.1 || die
+	mv doc/elvtags.man doc/elvtags.1 || die
+	mv doc/ref.man doc/ref.1 || die
+	doman doc/*.1
+
+	# Fixup some READMEs
+	sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
+		|| die 'sed /etc/elvis/README failed'
+	sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
+		|| die 'sed /usr/share/elvis/README failed'
+}
+
+pkg_postinst() {
+	einfo "Setting /usr/bin/vi symlink"
+	eselect vi set "${PN}"
+}
+
+pkg_postrm() {
+	einfo "Updating /usr/bin/vi symlink"
+	eselect vi update
+}