public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/
@ 2016-10-01 20:11 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2016-10-01 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f2adc93f628e14bf3eaca67b340141213c291c7f
Author:     Kacper Kołodziej <kacper <AT> kolodziej <DOT> in>
AuthorDate: Sat Oct  1 12:05:29 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct  1 20:11:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2adc93f

app-editors/fte: upgrade to EAPI=6

Package-Manager: portage-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/2411

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...{fte-20110708.ebuild => fte-20110708-r1.ebuild} | 38 ++++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/app-editors/fte/fte-20110708.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
similarity index 76%
rename from app-editors/fte/fte-20110708.ebuild
rename to app-editors/fte/fte-20110708-r1.ebuild
index 19c53c6..900419f 100644
--- a/app-editors/fte/fte-20110708.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit eutils toolchain-funcs
 
@@ -20,7 +20,7 @@ IUSE="gpm slang X"
 S="${WORKDIR}/${PN}"
 
 RDEPEND="
-	>=sys-libs/ncurses-5.2
+	sys-libs/ncurses:0=
 	X? (
 		x11-libs/libXdmcp
 		x11-libs/libXau
@@ -32,6 +32,8 @@ DEPEND="${RDEPEND}
 	slang? ( >=sys-libs/slang-2.1.3 )
 	app-arch/unzip"
 
+HTML_DOCS=( doc/. )
+
 set_targets() {
 	export TARGETS=""
 	use slang && TARGETS="${TARGETS} s${PN}"
@@ -43,14 +45,12 @@ set_targets() {
 }
 
 src_prepare() {
-	# Do not apply anymore, posibly deprecated. TODO: Check and clean up.
-	# epatch "${FILESDIR}"/${PN}-gcc34
-	# epatch "${FILESDIR}"/${PN}-new_keyword.patch
-	# epatch "${FILESDIR}"/${PN}-slang.patch
-	# epatch "${FILESDIR}"/${PN}-interix.patch
+	default
 
-	[[ -e /usr/include/linux/keyboard.h ]] && \
-		sed /usr/include/linux/keyboard.h -e '/wait.h/d' > src/hacked_keyboard.h
+	if [[ -e "${EPREFIX}"/usr/include/linux/keyboard.h ]]; then
+		sed "${EPREFIX}"/usr/include/linux/keyboard.h \
+			-e '/wait.h/d' > src/hacked_keyboard.h || die
+	fi
 
 	sed \
 		-e "s:<linux/keyboard.h>:\"hacked_keyboard.h\":" \
@@ -90,35 +90,31 @@ src_compile() {
 		DEFAULT_FTE_CONFIG=../config/main.${PN} UOS=${os}"
 
 	set_targets
-	emake CXX=$(tc-getCXX) OPTIMIZE="${CXXFLAGS}" ${DEFFLAGS} TARGETS="${TARGETS}" all
+	emake CXX="$(tc-getCXX)" OPTIMIZE="${CXXFLAGS}" "${DEFFLAGS}" TARGETS="${TARGETS}" all
 }
 
 src_install() {
-	local files
-
 	keepdir /etc/${PN}
-
 	into /usr
 
 	set_targets
-	files="${TARGETS} c${PN}"
 
+	local i files="${TARGETS} c${PN}"
 	for i in ${files}; do
-		dobin src/$i
+		dobin src/${i}
 	done
 
-	dobin "${FILESDIR}"/${PN}
+	dobin "${FILESDIR}/${PN}"
 
-	dodoc BUGS README TODO
-	dohtml doc/*
+	einstalldocs
 
 	insinto /usr/share/${PN}
-	doins -r config/*
+	doins -r config/.
 }
 
 pkg_postinst() {
 	ebegin "Compiling configuration"
 	cd "${EPREFIX}"/usr/share/${PN} || die "missing configuration dir"
-	"${EPREFIX}"/usr/bin/c${PN} main.${PN} "${EPREFIX}"/etc/${PN}/system.${PN}rc
+	"${EPREFIX}"/usr/bin/c${PN} main.${PN} "${EPREFIX}"/etc/${PN}/system.${PN}rc || die
 	eend $?
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/
@ 2017-01-29 14:38 Fabian Groffen
  0 siblings, 0 replies; 5+ messages in thread
From: Fabian Groffen @ 2017-01-29 14:38 UTC (permalink / raw
  To: gentoo-commits

commit:     e9a871e47a98e57eec3a2bb77bf355f3f90b5c6a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 14:31:55 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 14:38:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a871e4

app-editors/fte: dropped ~x86-interix

Package-Manager: portage-2.3.3

 app-editors/fte/fte-20051115-r3.ebuild | 4 ++--
 app-editors/fte/fte-20110708-r1.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-editors/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild
index 9818594..0eb273b 100644
--- a/app-editors/fte/fte-20051115-r3.ebuild
+++ b/app-editors/fte/fte-20051115-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc -sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"

diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index 900419f..d62ed0a 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/
@ 2019-01-27 14:09 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2019-01-27 14:09 UTC (permalink / raw
  To: gentoo-commits

commit:     6935632ef20b87d81bd2a86471c25532ae67941f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 27 12:30:04 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan 27 14:09:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6935632e

app-editors/fte: stable 20110708-r1 for ppc, bug #676394

Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-editors/fte/fte-20110708-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index e32fb0fe886..af1ba1a960e 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ppc -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/
@ 2019-02-07 12:15 Mikle Kolyada
  0 siblings, 0 replies; 5+ messages in thread
From: Mikle Kolyada @ 2019-02-07 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e2c0c97c2aeb6e1309dd49bee18e6a8154e66e45
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 12:15:04 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 12:15:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2c0c97c

app-editors/fte: Drop old

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-editors/fte/Manifest               |   2 -
 app-editors/fte/fte-20051115-r3.ebuild | 124 ---------------------------------
 2 files changed, 126 deletions(-)

diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index d15e084028d..ff4fbf95bc6 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -1,4 +1,2 @@
-DIST fte-20051115-common.zip 187849 BLAKE2B eb410c64b40650b475fb651a014c4ddf2cece6471f2144928b88644a04f9fe4886caf6f0f4b8d679a8fb506461bf7973f1e2bd3a9d8163f462e8eb03f2d85163 SHA512 18e1657a6fe1b48449dc97a357f00bfeb6626450520b48647e2751cc946d9d1bfc6d77d4b0fbdff0a980121502da870f739846b1db9569ff0b305530ee717323
-DIST fte-20051115-src.zip 549216 BLAKE2B 0ec3eeea813380cb0c2cac55dc42beaeecb10ec3c6bac02668d995b5735443cb92cdc430135973190560a8a4e9096737d9bc6b448258fa9e04c4bb1b18235609 SHA512 320c2c4f27041ff5e7417288e5acc8c776013da4aa7cfc187e6207086851642a7ed961383ca19f6ae6c1717a59453c6a9ca40a1c7eb77dae6e5b9184cd7c346a
 DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1
 DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089

diff --git a/app-editors/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild
deleted file mode 100644
index ea155c1e9f6..00000000000
--- a/app-editors/fte/fte-20051115-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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 Artistic )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-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"
-
-	[[ ${CHOST} == *-linux-gnu* ]] \
-		&& TARGETS="${TARGETS} vfte" \
-		|| TARGETS="${TARGETS} nfte"
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/fte-gcc34 \
-		"${FILESDIR}"/${PN}-new_keyword.patch \
-		"${FILESDIR}"/${PN}-slang.patch \
-		"${FILESDIR}"/${PN}-interix.patch \
-		"${FILESDIR}"/${PN}-cpp14.patch # bug #595048
-
-	[[ -e /usr/include/linux/keyboard.h ]] && \
-		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"
-	ecvs_clean
-}
-
-src_configure() {
-	set_targets
-	sed \
-		-e "s:@targets@:${TARGETS}:" \
-		-e '/^XINCDIR  =/c\XINCDIR  =' \
-		-e '/^XLIBDIR  =/c\XLIBDIR  = -lstdc++' \
-		-e '/^SINCDIR   =/c\SINCDIR = -I'"${EPREFIX}"'/usr/include/slang' \
-		-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() {
-	local os="-DLINUX" # by now the default in makefile
-	[[ ${CHOST} == *-interix* ]] && os=
-
-	DEFFLAGS="PREFIX='${EPREFIX}'/usr CONFIGDIR='${EPREFIX}'/usr/share/fte \
-		DEFAULT_FTE_CONFIG=../config/main.fte UOS=${os}"
-
-	set_targets
-	emake CXX=$(tc-getCXX) OPTIMIZE="${CXXFLAGS}" ${DEFFLAGS} TARGETS="${TARGETS}" all
-}
-
-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 CHANGES BUGS HISTORY README TODO
-	dohtml doc/*
-
-	insinto /usr/share/fte
-	doins -r config/*
-}
-
-pkg_postinst() {
-	ebegin "Compiling configuration"
-	cd "${EPREFIX}"/usr/share/fte || die "missing configuration dir"
-	"${EPREFIX}"/usr/bin/cfte main.fte "${EPREFIX}"/etc/fte/system.fterc
-	eend $?
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/
@ 2019-02-07 12:15 Mikle Kolyada
  0 siblings, 0 replies; 5+ messages in thread
From: Mikle Kolyada @ 2019-02-07 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     524f3396e6cda9f8677c57119389175787791669
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 12:13:43 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 12:13:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524f3396

app-editors/fte: amd64 stable wrt bug #676394

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-editors/fte/fte-20110708-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index 51caaafbbac..8a8545b19af 100644
--- a/app-editors/fte/fte-20110708-r1.ebuild
+++ b/app-editors/fte/fte-20110708-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="|| ( GPL-2 Artistic )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="gpm slang X"
 
 S="${WORKDIR}/${PN}"


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-02-07 12:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-01 20:11 [gentoo-commits] repo/gentoo:master commit in: app-editors/fte/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2017-01-29 14:38 Fabian Groffen
2019-01-27 14:09 Sergei Trofimovich
2019-02-07 12:15 Mikle Kolyada
2019-02-07 12:15 Mikle Kolyada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox