closing bug #75250 and taking it over

(Portage version: 2.0.51.21-r1)

7 files changed, 35 insertions, 198 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 8ca6bcd0b18c..9b94450bed0c 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-editors/fte
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.27 2005/01/30 19:54:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.28 2005/05/14 14:22:40 voxus Exp $
+
+*fte-20050108-r3 (14 May 2005)
+
+  14 May 2005; Konstantin Arkhipov <voxus@gentoo.org> ChangeLog,
+  -fte-20050108.ebuild, -fte-20050108-r1.ebuild, -fte-20050108-r2.ebuild,
+  +fte-20050108-r3.ebuild:
+  Taking this one over. Fixed changeLog's formatting and bug #75250.
+  Cleaned out old ebuilds.
+  Fixed metadata.
 
 *fte-20050108-r2 (30 Jan 2005)
 
@@ -68,7 +77,6 @@
 *fte-20020324 (17 May 2002)
 
   10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
-
   Removed redundant patches in files/.  Also, inherit eutils to use epatch
   in the two older versions.  And change from cat | sed to just sed.  And
   finally change sed expression delimiters from / to :, closing bug #15006
@@ -83,7 +91,6 @@
   Added ppc to keywords
 
   17 May 2002; M.Thibaut <murphy@gentoo.org> fte-20020324.ebuild :
-  
   New version of FTE released - Resolves bug #2587. Also some changes in 
   the ebuild that should make future releases easier. qfte has been disabled
   because it doesn't compile.
@@ -102,18 +109,19 @@
   sascha-gentoo-bugzilla@silbe.org (Sascha Silbe)
 
 *fte-20010819-r2 (24 Apr 2002)
+
   24 Apr 2002; Spider <spider@gentoo.org> ChangeLog fte-20010819-r2.ebuild : 
+
   Seems my logic was flawed yesterday. this program needs gpm to compile
 at all. Blah
 
-
 *fte-20010819-r1 (23 Apr 2002)
+
   23 Apr 2002; Spider <spider@gentoo.org> ChangeLog fte-20010819-r2.ebuild : 
   Add missing patch in -r1 
   (Wrong name)
   Update with -r2 that adds gpm? ( ) dependency and ncurses dependency
   closes bug #2004
-  
 
   30 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
 
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index ddd5fdaea5cd..286d7475afb5 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,18 +1,14 @@
-MD5 bda604be1c52ebeb9ee628f7287e6a73 fte-20050108-r2.ebuild 1906
 MD5 0960b72b6494de01232b0fd9da73de46 fte-20020324-r2.ebuild 1738
-MD5 5c94a9147d94a93ae1b28f78190c0e5b fte-20050108-r1.ebuild 1855
+MD5 3131ae693d8564d11d0eefad49a965eb fte-20050108-r3.ebuild 2084
 MD5 9e95a238c5e3224f9aaae3ff29d27487 fte-20020324-r1.ebuild 1856
 MD5 87e47c735985989518ca1202edd044c1 fte-20020324.ebuild 1813
-MD5 9104f977906327d19017fe74d6ccda80 ChangeLog 4640
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 0aaf57d747e068d9f581ca0e50ab20b4 fte-20050108.ebuild 1707
+MD5 eb74aabddc275f2871c9a50c2c1ba31e ChangeLog 4948
+MD5 b73a542414b6cbad1ebdccc7279b7828 metadata.xml 318
 MD5 7c996af2e2e68f96a748f4269c76f710 files/fte 604
 MD5 333d7c07d793fca986bf2558e5105607 files/configpath.patch 572
-MD5 5890d034c66b5003475090a5312cfbe8 files/digest-fte-20050108-r1 133
-MD5 5890d034c66b5003475090a5312cfbe8 files/digest-fte-20050108-r2 133
+MD5 5890d034c66b5003475090a5312cfbe8 files/digest-fte-20050108-r3 133
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324-r1 133
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324-r2 133
 MD5 23d2b8a8749e3a4a9f9ab911641d50e8 files/digest-fte-20020324 133
-MD5 5890d034c66b5003475090a5312cfbe8 files/digest-fte-20050108 133
 MD5 6247d87b3178cdf9fbcb8c9dbca1549a files/fte-new_keyword.patch 340
 MD5 be13218f7abfe31d83940c80adcbc59c files/fte-gcc34 1092
