From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E9EC158094 for ; Sun, 31 Jul 2022 20:03:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D7B9E0FA6; Sun, 31 Jul 2022 20:03:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7C8DE0FA6 for ; Sun, 31 Jul 2022 20:03:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B104E340E5F for ; Sun, 31 Jul 2022 20:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D52955A for ; Sun, 31 Jul 2022 20:03:49 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1659297800.5e3d221b8ff309df6ce38212d05157cdca2a45d7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/countrycodes/, app-misc/countrycodes/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild app-misc/countrycodes/files/1.0.5-Makefile.patch X-VCS-Directories: app-misc/countrycodes/ app-misc/countrycodes/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5e3d221b8ff309df6ce38212d05157cdca2a45d7 X-VCS-Branch: master Date: Sun, 31 Jul 2022 20:03:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a08ab5d7-beaf-4a8c-b80a-de92f98b8a19 X-Archives-Hash: afc71b937e9ee2619e271769c1d09e63 commit: 5e3d221b8ff309df6ce38212d05157cdca2a45d7 Author: David Seifert gentoo org> AuthorDate: Sun Jul 31 20:03:20 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jul 31 20:03:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3d221b app-misc/countrycodes: update EAPI 6 -> 8 Signed-off-by: David Seifert gentoo.org> ....0.5-r3.ebuild => countrycodes-1.0.5-r4.ebuild} | 16 ++++++------ app-misc/countrycodes/files/1.0.5-Makefile.patch | 29 ++++++++++++---------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild similarity index 71% rename from app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild rename to app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild index 01d51733774f..3515c7e85217 100644 --- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild +++ b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild @@ -1,31 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="An ISO 3166 country code finder" HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/" SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz" +S="${WORKDIR}/${P}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86" -S="${WORKDIR}"/${P}/src +PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch ) -PATCHES=( "${FILESDIR}/${PV}-Makefile.patch" ) - -src_prepare() { - default +src_configure() { tc-export CC } src_install() { emake \ - prefix="${D}/usr" \ - mandir="${D}/usr/share/man/man1" install + prefix="${ED}"/usr \ + mandir="${ED}"/usr/share/man/man1 install dosym iso3166 /usr/bin/countrycodes dosym iso3166.1 /usr/share/man/man1/countrycodes dodoc ../doc/{Changelog,README} diff --git a/app-misc/countrycodes/files/1.0.5-Makefile.patch b/app-misc/countrycodes/files/1.0.5-Makefile.patch index 677e59acc5c0..fab4c82019e1 100644 --- a/app-misc/countrycodes/files/1.0.5-Makefile.patch +++ b/app-misc/countrycodes/files/1.0.5-Makefile.patch @@ -1,34 +1,27 @@ -diff --git a/Makefile b/Makefile -index 9330578..3ff7319 100644 --- a/Makefile +++ b/Makefile -@@ -26,13 +26,13 @@ BINMODE=755 +@@ -26,10 +26,9 @@ LOGDIRMODE=700 # Compiler to use -CC=gcc -+CC ?= gcc # Compiler warnings -WARNINGS= -pedantic -Wall -+WARNINGS= ++CFLAGS += -pedantic -Wall # Compiler flags --CCOPTS = -O2 -fomit-frame-pointer -+CCOPTS = ${CFLAGS} - - # The makefile standards document I read says that I have to put it here... - SHELL = /bin/sh -@@ -61,7 +61,7 @@ PROGRAM = iso3166 + CCOPTS = -O2 -fomit-frame-pointer +@@ -61,7 +60,7 @@ all: $(PROGRAM) $(PROGRAM): $(ISO3166OBJ) - $(CC) $(CCOPTS) $(ISO3166OBJ) -o $@ -+ $(CC) $(CCOPTS) $(LDFLAGS) $(ISO3166OBJ) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(ISO3166OBJ) -o $@ clean: rm -f $(ISO3166OBJ) core defines.h $(PROGRAM) -@@ -70,8 +70,10 @@ strip: +@@ -70,8 +69,10 @@ strip $(PROGRAM) install: @@ -40,3 +33,13 @@ index 9330578..3ff7319 100644 @$(SEDBIN) $(SEDCMDS) ${docdir}/iso3166.1.in > ${mandir}/iso3166.1 @chown 0.0 ${mandir}/iso3166.1 @echo +@@ -80,9 +81,6 @@ + rm -f ${bindir}/$(PROGRAM) + rm -f ${mandir}/iso3166.1 + +-.c.o: +- $(CC) $(CCOPTS) $(WARNINGS) -c $< +- + $(ISO3166OBJ): common.h defines.h protos.h tables.h + + defines.h: