[gentoo-commits] repo/gentoo:master commit in: sys-apps/merge-usr/

[Mike Gilbert]

commit:     ddccef95489b8889d4fe373cd726fc476403a4be
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 11 19:34:57 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 11 19:34:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddccef95

sys-apps/merge-usr: add 7

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/merge-usr/Manifest           |  1 +
 sys-apps/merge-usr/merge-usr-7.ebuild | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 74189a4f7b19..19d4ec9ff369 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1,2 @@
 DIST merge-usr-6.tar.gz 9501 BLAKE2B 
3cdb769c1f75cb35a941c6ba6fe1d469e38bb0e96ce7aeac6fa6b8cfead4b630a13eac7b03144bb00f35a722a5264b39a504826e442d3c44b12d505c911d14a2
 SHA512 
57cbf2fadac587747b10f88299224e2c40a7a9375c0fc502ad966f42cf87f034b0b28d195001b275869f90dd1eecf210c47ffce9cd0163cc01b67b7860a680e4
+DIST merge-usr-7.tar.gz 9518 BLAKE2B 
2361a3571e23fd17bcda2072ace49ca66a9febc1900213544b52323d149322408a56429c5966afd2dc20f091bb0b557d7f07df7d88f36b57ee965265422776c7
 SHA512 
eb29f0a86d8b15002315eff071c4bba039a0f1f5c09de9fe70ef750f24d0d290f81bc963fe02bbf5bf4b661b2631602f8ce947f0f022506a59db9e0e23e08542

diff --git a/sys-apps/merge-usr/merge-usr-7.ebuild 
b/sys-apps/merge-usr/merge-usr-7.ebuild
new file mode 100644
index 000000000000..566847afdccc
--- /dev/null
+++ b/sys-apps/merge-usr/merge-usr-7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit python-single-r1
+
+DESCRIPTION="Script to migrate from split-usr to merged-usr"
+HOMEPAGE="https://github.com/floppym/merge-usr";
+SRC_URI="https://github.com/floppym/merge-usr/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+       python_doscript merge-usr
+}