diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-01 03:14:33 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-01 03:14:33 +0100 |
| commit | 0c764edfecb7e9e124d4669acd98bed09e23b6c0 (patch) | |
| tree | 2862ab17d2f88cb7c9614b7fbe579f25ae604b8d /app-misc/countrycodes | |
| parent | ae1bf373db295b495e1f685d116e3411bf10df0b (diff) | |
gentoo auto-resync : 01:08:2022 - 03:14:32
Diffstat (limited to 'app-misc/countrycodes')
| -rw-r--r-- | app-misc/countrycodes/Manifest | 4 | ||||
| -rw-r--r-- | app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild (renamed from app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild) | 16 | ||||
| -rw-r--r-- | app-misc/countrycodes/files/1.0.5-Makefile.patch | 29 |
3 files changed, 25 insertions, 24 deletions
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest index 00ffc07b0771..47350d04938b 100644 --- a/app-misc/countrycodes/Manifest +++ b/app-misc/countrycodes/Manifest @@ -1,4 +1,4 @@ -AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b677ef454e674e79bcb71ef2a28679f523785ad4eceab767fb976cc4a2388cbecca5e715aa21f6f5a9ae245aa SHA512 a0416ee6b6b7416d9f0f1d379b2b4a86fb0b0ca6df2dd5f0bf3d4e54ba1fa3213da1561a38b1757d2f98b4cf96df1ff74cdea1b7e05587c7250d77353f522832 +AUX 1.0.5-Makefile.patch 1010 BLAKE2B a45e729398432a402296a57a6b82cf994bd91608c3af5ed1aaaaaca399930f7d14220eb932bff6fe89d7989c7a6e3f29bd4652cdfd2e82608217fdabcbc46d4f SHA512 73b43a54e52490ee662cb7af7505d4d0bccbd16851b19010be36e0b309bd0d81636ef855cdb1c49f83c9d7dbac036191eaf8b38396759b1e14588b28a9dd1f17 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035 -EBUILD countrycodes-1.0.5-r3.ebuild 716 BLAKE2B c22a0689bb19edb2bbe52c5d2e7e67013be3a617a34968e0584d7ad4bc2147ebcbe7c4d6871bc3ee43d1402b06e63451ff6d2b2783385e497b90e80b57129c85 SHA512 de9bfd9fab4f3afe5504167c0b90f64455c907c281df18a6504f1d6875e6d356d48eacaaba2d0fe8d094e4c65bcfb6211ef36177efc2e42a63e8309de7b8c4a3 +EBUILD countrycodes-1.0.5-r4.ebuild 710 BLAKE2B 049005d915058af95f12a8f2c5c3693206f3386428a1afb3aef62ef92360c073c50996fe312879c3456996387b94f9f18cb4975811c82627468f634821cc6566 SHA512 eb10abc32ee84401560148c65e4e230b4aa8b4d70f5306cec5ddc5d40f5e31cb79e1bafd89059a4550f8b273f8cf36412757b9dd77329e9ffe55bea0ca5b9611 MISC metadata.xml 266 BLAKE2B 74ac06b4ea12603c8713e69cbff9ce6874266fc48ee5c846f0ac3d50bf577c3edb1e4b6690ec44fc4dd51e55e96dd5c2478831c9f754b04661fe7700d8baf66f SHA512 b996554131284e3556af42d2c5032c5b1635de67d48983096991935e7ee04c32aadc93e48cae5160861e86d64eb6fd4abafc40d9dd8b85ddc032b042a77677cb diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/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: |