From db16929598ac333b179fdfead630dbdfa68840a5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 1 Nov 2022 15:07:30 +0000 Subject: gentoo auto-resync : 01:11:2022 - 15:07:30 --- sys-fs/Manifest.gz | Bin 22211 -> 22213 bytes sys-fs/lxcfs/Manifest | 2 +- sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild | 77 ------------------------------------ sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild | 79 +++++++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 78 deletions(-) delete mode 100644 sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild create mode 100644 sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 58487480f987..c1e52c6a1dc0 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 7d1ec232b878..4faf25ba618a 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -3,5 +3,5 @@ AUX lxcfs-5.0.2.initd 576 BLAKE2B 5bda6d018dfb49d167d3fee09f3449e5aba6c0493aff5d AUX lxcfs-5.0.2.service 428 BLAKE2B effef16bfac727f703b9adfdaa5faf2ce76ac7efef6127873730f2f6482f0b886d96ab9cd0a9589db5b98744ede6b0b89804ad99cd12e0a4b20510eb2d29a097 SHA512 f22242d41cea1f1ea111641e4120d58c321056a49222694d6a15019de3241384f132be114d62df15bc7b0b8ca9a54b4a0daa48a345f1c707dee734ebc59e3967 DIST lxcfs-5.0.2.tar.gz 103236 BLAKE2B 5fc8dc437e97a79c78320f8d8111746b171b086beb176a6ada30b8c23164ae4e58ad42806bc0ea73bbbb15d94816bd9b3d5500f9e2a306e2458d23fb111bf68f SHA512 df51e7154060dd7efe992eb2bc40c5a52dce8c52063477110ed414ecc3f430f18d5023a29be6866560fc87b060c2158cc1e947f030c509188320d417eb23d407 DIST lxcfs-5.0.2.tar.gz.asc 833 BLAKE2B a411c6cb4f3382469ea80a974166c98b57ae4b92712bf55507720fc78ec73ef6acbd47f6b3410294b209f77f1f3a17dc4b9fb4dda00bb7323ef32c7185ba4c2e SHA512 f9d54e26d406ebca97c82298361318f13e74fd55285c2b6563ae6c71af63d9b8325ac06b9de8103a95a19c5d965c2d907c313ac151210a162998f8a37ea99676 -EBUILD lxcfs-5.0.2-r1.ebuild 1847 BLAKE2B e915fa8b351117130d1cfe7ef8777d7c696a92d8df71bffb671f65f79eaa3f31b46efdbd867a6562fd1c5617723038b0bd3de7d814beaa343a6eb1633f28e5dc SHA512 f957728a8442e4bc1ea4f33dd1d846c9dc9dc5f8241fc453d4d57d61eb3d2eff5d95ecfee950d5caba91525961c57f61552e62bd77533e49c89100a4faa93ff2 +EBUILD lxcfs-5.0.2-r2.ebuild 1883 BLAKE2B ce355c1d384153984e9d6c4f2ba78b02c03d478a45615ba76c6b402d9c601791690868322ea1493856bb4fd15ca4e5360f0d2c560e80e51565e5ca8c65c81e50 SHA512 c4a285df9b934d4c339b84f8b483992f5c53a5d9a42eb1e73b1ef4bdccfdebdaf4dd73a2f7435e8fa0ab68a559a49187d5b6cf821cd024fe86204c5f351a3745 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab diff --git a/sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild deleted file mode 100644 index e47074074d12..000000000000 --- a/sys-fs/lxcfs/lxcfs-5.0.2-r1.ebuild +++ /dev/null @@ -1,77 +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 cmake meson python-any-r1 systemd verify-sig - -DESCRIPTION="FUSE filesystem for LXC" -HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" -SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz - verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" - -LICENSE="Apache-2.0 LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~riscv ~x86" -IUSE="doc test" - -DEPEND="sys-fs/fuse:3" -RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/jinja[${PYTHON_USEDEP}] - ') - doc? ( sys-apps/help2man ) - verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" - -# Needs some black magic to work inside container/chroot. -RESTRICT="test" - -VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc - -python_check_deps() { - python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - default - - # Fix python shebangs for python-exec[-native-symlinks], #851480 - local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) - python_fix_shebang -q ${shebangs[*]} -} - -src_configure() { - local emesonargs=( - $(meson_use doc docs) - $(meson_use test tests) - - -Dfuse-version=3 - -Dinit-script="" - -Dwith-init-script="" - ) - - meson_src_configure -} - -src_test() { - cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory." - ./main.sh || die -} - -src_install() { - meson_src_install - - newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs - newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs - - # Provide our own service file (copy of upstream) due to paths being different from upstream, - # #728470 - systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service -} diff --git a/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild b/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild new file mode 100644 index 000000000000..551954d58b74 --- /dev/null +++ b/sys-fs/lxcfs/lxcfs-5.0.2-r2.ebuild @@ -0,0 +1,79 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake meson python-any-r1 systemd verify-sig + +DESCRIPTION="FUSE filesystem for LXC" +HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" +SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz + verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )" + +LICENSE="Apache-2.0 LGPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" +IUSE="doc test" + +DEPEND="sys-fs/fuse:3" +RDEPEND="${DEPEND}" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/jinja[${PYTHON_USEDEP}] + ') + doc? ( sys-apps/help2man ) + verify-sig? ( sec-keys/openpgp-keys-linuxcontainers )" + +# Needs some black magic to work inside container/chroot. +RESTRICT="test" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc + +python_check_deps() { + python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Fix python shebangs for python-exec[-native-symlinks], #851480 + local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) + python_fix_shebang -q ${shebangs[*]} +} + +src_configure() { + local emesonargs=( + --localstatedir "${EPREFIX}/var" + + $(meson_use doc docs) + $(meson_use test tests) + + -Dfuse-version=3 + -Dinit-script="" + -Dwith-init-script="" + ) + + meson_src_configure +} + +src_test() { + cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory." + ./main.sh || die +} + +src_install() { + meson_src_install + + newconfd "${FILESDIR}"/lxcfs-5.0.2.confd lxcfs + newinitd "${FILESDIR}"/lxcfs-5.0.2.initd lxcfs + + # Provide our own service file (copy of upstream) due to paths being different from upstream, + # #728470 + systemd_newunit "${FILESDIR}"/lxcfs-5.0.2.service lxcfs.service +} -- cgit v1.2.3