5 files changed, 4 insertions, 77 deletions
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index 6820a770e307..81eb311e7c37 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1,2 +1 @@
-DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
 DIST countrycodes-1.0.6.tar.gz 18834 BLAKE2B b5e0806618da0dd740a890b9c4d369cf2c44182515ec91aaa08a5e19da447635fb8536611a278ffcc419b506efa07df7e71bf5d520895a059c4aaa6e0cbc9b48 SHA512 be069593f60f785ef4d2e107340b941902a9c45d81ed04f8518a78f2be610ffdd1675da3da1d07271fc7ab736aabdd9f92f060d132e7b7b41310f1b653c53244
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild
deleted file mode 100644
index 3515c7e85217..000000000000
--- a/app-misc/countrycodes/countrycodes-1.0.5-r4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake \
-		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/countrycodes-1.0.6.ebuild b/app-misc/countrycodes/countrycodes-1.0.6.ebuild
index 01499421f229..4238cde9269e 100644
--- a/app-misc/countrycodes/countrycodes-1.0.6.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 PATCHES=( "${FILESDIR}"/${PV}-Makefile.patch )
 
diff --git a/app-misc/countrycodes/files/1.0.5-Makefile.patch b/app-misc/countrycodes/files/1.0.5-Makefile.patch
deleted file mode 100644
index fab4c82019e1..000000000000
--- a/app-misc/countrycodes/files/1.0.5-Makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -26,10 +26,9 @@
- LOGDIRMODE=700
- 
- # Compiler to use
--CC=gcc
- 
- # Compiler warnings
--WARNINGS= -pedantic -Wall
-+CFLAGS += -pedantic -Wall
- 
- # Compiler flags
- CCOPTS = -O2 -fomit-frame-pointer
-@@ -61,7 +60,7 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(ISO3166OBJ)
--	$(CC) $(CCOPTS) $(ISO3166OBJ) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(ISO3166OBJ) -o $@
- 
- clean:
- 	rm -f $(ISO3166OBJ) core defines.h $(PROGRAM)
-@@ -70,8 +69,10 @@
- 	strip $(PROGRAM)
- 
- install:
--	$(INSTALL) -g root -m $(BINMODE) -o root -s ${srcdir}/$(PROGRAM) ${bindir}
-+	mkdir -p ${bindir}
-+	$(INSTALL) -g root -m $(BINMODE) -o root ${srcdir}/$(PROGRAM) ${bindir}
- 	@echo "Installing man page..."
-+	mkdir -p ${mandir}
- 	@$(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:
diff --git a/app-misc/countrycodes/metadata.xml b/app-misc/countrycodes/metadata.xml
index 6258504e5133..3755461f1aa3 100644
--- a/app-misc/countrycodes/metadata.xml
+++ b/app-misc/countrycodes/metadata.xml
@@ -5,4 +5,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">countrycodes</remote-id>
+	</upstream>
 </pkgmetadata>