diff --git a/app-editors/fte/files/digest-fte-20050108-r3 b/app-editors/fte/files/digest-fte-20050108-r3
new file mode 100644
index 000000000000..9bd190d0e669
--- /dev/null
+++ b/app-editors/fte/files/digest-fte-20050108-r3
@@ -0,0 +1,2 @@
+MD5 910ef0041d5d56ede596fc6eb90c1f11 fte-20050108-src.zip 545246
+MD5 200d22e821e550148c0494b54d7dfd25 fte-20050108-common.zip 186252
diff --git a/app-editors/fte/fte-20050108-r1.ebuild b/app-editors/fte/fte-20050108-r1.ebuild
deleted file mode 100644
index b8dd83494fe8..000000000000
--- a/app-editors/fte/fte-20050108-r1.ebuild
+++ /dev/null
@@ -1,94 +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/fte/fte-20050108-r1.ebuild,v 1.1 2005/01/30 19:33:11 voxus 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="~x86 ~ppc ~sparc"
-IUSE="gpm slang X"
-S=${WORKDIR}/${PN}
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( >=sys-libs/gpm-1.20 )"
-DEPEND="${RDEPEND}
-	slang? ( sys-libs/slang )
-	app-arch/unzip
-	X? ( virtual/x11 )"
-
-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
-
-	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
-}
-
-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
-	into /usr
-
-	set_targets
-	files="${TARGETS} cfte compkeys"
-
-	for i in ${files} ; do
-		dobin src/$i ;
-	done
-
-	dobin ${FILESDIR}/fte
-
-	dodoc Artistic CHANGES BUGS HISTORY README TODO
-
-	keepdir etc/fte
-
-	dodir usr/share/doc/${P}/html
-	cp doc/INDEX doc/*.html ${D}/usr/share/doc/${P}/html
-
-	dodir usr/share/fte
-	cp -R config/* ${D}/usr/share/fte
-	rm -rf ${D}/usr/share/fte/CVS
-}
-
-pkg_postinst() {
-	einfo "Compiling configuration..."
-	cd /usr/share/fte
-	/usr/bin/cfte main.fte /etc/fte/system.fterc
-}
diff --git a/app-editors/fte/fte-20050108-r2.ebuild b/app-editors/fte/fte-20050108-r3.ebuild
index 4d7e4ed9cb63..18e2df6e8502 100644
--- a/app-editors/fte/fte-20050108-r2.ebuild
+++ b/app-editors/fte/fte-20050108-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20050108-r2.ebuild,v 1.1 2005/01/30 19:54:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20050108-r3.ebuild,v 1.1 2005/05/14 14:22:40 voxus Exp $
 
 inherit eutils
 
@@ -53,6 +53,14 @@ src_unpack() {
 			-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() {
@@ -89,7 +97,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Compiling configuration..."
+	ebegin "Compiling configuration"
 	cd /usr/share/fte
 	/usr/bin/cfte main.fte /etc/fte/system.fterc
+	eend $?
 }
diff --git a/app-editors/fte/fte-20050108.ebuild b/app-editors/fte/fte-20050108.ebuild
deleted file mode 100644
index d1d55971c1c1..000000000000
--- a/app-editors/fte/fte-20050108.ebuild
+++ /dev/null
@@ -1,84 +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/fte/fte-20050108.ebuild,v 1.1 2005/01/12 16:05:16 hanno 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="~x86 ~ppc ~sparc"
-IUSE="gpm slang X"
-S=${WORKDIR}/${PN}
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( >=sys-libs/gpm-1.20 )"
-DEPEND="${RDEPEND}
-	slang? ( sys-libs/slang )
-	app-arch/unzip
-	X? ( virtual/x11 )"
-
-set_targets() {
-	export TARGETS=""
-	use slang && TARGETS="$TARGETS sfte"
-	use X && TARGETS="$TARGETS xfte"
-	use gpm && TARGETS="$TARGETS vfte"
-}
-
-src_unpack() {
-	unpack ${P}-src.zip
-	unpack ${P}-common.zip
-
-	cd ${S}
-
-	epatch ${FILESDIR}/fte-gcc34
-
-	set_targets
-	sed \
-		-e "s:@targets@:${TARGETS}:" \
-		-e "s:@cflags@:${CFLAGS}:" \
-		-i src/fte-unix.mak
-}
-
-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
-	into /usr
-
-	set_targets
-	files="${TARGETS} cfte compkeys"
-
-	for i in ${files} ; do
-		dobin src/$i ;
-	done
-
-	dobin ${FILESDIR}/fte
-
-	dodoc Artistic CHANGES BUGS HISTORY README TODO
-
-	keepdir etc/fte
-
-	dodir usr/share/doc/${P}/html
-	cp doc/INDEX doc/*.html ${D}/usr/share/doc/${P}/html
-
-	dodir usr/share/fte
-	cp -R config/* ${D}/usr/share/fte
-	rm -rf ${D}/usr/share/fte/CVS
-}
-
-pkg_postinst() {
-	einfo "Compiling configuration..."
-	cd /usr/share/fte
-	/usr/bin/cfte main.fte /etc/fte/system.fterc
-}
diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml
index d8b96be3c5cd..8ffebb84ef8a 100644
--- a/app-editors/fte/metadata.xml
+++ b/app-editors/fte/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
+<maintainer>
+  <email>voxus@gentoo.org</email>
+  <description>Konstantin V. Arkhipov</description>
+</maintainer>
+<longdescription>Lightweight text-mode editor.</longdescription> 
 </pkgmetadata>