4 files changed, 24 insertions, 48 deletions
diff --git a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild b/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
deleted file mode 100644
index 24c622a843e3..000000000000
--- a/app-portage/diffmask/diffmask-0.3.3-r4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI="https://github.com/mgorny/diffmask/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/diffmask/diffmask-0.3.3-r5.ebuild b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
new file mode 100644
index 000000000000..a4cfe46a89af
--- /dev/null
+++ b/app-portage/diffmask/diffmask-0.3.3-r5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
+HOMEPAGE="https://github.com/projg2/diffmask/"
+SRC_URI="https://github.com/projg2/diffmask/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
diff --git a/app-portage/diffmask/diffmask-9999.ebuild b/app-portage/diffmask/diffmask-9999.ebuild
deleted file mode 100644
index b1bce60981a1..000000000000
--- a/app-portage/diffmask/diffmask-9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1 git-r3
-
-DESCRIPTION="A utility to maintain package.unmask entries up-to-date with masks"
-HOMEPAGE="https://github.com/mgorny/diffmask/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/diffmask/metadata.xml b/app-portage/diffmask/metadata.xml
index a7831157d057..82b3808f17cf 100644
--- a/app-portage/diffmask/metadata.xml
+++ b/app-portage/diffmask/metadata.xml
@@ -1,5 +1,5 @@
 <?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>
@@ -13,11 +13,7 @@
 		the mask entries) and remove old unmasks.
 	</longdescription>
 	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/diffmask/issues/</bugs-to>
-		<remote-id type="github">mgorny/diffmask</remote-id>
+		<bugs-to>https://github.com/projg2/diffmask/issues/</bugs-to>
+		<remote-id type="github">projg2/diffmask</remote-id>
 	</upstream>
 </pkgmetadata>