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

[Mike Gilbert]

commit: 090eca047330864c35ba5413ba72d19b95eaf8c3
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Apr 13 15:26:11 2024 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Apr 13 15:26:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090eca04

sys-apps/merge-usr: enable py3.12

Closes: https://bugs.gentoo.org/929815
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/merge-usr-6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/merge-usr/merge-usr-6.ebuild 
b/sys-apps/merge-usr/merge-usr-6.ebuild
index f48982d9506c..a519e3cbd577 100644
--- a/sys-apps/merge-usr/merge-usr-6.ebuild
+++ b/sys-apps/merge-usr/merge-usr-6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit python-single-r1
 
 DESCRIPTION="Script to migrate from split-usr to merged-usr"

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

[Mike Gilbert]

commit: 09bec241a7c605c7500a1e5201462d2a129bbf7d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Dec  3 18:32:06 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Dec  3 18:32:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bec241

sys-apps/merge-usr: add 6, drop 5

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/Manifest   | 2 +-
 sys-apps/merge-usr/{merge-usr-5.ebuild => merge-usr-6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index af540161fb82..74189a4f7b19 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1 @@
-DIST merge-usr-5.tar.gz 9492 BLAKE2B 
5fbd23a59f76004a1548ae230a4eccc9ecc81a36b235ed8744fd48cd980815c62929fb436068dd232812d92c39ed5f7d778ffe2ddbaaf4f9c7785c6927d6eb87
 SHA512 
b0b4d8da51a570057ce9aeccd4cf880c2a6bc52067958e23e5162d589b671a123ddbdab8a74dd5f076f689be737637e1b1a7b0581e94bfbae4e16ada37be6045
+DIST merge-usr-6.tar.gz 9501 BLAKE2B 
3cdb769c1f75cb35a941c6ba6fe1d469e38bb0e96ce7aeac6fa6b8cfead4b630a13eac7b03144bb00f35a722a5264b39a504826e442d3c44b12d505c911d14a2
 SHA512 
57cbf2fadac587747b10f88299224e2c40a7a9375c0fc502ad966f42cf87f034b0b28d195001b275869f90dd1eecf210c47ffce9cd0163cc01b67b7860a680e4

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-6.ebuild
similarity index 100%
rename from sys-apps/merge-usr/merge-usr-5.ebuild
rename to sys-apps/merge-usr/merge-usr-6.ebuild

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

[Sam James]

commit: fefd609aaa40f8580b6fdfa2027a426d6166a5d1
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:04:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:04:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefd609a

sys-apps/merge-usr: Stabilize 5 hppa, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index ea205d2b3a18..a7131924dcf8 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv 
~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: 682c43942f922206e1fcb996010df1292bf769a2
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682c4394

sys-apps/merge-usr: Stabilize 5 ppc64, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index 43b365d1f722..ea205d2b3a18 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv 
~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: d7eac959327c1bc344f04cb71211acda16fa0dd1
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7eac959

sys-apps/merge-usr: Stabilize 5 arm, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index 3c4cbba04d92..8148d1a22343 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: 93bde60f8665bcbd3dd92025f2625ccd0fee
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93bde60f

sys-apps/merge-usr: Stabilize 5 ppc, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index 8148d1a22343..43b365d1f722 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv 
~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: a235fd1200e8a824e3d8406fe497f90dde6a58d9
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a235fd12

sys-apps/merge-usr: Stabilize 5 sparc, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index 07055e4c6985..ce6f7d6b3177 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: 4c0e5b78e96f1e2f4bc5bddd07663712cf6f595a
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0e5b78

sys-apps/merge-usr: Stabilize 5 amd64, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index ce0fe22ec52d..518e20442a02 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: b346b3ad1eab4c7b459c3cd2960fda8aadd82a10
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b346b3ad

sys-apps/merge-usr: Stabilize 5 x86, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index ce6f7d6b3177..ce0fe22ec52d 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: d31b9318103c0b10647e15f0818307c150d1cd31
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  1 18:03:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  1 18:03:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31b9318

sys-apps/merge-usr: Stabilize 5 arm64, #883851

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-5.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
index 518e20442a02..3c4cbba04d92 100644
--- a/sys-apps/merge-usr/merge-usr-5.ebuild
+++ b/sys-apps/merge-usr/merge-usr-5.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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv 
~s390 sparc x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Mike Gilbert]

