Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/merge-usr/
Date: Wed, 02 Nov 2022 20:11:32
Message-Id: 1667419855.29e8109a12a05e6fa7020c3778adf549444c94c8.floppym@gentoo
1 commit: 29e8109a12a05e6fa7020c3778adf549444c94c8
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 2 20:10:55 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 2 20:10:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e8109a
7
8 sys-apps/merge-usr: add 4, drop 3
9
10 Closes: https://bugs.gentoo.org/879091
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-apps/merge-usr/Manifest | 2 +-
14 sys-apps/merge-usr/{merge-usr-3.ebuild => merge-usr-4.ebuild} | 0
15 2 files changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
18 index 4c366fe38836..4c8209a68fb6 100644
19 --- a/sys-apps/merge-usr/Manifest
20 +++ b/sys-apps/merge-usr/Manifest
21 @@ -1 +1 @@
22 -DIST merge-usr-3.tar.gz 9364 BLAKE2B c6302ee9a819c2779d3de2d2ceca05311bc4733f4e8a2fb294b582fa92241b61179e5b92957761a10a1157ec766cf64da9c9a9486c90599442fffb8974c439bf SHA512 606bfab1b7494f8475f41e514cb4dc071837ac9b0b96205ca832198c742c937dd1dcadc9bf48b69524422131873ace56362804380682dbed08a18515adfc9080
23 +DIST merge-usr-4.tar.gz 9494 BLAKE2B d431a276c04ba56996b63a6c93381f9f325c2107ca35b2cc5e9e6ba8f11b37fceab1ef5209fbd52178ca6c991d82c259220cc22e45856632f331e61d6f256592 SHA512 de614d9e15edbdb62c362dc022939d3f85622cd6c98a31d30cf41698b5c717d3b4978941b3793a320dc7a44ee29676e431d5b021b03c34d11ad60619aa34dabe
24
25 diff --git a/sys-apps/merge-usr/merge-usr-3.ebuild b/sys-apps/merge-usr/merge-usr-4.ebuild
26 similarity index 100%
27 rename from sys-apps/merge-usr/merge-usr-3.ebuild
28 rename to sys-apps/merge-usr/merge-usr-4.ebuild