gentoo resync : 28.04.2021

4 files changed, 3 insertions, 58 deletions

diff --git a/app-editors/dhex/Manifest b/app-editors/dhex/Manifest
index d76954e117fe..6f3224f8e838 100644
--- a/app-editors/dhex/Manifest
+++ b/app-editors/dhex/Manifest
@@ -1,7 +1,4 @@
-AUX dhex-0.63-Makefile.patch 651 BLAKE2B 094e99a7bd7d8c09c5fbbecb85070505a0fe8ffb1bf83a1ec03f2a875cad316e6723ee969652389b962f3def7c2257af592682eb1b39b00fc2e6db2205a6d86e SHA512 80a938e81aef1e7450410138ebb445541f9707a59add8dc25aa7ac7f0154d17d1adc4de1c4d72f2e933b9882cce545b9d13650e8e653f26cc38ee65ec7c6a685
 AUX dhex-0.69-Makefile.patch 506 BLAKE2B 5921fcc174c467e973cce08a0d11cb40e0d7dfacbb39834ec386a75d0a4473992ecdd2969b20eef2295ad9fde6ba9e09bbe212b29a36fdd17fe0d4dd0b85cec1 SHA512 0ab54c3c9df6bee462d34df8dc33d07a6cf8a91b64314d22cf0a433130e654c920f11172c9f7ba16a058e86bd0c59721ebc3b7c5706535c046977581f81f0117
-DIST dhex_0.68.tar.gz 58602 BLAKE2B c29d5af598b731bc415e2626e945253641ea61c8a744deaeee3f7a2e7b1636ccfb3f8b7696efd33d36fab59d59da408ff4f59b44a88a36a4d7afc27542326c9e SHA512 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421
 DIST dhex_0.69.tar.gz 57362 BLAKE2B 26bfeaffc65b0f3b0193ee940da3ad866ea1354d0e5bec021a68a6c515da956500bfd7561ba675d0a67526d09b1a72e8372ee7bb52ec372f2b59249313cf77c6 SHA512 76115fd6b67bf1f61af6acfbc4dac9ac54c14aeb291de6a190aa1ffa599cf8b3e40a422ed34c237cf1f5c7406b07e38e38fb1c9c9dd36ce93d05265238060ba0
-EBUILD dhex-0.68.ebuild 716 BLAKE2B da44d04df93d839d0e2a09d6dbe637c9bbf2386b027c0a1c64f86b1b35c55e83b30dc226d7b711770ff7e0e4ae707216cdbc7741e1f09f5135d916aa0d2cba20 SHA512 038f4083ad3578eab56f87fbc042de67d6be67f8c8bbf0e2c20134ab9f90f64e43bdced4fb5a25f308c1e0d5565bed6227a6eeee71bdc710b7d17e4c11c147da
-EBUILD dhex-0.69.ebuild 691 BLAKE2B 6a0fc6ba44933cb5f726c1372de8ed13493531bb11c49683eb0c8335cb6057584cf6afe87760991862d080dc08f87155fc5b155b1cc9a0e2968f3ace94ff3218 SHA512 09e87a865b452f94ff0a002b528708a15b78293256ea00a1ced61519917d65bdda534ff5aa26df200c38dfaefcfeabfaf6c926b7285eefca00825753a428ac7e
+EBUILD dhex-0.69.ebuild 717 BLAKE2B f08eb240a419451978657948b789109801286a72bccdfce705740f3b04f55b4aa3ce81c5947d814f1057af8d18f2966d4aaf5226a884b791be819e9aa4bdeacb SHA512 adf1d6197bc2da9775448f8140004262713ab2754de8b06407e1838379c22cc5d24b1db9440f1d4b37383e0a7c783362a66df5240ee747ffe4764254d03d26d2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/dhex/dhex-0.68.ebuild b/app-editors/dhex/dhex-0.68.ebuild
deleted file mode 100644
index bce05d75ad52..000000000000
--- a/app-editors/dhex/dhex-0.68.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="ncurses-based hex-editor with diff mode"
-HOMEPAGE="http://www.dettus.net/dhex/"
-SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:="
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.63-Makefile.patch
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin dhex
-	dodoc README.txt
-	doman dhex.1 dhex_markers.5 dhex_searchlog.5 dhexrc.5
-}
diff --git a/app-editors/dhex/dhex-0.69.ebuild b/app-editors/dhex/dhex-0.69.ebuild
index 01e5fc5f6c32..653613c88304 100644
--- a/app-editors/dhex/dhex-0.69.ebuild
+++ b/app-editors/dhex/dhex-0.69.ebuild
@@ -12,11 +12,12 @@ SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
+KEYWORDS="amd64 ~arm ~mips x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-editors/dhex/files/dhex-0.63-Makefile.patch b/app-editors/dhex/files/dhex-0.63-Makefile.patch
deleted file mode 100644
index f99c9ff1bf2d..000000000000
--- a/app-editors/dhex/files/dhex-0.63-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN dhex_0.63.orig/Makefile dhex_0.63/Makefile
---- dhex_0.63.orig/Makefile	2011-01-29 00:19:37.000000000 +0100
-+++ dhex_0.63/Makefile	2011-01-30 17:13:51.000000000 +0100
-@@ -1,11 +1,4 @@
--CC=		gcc
--LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
--CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
--CFLAGS=		-O3 -Wall -std=c99 
--#CFLAGS+= -ffunction-sections -fdata-sections
--#LDFLAGS+= --gc-sections 
- LIBS=		-lncurses
--DESTDIR=	/usr/local/
- 
- OFILES=buffers.o input.o output.o machine_type.o main.o menu.o ui.o hexcalc.o search.o gpl.o configfile.o markers.o
-