Move -slang.patch to -r1, and remove unused versions.

Package-Manager: portage-2.1.4.4

6 files changed, 40 insertions, 138 deletions

diff --git a/app-editors/fte/ChangeLog b/app-editors/fte/ChangeLog
index 34579c2cc871..bf5b6d6e278f 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.43 2008/02/09 11:52:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/ChangeLog,v 1.44 2008/02/16 08:59:59 drac Exp $
+
+*fte-20051115-r1 (16 Feb 2008)
+
+  16 Feb 2008; Samuli Suominen <drac@gentoo.org> -files/configpath.patch,
+  -fte-20020324-r2.ebuild, -fte-20050108-r3.ebuild, fte-20051115.ebuild,
+  +fte-20051115-r1.ebuild:
+  Move -slang.patch to -r1, and remove unused versions.
 
   09 Feb 2008; Samuli Suominen <drac@gentoo.org> +files/fte-slang.patch,
   fte-20051115.ebuild:
diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index ae0a5b1031ce..129337a7cc07 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,16 +1,10 @@
-AUX configpath.patch 572 RMD160 bb7a6c4770c3490f44587f2cf0c9060154941615 SHA1 329c14bbb6dca78b67a8b70e0da4d3332f60b57a SHA256 d4f3e90e94945d1a6d37a552e26fae98494b09870ca3aa3667471a56f5d6ddaf
 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
 AUX fte-slang.patch 3595 RMD160 4a16c00a29e84bfec5ea179d19d044f3f92aef4f SHA1 511df0fe643ec06e7b199be1804115e964430a24 SHA256 9bd83f97782446fb7ed7dbfca735f8302fa0bc6e0130b5cef05ba54106e8f372
-DIST fte-20020324-common.zip 184928 RMD160 9e2658b65658462e79b2503004c136eed3b76588 SHA1 673eb4cfbca14a04057876bea9278e570be215e5 SHA256 c20f9abc9c5a8e9efa47b8e0a27f9f666d8aa63cdd20d45b4ecbe64caf888800
-DIST fte-20020324-src.zip 625459 RMD160 15b9115ecb188f212d24b3f2c8373138f7652f85 SHA1 f76d750ad1d69a93a228ce0bebcc602d1fa86fae SHA256 d91379505ed99b0adba078c17c00db3ca88ea291db9e581739b2c2d7411bd48e
-DIST fte-20050108-common.zip 186252 RMD160 e482e2d224162b0c1a9e16d3821f2256bcd3c176 SHA1 3dcd62148d31507733ed7387858c98364cf94292 SHA256 8350045541a36df625d5615f14f9febb3614624b2e6a4f7e776a93f7e4d55921
-DIST fte-20050108-src.zip 545246 RMD160 1cfe07dc1f4b81e395578d41387e61623cd48dbf SHA1 18ac3eb2278f0630db1c4c9bae23dc46b2f76742 SHA256 57b3b883cba32663a5380c9a3f4c48d61319857f319833849ef210467a0bcbde
 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-20020324-r2.ebuild 1778 RMD160 40cfe681f15ab022ff705029f4710f80c7690a2e SHA1 b7d6c2d048d9b90da508c73e3e718d67f747be49 SHA256 967c0802044d7f104f507a926101f1e1581e5707e8b9ba2011e9fa8c1e895dd9
-EBUILD fte-20050108-r3.ebuild 2112 RMD160 2a1e2fa0bd4d5ebc01609fc6524068136e6a9c57 SHA1 fa8e82b9a273a35af444c1ee832eb93982e1e899 SHA256 108bcf1fb1ed455ac32c19c7786d347036ed03e6b8bba141f8462ab00a3f4f0e
-EBUILD fte-20051115.ebuild 2140 RMD160 0be9b0a9a9db284a052aadc3e5f1c1fe93711358 SHA1 cf926ffe718ff447c660b70881df5d300caa48d7 SHA256 46bed8895de114f3b5a3a1e35ae5bae1280344f45508d51342727d209e6040a9
-MISC ChangeLog 6712 RMD160 a3e7201eb4e601a1c6faa9a48b658dfd68f875c9 SHA1 70b551e5dc542ab0055152fb0a146bc02b79495e SHA256 f79c346e9a815976cc437e9a83ce810c49fccaf4472c860eaf34bb969ba3dc98
+EBUILD fte-20051115-r1.ebuild 2158 RMD160 18092247cd656384ac8217ba13cfdb337bf4d415 SHA1 e392f412bbca903b3607febc247aedbc732eef86 SHA256 e0cd9ab3bd0e3f7372772cbb8921308471620af3f02a0a74f3279b9c218717f9
+EBUILD fte-20051115.ebuild 2108 RMD160 dc5c603a070549f596ac8240c348bad56e474f01 SHA1 6d001e6e2d6e6e1bf28dc9d3bfc688c94424efb7 SHA256 7fa8dc4837d989e62c711d1be2b38d60c49359fb5b50cd9496665bcb62392426
+MISC ChangeLog 6975 RMD160 3855e7a2b08cd6b3a5aa9e3c20a618982939b197 SHA1 2b67fcd098c30d322eae77e17b249b85cdef5040 SHA256 31f05bec654548b51efa14c9f4ca0e57cd963a118286c4c08ebb265968b7d776
 MISC metadata.xml 339 RMD160 44e3b1b9ab2233175c8e911e5a4cecf48f091256 SHA1 09899b913d87f132809a52f03ed97f46f17694b8 SHA256 3f3e49bb8203f32507cc563ddc9c09368a1f1403e2786e204fbd2b528ede185d
