From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BEA68158020 for ; Sun, 30 Oct 2022 20:18:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 04B0AE0769; Sun, 30 Oct 2022 20:18:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB0BAE0769 for ; Sun, 30 Oct 2022 20:18:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CDDC6340D35 for ; Sun, 30 Oct 2022 20:18:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 352235E8 for ; Sun, 30 Oct 2022 20:18:45 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1667161123.b7bbfcddac74acd544770935024d765d45e1ff79.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/merge-usr/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/merge-usr/Manifest sys-apps/merge-usr/merge-usr-1.ebuild sys-apps/merge-usr/merge-usr-2.ebuild sys-apps/merge-usr/merge-usr-3.ebuild X-VCS-Directories: sys-apps/merge-usr/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b7bbfcddac74acd544770935024d765d45e1ff79 X-VCS-Branch: master Date: Sun, 30 Oct 2022 20:18:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2792b38f-04d4-4057-97f5-1695f502dc12 X-Archives-Hash: 84655c35b0cfb77d1c1a3d92eb88010a commit: b7bbfcddac74acd544770935024d765d45e1ff79 Author: Mike Gilbert gentoo org> AuthorDate: Sun Oct 30 20:17:57 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Oct 30 20:18:43 2022 +0000 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 1ef133fdf9a1a2063c2cccc11ff2f4c108e0f7f51d5a9e3fe21e03bcd29c7b604b71711d0eb2dc8b641fc578480aaa0c01d67da222cdc8c3185031e80a6b82f1 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..000000000000 --- 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