Merge updates from master

2026-07-11 16:13:21 -04:00 · 2024-01-22 17:35:10 +00:00
parent 9961efe101 1b7e3ee90e
commit 3ba7679004
14 changed files with 153 additions and 85 deletions
--- a/app-misc/diff-so-fancy/Manifest
+++ b/app-misc/diff-so-fancy/Manifest
@@ -1 +1 @@
-DIST diff-so-fancy-1.4.3.tar.gz 51800 BLAKE2B e36a30e79d50f9dd0c151ab42e4192563ab0dc9aa30d0aa12e2cf85c29ef8acf9761cc7c19e0067ecf62f5243b667a7d438ab19aaa7150fd93613e11ecbfabf8 SHA512 9c85c0ffcb7235ad985377206e93e56bdac3926f029d8ab8a899a4391339f344049e9bfe4b77df0f2bda29720ab454378218ea3752b97f40b5ac7ba72a5fa047
+DIST diff-so-fancy-1.4.4.tar.gz 188528 BLAKE2B dd4811e17b6b8a0a5a38d105ed92facdfc9b62836995f1b9e87c05a0fe4129706a4552465971bb593105569008cb7f4f3a069294801c07d510a1d9d819475c13 SHA512 477ad58a55ebc765f525b7d16993af18ee5ccf0c9f2835f4a608c6a1a9afa3170f2071dd93b9009dc3c2dab06f700763ac7652d0bedb932a67af23abf4f8884e
--- a/app-misc/diff-so-fancy/diff-so-fancy-1.4.3-r1.ebuild
+++ b/app-misc/diff-so-fancy/diff-so-fancy-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -11,24 +11,36 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"

-RDEPEND=""
+RDEPEND="dev-lang/perl"
 DEPEND="
 	${RDEPEND}
-	dev-lang/perl
 	test? (
 		dev-util/bats-assert
 		dev-util/bats-support
 	)
 "
-BDEPEND="test? ( dev-util/bats )"
+BDEPEND="
+	test? (
+		dev-util/bats
+		dev-vcs/git
+	)
+"

-PATCHES=(
-	"${FILESDIR}/fix-path.patch"
-	"${FILESDIR}/${P}-system-bats.patch"
-)
 DOCS=( README.md history.md pro-tips.md )
-RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	# fix file paths
+	sed -i "s|test_helper/bats-\(.*\)/load|${EPREFIX}/usr/share/bats-\1/load.bash|" \
+		test/{bugs,diff-so-fancy,git-config}.bats || die
+	sed -i "s|use lib .*;|use lib \"${EPREFIX}/usr/share/diff-so-fancy\";|" diff-so-fancy || die
+
+	# en_US locale is not always available, C is.
+	sed -i "s/LC_CTYPE=.*/LC_CTYPE=C.UTF-8/" test/test_helper/util.bash || die
+}

 src_install() {
 	dobin "${PN}"
@@ -40,12 +52,5 @@ src_install() {
 }

 src_test() {
-	# it want a git repo
-	git init || die
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	git add . || die
-	git commit -m 'init' || die
-
-	bats test || die
+	PERL5LIB=lib bats test || die
 }
--- a/app-misc/diff-so-fancy/files/diff-so-fancy-1.4.3-system-bats.patch
+++ b/app-misc/diff-so-fancy/files/diff-so-fancy-1.4.3-system-bats.patch
@@ -1,24 +0,0 @@
--- a/test/bugs.bats
-+++ b/test/bugs.bats
-@@ -1,7 +1,7 @@
- #!/usr/bin/env bats
- 
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
-+load '/usr/share/bats-support/load.bash'
-+load '/usr/share/bats-assert/load.bash'
- load 'test_helper/util'
- 
- # https://github.com/paulirish/dotfiles/commit/6743b907ff586c28cd36e08d1e1c634e2968893e#commitcomment-13459061
--- a/test/diff-so-fancy.bats
-+++ b/test/diff-so-fancy.bats
-@@ -1,7 +1,7 @@
- #!/usr/bin/env bats
- 
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
-+load '/usr/share/bats-support/load.bash'
-+load '/usr/share/bats-assert/load.bash'
- load 'test_helper/util'
- 
- set_env
--- a/app-misc/diff-so-fancy/files/fix-path.patch
+++ b/app-misc/diff-so-fancy/files/fix-path.patch
@@ -1,11 +0,0 @@
--- a/diff-so-fancy
-+++ b/diff-so-fancy
-@@ -9,7 +9,7 @@
- use File::Basename;                                         # For dirname
- use Encode;                                                 # For handling UTF8 stuff
- use Cwd qw(abs_path);                                       # For realpath()
-use lib dirname(abs_path(File::Spec->catdir($0))) . "/lib"; # Add the local lib/ to @INC
-+use lib "/usr/share/diff-so-fancy";
- use DiffHighlight;
- 
- use strict;
--- a/dev-python/pycpio/Manifest
+++ b/dev-python/pycpio/Manifest
@@ -1,2 +1,3 @@
 DIST pycpio-0.8.0.tar.gz 17988 BLAKE2B 101aa0d533e1a1b00eda7f6286a5f4c9b97248625adeeeece3377a6ef6510a6bc3f2a4e24c70a6b967e135270c3bae91419d20a2952464f22f8596cc2fefacf7 SHA512 d1c8519e1dc6e2663e55a2e9f6e8d90670cca5f47a58a8838f1ed9ec1bb7fb002db98b04b8d083475fc61b52f05e6a5a9d21435f06a6f627550b292d2eeea846
 DIST pycpio-0.8.2.tar.gz 17985 BLAKE2B 3e7e5e2ccc289c85d1a818e66a848c462225a7ec529c874d4e450e33141e8785bfd23ba5b3d24fb1c593c78188230def9fa0759d857c773dfc6941b421e66469 SHA512 1eb0e2213792c9d5c28e4377c7cb6acef4f2679830584c6efd9687912ae89268bfe265c79f42a3f786b74993ebc90290c8786353848f481a5e25fb26a43a2b81
+DIST pycpio-0.9.0.tar.gz 17790 BLAKE2B e9beee61b0b83dacca88ed6ad892f7bfbf0adbb12c40a95ed8645f9ec1967ba49a9d75d2dccccf94ee96b676ad3275ff860f15ec3907e94a6ad2205b85d2cce9 SHA512 ba22db8b6f17ef726464b4e2e3cc7600b61046229de7630c3c984f4da2f869fb946131235b936d60dab08df03bde6c36ecc9eddbac606733e7353ba3ffc49729
--- a/dev-python/pycpio/pycpio-0.9.0.ebuild
+++ b/dev-python/pycpio/pycpio-0.9.0.ebuild
@@ -0,0 +1,18 @@
+# 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
+
+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"
+
+DEPEND=">=dev-python/zenlib-1.7.2[${PYTHON_USEDEP}]"
--- a/dev-python/zenlib/Manifest
+++ b/dev-python/zenlib/Manifest
@@ -2,3 +2,4 @@ DIST zenlib-1.2.0.tar.gz 12766 BLAKE2B 9366beb9496d136cbf0efc9fd97c6d430b442eae4
 DIST zenlib-1.3.1.tar.gz 13470 BLAKE2B 03bd8dce7a46641e60646173607ea6cd574fed58cbfa5d81c4c7f1deabf863a3acd12bdfd3b59fd5fc853762d7320d57613e40d72407216cc3ae1d82f7744789 SHA512 50a6ac2cb26fd74b6e92e3691463ec707259fe27e37af2f2c68a9a1e0c247b789cdf17d5b1f882e02dbca5f0653a4137caab39f3f0380d0b5391efaf41f1312d
 DIST zenlib-1.4.0.tar.gz 14315 BLAKE2B 76f9e8ed74a451837b27406c7bf0791b8d131de9d5b75ab1b47cca47c665a676c07e7779f92baf843396e9e61fdc706e6e7fc6ff4e06a52e19706df6cf94d0c1 SHA512 6326a95226fbbb126d72ecc2a9b4940615ae866a5586f2c8d795e12ff37e5c27d0ec62cda7fa398d1aa460acaa401fd7fb330677edc12b92c23933514a7eb79e
 DIST zenlib-1.6.2.tar.gz 15799 BLAKE2B 4a29f7ac386c197a1b9c6034b202a1cbce4a20bfdc137ec373fbb8818e806caadf82bd049e5ee92c2c3a49bb92d23d84bbcbc4a9e21b7f9dca42b73b41e3a3c3 SHA512 26807f566d8b8ca58768588ef2e63674ad8b8ed5e6ae97c336f8d090c2c4f568dc8d5620a869e2e518876ae269cfbc39583c8b4ff928bf8488a6aeb0177b5c5b
+DIST zenlib-1.7.2.tar.gz 16853 BLAKE2B 9659723441c9e651e6a80a47565aeeb6bda67db04524bbd551fe5f9b38efa0afb33021a21e0fea3af934fc3c8c2b9cf4f38c4534c2c9bc4282971038503fafec SHA512 b69619b1e30f18892ec54b481e386a5bb7a728d87263601ddd4e22e2433e62d263bc67eea54748b9a49e528078cd152fd2d68738372409bb003a0a84a7cbb71b
--- a/dev-python/zenlib/zenlib-1.7.2.ebuild
+++ b/dev-python/zenlib/zenlib-1.7.2.ebuild
@@ -0,0 +1,16 @@
+# 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
+
+DESCRIPTION="Useful python decorators and utilities"
+HOMEPAGE="https://github.com/desultory/zenlib"
+SRC_URI="https://github.com/desultory/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
--- a/media-video/mpc-qt/Manifest
+++ b/media-video/mpc-qt/Manifest
@@ -1 +1 @@
-DIST v23.02.tar.gz 300103 BLAKE2B 7837dfc2f1e9d0c8f7742fed567601f9ecddb55170d79f2b92acb02ce1df8066484554ffe70d0f83470c97b9936d787cfa722cab3882e0fbeb863204e6705c16 SHA512 1c1316a17467f36e6ac01587980333ad9f0dde71122cd6f315a0e3772fbdc5905ae4247f37990fb85d17c3ee4c26947940ada39e49f14566e3d7338875d017ab
+DIST mpc-qt-23.12.tar.gz 303763 BLAKE2B c17ee305bdcea861f890dea4921dcb728697f6051337e43e69803cbc6586183257a95fd170d614e09e65ce2d9be42c6f89cb006dd82a309f0ce64a0617f997dd SHA512 45a3a59fe67007ec6afc3cd88b81fd99c714fc0cd8aed979dc380c249070da54410a1f8eafd237f0b2516d484c2a2b052c334613e0742b97ff44c8d9291b90a7
--- a/media-video/mpc-qt/metadata.xml
+++ b/media-video/mpc-qt/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>pastalian46@gmail.com</email>
+		<name>Takuya Wakazono</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mpc-qt/mpc-qt</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/media-video/mpc-qt/mpc-qt-23.02.ebuild
+++ b/media-video/mpc-qt/mpc-qt-23.02.ebuild
@@ -1,31 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils desktop
-
-DESCRIPTION="Media Player Classic Qute Theater"
-HOMEPAGE="https://mpc-qt.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-qt/qtcore:5"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_configure() {
-	eqmake5 mpc-qt.pro
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	dobin "${WORKDIR}/${P}/mpc-qt"
-	domenu "${WORKDIR}/${P}/io.github.mpc_qt.Mpc-Qt.desktop"
-}
--- a/media-video/mpc-qt/mpc-qt-23.12.ebuild
+++ b/media-video/mpc-qt/mpc-qt-23.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Media Player Classic Qute Theater"
+HOMEPAGE="https://mpc-qt.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-qt/qtbase:6[dbus,gui,network,opengl,widgets]
+	media-video/mpv:=[libmpv]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i "s|doc/mpc-qt/|doc/${PF}|" mpc-qt.pro || die
+}
+
+src_configure() {
+	eqmake6 MPCQT_VERSION="${PV}" PREFIX="${EPREFIX}/usr" mpc-qt.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
--- a/sys-kernel/ugrd/Manifest
+++ b/sys-kernel/ugrd/Manifest
@@ -2,3 +2,4 @@ DIST ugrd-0.12.1.tar.gz 39929 BLAKE2B d4d2788c0d23907b87ea6c98607f3d36e25c895618
 DIST ugrd-0.19.1.tar.gz 44713 BLAKE2B e22d8c6df5cffb6c903badf6b45f693a319215791d2fae6d45e163a1a191823130b4a1bdb541a20760154796e16f5e6e0bb10ce47f4d5c59279a71f37bc53362 SHA512 56383aca3bd52a734ae35ae51aec0aa12d849484466d58832324dc441fed3e955085119ba44d3248948033167e163be5d747fa27c71c999e78e7fa6357853e25
 DIST ugrd-0.19.3.tar.gz 44629 BLAKE2B 4c319cfe745640ff7ced5eb161498b3cd6250434d7b56e909a74b1a133910039ec81a399d55f6408b5b33f88a94fb41a54dd18d97443d00e73730a36802b635f SHA512 4cedc043d3e7ac616d263e4d467d1b825a5c425f7682f1ab531a84dfd17c49f99398226fc9ee39044591dcbc6d3308d01f1ffa6734e552945d1096bf1bff2923
 DIST ugrd-0.20.0.tar.gz 44531 BLAKE2B 3b76149371fac2c5945ce6693c41afdb27cf51028e138388406587cc9911113ad3af1dc64ce97bcdfe47b1916bba26e84b986efd12a8af67e58e16150fe69249 SHA512 11276bb6230f99d23fd59c8322f51c2648938ec27132a1425a4c99c34bfecb326f27b287a3583fb7a86ef62094674069e86f31bf504ac4fa8e63f88c52b33609
+DIST ugrd-0.21.0.tar.gz 44075 BLAKE2B 035ad4ce042e1e83df62109c2eda19a7b0708f49cbf14fa7edcfca64a81da6e543ee4daf086fde0fd4d5acca041a5cf18c923ec057dc354ffd0a4e18abfb69b6 SHA512 77ad34639b7b997788e0f069af8b26e33a7c8d96bfbf26f3e445872bf7ea771b25cac051411583a8441212d855c3415fbaa6ed345e05714f8599d4b244d831f9
--- a/sys-kernel/ugrd/ugrd-0.21.0.ebuild
+++ b/sys-kernel/ugrd/ugrd-0.21.0.ebuild
@@ -0,0 +1,43 @@
+# 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/zenlib-1.7.2[${PYTHON_USEDEP}]
+>=dev-python/pycpio-0.9.0[${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
+	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
+}