gentoo Easter resync : 12.04.2020

3 files changed, 2 insertions, 62 deletions

diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index d13338ef01eb..88e7a72e4f4e 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -4,6 +4,5 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa32
 AUX hteditor-2.1.0-gcc-7.patch 724 BLAKE2B 030fe4de475ce4b140f5dcee8cb0268bb0b6dc19f1e50b94cf0f3b8f0546d462025ca30a1a75acc16f7560c9318efaa8adeb6a29c33789c304c97512b31994c5 SHA512 afdc2fef1c05a225e9a8e8d4ccd25a8b1912ff6532dd09a320f6df031edb732d9b9b99fb77f39cd41ccc45fd9818fae1b802ca1831669a0e2825b59094094de9
 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36
 DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
-EBUILD hteditor-2.1.0-r1.ebuild 1249 BLAKE2B ff9ac8b1913e12b6cbf1fac05385dec458bf5c2d02d768505d782c736e88a70fcc9d838b718855a040552fff7029f06fd5245d9243cb53ca43aab842df06147b SHA512 84e4e21205388ef1b0282132fdd07a5719dd2562faaec5676ff205ba2a63b995df5f20674267b3565fab6ef77aaf3b93f8a9a07c9a46ebf5b77c53ddbeccae31
-EBUILD hteditor-2.1.0.ebuild 1173 BLAKE2B 4a61d5860885b2ef48f0f21621abea57429dd36ebbba36a6250954785880d8cdfd648a0827756ca38b25b33691fcc64afc06c11e7bf59d8823ac7068befa9d67 SHA512 6022aa8a28461dde621ff2a02695b1aecfb4473bc451a9555350f510773882534e8283e711c69037f1787a77f7483312e7645a0660940d60bb6eb968802bafb5
+EBUILD hteditor-2.1.0-r1.ebuild 1245 BLAKE2B a09a2fd5338de9df7f5f7effe9692d0c80be642a0362f38b0fecb45224161de4b2a926662e8cb52b4b802ff6fc47f67fc258faf96e66dd93cc818ad0573f14b8 SHA512 d4be8a225b7c710b6350b70113cfadb869b4bf7a4a953871550d613f3183a0a5888e8cf36a87ad17ec25a57c392587719a745bd97ca2cbe75ef5b3206bb017f1
 MISC metadata.xml 464 BLAKE2B 7fdb5c881881e21f4a74db09bf905c4d0aebdb5077598916186266ca12dca891c1619ce550a37ac3400ef92138ff2521dffd91c25bf254d8e49e0b628ea7ebca SHA512 b08be8368d7459a56096769aec6cdb6607225968b87ac12d22c788081287d16345060f071c09c0d505a8caffcb5de9378328250758b13c9229eb1fc5c10a8388
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 5b468939e1f1..44b7dd140f67 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="X"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild
deleted file mode 100644
index 837b225b19b7..000000000000
--- a/app-editors/hteditor/hteditor-2.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/editor}
-
-DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
-HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
-SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	>=dev-libs/lzo-2"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-7.patch
-	"${FILESDIR}"/${P}-tinfo.patch
-	"${FILESDIR}"/${P}-gcc-6-uchar.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable X x11-textmode) \
-		--enable-maintainermode
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	#For prefix
-	chmod u+x "${S}/install-sh"
-
-	local HTML_DOCS="doc/*.html"
-	doinfo doc/*.info
-
-	default
-}