commit: 37cac2c13ecf27126b148b4102e56b0aeac55b9f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Dec  1 16:45:15 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Dec  1 16:45:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37cac2c1

sys-apps/merge-usr: mark ALLARCHES

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/merge-usr/metadata.xml b/sys-apps/merge-usr/metadata.xml
index 64def215f310..383f6308c8ac 100644
--- a/sys-apps/merge-usr/metadata.xml
+++ b/sys-apps/merge-usr/metadata.xml
@@ -5,6 +5,7 @@
flop...@gentoo.org
Mike Gilbert

+   

floppym/merge-usr

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

[Mike Gilbert]

commit: 3830b2c6e158474b53cc3b5420ba1cbb5cc919cb
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Nov  4 16:16:32 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Nov  4 16:16:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3830b2c6

sys-apps/merge-usr: add 5, drop 4

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/Manifest   | 2 +-
 sys-apps/merge-usr/{merge-usr-4.ebuild => merge-usr-5.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 4c8209a68fb6..af540161fb82 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1 @@
-DIST merge-usr-4.tar.gz 9494 BLAKE2B 
d431a276c04ba56996b63a6c93381f9f325c2107ca35b2cc5e9e6ba8f11b37fceab1ef5209fbd52178ca6c991d82c259220cc22e45856632f331e61d6f256592
 SHA512 
de614d9e15edbdb62c362dc022939d3f85622cd6c98a31d30cf41698b5c717d3b4978941b3793a320dc7a44ee29676e431d5b021b03c34d11ad60619aa34dabe
+DIST merge-usr-5.tar.gz 9492 BLAKE2B 
5fbd23a59f76004a1548ae230a4eccc9ecc81a36b235ed8744fd48cd980815c62929fb436068dd232812d92c39ed5f7d778ffe2ddbaaf4f9c7785c6927d6eb87
 SHA512 
b0b4d8da51a570057ce9aeccd4cf880c2a6bc52067958e23e5162d589b671a123ddbdab8a74dd5f076f689be737637e1b1a7b0581e94bfbae4e16ada37be6045

diff --git a/sys-apps/merge-usr/merge-usr-4.ebuild 
b/sys-apps/merge-usr/merge-usr-5.ebuild
similarity index 100%
rename from sys-apps/merge-usr/merge-usr-4.ebuild
rename to sys-apps/merge-usr/merge-usr-5.ebuild

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

[Mike Gilbert]

commit: 29e8109a12a05e6fa7020c3778adf549444c94c8
Author: Mike Gilbert  gentoo  org>
AuthorDate: Wed Nov  2 20:10:55 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Wed Nov  2 20:10:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e8109a

sys-apps/merge-usr: add 4, drop 3

Closes: https://bugs.gentoo.org/879091
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/Manifest   | 2 +-
 sys-apps/merge-usr/{merge-usr-3.ebuild => merge-usr-4.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 4c366fe38836..4c8209a68fb6 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1 @@
-DIST merge-usr-3.tar.gz 9364 BLAKE2B 
c6302ee9a819c2779d3de2d2ceca05311bc4733f4e8a2fb294b582fa92241b61179e5b92957761a10a1157ec766cf64da9c9a9486c90599442fffb8974c439bf
 SHA512 
606bfab1b7494f8475f41e514cb4dc071837ac9b0b96205ca832198c742c937dd1dcadc9bf48b69524422131873ace56362804380682dbed08a18515adfc9080
+DIST merge-usr-4.tar.gz 9494 BLAKE2B 
d431a276c04ba56996b63a6c93381f9f325c2107ca35b2cc5e9e6ba8f11b37fceab1ef5209fbd52178ca6c991d82c259220cc22e45856632f331e61d6f256592
 SHA512 
de614d9e15edbdb62c362dc022939d3f85622cd6c98a31d30cf41698b5c717d3b4978941b3793a320dc7a44ee29676e431d5b021b03c34d11ad60619aa34dabe

diff --git a/sys-apps/merge-usr/merge-usr-3.ebuild 
b/sys-apps/merge-usr/merge-usr-4.ebuild
similarity index 100%
rename from sys-apps/merge-usr/merge-usr-3.ebuild
rename to sys-apps/merge-usr/merge-usr-4.ebuild

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

[Mike Gilbert]

commit: b7bbfcddac74acd544770935024d765d45e1ff79
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Oct 30 20:17:57 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Oct 30 20:18:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7bbfcdd

sys-apps/merge-usr: add 3, drop 1 and 2

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/Manifest|  3 +--
 sys-apps/merge-usr/merge-usr-2.ebuild  | 23 --
 .../{merge-usr-1.ebuild => merge-usr-3.ebuild} |  0
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 945238e0b229..4c366fe38836 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,2 +1 @@
-DIST merge-usr-1.tar.gz 9217 BLAKE2B 
e826025e27341d69ec700be9fb9b57d354710275896fb33d98c49f72a97c360f02f663cfad957a9d71d1e73d961affca84221cc4d08b6b114906f6f8b55f920f
 SHA512 
3a81e1b737ffc2a51d59c18b4733d4df000ea66c55ab3cf5042f034148d7ef1a393bb09650b0d0c7a63ce07bdcb833a00d4cf3f6acc838073059a8879f6af5d3
-DIST merge-usr-2.tar.gz 9361 BLAKE2B 
1ef133fdf9a1a2063c211ff2f4c108e0f7f51d5a9e3fe21e03bcd29c7b604b71711d0eb2dc8b641fc578480aaa0c01d67da222cdc8c3185031e80a6b82f1
 SHA512 
c88933806e22dcabcadc6bd780f13d9e23f4a48acec3083b3bd93228ef2380e3bfe6bde774750d7daefadfc43c1ca5c57969f38b61374e2d4329898f56db31d0
+DIST merge-usr-3.tar.gz 9364 BLAKE2B 
c6302ee9a819c2779d3de2d2ceca05311bc4733f4e8a2fb294b582fa92241b61179e5b92957761a10a1157ec766cf64da9c9a9486c90599442fffb8974c439bf
 SHA512 
606bfab1b7494f8475f41e514cb4dc071837ac9b0b96205ca832198c742c937dd1dcadc9bf48b69524422131873ace56362804380682dbed08a18515adfc9080

diff --git a/sys-apps/merge-usr/merge-usr-2.ebuild 
b/sys-apps/merge-usr/merge-usr-2.ebuild
deleted file mode 100644
index 07055e4c6985..
--- a/sys-apps/merge-usr/merge-usr-2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 ~sparc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-BDEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-   python_doscript merge-usr
-}

diff --git a/sys-apps/merge-usr/merge-usr-1.ebuild 
b/sys-apps/merge-usr/merge-usr-3.ebuild
similarity index 100%
rename from sys-apps/merge-usr/merge-usr-1.ebuild
rename to sys-apps/merge-usr/merge-usr-3.ebuild

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

[Mike Gilbert]

commit: 75fbbabe6a69b5f26a6664a074afb9385eb5eb2f
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Oct 21 21:23:14 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Oct 21 21:23:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75fbbabe

sys-apps/merge-usr: drop 0

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/Manifest   |  1 -
 sys-apps/merge-usr/merge-usr-0.ebuild | 23 ---
 2 files changed, 24 deletions(-)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 4965602067d2..1d6d573ac0f0 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,2 +1 @@
-DIST merge-usr-0.tar.gz 9022 BLAKE2B 
b8590bbdff92f1297fb0a3335a3a380464661025c1d57e526df1c665966c3732e4cb1b7333d5108aac34b59d70032978cea4b6e93dd4c5e0a9069174e412d8e3
 SHA512 
3ccba0360cf576f3d2c5fca63a4b8119e85840165f085172d6d3b8fcab212285fc8511c2004e303144870ba7738305d4030360f14196a6b73df40c6842abc40b
 DIST merge-usr-1.tar.gz 9217 BLAKE2B 
e826025e27341d69ec700be9fb9b57d354710275896fb33d98c49f72a97c360f02f663cfad957a9d71d1e73d961affca84221cc4d08b6b114906f6f8b55f920f
 SHA512 
3a81e1b737ffc2a51d59c18b4733d4df000ea66c55ab3cf5042f034148d7ef1a393bb09650b0d0c7a63ce07bdcb833a00d4cf3f6acc838073059a8879f6af5d3

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
deleted file mode 100644
index 6ae74a2fc288..
--- a/sys-apps/merge-usr/merge-usr-0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 ~s390 ~sparc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-BDEPEND="${PYTHON_DEPS}"
-RDEPEND="${PYTHON_DEPS}"
-
-src_install() {
-   python_doscript merge-usr
-}

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

[Mike Gilbert]

commit: 00c5bb5ed5e40a896d24d017ed9dc54f08085183
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Oct 21 21:24:28 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Fri Oct 21 21:24:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c5bb5e

sys-apps/merge-usr: add 2

Signed-off-by: Mike Gilbert  gentoo.org>

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

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 1d6d573ac0f0..945238e0b229 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1,2 @@
 DIST merge-usr-1.tar.gz 9217 BLAKE2B 
e826025e27341d69ec700be9fb9b57d354710275896fb33d98c49f72a97c360f02f663cfad957a9d71d1e73d961affca84221cc4d08b6b114906f6f8b55f920f
 SHA512 
3a81e1b737ffc2a51d59c18b4733d4df000ea66c55ab3cf5042f034148d7ef1a393bb09650b0d0c7a63ce07bdcb833a00d4cf3f6acc838073059a8879f6af5d3
+DIST merge-usr-2.tar.gz 9361 BLAKE2B 
1ef133fdf9a1a2063c211ff2f4c108e0f7f51d5a9e3fe21e03bcd29c7b604b71711d0eb2dc8b641fc578480aaa0c01d67da222cdc8c3185031e80a6b82f1
 SHA512 
c88933806e22dcabcadc6bd780f13d9e23f4a48acec3083b3bd93228ef2380e3bfe6bde774750d7daefadfc43c1ca5c57969f38b61374e2d4329898f56db31d0

diff --git a/sys-apps/merge-usr/merge-usr-2.ebuild 
b/sys-apps/merge-usr/merge-usr-2.ebuild
new file mode 100644
index ..07055e4c6985
--- /dev/null
+++ b/sys-apps/merge-usr/merge-usr-2.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 ~sparc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+   python_doscript merge-usr
+}

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

