summaryrefslogtreecommitdiff
path: root/sys-apps/merge-usr
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-14 11:10:11 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-14 11:10:11 +0100
commit81b8f20732954c4508baf2f77472b5435e3f851f (patch)
tree4180177cb7ba85eab50159ce96218c2419fb24a6 /sys-apps/merge-usr
parent946859e0e36904cffb3e0ccbccb6b7b1347c1cc8 (diff)
gentoo auto-resync : 14:09:2022 - 11:10:10
Diffstat (limited to 'sys-apps/merge-usr')
-rw-r--r--sys-apps/merge-usr/Manifest4
-rw-r--r--sys-apps/merge-usr/merge-usr-0.ebuild2
-rw-r--r--sys-apps/merge-usr/merge-usr-1.ebuild23
3 files changed, 27 insertions, 2 deletions
diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 0b46982a0aa8..85170e52d126 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,3 +1,5 @@
DIST merge-usr-0.tar.gz 9022 BLAKE2B b8590bbdff92f1297fb0a3335a3a380464661025c1d57e526df1c665966c3732e4cb1b7333d5108aac34b59d70032978cea4b6e93dd4c5e0a9069174e412d8e3 SHA512 3ccba0360cf576f3d2c5fca63a4b8119e85840165f085172d6d3b8fcab212285fc8511c2004e303144870ba7738305d4030360f14196a6b73df40c6842abc40b
-EBUILD merge-usr-0.ebuild 600 BLAKE2B e227c4f8caa8badf027e877846af3205a3831d72a541de3b7c37d84af4d0ab68d97dfb7c722f4e0a6491a2560beabd8f198146301d9b1a5d522da9c2a39c9a2e SHA512 922099a2bed67babc4938a4ea9f5568033970668340523b4de9de4b23aa9fe8de729ad4293b848c2f760f0122fa36b2d1b8f03e3405607099cf587f68e3c2bec
+DIST merge-usr-1.tar.gz 9217 BLAKE2B e826025e27341d69ec700be9fb9b57d354710275896fb33d98c49f72a97c360f02f663cfad957a9d71d1e73d961affca84221cc4d08b6b114906f6f8b55f920f SHA512 3a81e1b737ffc2a51d59c18b4733d4df000ea66c55ab3cf5042f034148d7ef1a393bb09650b0d0c7a63ce07bdcb833a00d4cf3f6acc838073059a8879f6af5d3
+EBUILD merge-usr-0.ebuild 606 BLAKE2B b1afb8b28ae525d38c9258488644bfa3816fcb002108e6b6d1501278c14e6693e3d575f031919e7fbabd0aa07318d862f1931597d0348833369a88359e23f401 SHA512 0dc5f238aeac57c9bbf1e6fc6993d27be7b45a1eadf2aa148d86614ba3c10518bd31f20c4193f490c60f18184b2590e0a16375c740c6e83d74ee15f8243ccad9
+EBUILD merge-usr-1.ebuild 613 BLAKE2B 11c48f2f40734701e1129108f3a618afdbbfacdbacf769e87eadded8e6ed6a88ad8464b37f99b4a6c5a8804bd5538a9c66e2bc77ac8ae809436dd46c6b3a6c1e SHA512 4ef73463833a88f29ffcb095ed429b5d254e010bba2ff25d744e8aadae0cb3907d5dccf013d28a61250bff2de9a969fdb7d6a55947a11f200a85b4db1e0abfee
MISC metadata.xml 329 BLAKE2B fdb965403d89b88b2bb3c1bbb5ae8dd614dfce3f8ebc379aeee60c2d55b529887e3663b3db98a0e1fd078cf62762888bd71685eaa052c73b821d944da16413de SHA512 8a55a22b7e45363c1e2b964cb80324584814a28b6aae34f88e061f6ab137d869905be1bc16590391b082bed98602b69e06def88ea90dde0be92279733fff2890
diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild b/sys-apps/merge-usr/merge-usr-0.ebuild
index d22852ef7825..6ae74a2fc288 100644
--- a/sys-apps/merge-usr/merge-usr-0.ebuild
+++ b/sys-apps/merge-usr/merge-usr-0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/floppym/merge-usr/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="${PYTHON_DEPS}"
diff --git a/sys-apps/merge-usr/merge-usr-1.ebuild b/sys-apps/merge-usr/merge-usr-1.ebuild
new file mode 100644
index 000000000000..d5f00347868a
--- /dev/null
+++ b/sys-apps/merge-usr/merge-usr-1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+ python_doscript merge-usr
+}