From 314a5f72ccfc3be0c1ba2c734416ffc69aa05de4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Oct 2022 02:03:41 +0100 Subject: gentoo auto-resync : 22:10:2022 - 02:03:41 --- sys-apps/Manifest.gz | Bin 49332 -> 49333 bytes sys-apps/merge-usr/Manifest | 4 ++-- sys-apps/merge-usr/merge-usr-0.ebuild | 23 ----------------------- sys-apps/merge-usr/merge-usr-2.ebuild | 23 +++++++++++++++++++++++ 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 sys-apps/merge-usr/merge-usr-0.ebuild create mode 100644 sys-apps/merge-usr/merge-usr-2.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 50d3379f24d3..b553152cea09 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 118c42196458..533e78b45ad7 100644 --- a/sys-apps/merge-usr/Manifest +++ b/sys-apps/merge-usr/Manifest @@ -1,5 +1,5 @@ -DIST merge-usr-0.tar.gz 9022 BLAKE2B b8590bbdff92f1297fb0a3335a3a380464661025c1d57e526df1c665966c3732e4cb1b7333d5108aac34b59d70032978cea4b6e93dd4c5e0a9069174e412d8e3 SHA512 3ccba0360cf576f3d2c5fca63a4b8119e85840165f085172d6d3b8fcab212285fc8511c2004e303144870ba7738305d4030360f14196a6b73df40c6842abc40b DIST merge-usr-1.tar.gz 9217 BLAKE2B e826025e27341d69ec700be9fb9b57d354710275896fb33d98c49f72a97c360f02f663cfad957a9d71d1e73d961affca84221cc4d08b6b114906f6f8b55f920f SHA512 3a81e1b737ffc2a51d59c18b4733d4df000ea66c55ab3cf5042f034148d7ef1a393bb09650b0d0c7a63ce07bdcb833a00d4cf3f6acc838073059a8879f6af5d3 -EBUILD merge-usr-0.ebuild 606 BLAKE2B b1afb8b28ae525d38c9258488644bfa3816fcb002108e6b6d1501278c14e6693e3d575f031919e7fbabd0aa07318d862f1931597d0348833369a88359e23f401 SHA512 0dc5f238aeac57c9bbf1e6fc6993d27be7b45a1eadf2aa148d86614ba3c10518bd31f20c4193f490c60f18184b2590e0a16375c740c6e83d74ee15f8243ccad9 +DIST merge-usr-2.tar.gz 9361 BLAKE2B 1ef133fdf9a1a2063c2cccc11ff2f4c108e0f7f51d5a9e3fe21e03bcd29c7b604b71711d0eb2dc8b641fc578480aaa0c01d67da222cdc8c3185031e80a6b82f1 SHA512 c88933806e22dcabcadc6bd780f13d9e23f4a48acec3083b3bd93228ef2380e3bfe6bde774750d7daefadfc43c1ca5c57969f38b61374e2d4329898f56db31d0 EBUILD merge-usr-1.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7 +EBUILD merge-usr-2.ebuild 627 BLAKE2B 4cc257f8e5f7acf4b4eb9491e8ff63af699ff52060cc430003686973a38739ae2eb49b7f11fa603f9fb53d4f7a7e591802cc035d9241c2820b4e4dd2ef8c058b SHA512 b21913c55e3839dfb8d6490b67b964efb5020364feb90773d7ebdea11e8609cc995183a0a9e6fbe1d50cc135d3a4e7532b22324a347cd39d4d9ce9f6276369e7 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 deleted file mode 100644 index 6ae74a2fc288..000000000000 --- 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 -} 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 000000000000..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 +} -- cgit v1.2.3