Remove old ebuilds, make modular X friendly.

(Portage version: 2.0.54)

9 files changed, 84 insertions, 121 deletions

diff --git a/app-editors/elvis/ChangeLog b/app-editors/elvis/ChangeLog
index b74f54c73ee2..05376fd23cd4 100644
--- a/app-editors/elvis/ChangeLog
+++ b/app-editors/elvis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/elvis
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.18 2005/09/20 18:11:38 kito Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.19 2006/01/20 00:18:28 vanquirius Exp $
+
+*elvis-2.2.0-r1 (20 Jan 2006)
+
+  20 Jan 2006; Marcelo Goes <vanquirius@gentoo.org>
+  -files/elvis-2.1.4-keysym.patch, -elvis-2.1.4.ebuild,
+  -elvis-2.1.4-r1.ebuild, +elvis-2.2.0-r1.ebuild:
+  Remove old ebuilds, make modular X friendly.
 
   20 Sep 2005; Kito <kito@gentoo.org> elvis-2.2.0.ebuild:
   ~ppc-macos. Closes Bug 106579
diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest
index 1e8ec944379c..40868197e0c4 100644
--- a/app-editors/elvis/Manifest
+++ b/app-editors/elvis/Manifest
@@ -1,8 +1,5 @@
 MD5 c54602d23a859582e272726599559e87 ChangeLog 2107
-MD5 5af428ac46df88d49ac025aa8414e630 elvis-2.1.4-r1.ebuild 1322
-MD5 7fd6141c6013d2c72aa3e8c0e4833c41 elvis-2.1.4.ebuild 1026
+MD5 61fa2d85a9200a830e8e75fee2036673 elvis-2.2.0-r1.ebuild 1939
 MD5 a4f41fd0cd5a38fe443b3324355cb0fe elvis-2.2.0.ebuild 1777
-MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4 64
-MD5 1762fdf10bd50258327aa776db1ddcb8 files/digest-elvis-2.1.4-r1 64
 MD5 ba372ffdf92479b8a5d069ed732da44e files/digest-elvis-2.2.0 64
-MD5 718daade31001ee4158c1fbf2c531845 files/elvis-2.1.4-keysym.patch 307
+MD5 ba372ffdf92479b8a5d069ed732da44e files/digest-elvis-2.2.0-r1 64
diff --git a/app-editors/elvis/elvis-2.1.4-r1.ebuild b/app-editors/elvis/elvis-2.1.4-r1.ebuild
deleted file mode 100644
index cc05d761485c..000000000000
--- a/app-editors/elvis/elvis-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4-r1.ebuild,v 1.21 2005/01/01 13:23:44 eradicator Exp $
-
-inherit eutils
-
-MY_P="${PN}-2.1_4"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
-IUSE="X"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	X? ( virtual/x11 )"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix bug 20864 using patch from FreeBSD port.
-	# http://www.freshports.org/editors/elvis/
-	epatch ${FILESDIR}/elvis-2.1.4-keysym.patch || die "epatch failed"
-}
-
-src_compile() {
-	local myconf
-	use X \
-		&& myconf="--with-x" \
-		|| myconf="--without-x"
-
-	./configure \
-		--bindir=${D}/usr/bin \
-		--datadir=${D}/usr/share/elvis \
-		${myconf} || die
-
-	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile
-	sed -i -e "s:${D}/usr/share/elvis:/usr/share/elvis:" config.h
-	make || die
-}
-
-src_install() {
-	sed -i -e "s:/usr/man:${D}/usr/share/man:g" instman.sh
-
-	sed -i -e "s:^xinc=.*$:xinc=${D}/usr/include:" \
-	 -e "s:^xlib=.*$:xlib=${D}/usr/lib:" \
-		insticon.sh
-
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	make install || die
-}
diff --git a/app-editors/elvis/elvis-2.1.4.ebuild b/app-editors/elvis/elvis-2.1.4.ebuild
deleted file mode 100644
index 1bff80b91f07..000000000000
--- a/app-editors/elvis/elvis-2.1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.1.4.ebuild,v 1.17 2005/01/01 13:23:44 eradicator Exp $
-
-MY_P="${PN}-2.1_4"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="X"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	X? ( virtual/x11 )"
-PROVIDE="virtual/editor"
-
-src_compile() {
-	local myconf
-	use X \
-		&& myconf="--with-x" \
-		|| myconf="--without-x"
-	./configure \
-		--bindir=${D}/usr/bin \
-		--datadir=${D}/usr/share/elvis \
-		${myconf} || die
-
-	sed -i -e "s:gcc -O2:gcc ${CFLAGS}:" Makefile
-	make || die
-}
-
-src_install() {
-	sed -i -e "s:/usr/man:${D}/usr/share/man:g" instman.sh
-
-	sed -i -e "s:^xinc=.*$:xinc=${D}/usr/include:" \
-	 -e "s:^xlib=.*$:xlib=${D}/usr/lib:" \
-		insticon.sh
-
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	make install || die
-}
diff --git a/app-editors/elvis/elvis-2.2.0-r1.ebuild b/app-editors/elvis/elvis-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..c82262c2b667
--- /dev/null
+++ b/app-editors/elvis/elvis-2.2.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-r1.ebuild,v 1.1 2006/01/20 00:18:28 vanquirius Exp $
+
+inherit eutils
+
+MY_P="${PN}-2.2_0"
+S="${WORKDIR}/${MY_P}"
+DESCRIPTION="A vi/ex clone"
+HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/"
+SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${MY_P}.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"
+
+src_compile() {
+	./configure \
+		--prefix=/usr \
+		--bindur=/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'
+}
diff --git a/app-editors/elvis/files/digest-elvis-2.1.4 b/app-editors/elvis/files/digest-elvis-2.1.4
deleted file mode 100644
index 2775bba36c77..000000000000
--- a/app-editors/elvis/files/digest-elvis-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5a5040899bdc197e9ccc70a561a6676 elvis-2.1_4.tar.gz 1052052
diff --git a/app-editors/elvis/files/digest-elvis-2.1.4-r1 b/app-editors/elvis/files/digest-elvis-2.1.4-r1
deleted file mode 100644
index 2775bba36c77..000000000000
--- a/app-editors/elvis/files/digest-elvis-2.1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5a5040899bdc197e9ccc70a561a6676 elvis-2.1_4.tar.gz 1052052
diff --git a/app-editors/elvis/files/digest-elvis-2.2.0-r1 b/app-editors/elvis/files/digest-elvis-2.2.0-r1
new file mode 100644
index 000000000000..d06a55ca968b
--- /dev/null
+++ b/app-editors/elvis/files/digest-elvis-2.2.0-r1
@@ -0,0 +1 @@
+MD5 6831b8df3e4a530395e66c2889783752 elvis-2.2_0.tar.gz 1439293
diff --git a/app-editors/elvis/files/elvis-2.1.4-keysym.patch b/app-editors/elvis/files/elvis-2.1.4-keysym.patch
deleted file mode 100644
index 17382661485a..000000000000
--- a/app-editors/elvis/files/elvis-2.1.4-keysym.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guix11/guix11.h.orig	Wed Mar 12 22:40:16 2003
-+++ guix11/guix11.h	Wed Mar 12 22:40:25 2003
-@@ -12,7 +12,7 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #define XK_MISCELLANY
--#include <X11/keysymdef.h>
-+#include <X11/keysym.h>
- #include <X11/Xatom.h>
- #include <X11/Xresource.h>
- #ifdef NEED_XOS_H