Respect LDFLAGS (bug #337413), CFLAGS (bug #239928), CXX. Add x11-libs/libXpm dependency (bug #216444 by Evil Compile Person). Split off configure and prepare from unpack. Replace cat | grep with sed. Die on sed/dobin.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

3 files changed, 125 insertions, 13 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 61bcd53391e9..aea4565c3a62 100644
--- a/app-editors/fte/ChangeLog
+++ b/app-editors/fte/ChangeLog
@@ -1,6 +1,13 @@
 # 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.48 2008/11/17 19:56:48 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.49 2010/12/30 17:42:19 jer Exp $
+
+*fte-20051115-r2 (30 Dec 2010)
+
+  30 Dec 2010; Jeroen Roovers <jer@gentoo.org> +fte-20051115-r2.ebuild:
+  Respect LDFLAGS (bug #337413), CFLAGS (bug #239928), CXX. Add x11-libs/libXpm
+  dependency (bug #216444 by Evil Compile Person). Split off configure and
+  prepare from unpack. Replace cat | grep with sed. Die on sed/dobin.
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/fte-slang.patch:
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 44c72a5a072f..82692d120790 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fte 604 RMD160 7d4b76fadc215c8e8f1c410f4212f5ebcb0dbfff SHA1 4a33bfe442b7c14a355b7f195678cf751bcdba21 SHA256 ab2f22eb5fe1d1df82c0f976a457979f66b0c4f605fb69baba46d50204021f0c
 AUX fte-gcc34 1092 RMD160 d78b030cde6da6beeef6fe225468e2b388b099cc SHA1 08b03caeea2dfb2e664f5c88a33d54a53bd4ce24 SHA256 c3f452a0b72182c50a2f3057a10d749d8a304890b0844ad9ee572cf4ebf83811
 AUX fte-new_keyword.patch 340 RMD160 05ab1d867f830814255834bb35226a0c1712c485 SHA1 936f1080189d90b5191d00c9bf607823acc1beee SHA256 c30c5c216ee481a6e1fe964d12998b5b36e288d30883f9ced88fca60ab7253b8
@@ -8,12 +5,6 @@ AUX fte-slang.patch 3567 RMD160 c1d8027bdb4b3315dbb0018d12b39aede9c5f556 SHA1 35
 DIST fte-20051115-common.zip 187849 RMD160 07b0406abd9dfafcce83b39d175bac54ad6bc21d SHA1 a4a8088bdafbfc649ed9819bdcb274f617fedf4e SHA256 794031dd1d06156259d21ddcb3dec3196001818ea7116e9786b54314484dabf4
 DIST fte-20051115-src.zip 549216 RMD160 0db9941c1dfeb48a651b004590ef0cac9bfdf4b7 SHA1 2ef22f36b523c7c89ccff93849b7b9009b9065d9 SHA256 bb4135e5c39223fa346d20613052e69090b14ed46855d5134bf2dbc4ba40d962
 EBUILD fte-20051115-r1.ebuild 2155 RMD160 f02ca07fe10e032286533e0657c4fd193b75aecf SHA1 a6bc76ed207a62d41fc2a530bd8c1f3f34c6560f SHA256 0bd8b9e960b9688b1f32b9a7f2ea3dd8b83b276d5df9da365a8910fe12a62e37
-MISC ChangeLog 7406 RMD160 3ce6e0201b703f318fdc5e1e4ecbfc8e70ac9b3c SHA1 c5b8b1faa994353a83a9d95729ab1bf81e7bf20c SHA256 c3987c16c22469d375827dba0eabbd4f6d140f979bad826258ed4076d6db2b04
+EBUILD fte-20051115-r2.ebuild 2446 RMD160 01dee7f5e02acaf086175525f145561333d0b5d3 SHA1 94bc088ad26dc4a3bf2029e35b59b35ddd9fefa9 SHA256 3be1d316160a7ea6ec548721a82509cb514f4ae0615f754bb60d38a7552a79e2
+MISC ChangeLog 7730 RMD160 f4c7404aab0d0612959c655ee543db75e579611b SHA1 dcd9630d41f643b24b5f01b6fa57258ef879f30e SHA256 7c30350887deccce7c1d9d948f64edaf3c76c14db8d373e93e6997f8dd7aa1f6
 MISC metadata.xml 299 RMD160 8abd04fe41ae98b0c4b8b6fbe4fd28805770acaf SHA1 4260f0b3bd104696284264b4c8f16406280b7665 SHA256 af8cdd02e698b83e07187b14b915572d2a8e6e03afed958ec6a7e91941a2c481
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzQXrcACgkQ9/cejkQaxBBWJACePjVCTzACWcevE61c9M4PzIk3
-z8AAnAuuLjE2cSU89KQ3VENqD1VvEqmn
-=8Ktl
------END PGP SIGNATURE-----
diff --git a/app-editors/fte/fte-20051115-r2.ebuild b/app-editors/fte/fte-20051115-r2.ebuild
new file mode 100644
index 000000000000..6979c6981c1f
--- /dev/null
+++ b/app-editors/fte/fte-20051115-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r2.ebuild,v 1.1 2010/12/30 17:42:18 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+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
+		x11-libs/libXpm
+	)
+	gpm? ( >=sys-libs/gpm-1.20 )"
+DEPEND="${RDEPEND}
+	slang? ( >=sys-libs/slang-2.1.3 )
+	app-arch/unzip"
+
+set_targets() {
+	export TARGETS=""
+	use slang && TARGETS="${TARGETS} sfte"
+	use X && TARGETS="${TARGETS} xfte"
+
+	TARGETS="{$TARGETS} vfte"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/fte-gcc34
+	epatch "${FILESDIR}"/${PN}-new_keyword.patch
+	epatch "${FILESDIR}"/${PN}-slang.patch
+
+	sed /usr/include/linux/keyboard.h -e '/wait.h/d' > src/hacked_keyboard.h
+
+	sed \
+		-e "s:<linux/keyboard.h>:\"hacked_keyboard.h\":" \
+		-i src/con_linux.cpp || die "sed keyboard"
+	sed \
+		-e 's:^OPTIMIZE:#&:g' \
+		-e '/^LDFLAGS/s:=:+=:g' \
+		-e 's:= g++:= $(CXX):g' \
+		-i src/fte-unix.mak || die "sed CFLAGS, LDFLAGS, CC"
+}
+
+src_configure() {
+	set_targets
+	sed \
+		-e "s:@targets@:${TARGETS}:" \
+		-i src/fte-unix.mak || die "sed targets"
+
+	if ! use gpm; then
+		sed \
+			-e "s:#define USE_GPM://#define USE_GPM:" \
+			-i src/con_linux.cpp || die "sed USE_GPM"
+		sed \
+			-e "s:-lgpm::" \
+			-i src/fte-unix.mak || die "sed -lgpm"
+	fi
+}
+
+src_compile() {
+	DEFFLAGS="PREFIX=/usr CONFIGDIR=/usr/share/fte \
+		DEFAULT_FTE_CONFIG=../config/main.fte"
+
+	set_targets
+	emake CXX=$(tc-getCXX) OPTIMIZE="${CXXFLAGS}" ${DEFFLAGS} TARGETS="${TARGETS}" \
+		all || die "emake failed"
+}
+
+src_install() {
+	local files
+
+	keepdir /etc/fte
+
+	into /usr
+
+	set_targets
+	files="${TARGETS} cfte"
+
+	for i in ${files}; do
+		dobin src/$i || die "dobin ${i}"
+	done
+
+	dobin "${FILESDIR}"/fte || die "dobin 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 $?
+}