From cc591ba8d03842768663c67463304ab2a7914563 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 20 Jan 2024 17:37:04 +0000 Subject: app-portage/flaggie : import from Gentoo, make it work with Sisyphus layout (bugfix : https://bugs.redcorelinux.org/show_bug.cgi?id=148) --- app-portage/flaggie/Manifest | 1 + .../flaggie/files/flaggie-0.99.8_sisyphus.patch | 43 ++++++++++++++++++++++ app-portage/flaggie/flaggie-0.99.8-r1.ebuild | 35 ++++++++++++++++++ metadata/md5-cache/app-portage/flaggie-0.99.8-r1 | 16 ++++++++ metadata/pkg_desc_index | 1 + 5 files changed, 96 insertions(+) create mode 100644 app-portage/flaggie/Manifest create mode 100644 app-portage/flaggie/files/flaggie-0.99.8_sisyphus.patch create mode 100644 app-portage/flaggie/flaggie-0.99.8-r1.ebuild create mode 100644 metadata/md5-cache/app-portage/flaggie-0.99.8-r1 diff --git a/app-portage/flaggie/Manifest b/app-portage/flaggie/Manifest new file mode 100644 index 00000000..5fef7c99 --- /dev/null +++ b/app-portage/flaggie/Manifest @@ -0,0 +1 @@ +DIST flaggie-0.99.8.tar.gz 17865 BLAKE2B af52f5c030ff81ebd1efac6c02a736c87d0ce8f953722f0f364adf7ace74a26245fb43fb5ba96000fb2da391ff90c6c682522fc5a7725fca0289c1063e4704ac SHA512 77265b2958210a9643776dfaad65d00cd511b2b8d1cedd397c6712559af9c7d671cf286eabd0c866b10408429829615cd2f2b7c3013a99d470be8f2f7e8cccfb diff --git a/app-portage/flaggie/files/flaggie-0.99.8_sisyphus.patch b/app-portage/flaggie/files/flaggie-0.99.8_sisyphus.patch new file mode 100644 index 00000000..0b45d116 --- /dev/null +++ b/app-portage/flaggie/files/flaggie-0.99.8_sisyphus.patch @@ -0,0 +1,43 @@ +diff -ruN old/flaggie/config.py new/flaggie/config.py +--- old/flaggie/config.py 2023-01-15 08:39:45.000000000 +0100 ++++ new/flaggie/config.py 2023-10-08 12:46:51.500298249 +0200 +@@ -63,6 +63,10 @@ + COMMENT_RE = re.compile(r"(? str: ++ return "sisyphus." + re.sub(r'\.(accept_)?', "-", filename) + ".conf" ++ ++ + def find_config_files(config_root: Path, token_type: TokenType) -> list[Path]: + """ + Find all configuration files of given type +@@ -72,7 +76,11 @@ + order as they are read by Portage. + """ + +- path = config_root / "etc/portage" / CONFIG_FILENAMES[token_type] ++ filename = CONFIG_FILENAMES[token_type] ++ sisyphus = config_root / "etc/sisyphus" / to_sisyphus_filename(filename) ++ if sisyphus.exists(): ++ return [sisyphus] ++ path = config_root / "etc/portage" / filename + + # if it's an existing directory, find the last visible file + # in the directory (provided there is any) +diff -ruN old/test/test_config.py new/test/test_config.py +--- old/test/test_config.py 2023-01-15 08:39:45.000000000 +0100 ++++ new/test/test_config.py 2023-10-08 12:35:11.372100053 +0200 +@@ -26,9 +26,11 @@ + ["package.use/foo.conf"]), + # corner case: package.use yielding no valid files + (["package.use/.foo"], ["package.use/99local.conf"]), ++ (["sisyphus.package-use.conf"], None), + ]) + def test_find_config(tmp_path, layout, expected): +- confdir = tmp_path / "etc/portage" ++ sisyphus = layout and layout[0].startswith("sisyphus.") ++ confdir = tmp_path / "etc" / ("sisyphus" if sisyphus else "portage") + for f in layout: + path = confdir / f + path.parent.mkdir(parents=True, exist_ok=True) diff --git a/app-portage/flaggie/flaggie-0.99.8-r1.ebuild b/app-portage/flaggie/flaggie-0.99.8-r1.ebuild new file mode 100644 index 00000000..0a52d3da --- /dev/null +++ b/app-portage/flaggie/flaggie-0.99.8-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=flit +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="A smart CLI mangler for package.* files" +HOMEPAGE=" + https://github.com/projg2/flaggie/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + >=app-portage/gentoopm-0.5.0[${PYTHON_USEDEP}] + dev-python/more-itertools[${PYTHON_USEDEP}] + dev-vcs/git +" +PATCHES=( + "${FILESDIR}/${P}_sisyphus.patch" +) + +distutils_enable_tests pytest + +pkg_postinst() { + ewarn "This is a preview release of flaggie 1.x. It it not fully featured" + ewarn "yet and it may have significant bugs. Please back your /etc/portage" + ewarn "up before using it. Verify the results using --pretend." +} diff --git a/metadata/md5-cache/app-portage/flaggie-0.99.8-r1 b/metadata/md5-cache/app-portage/flaggie-0.99.8-r1 new file mode 100644 index 00000000..c4d5c412 --- /dev/null +++ b/metadata/md5-cache/app-portage/flaggie-0.99.8-r1 @@ -0,0 +1,16 @@ +BDEPEND=test? ( >=app-portage/gentoopm-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/flit-core-3.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] +DEFINED_PHASES=compile configure install postinst prepare test +DESCRIPTION=A smart CLI mangler for package.* files +EAPI=8 +HOMEPAGE=https://github.com/projg2/flaggie/ +INHERIT=distutils-r1 pypi +IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 +KEYWORDS=amd64 arm arm64 ~hppa ~mips ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux +LICENSE=MIT +RDEPEND=>=app-portage/gentoopm-0.5.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/more-itertools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-vcs/git python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) +REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 ) +RESTRICT=!test? ( test ) +SLOT=0 +SRC_URI=https://files.pythonhosted.org/packages/source/f/flaggie/flaggie-0.99.8.tar.gz +_eclasses_=distutils-r1 b9318b5e40104e608d7e4582121fb561 flag-o-matic 78cf3cc2d5572fddf5e5e10c70f7c81a multibuild d67e78a235f541871c7dfe4cf7931489 multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing 30ead54fa2e2b5f9cd4e612ffc34d0fe ninja-utils 2df4e452cea39a9ec8fb543ce059f8d6 out-of-source-utils 1a9007554652a6e627edbccb3c25a439 pypi 2eecb475512bc76e5ea9192a681b9e6b python-r1 8a28fa6d3e3bc96ff8a7eff2badbe71f python-utils-r1 042f4cc53680245bf99a84669b94155a toolchain-funcs e56c7649b804f051623c8bc1a1c44084 +_md5_=5fcfbc62cc3c7635294405aec265cc0c diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index index 36816987..185dc86a 100644 --- a/metadata/pkg_desc_index +++ b/metadata/pkg_desc_index @@ -11,6 +11,7 @@ app-misc/calamares-config-redcore 1.314.1337-r5: Redcore Linux Calamares modules app-misc/geoclue 2.7.1-r5: A location information D-Bus service app-misc/redcore-live 1.314.1337: Redcore Linux live scripts app-misc/redcore-skel 1.314.1337-r2: Redcore Linux skel tree +app-portage/flaggie 0.99.8-r1: A smart CLI mangler for package.* files app-portage/sisyphus 6.2305.0-r2: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) app-portage/sisyphus-qt 6.2305.0-r1: A simple portage python wrapper which works like other package managers(apt-get/yum/dnf) app-text/simplenote 2.6.0: The simplest way to keep notes -- cgit v1.2.3