diff --git a/app-editors/fte/files/configpath.patch b/app-editors/fte/files/configpath.patch
deleted file mode 100644
index 168974b3f6a1..000000000000
--- a/app-editors/fte/files/configpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cfte.cpp	2002-03-23 00:46:32.000000000 +0100
-+++ src/cfte.cpp.new	2004-03-17 15:25:13.170166354 +0100
-@@ -1756,8 +1756,8 @@
-         //fprintf(stderr, "Looking for %s\n", Cfg);
-         if (!FileExists(Cfg))
-         {
--            // Okay, now try "local config".
--            sprintf(tmp, "%slocalconfig/%s", StartDir, CfgName);
-+	    // Try at least one FHS compliant location
-+            sprintf(tmp, "/usr/share/fte/%s", CfgName);
-             ExpandPath(tmp, Cfg);
-             //fprintf(stderr, "Looking for %s\n", Cfg);
-             if (!FileExists(Cfg))
diff --git a/app-editors/fte/fte-20020324-r2.ebuild b/app-editors/fte/fte-20020324-r2.ebuild
deleted file mode 100644
index fdc04682be3f..000000000000
--- a/app-editors/fte/fte-20020324-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20020324-r2.ebuild,v 1.10 2007/07/22 08:45:36 omp 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="ppc -sparc x86"
-IUSE="gpm slang X"
-
-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 )
-	app-arch/unzip"
-
-set_targets() {
-	export TARGETS=""
-	use slang && TARGETS="$TARGETS sfte"
-	use X && TARGETS="$TARGETS xfte"
-	use gpm && TARGETS="$TARGETS vfte"
-}
-
-src_unpack() {
-	unpack fte-20020324-src.zip
-	unpack fte-20020324-common.zip
-
-	mv fte fte-20020324
-
-	cd ${S}
-
-	epatch ${FILESDIR}/configpath.patch
-
-	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/fte-20050108-r3.ebuild b/app-editors/fte/fte-20051115-r1.ebuild
index 7034b5d6c1ab..663e4b512f5b 100644
--- a/app-editors/fte/fte-20050108-r3.ebuild
+++ b/app-editors/fte/fte-20051115-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-20050108-r3.ebuild,v 1.6 2007/07/22 08:45:36 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115-r1.ebuild,v 1.1 2008/02/16 08:59:59 drac Exp $
 
 inherit eutils
 
@@ -11,17 +11,19 @@ SRC_URI="mirror://sourceforge/fte/${P}-src.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc -sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86"
 IUSE="gpm slang X"
 S=${WORKDIR}/${PN}
 
-RDEPEND="x11-libs/libXdmcp
-	x11-libs/libXau
-	x11-libs/libX11
-	>=sys-libs/ncurses-5.2
+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 )
+	slang? ( >=sys-libs/slang-2.1.3 )
 	app-arch/unzip"
 
 set_targets() {
@@ -36,10 +38,11 @@ src_unpack() {
 	unpack ${P}-src.zip
 	unpack ${P}-common.zip
 
-	cd ${S}
+	cd "${S}"
 
-	epatch ${FILESDIR}/fte-gcc34
-	epatch ${FILESDIR}/${PN}-new_keyword.patch
+	epatch "${FILESDIR}"/fte-gcc34
+	epatch "${FILESDIR}"/${PN}-new_keyword.patch
+	epatch "${FILESDIR}"/${PN}-slang.patch
 
 	set_targets
 	sed \
@@ -75,32 +78,33 @@ src_compile() {
 
 src_install() {
 	local files
+
+	keepdir /etc/fte
+
 	into /usr
 
 	set_targets
-	files="${TARGETS} cfte compkeys"
+	files="${TARGETS} cfte"
 
 	for i in ${files} ; do
 		dobin src/$i ;
 	done
 
-	dobin ${FILESDIR}/fte
+	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
+	dohtml doc/*
 
 	dodir usr/share/fte
-	cp -R config/* ${D}/usr/share/fte
-	rm -rf ${D}/usr/share/fte/CVS
+	insinto /usr/share/fte
+	doins -r config/*
+
+	rm -rf "${D}"/usr/share/fte/CVS
 }
 
 pkg_postinst() {
 	ebegin "Compiling configuration"
-	cd /usr/share/fte
+	cd /usr/share/fte || die "missing configuration dir"
 	/usr/bin/cfte main.fte /etc/fte/system.fterc
 	eend $?
 }
diff --git a/app-editors/fte/fte-20051115.ebuild b/app-editors/fte/fte-20051115.ebuild
index c9ded0462b21..521965b47392 100644
--- a/app-editors/fte/fte-20051115.ebuild
+++ b/app-editors/fte/fte-20051115.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.ebuild,v 1.8 2008/02/09 11:52:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/fte/fte-20051115.ebuild,v 1.9 2008/02/16 08:59:59 drac Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	)
 	gpm? ( >=sys-libs/gpm-1.20 )"
 DEPEND="${RDEPEND}
-	slang? ( sys-libs/slang )
+	slang? ( =sys-libs/slang-1* )
 	app-arch/unzip"
 
 set_targets() {
@@ -42,7 +42,6 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/fte-gcc34
 	epatch "${FILESDIR}"/${PN}-new_keyword.patch
-	epatch "${FILESDIR}"/${PN}-slang.patch
 
 	set_targets
 	sed \
@@ -90,7 +89,7 @@ src_install() {
 		dobin src/$i ;
 	done
 
-	dobin ${FILESDIR}/fte
+	dobin "${FILESDIR}"/fte
 
 	dodoc Artistic CHANGES BUGS HISTORY README TODO
 	dohtml doc/*
@@ -99,7 +98,7 @@ src_install() {
 	insinto /usr/share/fte
 	doins -r config/*
 
-	rm -rf ${D}/usr/share/fte/CVS
+	rm -rf "${D}"/usr/share/fte/CVS
 }
 
 pkg_postinst() {