diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2022-10-30 16:17:57 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2022-10-30 16:18:43 -0400 |
| commit | b7bbfcddac74acd544770935024d765d45e1ff79 (patch) | |
| tree | 3f9f1cac36b1e0711dbe31feb700c0058bc04775 | |
| parent | dev-python/contourpy: add 1.0.6 (diff) | |
| download | gentoo-b7bbfcdd.tar.gz gentoo-b7bbfcdd.tar.bz2 gentoo-b7bbfcdd.zip | |
sys-apps/merge-usr: add 3, drop 1 and 2
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-apps/merge-usr/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/merge-usr/merge-usr-2.ebuild | 23 | ||||
| -rw-r--r-- | sys-apps/merge-usr/merge-usr-3.ebuild (renamed from sys-apps/merge-usr/merge-usr-1.ebuild) | 0 |
3 files changed, 1 insertions, 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 index 07055e4c6985..07055e4c6985 100644 --- a/sys-apps/merge-usr/merge-usr-1.ebuild +++ b/sys-apps/merge-usr/merge-usr-3.ebuild |