4 files changed, 41 insertions, 55 deletions
diff --git a/app-cdr/mirage2iso/metadata.xml b/app-cdr/mirage2iso/metadata.xml
index 80f0436e5426..0933360adb2d 100644
--- a/app-cdr/mirage2iso/metadata.xml
+++ b/app-cdr/mirage2iso/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>
@@ -14,7 +14,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/mirage2iso/issues/</bugs-to>
-		<remote-id type="github">mgorny/mirage2iso</remote-id>
+		<bugs-to>https://github.com/projg2/mirage2iso/issues/</bugs-to>
+		<remote-id type="github">projg2/mirage2iso</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..e61b1d13f91d
--- /dev/null
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="CD/DVD image converter using libmirage"
+HOMEPAGE="https://github.com/projg2/mirage2iso/"
+SRC_URI="
+	https://github.com/projg2/${PN}/releases/download/v${PV}/${P}.tar.xz
+	test? ( https://github.com/projg2/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="pinentry test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/libmirage-2.0.0:0=
+	dev-libs/glib:2=
+	pinentry? ( dev-libs/libassuan:0= )"
+RDEPEND="${DEPEND}
+	pinentry? ( app-crypt/pinentry )"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf $(use_with pinentry libassuan)
+}
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
deleted file mode 100644
index c1efb10c0087..000000000000
--- a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="CD/DVD image converter using libmirage"
-HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz
-	test? ( https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pinentry test"
-
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
-	dev-libs/glib:2=
-	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	pinentry? ( app-crypt/pinentry )"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	local myconf=(
-		$(use_with pinentry libassuan)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
index 117ba275a26e..6eaba9ee1d9f 100644
--- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild
+++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git"
 inherit autotools git-r3
 
 DESCRIPTION="CD/DVD image converter using libmirage"
-HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI=""
+HOMEPAGE="https://github.com/projg2/mirage2iso/"
+EGIT_REPO_URI="https://github.com/projg2/mirage2iso.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="pinentry test"
+RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
+DEPEND="
+	>=dev-libs/libmirage-2.0.0:0=
 	dev-libs/glib:2=
 	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libassuan
-	virtual/pkgconfig
-	test? ( app-arch/xz-utils )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	pinentry? ( app-crypt/pinentry )"
-
-RESTRICT="!test? ( test )"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -33,9 +28,5 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=(
-		$(use_with pinentry libassuan)
-	)
-
-	econf "${myconf[@]}"
+	econf $(use_with pinentry libassuan)
 }