app-editors/lfhex: Port EAPI-7, qmake-utils, desktop eclass

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 30 insertions, 22 deletions

diff --git a/app-editors/lfhex/Manifest b/app-editors/lfhex/Manifest
index 12494585..9369d650 100644
--- a/app-editors/lfhex/Manifest
+++ b/app-editors/lfhex/Manifest
@@ -1 +1 @@
-DIST lfhex-0.42.tar.gz 868287 BLAKE2B 23c9879025682dd18ec9b2dce41411e77513f5f09a4295be094de5c20df05b06c5b7689587294417676996724c4548daa33a8ce6f0d66d50410bde612cb5780a SHA512 5b0d61f732b4b3a0ff2d73ae3ea551af78047a2edd45916d6ad61fb6d89c18faa4e28ed321e51e034519635c3310ce7b0b67fb809ed67d6c37cb252b78696c88
+DIST lfhex-0.42a.tar.gz 38353 BLAKE2B 9aa143dc3e8d1e2f5bd209d6c4234d52ecc130f00a44043d123834b810b22fcb7a75154ed7af4f54acb241b239b90b0fcef6247e993c6e2ca59e05252e183d47 SHA512 380bd8938675f7aa2dda5ac924b0fbf87e047f4ae6237858dd1db3b3f97b2696a5bd3b2f28a12afe4bfda6017564a1ef28ec83fb57697c42899f2ec21324e829
diff --git a/app-editors/lfhex/files/01-abs-llabs.dpatch b/app-editors/lfhex/files/01-abs-llabs.dpatch
index 74ffcbce..b9bf08ca 100644
--- a/app-editors/lfhex/files/01-abs-llabs.dpatch
+++ b/app-editors/lfhex/files/01-abs-llabs.dpatch
@@ -4,9 +4,9 @@
 ## DP: Fixes FTBFS due to abs() not being in the global anymore since g++ 4.3
 ## (#495467)
 
-diff -up lfhex-0.42.orig/src/reader.cpp lfhex-0.42/src/reader.cpp
---- lfhex-0.42.orig/src/reader.cpp	2008-10-08 19:25:57.000000000 +0200
-+++ lfhex-0.42/src/reader.cpp	2008-10-08 19:26:16.000000000 +0200
+diff -up a/reader.cpp b/reader.cpp
+--- a/reader.cpp	2008-10-08 19:25:57.000000000 +0200
++++ b/reader.cpp	2008-10-08 19:26:16.000000000 +0200
 @@ -238,7 +238,7 @@ bool Reader::loadPage(off_t pageIdx)
      // free the page which is the furthest away from the page we are loading
  
diff --git a/app-editors/lfhex/files/02-gcc-4.7.dpatch b/app-editors/lfhex/files/02-gcc-4.7.dpatch
index 0d58072d..dd4a1777 100644
--- a/app-editors/lfhex/files/02-gcc-4.7.dpatch
+++ b/app-editors/lfhex/files/02-gcc-4.7.dpatch
@@ -6,9 +6,9 @@
 ## DP: Bug-Debian: http://bugs.debian.org/667238
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lfhex-0.42~/src/expr.h lfhex-0.42/src/expr.h
---- lfhex-0.42~/src/expr.h	2008-09-19 02:36:49.000000000 +0200
-+++ lfhex-0.42/src/expr.h	2012-05-07 17:03:22.788794002 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a/expr.h b/expr.h
+--- a/expr.h	2008-09-19 02:36:49.000000000 +0200
++++ b/expr.h	2012-05-07 17:03:22.788794002 +0200
 @@ -19,6 +19,7 @@
   */
  
diff --git a/app-editors/lfhex/lfhex-0.42.ebuild b/app-editors/lfhex/lfhex-0.42.ebuild
index d6148dbe..02ac2e9e 100644
--- a/app-editors/lfhex/lfhex-0.42.ebuild
+++ b/app-editors/lfhex/lfhex-0.42.ebuild
@@ -1,30 +1,38 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils qt4-r2
+EAPI=7
 
-DESCRIPTION="A fast hex-editor with support for large files and comparing binary files"
-HOMEPAGE="http://stoopidsimple.com/lfhex"
-SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
+inherit desktop qmake-utils
+
+DESCRIPTION="Fast hex-editor with support for large files and comparing binary files"
+HOMEPAGE="http://freshmeat.sourceforge.net/projects/lfhex/
+https://github.com/srtlg/lfhex"
+SRC_URI="https://github.com/srtlg/${PN}/archive/v${PV}.tar.gz -> ${P}a.tar.gz"
+S="${WORKDIR}/${P}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="dev-qt/qtgui:4
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
+DOCS=( ../README )
 
-S=${WORKDIR}/${P}/src
+RDEPEND="
+	dev-qt/qtgui:4
+	x11-libs/libXt
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
 
-src_prepare() {
+PATCHES=(
 	# Apply Debian patches to fix compilation errors like gcc-4.7 compat
-	epatch "${FILESDIR}"/*.dpatch
-}
+	"${FILESDIR}"/01-abs-llabs.dpatch
+	"${FILESDIR}"/02-gcc-4.7.dpatch
+)
 
 src_configure() {
 	eqmake4
@@ -32,6 +40,6 @@ src_configure() {
 
 src_install() {
 	dobin lfhex
-	dodoc ../README
+	einstalldocs
 	make_desktop_entry "${PN}" "${PN}"
 }