| 1 |
commit: 5e3d221b8ff309df6ce38212d05157cdca2a45d7 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 31 20:03:20 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 20:03:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3d221b |
| 7 |
|
| 8 |
app-misc/countrycodes: update EAPI 6 -> 8 |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
....0.5-r3.ebuild => countrycodes-1.0.5-r4.ebuild} | 16 ++++++------ |
| 13 |
app-misc/countrycodes/files/1.0.5-Makefile.patch | 29 ++++++++++++---------- |
| 14 |
2 files changed, 23 insertions(+), 22 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild |
| 17 |
similarity index 71% |
| 18 |
rename from app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild |
| 19 |
rename to app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild |
| 20 |
index 01d51733774f..3515c7e85217 100644 |
| 21 |
--- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild |
| 22 |
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild |
| 23 |
@@ -1,31 +1,29 @@ |
| 24 |
-# Copyright 1999-2020 Gentoo Authors |
| 25 |
+# Copyright 1999-2022 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
+EAPI=8 |
| 30 |
|
| 31 |
inherit toolchain-funcs |
| 32 |
|
| 33 |
DESCRIPTION="An ISO 3166 country code finder" |
| 34 |
HOMEPAGE="http://www.grigna.com/diego/linux/countrycodes/" |
| 35 |
SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz" |
| 36 |
+S="${WORKDIR}/${P}/src" |
| 37 |
|
| 38 |
LICENSE="GPL-2" |
| 39 |
SLOT="0" |
| 40 |
KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86" |
| 41 |
|
| 42 |
-S="${WORKDIR}"/${P}/src |
| 43 |
+PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch ) |
| 44 |
|
| 45 |
-PATCHES=( "${FILESDIR}/${PV}-Makefile.patch" ) |
| 46 |
- |
| 47 |
-src_prepare() { |
| 48 |
- default |
| 49 |
+src_configure() { |
| 50 |
tc-export CC |
| 51 |
} |
| 52 |
|
| 53 |
src_install() { |
| 54 |
emake \ |
| 55 |
- prefix="${D}/usr" \ |
| 56 |
- mandir="${D}/usr/share/man/man1" install |
| 57 |
+ prefix="${ED}"/usr \ |
| 58 |
+ mandir="${ED}"/usr/share/man/man1 install |
| 59 |
dosym iso3166 /usr/bin/countrycodes |
| 60 |
dosym iso3166.1 /usr/share/man/man1/countrycodes |
| 61 |
dodoc ../doc/{Changelog,README} |
| 62 |
|
| 63 |
diff --git a/app-misc/countrycodes/files/1.0.5-Makefile.patch b/app-misc/countrycodes/files/1.0.5-Makefile.patch |
| 64 |
index 677e59acc5c0..fab4c82019e1 100644 |
| 65 |
--- a/app-misc/countrycodes/files/1.0.5-Makefile.patch |
| 66 |
+++ b/app-misc/countrycodes/files/1.0.5-Makefile.patch |
| 67 |
@@ -1,34 +1,27 @@ |
| 68 |
-diff --git a/Makefile b/Makefile |
| 69 |
-index 9330578..3ff7319 100644 |
| 70 |
--- a/Makefile |
| 71 |
+++ b/Makefile |
| 72 |
-@@ -26,13 +26,13 @@ BINMODE=755 |
| 73 |
+@@ -26,10 +26,9 @@ |
| 74 |
LOGDIRMODE=700 |
| 75 |
|
| 76 |
# Compiler to use |
| 77 |
-CC=gcc |
| 78 |
-+CC ?= gcc |
| 79 |
|
| 80 |
# Compiler warnings |
| 81 |
-WARNINGS= -pedantic -Wall |
| 82 |
-+WARNINGS= |
| 83 |
++CFLAGS += -pedantic -Wall |
| 84 |
|
| 85 |
# Compiler flags |
| 86 |
--CCOPTS = -O2 -fomit-frame-pointer |
| 87 |
-+CCOPTS = ${CFLAGS} |
| 88 |
- |
| 89 |
- # The makefile standards document I read says that I have to put it here... |
| 90 |
- SHELL = /bin/sh |
| 91 |
-@@ -61,7 +61,7 @@ PROGRAM = iso3166 |
| 92 |
+ CCOPTS = -O2 -fomit-frame-pointer |
| 93 |
+@@ -61,7 +60,7 @@ |
| 94 |
all: $(PROGRAM) |
| 95 |
|
| 96 |
$(PROGRAM): $(ISO3166OBJ) |
| 97 |
- $(CC) $(CCOPTS) $(ISO3166OBJ) -o $@ |
| 98 |
-+ $(CC) $(CCOPTS) $(LDFLAGS) $(ISO3166OBJ) -o $@ |
| 99 |
++ $(CC) $(CFLAGS) $(LDFLAGS) $(ISO3166OBJ) -o $@ |
| 100 |
|
| 101 |
clean: |
| 102 |
rm -f $(ISO3166OBJ) core defines.h $(PROGRAM) |
| 103 |
-@@ -70,8 +70,10 @@ strip: |
| 104 |
+@@ -70,8 +69,10 @@ |
| 105 |
strip $(PROGRAM) |
| 106 |
|
| 107 |
install: |
| 108 |
@@ -40,3 +33,13 @@ index 9330578..3ff7319 100644 |
| 109 |
@$(SEDBIN) $(SEDCMDS) ${docdir}/iso3166.1.in > ${mandir}/iso3166.1 |
| 110 |
@chown 0.0 ${mandir}/iso3166.1 |
| 111 |
@echo |
| 112 |
+@@ -80,9 +81,6 @@ |
| 113 |
+ rm -f ${bindir}/$(PROGRAM) |
| 114 |
+ rm -f ${mandir}/iso3166.1 |
| 115 |
+ |
| 116 |
+-.c.o: |
| 117 |
+- $(CC) $(CCOPTS) $(WARNINGS) -c $< |
| 118 |
+- |
| 119 |
+ $(ISO3166OBJ): common.h defines.h protos.h tables.h |
| 120 |
+ |
| 121 |
+ defines.h: |
Archives