From f932718a139f93e19a6883c061f81b365a408592 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 4 Nov 2022 21:16:38 +0000
Subject: gentoo auto-resync : 04:11:2022 - 21:16:37

---
 sys-apps/Manifest.gz                  | Bin 49301 -> 49291 bytes
 sys-apps/merge-usr/Manifest           |   4 ++--
 sys-apps/merge-usr/merge-usr-4.ebuild |  23 -----------------------
 sys-apps/merge-usr/merge-usr-5.ebuild |  23 +++++++++++++++++++++++
 4 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 sys-apps/merge-usr/merge-usr-4.ebuild
 create mode 100644 sys-apps/merge-usr/merge-usr-5.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5c0cb6484e1f..48a31ef4d61f 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/merge-usr/Manifest b/sys-apps/merge-usr/Manifest
index ea69842a792b..0899ced8a80e 100644
--- a/sys-apps/merge-usr/Manifest
+++ b/sys-apps/merge-usr/Manifest
@@ -1,3 +1,3 @@
-DIST merge-usr-4.tar.gz 9494 BLAKE2B d431a276c04ba56996b63a6c93381f9f325c2107ca35b2cc5e9e6ba8f11b37fceab1ef5209fbd52178ca6c991d82c259220cc22e45856632f331e61d6f256592 SHA512 de614d9e15edbdb62c362dc022939d3f85622cd6c98a31d30cf41698b5c717d3b4978941b3793a320dc7a44ee29676e431d5b021b03c34d11ad60619aa34dabe
-EBUILD merge-usr-4.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7
+DIST merge-usr-5.tar.gz 9492 BLAKE2B 5fbd23a59f76004a1548ae230a4eccc9ecc81a36b235ed8744fd48cd980815c62929fb436068dd232812d92c39ed5f7d778ffe2ddbaaf4f9c7785c6927d6eb87 SHA512 b0b4d8da51a570057ce9aeccd4cf880c2a6bc52067958e23e5162d589b671a123ddbdab8a74dd5f076f689be737637e1b1a7b0581e94bfbae4e16ada37be6045
+EBUILD merge-usr-5.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7
 MISC metadata.xml 329 BLAKE2B fdb965403d89b88b2bb3c1bbb5ae8dd614dfce3f8ebc379aeee60c2d55b529887e3663b3db98a0e1fd078cf62762888bd71685eaa052c73b821d944da16413de SHA512 8a55a22b7e45363c1e2b964cb80324584814a28b6aae34f88e061f6ab137d869905be1bc16590391b082bed98602b69e06def88ea90dde0be92279733fff2890
diff --git a/sys-apps/merge-usr/merge-usr-4.ebuild b/sys-apps/merge-usr/merge-usr-4.ebuild
deleted file mode 100644
index 07055e4c6985..000000000000
--- a/sys-apps/merge-usr/merge-usr-4.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-5.ebuild b/sys-apps/merge-usr/merge-usr-5.ebuild
new file mode 100644
index 000000000000..07055e4c6985
--- /dev/null
+++ b/sys-apps/merge-usr/merge-usr-5.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
+}
-- 
cgit v1.2.3