[gentoo-commits] repo/gentoo:master commit in: dev-tex/detex/, dev-tex/detex/files/

[gentoo-commits] repo/gentoo:master commit in: dev-tex/detex/, dev-tex/detex/files/

[Aaron Bauman]

commit:     b912050adcd8a03622ba8a3c06f3f3c4d345ddc6
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 19:54:52 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 19:56:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b912050a

dev-tex/detex: bump EAPI and stuff

* This is a legacy version and a newer version is upstream
* Update homepage
* Use HTTPS
* drop eutils
* use src_prepare
* remove unneeded dies

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 dev-tex/detex/detex-2.8-r1.ebuild           | 24 ++++++++++++------------
 dev-tex/detex/files/detex-2.8-ldflags.patch |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dev-tex/detex/detex-2.8-r1.ebuild b/dev-tex/detex/detex-2.8-r1.ebuild
index 9f4543a4c0b..8245b520dec 100644
--- a/dev-tex/detex/detex-2.8-r1.ebuild
+++ b/dev-tex/detex/detex-2.8-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A filter program that removes the LaTeX (or TeX) control sequences"
-HOMEPAGE="http://www.cs.purdue.edu/homes/trinkle/detex/"
-SRC_URI="http://www.cs.purdue.edu/homes/trinkle/detex/${P}.tar"
+HOMEPAGE="https://www.cs.purdue.edu/homes/trinkle/detex/index-legacy.html"
+SRC_URI="https://www.cs.purdue.edu/homes/trinkle/detex/${P}.tar"
 
 LICENSE="BSD"
 SLOT="0"
@@ -17,26 +17,26 @@ IUSE=""
 DEPEND="sys-devel/flex"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ldflags.patch"
+PATCHES=( "${FILESDIR}/${P}-ldflags.patch" )
+
+src_prepare() {
 	sed -i \
 		-e "s:CFLAGS	= -O \${DEFS}:CFLAGS	= ${CFLAGS} \${DEFS}:" \
 		-e 's:LEX	= lex:#LEX	= lex:' \
 		-e 's:#LEX	= flex:LEX	= flex:' \
 		-e 's:#DEFS	+= ${DEFS} -DNO_MALLOC_DECL:DEFS += -DNO_MALLOC_DECL:' \
 		-e 's:LEXLIB	= -ll:LEXLIB	= -lfl:' \
-		Makefile || die "sed failed"
+		Makefile || die "Fixing Makefile failed"
+	default
 }
 
 src_compile() {
 	tc-export CC
-	emake || die "emake failed"
+	emake
 }
 
 src_install() {
-	dobin detex || die
+	dobin detex
 	dodoc README
 	doman detex.1l
 }

diff --git a/dev-tex/detex/files/detex-2.8-ldflags.patch b/dev-tex/detex/files/detex-2.8-ldflags.patch
index e70c000b0c5..3ae3c2ff054 100644
--- a/dev-tex/detex/files/detex-2.8-ldflags.patch
+++ b/dev-tex/detex/files/detex-2.8-ldflags.patch
@@ -4,8 +4,8 @@ bug #209731
 
 Index: detex-2.8/Makefile
 ===================================================================
---- detex-2.8.orig/Makefile
-+++ detex-2.8/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -104,7 +104,7 @@ D_OBJ	= detex.o
  all:	${PROGS}