[WANG Xuerui]

commit: f1352f205c2259f5ab376cf974cac52f761788f0
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Oct  7 08:28:47 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri Oct  7 08:29:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1352f20

sys-apps/merge-usr: keyword 1 for ~loong

Tested on bare-matal installation, works okay.

Bug: https://bugs.gentoo.org/868291
Signed-off-by: WANG Xuerui  gentoo.org>

 sys-apps/merge-usr/merge-usr-1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-1.ebuild 
b/sys-apps/merge-usr/merge-usr-1.ebuild
index 64f9430b454a..07055e4c6985 100644
--- a/sys-apps/merge-usr/merge-usr-1.ebuild
+++ b/sys-apps/merge-usr/merge-usr-1.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 
~riscv ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Michał Górny]

commit: 21a2db98aaa39f8c98da1a01aa16052998b496d0
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Sep 26 01:24:08 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 26 07:30:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a2db98

sys-apps/merge-usr: keyword 1 for ~alpha

Closes: https://github.com/gentoo/gentoo/pull/27464
Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/merge-usr/merge-usr-1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-1.ebuild 
b/sys-apps/merge-usr/merge-usr-1.ebuild
index d5f00347868a..64f9430b454a 100644
--- a/sys-apps/merge-usr/merge-usr-1.ebuild
+++ b/sys-apps/merge-usr/merge-usr-1.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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 
~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Yixun Lan]

