gentoo resync : 13.10.2019

3 files changed, 2 insertions, 64 deletions

diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index f77607d4cb46..0b2579e1157b 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,4 +1,3 @@
 DIST jed-0.99-19.tar.bz2 884198 BLAKE2B c3d967e59b909a39d0f7fb49c8ce9aef70585ba433bc5c6bebf5db1b6b88de0c41b35059a242a38be91a97a5296a279bdc85ac30ec9d4ae221d94e50e41d8995 SHA512 db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
-EBUILD jed-0.99.19-r1.ebuild 1113 BLAKE2B d8e5bce395af77ed43d7b54542c0274dd414e17fe2eec77b939b7fdc9b136878239478b2f0011b63befa0c739dbbff475aac2867f784d731bab739793903f745 SHA512 6c9be8b81b1bd147e4416a4af26d7fdc8a58045cb798e21b246fade1b4edbbeda30d7e899987f40cfb7486d4022754a3d1a2ec11b081fab17146e995278b9327
-EBUILD jed-0.99.19.ebuild 1135 BLAKE2B 31333f1321e4f07b5d37b3198f4f91c22c7578996723c288a2d0152cf31b8dcc2f7c4343bc9c902c47772bcce8f670c048b48ea4eaf7272afd79d3510ca98bf5 SHA512 1311e8b402ab97a696f6538543da6b313fd84d62fd0fb3000642e03205d693d867fcb076843e9edcf1cab139ebeeda898875b6c33e6304381a537fa800d5981f
+EBUILD jed-0.99.19-r1.ebuild 1108 BLAKE2B 83cc4abce340b0ce713cb287f2c481ca5ad7a0d140867d698542ebefd3c77d0efc11405e8b5bc63ea879497de86907bed696a576247ae61fdd2d6ca33152c0c6 SHA512 546f2db3dc94643d966e272a87a3cd50023e85b585627c59f20a14794e39cfecb300577eb120c8f6cf5ddbacd289bbd58f8d9c935e6b73d2e36761fa61f48003
 MISC metadata.xml 614 BLAKE2B 023aea459e74aa16cbfd069da28b6c2bc1b87e17be50f1f49e4f070ef8764a75f53b56b6d61a9741caf93ccc1b07cd34a523940754fc33cb6591bdf7f6f417cc SHA512 79f54c7d84965a95e575c4c38d5c9a2158de0a1c539ee32f5839312bed707c8d0df00f7733c3cedeee1cfb3ac10619ff60dc0441f7062535f0d7f79094f5443b
diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild
index ec91058ed134..b6609a508346 100644
--- a/app-editors/jed/jed-0.99.19-r1.ebuild
+++ b/app-editors/jed/jed-0.99.19-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="X gpm xft"
 
 RDEPEND=">=sys-libs/slang-2
diff --git a/app-editors/jed/jed-0.99.19.ebuild b/app-editors/jed/jed-0.99.19.ebuild
deleted file mode 100644
index 04e69c80056f..000000000000
--- a/app-editors/jed/jed-0.99.19.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="Console S-Lang-based editor"
-HOMEPAGE="http://www.jedsoft.org/jed/"
-SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="X gpm xft"
-
-RDEPEND=">=sys-libs/slang-2
-	gpm? ( sys-libs/gpm )
-	X? (
-		x11-libs/libX11
-		xft? (
-			>=media-libs/freetype-2
-			x11-libs/libXft
-		)
-	)"
-DEPEND="${RDEPEND}
-	X? (
-		x11-libs/libXt
-		x11-base/xorg-proto
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	export JED_ROOT="${EPREFIX}"/usr/share/jed
-	econf \
-		$(use_enable gpm) \
-		$(use_enable xft)
-}
-
-src_compile() {
-	emake
-	use X && emake xjed
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc changes.txt INSTALL{,.unx} README
-	doinfo info/jed*
-
-	insinto /etc
-	doins lib/jed.conf
-
-	# replace IDE mode with EMACS mode
-	sed -i \
-		-e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
-		"${ED}"/etc/jed.conf || die
-}