amd64 stable wrt #211990

(Portage version: 2.1.4.4)

3 files changed, 7 insertions, 112 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 88504b68205c..3cf252c1af12 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/fte
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.46 2008/03/09 14:39:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.47 2008/03/10 13:58:16 drac Exp $
+
+  10 Mar 2008; Samuli Suominen <drac@gentoo.org> -fte-20051115.ebuild,
+  fte-20051115-r1.ebuild:
+  amd64 stable wrt #211990
 
   09 Mar 2008; nixnut <nixnut@gentoo.org> fte-20051115-r1.ebuild:
   Stable on ppc wrt bug 211990
diff --git a/app-editors/fte/fte-20051115-r1.ebuild b/app-editors/fte/fte-20051115-r1.ebuild
index b164634e062d..e7a9185dce60 100644
--- a/app-editors/fte/fte-20051115-r1.ebuild
+++ b/app-editors/fte/fte-20051115-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r1.ebuild,v 1.3 2008/03/09 14:39:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r1.ebuild,v 1.4 2008/03/10 13:58:16 drac Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc -sparc x86"
+KEYWORDS="~alpha amd64 ppc -sparc x86"
 IUSE="gpm slang X"
 S=${WORKDIR}/${PN}
 
diff --git a/app-editors/fte/fte-20051115.ebuild b/app-editors/fte/fte-20051115.ebuild
deleted file mode 100644
index 521965b47392..000000000000
--- a/app-editors/fte/fte-20051115.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115.ebuild,v 1.9 2008/02/16 08:59:59 drac Exp $
-
-inherit eutils
-
-DESCRIPTION="Lightweight text-mode editor"
-HOMEPAGE="http://fte.sourceforge.net"
-SRC_URI="mirror://sourceforge/fte/${P}-src.zip
-	mirror://sourceforge/fte/${P}-common.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc -sparc x86"
-IUSE="gpm slang X"
-S=${WORKDIR}/${PN}
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	X? (
-		x11-libs/libXdmcp
-		x11-libs/libXau
-		x11-libs/libX11
-	)
-	gpm? ( >=sys-libs/gpm-1.20 )"
-DEPEND="${RDEPEND}
-	slang? ( =sys-libs/slang-1* )
-	app-arch/unzip"
-
-set_targets() {
-	export TARGETS=""
-	use slang && TARGETS="$TARGETS sfte"
-	use X && TARGETS="$TARGETS xfte"
-
-	TARGETS="$TARGETS vfte"
-}
-
-src_unpack() {
-	unpack ${P}-src.zip
-	unpack ${P}-common.zip
-
-	cd "${S}"
-
-	epatch "${FILESDIR}"/fte-gcc34
-	epatch "${FILESDIR}"/${PN}-new_keyword.patch
-
-	set_targets
-	sed \
-		-e "s:@targets@:${TARGETS}:" \
-		-e "s:@cflags@:${CFLAGS}:" \
-		-i src/fte-unix.mak
-
-	if ! use gpm; then
-		sed \
-			-e "s:#define USE_GPM://#define USE_GPM:" \
-			-i src/con_linux.cpp
-		sed \
-			-e "s:-lgpm::" \
-			-i src/fte-unix.mak
-	fi
-
-	cat /usr/include/linux/keyboard.h \
-		| grep -v "wait.h" \
-		> src/hacked_keyboard.h
-
-	sed \
-		-e "s:<linux/keyboard.h>:\"hacked_keyboard.h\":" \
-		-i src/con_linux.cpp
-}
-
-src_compile() {
-	DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \
-		DEFAULT_FTE_CONFIG=../config/main.fte OPTIMIZE="
-
-	set_targets
-	emake $DEFFLAGS TARGETS="$TARGETS" all || die
-}
-
-src_install() {
-	local files
-
-	keepdir /etc/fte
-
-	into /usr
-
-	set_targets
-	files="${TARGETS} cfte"
-
-	for i in ${files} ; do
-		dobin src/$i ;
-	done
-
-	dobin "${FILESDIR}"/fte
-
-	dodoc Artistic CHANGES BUGS HISTORY README TODO
-	dohtml doc/*
-
-	dodir usr/share/fte
-	insinto /usr/share/fte
-	doins -r config/*
-
-	rm -rf "${D}"/usr/share/fte/CVS
-}
-
-pkg_postinst() {
-	ebegin "Compiling configuration"
-	cd /usr/share/fte || die "missing configuration dir"
-	/usr/bin/cfte main.fte /etc/fte/system.fterc
-	eend $?
-}