commit: 8665bb46529b55d607736bd3d023f04d2e88a02b Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Dec 28 11:51:02 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 28 12:03:22 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8665bb46
app-crypt/codegroup: Port to EAPI 6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-crypt/codegroup/codegroup-20080907-r1.ebuild | 21 ++++++++++----------- .../files/codegroup-20080907-Makefile.patch | 17 ++++++++--------- app-crypt/codegroup/metadata.xml | 8 ++++---- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/app-crypt/codegroup/codegroup-20080907-r1.ebuild b/app-crypt/codegroup/codegroup-20080907-r1.ebuild index 182c7ef8e45..cf15b9cc4d1 100644 --- a/app-crypt/codegroup/codegroup-20080907-r1.ebuild +++ b/app-crypt/codegroup/codegroup-20080907-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="encode / decode binary file as five letter codegroups" HOMEPAGE="http://www.fourmilab.ch/codegroup/"; @@ -17,17 +17,16 @@ IUSE="" DEPEND="app-arch/unzip" RDEPEND="" -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch -} +S=${WORKDIR} +PATCHES=( "${FILESDIR}"/${P}-Makefile.patch ) -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die +src_configure() { + tc-export CC } src_install() { - dobin ${PN} || die + dobin ${PN} - doman ${PN}.1 || die - dodoc ${PN}.{html,jpg} || die + doman ${PN}.1 + dodoc ${PN}.{html,jpg} } diff --git a/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch index 4fabba6cb3c..8bee7abe984 100644 --- a/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch +++ b/app-crypt/codegroup/files/codegroup-20080907-Makefile.patch @@ -1,20 +1,19 @@ ---- codegroup-20080907/work/Makefile -+++ codegroup-20080907/work/Makefile -@@ -1,6 +1,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,5 @@ PROGS = codegroup -CFLAGS = -O -Wall -+CFLAGS = -+LDFLAGS = PAGER = more all: $(PROGS) -@@ -9,7 +10,7 @@ +@@ -8,9 +7,6 @@ + clean: rm -f $(PROGS) *.o *.bak *.zip core code.* *.out - codegroup: codegroup.o +-codegroup: codegroup.o - $(CC) codegroup.o -o codegroup $(CFLAGS) -+ $(CC) codegroup.o -o codegroup $(CFLAGS) $(LDFLAGS) - +- # Create zipped archive + RELFILES = Makefile codegroup.1 codegroup.c \ diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml index a535b885282..3c3d5ced641 100644 --- a/app-crypt/codegroup/metadata.xml +++ b/app-crypt/codegroup/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="person"> -<email>[email protected]</email> -<name>Michael Weber</name> -</maintainer> + <maintainer type="person"> + <email>[email protected]</email> + <name>Michael Weber</name> + </maintainer> </pkgmetadata>
