Adding support for eselect vi. Currently package.masked. See bug #147857

Package-Manager: portage-2.1.2_pre1

5 files changed, 114 insertions, 5 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index 9dcb82484dd9..4c3b17ac621b 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/elvis
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.25 2006/08/27 15:09:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.26 2006/09/20 15:50:52 pioto Exp $
+
+*elvis-2.2.0-r2 (20 Sep 2006)
+
+  20 Sep 2006; Mike Kelly <pioto@gentoo.org>  elvis-2.2.0-r2.ebuild:
+  Adding support for eselect vi. Currently package.masked. See bug #147857
 
   27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org> -elvis-2.2.0.ebuild:
   clean out older, non-modX ebuild
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index aca2ddd132f0..d95e846d79f5 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -3,10 +3,21 @@ EBUILD elvis-2.2.0-r1.ebuild 1936 RMD160 c7c942fe664fca60742f719873358efbdcab964
 MD5 e076451a961a6e2f349dc68d38d09c1a elvis-2.2.0-r1.ebuild 1936
 RMD160 c7c942fe664fca60742f719873358efbdcab964b elvis-2.2.0-r1.ebuild 1936
 SHA256 73c01fe68d023f94ac1ca24d04be717d73968cc90429993f1498017fb4ce30bc elvis-2.2.0-r1.ebuild 1936
-MISC ChangeLog 2993 RMD160 65f3fe9c81fe5415ab622797e0fe2a042dbd4955 SHA1 efd2fbb50f9e39d235199f827be7226e7387d7c2 SHA256 d1f101023d6441f943f018ef0779738facd0c8368f556c0af179cd873b485e35
-MD5 87ec1bf34144a025dc06864b423bcc0b ChangeLog 2993
-RMD160 65f3fe9c81fe5415ab622797e0fe2a042dbd4955 ChangeLog 2993
-SHA256 d1f101023d6441f943f018ef0779738facd0c8368f556c0af179cd873b485e35 ChangeLog 2993
+EBUILD elvis-2.2.0-r2.ebuild 2161 RMD160 dc7a2c8c6c07a45ed4af3d468dd10f143046a4ec SHA1 c47805d77d240e469aefc4d69238d7e548431806 SHA256 3c393cf08863b94dc6a290cb4db613d50ef103af902b5d4b3ab30057e02d8fa6
+MD5 6105a3dfefb12de5657d78ec4f6538ce elvis-2.2.0-r2.ebuild 2161
+RMD160 dc7a2c8c6c07a45ed4af3d468dd10f143046a4ec elvis-2.2.0-r2.ebuild 2161
+SHA256 3c393cf08863b94dc6a290cb4db613d50ef103af902b5d4b3ab30057e02d8fa6 elvis-2.2.0-r2.ebuild 2161
+MISC ChangeLog 3165 RMD160 d1967e6b0116ba6c5c32560a947e96dc65324969 SHA1 ea470d0a10ab5b8aa9deda85d96fb26530a762a6 SHA256 9c4b4a57e2806d95a82f2b9239c1f297efa58d2f921b22c3e2d2f6c8a1436565
+MD5 c145791bc697a542d5f61d1b1a478b0b ChangeLog 3165
+RMD160 d1967e6b0116ba6c5c32560a947e96dc65324969 ChangeLog 3165
+SHA256 9c4b4a57e2806d95a82f2b9239c1f297efa58d2f921b22c3e2d2f6c8a1436565 ChangeLog 3165
+MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
+MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
+RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 metadata.xml 156
+SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 metadata.xml 156
 MD5 8aa501c191936cb24f0bdc10b843de5b files/digest-elvis-2.2.0-r1 238
 RMD160 0d484b3a40ab5b0f24140528dbd58bb5248f6b75 files/digest-elvis-2.2.0-r1 238
 SHA256 3fabe072b56fb0456317219876619e7b16dfe7358fecf4661033603d923ba55e files/digest-elvis-2.2.0-r1 238
+MD5 8aa501c191936cb24f0bdc10b843de5b files/digest-elvis-2.2.0-r2 238
+RMD160 0d484b3a40ab5b0f24140528dbd58bb5248f6b75 files/digest-elvis-2.2.0-r2 238
+SHA256 3fabe072b56fb0456317219876619e7b16dfe7358fecf4661033603d923ba55e files/digest-elvis-2.2.0-r2 238
diff --git a/app-editors/elvis/elvis-2.2.0-r2.ebuild b/app-editors/elvis/elvis-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..45a6bf385cd5
--- /dev/null
+++ b/app-editors/elvis/elvis-2.2.0-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r2.ebuild,v 1.1 2006/09/20 15:50:52 pioto Exp $
+
+inherit eutils versionator
+
+MY_PV="$(replace_version_separator 2 '_')"
+
+DESCRIPTION="A vi/ex clone"
+HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="X"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	X? ( || (
+	( >=x11-proto/xproto-7.0.4
+	>=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 )
+	virtual/x11 ) )"
+PROVIDE="virtual/editor"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--datadir=/usr/share/elvis \
+		--docdir=/usr/share/doc/"${PF}" \
+		$(use_with X x) \
+		|| die "configure failed"
+
+	# Some Makefile fixups (must happen after configure)
+	# Use our CFLAGS
+	sed -i -e "s:gcc -O2:gcc ${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,${D}/etc/elvis,g' Makefile || die "sed 3 failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+	dodir /usr/share/elvis
+	dodir /usr/share/doc/"${PF}"
+	dodir /etc
+	make install \
+		PREFIX="${D}"/usr \
+		BINDIR="${D}"/usr/bin \
+		DATADIR="${D}"/usr/share/elvis \
+		DOCDIR="${D}"/usr/share/doc/"${PF}" || die 'make install failed'
+
+	# Install the man-pages
+	mv doc/elvis.man doc/elvis.1
+	mv doc/elvtags.man doc/elvtags.1
+	mv doc/ref.man doc/ref.1
+	doman doc/*.1 || die 'doman failed'
+
+	# Fixup some READMEs
+	sed -i -e "s,${D},,g" "${D}"/etc/elvis/README \
+		|| die 'sed /etc/elvis/README failed'
+	sed -i -e "s,${D},,g" "${D}"/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
+}
diff --git a/app-editors/elvis/files/digest-elvis-2.2.0-r2 b/app-editors/elvis/files/digest-elvis-2.2.0-r2
new file mode 100644
index 000000000000..2f4cb20be284
--- /dev/null
+++ b/app-editors/elvis/files/digest-elvis-2.2.0-r2
@@ -0,0 +1,3 @@
+MD5 6831b8df3e4a530395e66c2889783752 elvis-2.2_0.tar.gz 1439293
+RMD160 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 elvis-2.2_0.tar.gz 1439293
+SHA256 9a8466b2293798441056bc279736af3a616baaba2f11940396cc60ff71924ea0 elvis-2.2_0.tar.gz 1439293
diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml
new file mode 100644
index 000000000000..5fcb67350f69
--- /dev/null
+++ b/app-editors/elvis/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>vim</herd>
+</pkgmetadata>