commit: 430b90083e75f77467797695b7268a644f7cd7ea
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Sep 14 02:34:39 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Sep 14 02:39:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430b9008

sys-apps/merge-usr: keyword 1 for ~riscv, #868291

Signed-off-by: Yixun Lan  gentoo.org>

 sys-apps/merge-usr/merge-usr-1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-1.ebuild 
b/sys-apps/merge-usr/merge-usr-1.ebuild
index 6ae74a2fc288..d5f00347868a 100644
--- a/sys-apps/merge-usr/merge-usr-1.ebuild
+++ b/sys-apps/merge-usr/merge-usr-1.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 ~m68k ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Mike Gilbert]

commit: e91bd3fb6defafb7f8d9208b4e42e7a0d61cb92d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sat Sep 10 23:06:06 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Sep 10 23:06:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91bd3fb

sys-apps/merge-usr: add 1

Signed-off-by: Mike Gilbert  gentoo.org>

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

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index 6e9d2106baf5..4965602067d2 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1 +1,2 @@
 DIST merge-usr-0.tar.gz 9022 BLAKE2B 
b8590bbdff92f1297fb0a3335a3a380464661025c1d57e526df1c665966c3732e4cb1b7333d5108aac34b59d70032978cea4b6e93dd4c5e0a9069174e412d8e3
 SHA512 
