gentoo resync : 10.02.2019

3 files changed, 2 insertions, 129 deletions

diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest
index 48bfb69c8918..2648deb205ac 100644
--- a/app-editors/fte/Manifest
+++ b/app-editors/fte/Manifest
@@ -4,10 +4,7 @@ AUX fte-gcc34 1092 BLAKE2B f713cc9b727b2e133a55fcf01b2a22b9d27451deb7db803946160
 AUX fte-interix.patch 1041 BLAKE2B 55f18c0cc954181800e9efcdbf463d4ceaa63ff3ae8f9e062af824bafab5364ab079afae40361d0caba95cca7635c8d756f7317355092293bf901aac4076b031 SHA512 6f43c682b577b838675fe93c9e2b4c225e3c853d2db95f81f84d64508e78c6f957f1c8842343df2d9a6e7d01e5103a6cc2a1cd0cf414cee641b6b11c0d551b78
 AUX fte-new_keyword.patch 340 BLAKE2B a50987a59180352dfec174af7467f153c575442407dbd48b40c7a0c1d2e0260f09a42d55cab122489ea01fd98f4579722ddd39ebc0eecf50d720a464b410e25c SHA512 ab003f671919fb03429ab13adda5025554258e0799844b887cb786c2378e81025893998b0ef3b0b121d82422502d90f5dc8afa9855c1432c8d2f6597ea087c7a
 AUX fte-slang.patch 3567 BLAKE2B 3519a97a1f354ad8515df86ce8dbb8c9a66f531f8f8653c1ddc5d910a97ba794556b9840a5c0694710150e7fddd53dd6bb69e1a70fb40c2c33e0232b9719bf77 SHA512 3f9504d9b4d6de6e012f0aedf762dce51d1fbc79345f2f45f5303bc81194441396cbd7eadc9457e07814cb6d33b6db6ad1186de026b5b474f9419071e4b75d10
-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
-EBUILD fte-20051115-r3.ebuild 2780 BLAKE2B 39ee917eca7bbf6172a1c550d900eaf9d8aef5db4cc325dc11c734560e2679cc0e2522bfeb8f5afcaae92042d3ee73505f89e7b76796dde5550932a58e5ffa2b SHA512 106f6eda464bb37d35d549e8c3a56c53a3571e259e748bf7f975d1e6fce4a4e1fa32ea85f8cc26f38ac5181cdd64af32012a8332594a74c09d4e064779a9778a
-EBUILD fte-20110708-r1.ebuild 2652 BLAKE2B d34bf5ebceccb98c779143b0aa2d63be524855071a99c81ac5094eede5f67c0e21ad74ebf24a33378922403f80464ae56bef960327c77eeb389ec6fd3ad47fea SHA512 a07e6508dbe4dc1e9d4cca7b06935655154dcb5ea936e6fe8d3660cd8fa587200fedc9816317e4a0d1a346b6c2e54a65f465f4846acf7ccc43befc95fb0f1f82
+EBUILD fte-20110708-r1.ebuild 2650 BLAKE2B dd59d0f406114411a1e1c209874638c70c64a3009a25c7bcf9f66e030519ec5bcbb2b5cc7114ac0ee2ad04abb9e589c07d62ceb0bf007c90884ada1a8650ced5 SHA512 7806ebeb454e83cae2dff40f5bb30d942545f22e58ea3cc768dfb5bf944eed6ea1c91176d91a3e6e56df1c29bedbca9820cb9616efd53ef6673d878043569765
 MISC metadata.xml 312 BLAKE2B 0092b7eaef6d8c1e8f1bd490c8d4e9f43909d86097fbf06692b2e92e7496332bac289bb40fc3cb9a7dc1d32a63ca19db01cc75e0a9014f1d2e8074816ed26a8b SHA512 3946924797105501c1388f172caf774488ebb480ff13664fffd75fb30ebdfba27d52c3e7d534e7dcad5204b6074ba28ee25a4724ed117748059fceeff9d23b60
diff --git a/app-editors/fte/fte-20051115-r3.ebuild b/app-editors/fte/fte-20051115-r3.ebuild
deleted file mode 100644
index ea155c1e9f64..000000000000
--- 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 $?
-}
diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild
index af1ba1a960e6..8a8545b19afe 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}"