3 files changed, 5 insertions, 97 deletions
diff --git a/x11-terms/xvt/ChangeLog b/x11-terms/xvt/ChangeLog
index ce5b9a730491..7b76571afbe6 100644
--- a/x11-terms/xvt/ChangeLog
+++ b/x11-terms/xvt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/xvt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.21 2012/03/02 23:03:05 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/ChangeLog,v 1.22 2012/06/28 09:29:34 kensington Exp $
+
+  28 Jun 2012; Michael Palimaka <kensington@gentoo.org> -xvt-2.1-r1.ebuild,
+  -xvt-2.1-r2.ebuild:
+  Remove old.
 
   02 Mar 2012; Tobias Klausmann <klausman@gentoo.org> xvt-2.1-r3.ebuild:
   Stable on alpha, bug #397297
@@ -78,4 +82,3 @@
   23 Nov 2003; Tavis Ormandy <taviso@gentoo.org> xvt-2.1.ebuild,
   files/xvt-2.1.diff.gz:
   initial import
-
diff --git a/x11-terms/xvt/xvt-2.1-r1.ebuild b/x11-terms/xvt/xvt-2.1-r1.ebuild
deleted file mode 100644
index d10eef7e0d94..000000000000
--- a/x11-terms/xvt/xvt-2.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r1.ebuild,v 1.9 2010/01/11 17:58:35 armin76 Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A tiny vt100 terminal emulator for X"
-HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
-SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
-		mirror://gentoo/xvt-2.1.diff.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-S=${WORKDIR}/${PN}-1.0
-
-src_unpack() {
-	unpack ${A}
-
-	# this brings the distribution upto version 2.1
-	cd "${S}"
-	epatch "${WORKDIR}"/xvt-2.1.diff
-
-	# fix #61393
-	epatch "${FILESDIR}"/xvt-ttyinit-svr4pty.diff
-
-	# set the makefile options
-	sed -i 's/#\(ARCH=LINUX\)/\1/g' Makefile
-
-	# set CFLAGS
-	sed -i "s^\(CFLAGS=\)-O^\1${CFLAGS}^g" Makefile
-
-	# make gcc quiet.
-	sed -i -e 's/^void$/int/' -e 's/^void\( main\)/int\1/g' xvt.c
-
-}
-
-src_compile() {
-	# emake -j1 config
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xvt || die "dobin failed"
-	doman xvt.1
-	dodoc README
-}
diff --git a/x11-terms/xvt/xvt-2.1-r2.ebuild b/x11-terms/xvt/xvt-2.1-r2.ebuild
deleted file mode 100644
index 4e16dcf41ca3..000000000000
--- a/x11-terms/xvt/xvt-2.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xvt/xvt-2.1-r2.ebuild,v 1.2 2010/01/11 17:58:35 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A tiny vt100 terminal emulator for X"
-HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
-SRC_URI="ftp://ftp.x.org/R5contrib/xvt-1.0.tar.Z
-		mirror://gentoo/xvt-2.1.diff.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-S=${WORKDIR}/${PN}-1.0
-
-src_prepare() {
-	# this brings the distribution upto version 2.1
-	epatch "${WORKDIR}"/xvt-2.1.diff
-
-	# fix #61393
-	epatch "${FILESDIR}/xvt-ttyinit-svr4pty.diff"
-
-	# CFLAGS, CC #241554
-	epatch "${FILESDIR}/xvt-makefile.patch"
-
-	# int main, not void main
-	epatch "${FILESDIR}/xvt-int-main.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xvt || die "dobin failed"
-	doman xvt.1
-	dodoc README
-}