3ccba0360cf576f3d2c5fca63a4b8119e85840165f085172d6d3b8fcab212285fc8511c2004e303144870ba7738305d4030360f14196a6b73df40c6842abc40b
+DIST merge-usr-1.tar.gz 9217 BLAKE2B 
e826025e27341d69ec700be9fb9b57d354710275896fb33d98c49f72a97c360f02f663cfad957a9d71d1e73d961affca84221cc4d08b6b114906f6f8b55f920f
 SHA512 
3a81e1b737ffc2a51d59c18b4733d4df000ea66c55ab3cf5042f034148d7ef1a393bb09650b0d0c7a63ce07bdcb833a00d4cf3f6acc838073059a8879f6af5d3

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 ..6ae74a2fc288
--- /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 ~s390 ~sparc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+   python_doscript merge-usr
+}

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

[James Le Cuirot]

commit: a7198b3056a58ae30dc097921b2d9989d4a99b85
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep 10 15:29:03 2022 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep 10 15:29:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7198b30

sys-apps/merge-usr: Keyword 0 for ~m68k

Manually tested.

Signed-off-by: James Le Cuirot  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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}"

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

[Arthur Zamarin]

commit: fa80cd54bf2cd44f8f6753d1a5fa5e7b1937c1d4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep  4 18:24:29 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep  4 18:24:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa80cd54

sys-apps/merge-usr: keyword 0 for ~ppc64

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index c672feb3657b..d22852ef7825 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Arthur Zamarin]

commit: 90b0acea1f87bec51d47ef333ef7bfd3b922943c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep  4 18:24:09 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep  4 18:24:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b0acea

sys-apps/merge-usr: keyword 0 for ~ppc

Tested on devbox

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 683d5084565a..c672feb3657b 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Arthur Zamarin]

commit: 9ce8ccdf46620d07913d19e090ad2bdb06f79c2b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Sep  4 18:18:56 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Sep  4 18:21:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce8ccdf

sys-apps/merge-usr: Keyword 0 ia64, #868291

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index d64a710e8157..683d5084565a 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: cdfe66559c24afab77bac69ed47faa67decb9c25
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  4 00:29:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  4 00:29:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdfe6655

sys-apps/merge-usr: keyword 0 for ~hppa

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 501e2c113d07..d64a710e8157 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Jakov Smolić]

commit: cf3f58c6ce357ed2260def4104c36261fa15116d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Sep  3 21:31:57 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Sep  3 21:31:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3f58c6

Revert "sys-apps/merge-usr: Keyword 0 ppc64, #868291"

This reverts commit 753e444c6c351334c5c54550a0ce7dc88ed25135.

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 393d4c555d83..501e2c113d07 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 ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Jakov Smolić]

commit: 686885ba28be7f57fd499d3aad605602cc588b59
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Sep  3 21:31:01 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Sep  3 21:31:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686885ba

Revert "sys-apps/merge-usr: Keyword 0 ppc, #868291"

This reverts commit b6f93763df76af8ce0d600825d61bd8b6f15445c.

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 26537d611c89..393d4c555d83 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 ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Jakov Smolić]

commit: b6f93763df76af8ce0d600825d61bd8b6f15445c
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Sep  3 21:29:43 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Sep  3 21:29:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6f93763

sys-apps/merge-usr: Keyword 0 ppc, #868291

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 393d4c555d83..26537d611c89 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 ~ppc64 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Jakov Smolić]

commit: 753e444c6c351334c5c54550a0ce7dc88ed25135
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Sep  3 21:29:41 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Sep  3 21:29:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753e444c

sys-apps/merge-usr: Keyword 0 ppc64, #868291

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 501e2c113d07..393d4c555d83 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Arthur Zamarin]

commit: 92285afe31dead5d93dbec77a6279e6432338958
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep  3 18:12:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep  3 18:12:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92285afe

