7 files changed, 17 insertions, 121 deletions
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index a39ad055c5cc..6ff103eb1ce4 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,3 +1 @@
-DIST cpuid2cpuflags-10.tar.bz2 82756 BLAKE2B 144ccc9ffff9fdafa9d29628963143b3685421c3c96a81ab780d835c7e0d83fdfe02c720744f57f2947c6079af157c2b6d3e61277f5af734fdba08c6fec23b9f SHA512 c34feef1548b9ade349efbdb68880fea303dd9a8d361de017b925688f9b189602cb175e1699dbe7b48f6887f343fafca9ff0ac95b8eb174bf7201c8bb5978c98
-DIST cpuid2cpuflags-9.tar.bz2 82841 BLAKE2B 6f866a29680b53975359c56f54f3ecd8e978fe55297fdfcb84b25f57dc38bb0fb5c2169dde83e29235d13667a43faa11d75fa15e3d8fbef65a86cea2832363c4 SHA512 61a265abfd5b0920e1b3c18d322dceb416a6a353b3d3ef3f01ab1d02aab1b45dd1ec4eed4ccf667eae82c953830f29d22a671dd7d7c2b4d309050033af1fd5b7
-DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
+DIST cpuid2cpuflags-14.tar.bz2 85645 BLAKE2B 19a2fccfbdff107acf715e570103aed7b47a75fa7d493a421d979f31cf559713f260df2d01ae0d8b3ff5c97cb569f89093279de951de22c1d3786ee39e66f19f SHA512 595174e91dcfed9ac94827cb385f8c0069b25f4b76e0753b792cf94b6d97b45c7deb81708d1d304fbd159875952f3907699eca51fd85787a63327f971cf7526b
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
deleted file mode 100644
index 3ca2f491f50c..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PN=cpuinfo2cpuflags
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Script to guess CPU_FLAGS_X86 flags from /proc/cpuinfo"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	python_foreach_impl python_newscript "${MY_PN}-x86"{.py,}
-}
-
-pkg_postinst() {
-	if has_version 'sys-apps/portage' \
-		&& ! has_version "sys-apps/portage[${PYTHON_USEDEP}]"
-	then
-		ewarn "Support for matching Python implementations should be enabled"
-		ewarn "on sys-apps/portage as well. Otherwise, cpuinfo2cpuflags won't"
-		ewarn "be able to figure out the correct repository location and will"
-		ewarn "require you to specify it explicitly."
-	fi
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
deleted file mode 100644
index 5914671097eb..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-14.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-14.ebuild
new file mode 100644
index 000000000000..b3c3227bcbd4
--- /dev/null
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-14.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
+HOMEPAGE="https://github.com/projg2/cpuid2cpuflags/"
+SRC_URI="
+	https://github.com/projg2/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x64-solaris"
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
deleted file mode 100644
index 5914671097eb..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ ${v%-r*} -lt 2 ]]; then
-			elog 'Please note that the output has changed in v2. The new format is suitable'
-			elog 'both for Portage and Paludis. To use it, e.g.:'
-			elog
-			elog '  $ echo "*/* $(cpuid2cpuflags)" > /etc/portage/package.use/00cpuflags'
-			elog
-			elog '(you may need to convert package.use into a directory if you want to use'
-			elog ' separate file as presented here)'
-		fi
-	done
-}
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
deleted file mode 100644
index 5192dad1280b..000000000000
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/mgorny/cpuid2cpuflags"
-inherit autotools git-r3
-
-DESCRIPTION="Tool to guess CPU_FLAGS_* flags for the host"
-HOMEPAGE="https://github.com/mgorny/cpuid2cpuflags"
-SRC_URI=""
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/app-portage/cpuid2cpuflags/metadata.xml b/app-portage/cpuid2cpuflags/metadata.xml
index 422aab7218c1..2d8cc330ba90 100644
--- a/app-portage/cpuid2cpuflags/metadata.xml
+++ b/app-portage/cpuid2cpuflags/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">mgorny/cpuid2cpuflags</remote-id>
+    <remote-id type="github">projg2/cpuid2cpuflags</remote-id>
   </upstream>
 </pkgmetadata>