+ ~amd64 keyword and 'new keyword' patch

Package-Manager: portage-2.0.51-r15

5 files changed, 124 insertions, 2 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 78f90707951d..8ca6bcd0b18c 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,6 +1,14 @@
 # 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.26 2005/01/30 19:33:11 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.27 2005/01/30 19:54:12 voxus Exp $
+
+*fte-20050108-r2 (30 Jan 2005)
+
+  30 Jan 2005; Konstantin Arkhipov <voxus@gentoo.org>
+  +fte-20050108-r2.ebuild,
+  +files/fte-new_keyword.patch:
+  Added patch to workaround 'new keyword' problem on amd64.
+  Added ~amd64 keyword.  
 
 *fte-20050108-r1 (30 Jan 2005)
 
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index a72d423ce573..ddd5fdaea5cd 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,15 +1,18 @@
+MD5 bda604be1c52ebeb9ee628f7287e6a73 fte-20050108-r2.ebuild 1906
 MD5 0960b72b6494de01232b0fd9da73de46 fte-20020324-r2.ebuild 1738
 MD5 5c94a9147d94a93ae1b28f78190c0e5b fte-20050108-r1.ebuild 1855
 MD5 9e95a238c5e3224f9aaae3ff29d27487 fte-20020324-r1.ebuild 1856
 MD5 87e47c735985989518ca1202edd044c1 fte-20020324.ebuild 1813
-MD5 cbc03fa9551c42db9556f0f90e140504 ChangeLog 4408
+MD5 9104f977906327d19017fe74d6ccda80 ChangeLog 4640
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 0aaf57d747e068d9f581ca0e50ab20b4 fte-20050108.ebuild 1707
 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 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-r2 b/app-editors/fte/files/digest-fte-20050108-r2
new file mode 100644
index 000000000000..9bd190d0e669
--- /dev/null
+++ b/app-editors/fte/files/digest-fte-20050108-r2
@@ -0,0 +1,2 @@
+MD5 910ef0041d5d56ede596fc6eb90c1f11 fte-20050108-src.zip 545246
+MD5 200d22e821e550148c0494b54d7dfd25 fte-20050108-common.zip 186252
diff --git a/app-editors/fte/files/fte-new_keyword.patch b/app-editors/fte/files/fte-new_keyword.patch
new file mode 100644
index 000000000000..c7b2a2b64554
--- /dev/null
+++ b/app-editors/fte/files/fte-new_keyword.patch
@@ -0,0 +1,14 @@
+--- src/con_linux.cpp.orig	2005-01-30 22:46:54.170485296 +0300
++++ src/con_linux.cpp	2005-01-30 22:46:28.859333176 +0300
+@@ -50,7 +50,11 @@
+ #include <linux/major.h>
+ #include <linux/kdev_t.h>
+ #include <linux/kd.h>
++extern "C" {
++#define new xnew
+ #include <linux/keyboard.h>
++#undef new
++}
+ #ifdef USE_GPM
+ extern "C" {
+ #include <gpm.h>
diff --git a/app-editors/fte/fte-20050108-r2.ebuild b/app-editors/fte/fte-20050108-r2.ebuild
new file mode 100644
index 000000000000..4d7e4ed9cb63
--- /dev/null
+++ b/app-editors/fte/fte-20050108-r2.ebuild
@@ -0,0 +1,95 @@
+# 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 $
+
+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 ~amd64"
+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
+	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
+}
+
+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
+}