From 9285aa60d04bd972cc1591ce33b9a76d731011e9 Mon Sep 17 00:00:00 2001 From: Zen Date: Sun, 9 Jun 2024 15:35:24 -0500 Subject: [PATCH 01/10] dev-python/pycpio: Add 1.2.0 Signed-off-by: Zen --- dev-python/pycpio/pycpio-1.2.0.ebuild | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 dev-python/pycpio/pycpio-1.2.0.ebuild diff --git a/dev-python/pycpio/pycpio-1.2.0.ebuild b/dev-python/pycpio/pycpio-1.2.0.ebuild new file mode 100644 index 0000000000..48966fa068 --- /dev/null +++ b/dev-python/pycpio/pycpio-1.2.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) +inherit distutils-r1 + +DESCRIPTION="Python CPIO library" +HOMEPAGE="https://github.com/desultory/pycpio" +SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]" From 9d9a54cf0c7218a4dd3a72d83336a94134d4592c Mon Sep 17 00:00:00 2001 From: Zen Date: Sun, 9 Jun 2024 15:36:18 -0500 Subject: [PATCH 02/10] dev-python/pycpio: Add manifest Signed-off-by: Zen --- dev-python/pycpio/Manifest | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest index 3737b3e93f..82928b9125 100644 --- a/dev-python/pycpio/Manifest +++ b/dev-python/pycpio/Manifest @@ -2,3 +2,4 @@ DIST pycpio-1.0.0.tar.gz 17890 BLAKE2B beeec891fc17416280247e8a15373628f40be1094 DIST pycpio-1.1.2.tar.gz 18207 BLAKE2B acc92b626b5a110b8aa1672449fa1065283edfeb300c406b654e5a045bc554d9f79d3cd8f7edb53142405e600ceec21fa811a863907af3464d310482aa3fc528 SHA512 9a420edabec91e633b618f68878942d047d851eecad861255705f3db3f9fa8d14fa364f19320eb22758bbb7f1b23e7231b5db7aca117e670286e73f1dcb289ce DIST pycpio-1.1.4.tar.gz 18235 BLAKE2B 5b7aa4f9af1903b02361cad228673a83deaa497b3259ef7094d1b6995860eed8710e0d0aa6fc4603a4f52f6f7ab3c4356bc37134a70f80f0a1e4f36ce782beb3 SHA512 46cf8f43cb95332d55b75318b5620f81632151010d1329177243853bca5cf8dbc2881805d2d304bfd1889d504fa0f03ac54e5377a42ba1e0b8f1166c12e9fa3c DIST pycpio-1.1.6.tar.gz 18281 BLAKE2B c0a6d39ec20c91ec39d6f7ef99cb05d039ea1e89369205196fe40c924f8ed9757e26ea8f31a8036693f8ea04901343421405c4b50cec33df90b548550f0f2f81 SHA512 34a59a279ff1d271fb824c9f7be94da0b3bfedd49c09a8fe8855851363200f104b67a9d7686cc8f1364f325b8d8c86e6fe3dff162bb49ddc6a9b8ec10ee75724 +DIST pycpio-1.2.0.tar.gz 18473 BLAKE2B 240523b7a169e952b6539879b622e3c32db9fce19763f69a19cf6c6b0d0fb0e25b78bd9a7cd6d84d8076ee7dd3361c2e026c4425f8ff2ee9a4017b1695003aae SHA512 282e74b289a1e998c336a62fddb6394d0f0014153f860b070ed2f642c556e30ee311a5ccaaf3245fc254a223c99896a604c8c736eb861edc944b90f4a42b9b79 From a95ab858664d6a255999636907c67d7003aeac0c Mon Sep 17 00:00:00 2001 From: Zen Date: Sun, 9 Jun 2024 15:48:35 -0500 Subject: [PATCH 03/10] dev-python/pycpio: Drop 1.2.0, add 1.2.1 Signed-off-by: Zen --- dev-python/pycpio/Manifest | 2 +- dev-python/pycpio/{pycpio-1.2.0.ebuild => pycpio-1.2.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev-python/pycpio/{pycpio-1.2.0.ebuild => pycpio-1.2.1.ebuild} (100%) diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest index 82928b9125..1de5d63fe0 100644 --- a/dev-python/pycpio/Manifest +++ b/dev-python/pycpio/Manifest @@ -2,4 +2,4 @@ DIST pycpio-1.0.0.tar.gz 17890 BLAKE2B beeec891fc17416280247e8a15373628f40be1094 DIST pycpio-1.1.2.tar.gz 18207 BLAKE2B acc92b626b5a110b8aa1672449fa1065283edfeb300c406b654e5a045bc554d9f79d3cd8f7edb53142405e600ceec21fa811a863907af3464d310482aa3fc528 SHA512 9a420edabec91e633b618f68878942d047d851eecad861255705f3db3f9fa8d14fa364f19320eb22758bbb7f1b23e7231b5db7aca117e670286e73f1dcb289ce DIST pycpio-1.1.4.tar.gz 18235 BLAKE2B 5b7aa4f9af1903b02361cad228673a83deaa497b3259ef7094d1b6995860eed8710e0d0aa6fc4603a4f52f6f7ab3c4356bc37134a70f80f0a1e4f36ce782beb3 SHA512 46cf8f43cb95332d55b75318b5620f81632151010d1329177243853bca5cf8dbc2881805d2d304bfd1889d504fa0f03ac54e5377a42ba1e0b8f1166c12e9fa3c DIST pycpio-1.1.6.tar.gz 18281 BLAKE2B c0a6d39ec20c91ec39d6f7ef99cb05d039ea1e89369205196fe40c924f8ed9757e26ea8f31a8036693f8ea04901343421405c4b50cec33df90b548550f0f2f81 SHA512 34a59a279ff1d271fb824c9f7be94da0b3bfedd49c09a8fe8855851363200f104b67a9d7686cc8f1364f325b8d8c86e6fe3dff162bb49ddc6a9b8ec10ee75724 -DIST pycpio-1.2.0.tar.gz 18473 BLAKE2B 240523b7a169e952b6539879b622e3c32db9fce19763f69a19cf6c6b0d0fb0e25b78bd9a7cd6d84d8076ee7dd3361c2e026c4425f8ff2ee9a4017b1695003aae SHA512 282e74b289a1e998c336a62fddb6394d0f0014153f860b070ed2f642c556e30ee311a5ccaaf3245fc254a223c99896a604c8c736eb861edc944b90f4a42b9b79 +DIST pycpio-1.2.1.tar.gz 18512 BLAKE2B e835e3810d174d8f4cd5afc2984c0d84d55f9492725c16afdcd1b760dc8c58b4b83a1d13c0b266c8ec9407ab5c1114fe95468d742b202ba99e3c4a76a69dff15 SHA512 4611829339a45a848deb0c5c35098215ac7c378714e4fb1e10975e00b386e5e6bcd295fde83f361998f234f506276b906a4424a7d4aa925fe2bd92a0d7311d86 diff --git a/dev-python/pycpio/pycpio-1.2.0.ebuild b/dev-python/pycpio/pycpio-1.2.1.ebuild similarity index 100% rename from dev-python/pycpio/pycpio-1.2.0.ebuild rename to dev-python/pycpio/pycpio-1.2.1.ebuild From e8a99c92024dcf97eff1e44ffc85c3a214271f3f Mon Sep 17 00:00:00 2001 From: Zen Date: Sun, 9 Jun 2024 16:12:34 -0500 Subject: [PATCH 04/10] sys-kernel/ugrd: Add 1.12.0 Signed-off-by: Zen --- sys-kernel/ugrd/Manifest | 1 + sys-kernel/ugrd/ugrd-1.12.0.ebuild | 52 ++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 sys-kernel/ugrd/ugrd-1.12.0.ebuild diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest index d4eef6d0f1..705e6d2e9e 100644 --- a/sys-kernel/ugrd/Manifest +++ b/sys-kernel/ugrd/Manifest @@ -1,4 +1,5 @@ DIST ugrd-1.11.2.tar.gz 63195 BLAKE2B 059d2e734feb62f028da0ae004f538599557666863608e9e7fecc73b5db1a17e075c7753a57d1692a14d834071aa0434e47255e94a4fb085f18bda7e984f2adb SHA512 26a87ba78263ead981857dd9b9e1bdadc78caf2ce45bc94fe7556c142208d5c89bad9650cfcccea4b4b87b2c19e68f707c3b2c4cd16021c6e3c977119e37f5d6 +DIST ugrd-1.12.0.tar.gz 63609 BLAKE2B 1d5938d6b15b0594ea874909fbde508222609cbd84a4d04880a82f508f7406a723a2cccc57b25b79f489147695009c54f2b5cd35d0fd977422bac3258a85c6ef SHA512 153e47f8779c9a4cdcc42834e3741a79a81e2d7ba4524a268909cecb0c35033e70298a682e424daa23d5ff73b7e04580e35c2f6c9a1105ad310dcadb755ec89b DIST ugrd-1.2.2.tar.gz 49312 BLAKE2B 819457ae44cb278b93ef24af5e0aa2e23bf2d31d07fccec86e597f658a5cb13aad7838b08df644090417719402673b63087d27b6edbdb46dea04b98b48d26fb0 SHA512 6348458708406408973534ac5f15f8f9f6d9427bbac48443f7ff362bb97627be6288ba2d138355f92fc1c79a4eb5e51081485adb051cadf523a58f1ef618667e DIST ugrd-1.3.8.tar.gz 50142 BLAKE2B 0a61977eb6c0fb6af31db445061385057acf825b4fd300aecda25b70a3ee0ce941c34a2c4d8a712e5d737c4aa2a01f0eb6e5e4dfabc4cd4436f343356d1890ea SHA512 95f5b9b2ea60409b6e5f33e813c7a5c4c8c2613c724b15d9a2b482fd8dd4eb59a209473cade9496fb901f633c3a06357a2cd9477cc3de1f2e2f759162065eb6e DIST ugrd-1.4.0.tar.gz 50372 BLAKE2B aa5b253d78f82d9a35d812d8090441e7c068c048530a5a4e27c6dd0e15d4e3c4b59582311043a5a55904b09c8468d2600c2548e32e1c918b5f7db45c367e9653 SHA512 020eaae8659f5143a63c122fe6f30ed48b231f96d8ae9eb4f3c2861684d9dbe8999fcc5d6d7fa68d473bd565089f96a36f3fa01c61f8113955eac2aef1f3fe2c diff --git a/sys-kernel/ugrd/ugrd-1.12.0.ebuild b/sys-kernel/ugrd/ugrd-1.12.0.ebuild new file mode 100644 index 0000000000..aa83039994 --- /dev/null +++ b/sys-kernel/ugrd/ugrd-1.12.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) +inherit distutils-r1 optfeature shell-completion + +DESCRIPTION="Python based initramfs generator with TOML defintions" +HOMEPAGE="https://github.com/desultory/ugrd" +SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RDEPEND=" + app-misc/pax-utils + >=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}] + >=dev-python/pycpio-1.2.1[${PYTHON_USEDEP}] + sys-apps/pciutils +" + +src_install() { + # Call the distutils-r1_src_install function to install the package + distutils-r1_src_install + # Create the ugrd config directory + keepdir /etc/ugrd + # Install the example config into /etc/ugrd/config.toml + # Do not overwrite an existing config + insinto /etc/ugrd + newins examples/example.toml config.toml + # Create the kernel preinst.d directory if it doesn't exist + # Install the kernel preinst.d hook + exeinto /usr/lib/kernel/preinst.d + doexe hooks/installkernel/52-ugrd.install + exeinto /usr/lib/kernel/install.d + doexe hooks/kernel-install/52-ugrd.install + # Install bash autocomplete script + dobashcomp completion/ugrd + dozshcomp completion/_ugrd +} + +pkg_postinst() { + optfeature "ugrd.crypto.cryptsetup support" sys-fs/cryptsetup + optfeature "ugrd.fs.btrfs support" sys-fs/btrfs-progs + optfeature "ugrd.crypto.gpg support" app-crypt/gnupg + optfeature "ugrd.fs.lvm support" sys-fs/lvm2[lvm] + ewarn "UGRD will not be used with installkernel unless 'ugrd' is set as the" + ewarn "'initrd_generator' in /etc/kernel/install.conf." +} From 0bc8ef3620a73934c1708167b38afdfaa1bb2763 Mon Sep 17 00:00:00 2001 From: Zen Date: Sun, 9 Jun 2024 18:28:48 -0500 Subject: [PATCH 05/10] dev-python/pycpio: Add 9999 Signed-off-by: Zen --- dev-python/pycpio/pycpio-9999.ebuild | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 dev-python/pycpio/pycpio-9999.ebuild diff --git a/dev-python/pycpio/pycpio-9999.ebuild b/dev-python/pycpio/pycpio-9999.ebuild new file mode 100644 index 0000000000..190f9a014b --- /dev/null +++ b/dev-python/pycpio/pycpio-9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11..12} ) +inherit distutils-r1 git-r3 + +DESCRIPTION="Python CPIO library" +HOMEPAGE="https://github.com/desultory/pycpio" +EGIT_REPO_URI="https://github.com/desultory/${PN}" + +LICENSE="GPL-2" +SLOT="0" + +RDEPEND=">=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}]" From 892d6f8105549e6f6e80cc6593552660c28bc57d Mon Sep 17 00:00:00 2001 From: Zen Date: Sun, 9 Jun 2024 18:31:24 -0500 Subject: [PATCH 06/10] sys-kernel/ugrd: Update 9999 to use pycpio-9999 Signed-off-by: Zen --- sys-kernel/ugrd/ugrd-9999.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-kernel/ugrd/ugrd-9999.ebuild b/sys-kernel/ugrd/ugrd-9999.ebuild index de6ede04fa..6f3a6de3a4 100644 --- a/sys-kernel/ugrd/ugrd-9999.ebuild +++ b/sys-kernel/ugrd/ugrd-9999.ebuild @@ -17,7 +17,7 @@ SLOT="0" RDEPEND=" app-misc/pax-utils >=dev-python/zenlib-2.1.2[${PYTHON_USEDEP}] - >=dev-python/pycpio-1.1.2[${PYTHON_USEDEP}] + >=dev-python/pycpio-9999[${PYTHON_USEDEP}] sys-apps/pciutils " From 65406183c23ff99126ab733612325e9c6aad3cc9 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 10 Jun 2024 08:54:17 +0300 Subject: [PATCH 07/10] dev-python/sdnotify: treeclean Bug: https://bugs.gentoo.org/931420 Signed-off-by: Viorel Munteanu --- dev-python/sdnotify/Manifest | 1 - dev-python/sdnotify/metadata.xml | 12 ----------- dev-python/sdnotify/sdnotify-0.3.2.ebuild | 25 ----------------------- 3 files changed, 38 deletions(-) delete mode 100644 dev-python/sdnotify/Manifest delete mode 100644 dev-python/sdnotify/metadata.xml delete mode 100644 dev-python/sdnotify/sdnotify-0.3.2.ebuild diff --git a/dev-python/sdnotify/Manifest b/dev-python/sdnotify/Manifest deleted file mode 100644 index 73384e0746..0000000000 --- a/dev-python/sdnotify/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sdnotify-0.3.2.tar.gz 2459 BLAKE2B 1d1846e37889c36cfa7242d14e4040ebb9b73d3e53f5a3423447ae1a4912373e4249faa7803ac212e3c7d64371d1fe9e1be2d56f8604791cead2cbe22e422053 SHA512 f7e7d38c8d7f56ebad8b0343361a0bf6177208b94916430343a0a392015622d7bb62aa391e17956e5aa9a0d7189c79268cb86c46bb52b36488df5aebca5cfbd3 diff --git a/dev-python/sdnotify/metadata.xml b/dev-python/sdnotify/metadata.xml deleted file mode 100644 index 768e83c1b9..0000000000 --- a/dev-python/sdnotify/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - ceamac@gentoo.org - Primary maintainer - - - bb4242/sdnotify - sdnotify - - diff --git a/dev-python/sdnotify/sdnotify-0.3.2.ebuild b/dev-python/sdnotify/sdnotify-0.3.2.ebuild deleted file mode 100644 index 49b8409238..0000000000 --- a/dev-python/sdnotify/sdnotify-0.3.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 pypi - -DESCRIPTION="Python implementation of the systemd sd_notify protocol" -HOMEPAGE=" - https://github.com/bb4242/sdnotify - https://pypi.org/project/sdnotify/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -python_prepare_all() { - # Fix QA warning. No point in reporting upstream, the project seems abandoned - sed 's/description-file/description_file/' -i setup.cfg - - distutils-r1_python_prepare_all -} From 9edd69c1acb8204a7b64edd98aa36fc8302b313c Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 10 Jun 2024 08:54:45 +0300 Subject: [PATCH 08/10] profiles: Remove dev-python/sdnotify Signed-off-by: Viorel Munteanu --- profiles/package.mask | 6 ------ 1 file changed, 6 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 042f3fc0aa..847b005782 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -104,12 +104,6 @@ dev-python/portion # Removal: 2024-06-09. Bug #931440. dev-python/wrapio -# Viorel Munteanu (2024-05-10) -# No upstream activity in more than 3 years. -# No revdeps left in tree. -# Removal: 2024-06-09. Bug #931420. -dev-python/sdnotify - # Julien Roy (2024-03-21) # sys-libs/libucontext is masked in ::gentoo sys-libs/gcompat From 80aabd5096993c76c9800453fe7d7a51dd315844 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 10 Jun 2024 08:55:13 +0300 Subject: [PATCH 09/10] dev-python/wrapio: treeclean Bug: https://bugs.gentoo.org/931440 Signed-off-by: Viorel Munteanu --- dev-python/wrapio/Manifest | 1 - dev-python/wrapio/metadata.xml | 12 ------------ dev-python/wrapio/wrapio-2.0.0.ebuild | 18 ------------------ 3 files changed, 31 deletions(-) delete mode 100644 dev-python/wrapio/Manifest delete mode 100644 dev-python/wrapio/metadata.xml delete mode 100644 dev-python/wrapio/wrapio-2.0.0.ebuild diff --git a/dev-python/wrapio/Manifest b/dev-python/wrapio/Manifest deleted file mode 100644 index 4556e129ad..0000000000 --- a/dev-python/wrapio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wrapio-2.0.0.tar.gz 5197 BLAKE2B 1fc6bc0792b0a14b4c39bf9be85baa33580e98535d44d2aae726713a838e99b0b8e3ce69d17242843a754966dc6fc502452a8c095079b785f622883620ed9a68 SHA512 ae15cf05c7689a738514f4c6bd815bdbc90b6929a1da958486cd3b0bd5ee7055fa13d7e8edccbff6cb5fdf07088ddad316d9cd42e2d2e97fe56687b8f73cc84c diff --git a/dev-python/wrapio/metadata.xml b/dev-python/wrapio/metadata.xml deleted file mode 100644 index 1dde812902..0000000000 --- a/dev-python/wrapio/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - ceamac@gentoo.org - Primary maintainer - - - Exahilosys/wrapio - wrapio - - diff --git a/dev-python/wrapio/wrapio-2.0.0.ebuild b/dev-python/wrapio/wrapio-2.0.0.ebuild deleted file mode 100644 index fd567c8756..0000000000 --- a/dev-python/wrapio/wrapio-2.0.0.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) -inherit distutils-r1 pypi - -DESCRIPTION="Handling event-based streams in Python" -HOMEPAGE=" - https://github.com/Exahilosys/wrapio - https://pypi.org/project/wrapio/ - " - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" From 5b12513a816f8820fa1ee741e7770d352003e6b7 Mon Sep 17 00:00:00 2001 From: Viorel Munteanu Date: Mon, 10 Jun 2024 08:55:48 +0300 Subject: [PATCH 10/10] profiles: Remove dev-python/wrapio Signed-off-by: Viorel Munteanu --- profiles/package.mask | 6 ------ 1 file changed, 6 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 847b005782..f6288c7bd8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -98,12 +98,6 @@ dev-python/multipart # Removal in 30 days dev-python/portion -# Viorel Munteanu (2024-05-10) -# No upstream activity in 3 years. -# No revdeps left in tree. -# Removal: 2024-06-09. Bug #931440. -dev-python/wrapio - # Julien Roy (2024-03-21) # sys-libs/libucontext is masked in ::gentoo sys-libs/gcompat