sys-apps/merge-usr: keyword 0 for ~arm64, #868291

Tested on kamaji.arm, with systemd container fully migrated (all
6 stages listed in bug)

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 54762c44e634..501e2c113d07 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Arthur Zamarin]

commit: d55466efd602ead08b91ddda3392b4744fc08d21
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep  3 18:11:20 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep  3 18:12:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55466ef

sys-apps/merge-usr: keyword 0 for ~arm, #868291

Tested on kamaji.arm, with systemd container fully migrated (all
6 stages listed in bug)

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index bf7fe4f35de3..54762c44e634 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 ~s390 ~sparc"
+KEYWORDS="~amd64 ~arm ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Arthur Zamarin]

commit: 6436de7f6f0577ed7680a0c8b8ec3b4e9babd3b9
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep  3 16:48:13 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep  3 16:48:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6436de7f

sys-apps/merge-usr: keyword 0 for ~sparc, #868291

Tested on catbus.sparc, with systemd container fully migrated (all
6 stages listed in bug)

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 6ee692ec1a0a..bf7fe4f35de3 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 ~s390"
+KEYWORDS="~amd64 ~s390 ~sparc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Arthur Zamarin]

commit: e826126a7911c18f08903a18697ebc6a560c8966
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Sep  3 16:46:16 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Sep  3 16:48:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e826126a

sys-apps/merge-usr: keyword 0 for ~s390, #868291

Tested on lgentoo3.s390, with systemd container fully migrated (all
6 staged listed in bug)

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/merge-usr/merge-usr-0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
index 6f56ff4dac41..6ee692ec1a0a 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"
+KEYWORDS="~amd64 ~s390"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 BDEPEND="${PYTHON_DEPS}"

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

[Sam James]

commit: bad102e3d96843065075309a11fca1a60654013f
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 30 19:37:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 30 19:37:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bad102e3

sys-apps/merge-usr: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/merge-usr/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-apps/merge-usr/metadata.xml b/sys-apps/merge-usr/metadata.xml
index 077cdb6aa203..64def215f310 100644
--- a/sys-apps/merge-usr/metadata.xml
+++ b/sys-apps/merge-usr/metadata.xml
@@ -5,4 +5,7 @@
flop...@gentoo.org
Mike Gilbert

+   
+   floppym/merge-usr
+   
 

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

[Mike Gilbert]

commit: 421f0b93da93d899eb8c12bfee643bdd180fe628
Author: Mike Gilbert  gentoo  org>
AuthorDate: Tue Aug 30 17:49:43 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Aug 30 17:57:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=421f0b93

sys-apps/merge-usr: new package, add 0

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/merge-usr/Manifest   |  1 +
 sys-apps/merge-usr/merge-usr-0.ebuild | 23 +++
 sys-apps/merge-usr/metadata.xml   |  8 
 3 files changed, 32 insertions(+)

diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
new file mode 100644
index ..6e9d2106baf5
--- /dev/null
+++ b/sys-apps/merge-usr/Manifest
@@ -0,0 +1 @@
+DIST merge-usr-0.tar.gz 9022 BLAKE2B 
b8590bbdff92f1297fb0a3335a3a380464661025c1d57e526df1c665966c3732e4cb1b7333d5108aac34b59d70032978cea4b6e93dd4c5e0a9069174e412d8e3
 SHA512 
3ccba0360cf576f3d2c5fca63a4b8119e85840165f085172d6d3b8fcab212285fc8511c2004e303144870ba7738305d4030360f14196a6b73df40c6842abc40b

diff --git a/sys-apps/merge-usr/merge-usr-0.ebuild 
b/sys-apps/merge-usr/merge-usr-0.ebuild
new file mode 100644
index ..6f56ff4dac41
--- /dev/null
+++ b/sys-apps/merge-usr/merge-usr-0.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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+BDEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+   python_doscript merge-usr
+}

diff --git a/sys-apps/merge-usr/metadata.xml b/sys-apps/merge-usr/metadata.xml
new file mode 100644
index ..077cdb6aa203
--- /dev/null
+++ b/sys-apps/merge-usr/metadata.xml
@@ -0,0 +1,8 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   flop...@gentoo.org
+   Mike Gilbert
+   
+