commit: fb2744d80071ec136192752c8e594e5b51b152d2
Author: Zen <z <AT> pyl <DOT> onl>
AuthorDate: Sun Dec 31 22:41:46 2023 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Dec 31 22:45:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb2744d8
Add zen-util and zen-logging to split zenlib. Update packages which use
zenlib to use more split libraries
Signed-off-by: Zen <z <AT> pyl.onl>
dev-python/pycpio/Manifest | 3 +-
.../{pycpio-0.6.1.ebuild => pycpio-0.7.3.ebuild} | 3 +-
dev-python/zen-logging/Manifest | 1 +
dev-python/zen-logging/metadata.xml | 11 ++++++
.../zen-logging-1.1.0.ebuild} | 6 +--
dev-python/zen-util/Manifest | 1 +
dev-python/zen-util/metadata.xml | 11 ++++++
.../zen-util-1.0.1.ebuild} | 9 ++---
sys-kernel/ugrd/Manifest | 1 +
sys-kernel/ugrd/ugrd-0.19.2.ebuild | 44 ++++++++++++++++++++++
10 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/dev-python/pycpio/Manifest b/dev-python/pycpio/Manifest
index e6bbe54a64..b5aa717b6d 100644
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,2 +1 @@
-DIST pycpio-0.6.1.tar.gz 17236 BLAKE2B
4951ba3b7ad2fe603eb1cc07c851349de2ad73985ad1b2efcdb138f2ba26c43040a09d036ef993a28190b381af58bb8dc2e876ed1dff309ac010b69341a8c881
SHA512
49386b45172b13ecdeb040b719eaae0f17e5cbf7d68d3dcbcec99e01bfb3c539b8b02a768da640f56bb8941e79053c56e391b7186c9a5e5226d91fbdc55eeb11
-DIST pycpio-0.7.0.tar.gz 17942 BLAKE2B
760bfec68fe77ac9495a01fd8481e7f7a88fce0be983e60220bba66e12b104214117fd0e18e362bf1fc7a367226a5c874940fa43c23f7fee2bb39f76ec4a2ccb
SHA512
4730083295e0bde39651d323507d12adef6b27e2cde095e281c76f4b6f20262eaa40cf31eb900d6818a7266b3b21c6159a334fd088249a55d054e277200ffaaa
+DIST pycpio-0.7.3.tar.gz 17991 BLAKE2B
92b6ae62dd1d81b9c87423e417ef24989df6340b22cf1686a7718dd164c2ed4193b65fd2be55bb17d86500fefec9e2a81efd2c518943bca6d6225e819c30cf86
SHA512
509294f8f0688cd3c9b82790bbf23627a3aeb045ecb7f2371fbaae10c6d9ae98a7965d25e19f8ef3d230faeddb5fad82b8305876fb144122f2bd6c46b4fe19f0
diff --git a/dev-python/pycpio/pycpio-0.6.1.ebuild
b/dev-python/pycpio/pycpio-0.7.3.ebuild
similarity index 85%
copy from dev-python/pycpio/pycpio-0.6.1.ebuild
copy to dev-python/pycpio/pycpio-0.7.3.ebuild
index cc9f2e41e4..a36203e9fa 100644
--- a/dev-python/pycpio/pycpio-0.6.1.ebuild
+++ b/dev-python/pycpio/pycpio-0.7.3.ebuild
@@ -15,4 +15,5 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-DEPEND=">=dev-python/zenlib-1.2.0"
+DEPEND=">=dev-python/zen-logging-1.1.0
+>=dev-python/zen-util-1.0.1"
diff --git a/dev-python/zen-logging/Manifest b/dev-python/zen-logging/Manifest
new file mode 100644
index 0000000000..564edcccab
--- /dev/null
+++ b/dev-python/zen-logging/Manifest
@@ -0,0 +1 @@
+DIST zen-logging-1.1.0.tar.gz 9798 BLAKE2B
3a97b934e8c35bce0c3fbf720b776e0c563f2b06e57c29a6ffbb58786ed6e8ffc39da7ab2db3196affbc43029f14ff0b55c4647aa7fbe1f03f7a1b54accf4c59
SHA512
febdc2fe9cf2d44f9c2547b0eb3d79aef097e9c191a5118031e330210bc092c0c6b4242eeaa0f27f6b2181d3689bd4369b1ac4c28629c2554038766690204822
diff --git a/dev-python/zen-logging/metadata.xml
b/dev-python/zen-logging/metadata.xml
new file mode 100644
index 0000000000..248b2b4feb
--- /dev/null
+++ b/dev-python/zen-logging/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="person">
+ <email>d...@pyl.onl</email>
+ <name>Zen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">desultory/zen-logging</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycpio/pycpio-0.6.1.ebuild
b/dev-python/zen-logging/zen-logging-1.1.0.ebuild
similarity index 73%
rename from dev-python/pycpio/pycpio-0.6.1.ebuild
rename to dev-python/zen-logging/zen-logging-1.1.0.ebuild
index cc9f2e41e4..058a94d25c 100644
--- a/dev-python/pycpio/pycpio-0.6.1.ebuild
+++ b/dev-python/zen-logging/zen-logging-1.1.0.ebuild
@@ -7,12 +7,10 @@ DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..12} )
inherit distutils-r1
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio";
+DESCRIPTION="Python logging helpers"
+HOMEPAGE="https://github.com/desultory/zen_logging";
SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-
-DEPEND=">=dev-python/zenlib-1.2.0"
diff --git a/dev-python/zen-util/Manifest b/dev-python/zen-util/Manifest
new file mode 100644
index 0000000000..6883e71eba
--- /dev/null
+++ b/dev-python/zen-util/Manifest
@@ -0,0 +1 @@
+DIST zen-util-1.0.1.tar.gz 11025 BLAKE2B
0e47e9a62a4f0f2e573e16a11956ee20505d5618c7e2c47b5699d699a6e920f23f935122de9b0fd5128a070a99758f9b40aa9df39190805ca609814a26b8a4b8
SHA512
88110ab041255def72364e5dfc95818b250b8f52a0d7505a7023b8a3a418247f38707f6c9d0858ae492976969c78bc8a292545c28d22721c8c5b2cce7c90d68c
diff --git a/dev-python/zen-util/metadata.xml b/dev-python/zen-util/metadata.xml
new file mode 100644
index 0000000000..ec9806d004
--- /dev/null
+++ b/dev-python/zen-util/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+ <maintainer type="person">
+ <email>d...@pyl.onl</email>
+ <name>Zen</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">desultory/zen-util</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/pycpio/pycpio-0.7.0.ebuild
b/dev-python/zen-util/zen-util-1.0.1.ebuild
similarity index 61%
rename from dev-python/pycpio/pycpio-0.7.0.ebuild
rename to dev-python/zen-util/zen-util-1.0.1.ebuild
index 1d06a3ea75..6c4a9a590d 100644
--- a/dev-python/pycpio/pycpio-0.7.0.ebuild
+++ b/dev-python/zen-util/zen-util-1.0.1.ebuild
@@ -7,15 +7,12 @@ DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{11..12} )
inherit distutils-r1
-DESCRIPTION="Python CPIO library"
-HOMEPAGE="https://github.com/desultory/pycpio";
+DESCRIPTION="Python logging helpers"
+HOMEPAGE="https://github.com/desultory/zen_logging";
SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
-# Specify the subdirectory containing the actual source code
-S="${WORKDIR}/${PN}-${PV}"
-
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-DEPEND=">=dev-python/zenlib-1.1.1"
+RDEPEND=">=dev-python/zen-logging-1.1.0"
diff --git a/sys-kernel/ugrd/Manifest b/sys-kernel/ugrd/Manifest
index 280a49d1fd..8a81e522d0 100644
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -1,2 +1,3 @@
DIST ugrd-0.12.1.tar.gz 39929 BLAKE2B
d4d2788c0d23907b87ea6c98607f3d36e25c895618668123089c2cb96dc8895be411c7c5865522b58a53a90c51e77f874ee13324c5602bceb325bb680dccf63b
SHA512
3dec60f8535bb63525a0da07583d35c539de27e0d4ab2c79c033ce49a1b745b262a245e58224f5fabb1450af76d750578e47d60eb0961ac842eaed6e5f212c7d
DIST ugrd-0.19.1.tar.gz 44713 BLAKE2B
e22d8c6df5cffb6c903badf6b45f693a319215791d2fae6d45e163a1a191823130b4a1bdb541a20760154796e16f5e6e0bb10ce47f4d5c59279a71f37bc53362
SHA512
56383aca3bd52a734ae35ae51aec0aa12d849484466d58832324dc441fed3e955085119ba44d3248948033167e163be5d747fa27c71c999e78e7fa6357853e25
+DIST ugrd-0.19.2.tar.gz 44628 BLAKE2B
e9020f65a6cc51ea7ad205d16cd6360eb74bf21b82a0f0df1f33a89eb39b0a4dcaba7b6c9f4c61124e6ae947d2c93062219081c0ebfb398327abbf1b099dbc7d
SHA512
4e1ebaf4d361d7f0cf75679e7857ef3fe4a3aaf78a5ed2117547ea32c90773645337f0604f23f13c33f248cb55cabfaaf4a2dad1e234822eb3967bafe103fca9
diff --git a/sys-kernel/ugrd/ugrd-0.19.2.ebuild
b/sys-kernel/ugrd/ugrd-0.19.2.ebuild
new file mode 100644
index 0000000000..871bdbc645
--- /dev/null
+++ b/sys-kernel/ugrd/ugrd-0.19.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2023 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
+
+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"
+
+RDEPEND="app-misc/pax-utils"
+DEPEND=">=dev-python/zen-logging-1.1.0
+>=dev-python/zen-util-1.0.1
+>=dev-python/pycpio-0.7.3
+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
+ keepdir /etc/kernel/preinst.d
+ exeinto /etc/kernel/preinst.d
+ doexe hooks/51-ugrd.install
+}
+
+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
+}
