From 0e6a8a6c51115943235f06224d9fd14b0eb41df3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Sep 2022 11:17:07 +0100 Subject: gentoo auto-resync : 17:09:2022 - 11:17:07 --- dev-util/schroot/Manifest | 5 +- dev-util/schroot/schroot-1.6.10_p7-r1.ebuild | 130 ----------------------- dev-util/schroot/schroot-1.6.13_p2.ebuild | 148 +++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 132 deletions(-) delete mode 100644 dev-util/schroot/schroot-1.6.10_p7-r1.ebuild create mode 100644 dev-util/schroot/schroot-1.6.13_p2.ebuild (limited to 'dev-util/schroot') diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest index 23d82ab15dcb..a084a6d461c5 100644 --- a/dev-util/schroot/Manifest +++ b/dev-util/schroot/Manifest @@ -4,9 +4,10 @@ AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2b AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96 AUX schroot_prompt.sh 73 BLAKE2B d833a51c7a36ba45b672e1b7adc1e371c3641b53c74530abe7c21c4d3d590b59aef4ff86f33db5e4feef500e74aee9566cddaffba67c3798e202605c7fb90c22 SHA512 403145790845a1fcc49991c76c1bf76c5e38a6e86d8fa150690289f34660d7b02acb91e8ac24335975285437176e0d4f8d91a643a173962a9578938e7f0f4b48 +DIST schroot-1.6.13.tar.gz 687581 BLAKE2B 5054407e545f39258df7598dbc233a836f6a86a02b4d0f3368109fd3edaea543fde6f81cfc6fedcdd6124490a3d5bc4d3a7e113ebe5ba2cfe7ec2c204f9cd0f4 SHA512 a250a02eb2384f1c27a9ff6479b77647a7a19b96b3b4e9d63e32a5dabe6ef3a3b1e2efaf98ddd9db93ded50fc93595ce545b0f0247c4a9e481349adafe806c2d DIST schroot_1.6.10-12.debian.tar.xz 83636 BLAKE2B 0289848f7e64983c06f47a70346e06d7024722c643034ac24745fe4548311b893053ec28891f39264cb0894c12236f4e8523b70cd83553d1a7179cbfc63cbfa3 SHA512 77ae2d758593de505e9381e4800eb17a9e14fb949a5bdb07b9235671ae4bd18c668aa9c35a1ba6340af93b308b5c3798afc83f14165e4b19e7cebab92b83fc52 -DIST schroot_1.6.10-7.debian.tar.xz 82524 BLAKE2B 664ee356f8de1215c761a771cc0700d25ff6c0513124f4d84d5b33a046cac6ff194b62dded1e8f966a922a013644edd3d9424b0d577a8bb2b371e23e8dd88ed5 SHA512 ee362cce46ec804cd0ad6bfe3c7dec37fdeffe56941d51aec9e9622057a4d2a94e47f7530d28862c948233c6623cfa4b4721c27f293e31a28ec0320ffe02a47a DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe +DIST schroot_1.6.13-2.debian.tar.xz 110752 BLAKE2B 77c877e13541968ffd4edaa04c1a846e9deb19a3670088c19cdf3a217acfc2521d2b8d8dec7b8e6188b107f793af6152d5724fd596a9c62f6c9b57f2c30d57b0 SHA512 8fd7e7f95131285ec49bda3d9ccc6ba025976009c382998ef183142d2e3e288b7936e2c8ec6532870b601f62b460d577920d9a801b789f0d1bf7ee31b45356c3 EBUILD schroot-1.6.10_p12-r2.ebuild 3482 BLAKE2B cba9a46614acfb538b9db92cbba357d10fe930a4de0c9693833c0e906495dbbff332c2e4a9f1ec108864c82f5a30b499fdcae2a79db59fdc7501db2dc75cb75d SHA512 221576e9994192fefe59fad5c80a0a4ef77aa18d61aaf1e0a9a223c9caad3b5a19087ecd38057c30584b3f229e3b285c482b944f0892a761a76666fb81fe27ca -EBUILD schroot-1.6.10_p7-r1.ebuild 2927 BLAKE2B e271418d1b67228d102a4cca0d97fed0d5d7cb173b6648d6c431247ca30d7ceb646651ed2dbd035f981648c3e11730420a2265846ac103df76f55eb05aa0c286 SHA512 d10453f1bf39f65da99fbb3d3ea55ead4304e2f32a2cf7857b58d490d3968614234b688ed341a46be64146d932de108ee849fb6efd2e4cbb39c2578b336e3425 +EBUILD schroot-1.6.13_p2.ebuild 3570 BLAKE2B 34703bfc312133ac73ec6343689e26cf788b95bc52f957dad85eed7116063c5a5e4049e22cab94ae410a02c6ae186b9d2193e60ac468e3d04e55400ec80813d9 SHA512 a2711a48727231e637455a0c90208eceeced4b335d2bad660d14616f8baafbeae29e7defd78a36548071bc414a0389581bb58d2d1f55718d705771aab7310cc5 MISC metadata.xml 616 BLAKE2B ec6e30d14cf7b8a9b8bfbe68be7d4f044d3ad8c84edea4c98b997426dcf1a29d87d2ef74968184b2aab28b68925687fd04a319f5dec0a594d586b2a7a10d7818 SHA512 18118a20b8c4f02926d27bca2a394611512bb7c353720b092ef79036691c3de24febb29d96b36171158d31534ed1dc994f2e4952517438ff550fb95cfad9dc4c diff --git a/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild b/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild deleted file mode 100644 index d5d3ed39319a..000000000000 --- a/dev-util/schroot/schroot-1.6.10_p7-r1.ebuild +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 cmake pam tmpfiles - -MY_P=${PN}_${PV/_p/-} - -DESCRIPTION="Utility to execute commands in a chroot environment" -HOMEPAGE="https://packages.debian.org/source/sid/schroot" -SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz - mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -IUSE="btrfs +dchroot debug doc lvm nls pam test zfs" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/boost:= - >=sys-apps/util-linux-2.16 - btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) - lvm? ( sys-fs/lvm2 ) - pam? ( sys-libs/pam ) - zfs? ( sys-fs/zfs ) -" - -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - sys-apps/groff - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) - nls? ( - >=app-text/po4a-0.40 - sys-devel/gettext - ) - test? ( >=dev-util/cppunit-1.10.0 ) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/debianutils - dchroot? ( !sys-apps/dchroot ) - nls? ( virtual/libintl ) -" - -S="${WORKDIR}/${PN}-${PV/%_p*/}" - -src_unpack() { - unpack ${MY_P/%-*/}.orig.tar.xz - cd "${S}" - unpack ${MY_P}.debian.tar.xz -} - -src_prepare() { - sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die - eapply "${S}"/debian/patches/*.patch - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -Dbtrfs-snapshot=$(usex btrfs) - -Ddchroot=$(usex dchroot) - -Ddchroot-dsa=$(usex dchroot) - -Ddebug=$(usex debug) - -Ddoxygen=$(usex doc) - -Dlvm-snapshot=$(usex lvm) - -Dnls=$(usex nls) - -Dpam=$(usex pam) - -Dtest=$(usex test) - -Dzfs-snapshot=$(usex zfs) - -Dbash_completion_dir="$(get_bashcompdir)" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" - -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount" - -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120 - ) - if ! use nls; then - mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all $(usev doc) -} - -src_test() { - if [[ ${EUID} -ne 0 ]]; then - ewarn "Disabling tests because you are not root" - return 0 - fi - - cmake_src_test -} - -src_install() { - cmake_src_install - - keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}} - - docinto contrib/setup.d - dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh - - newdoc debian/schroot.NEWS NEWS.debian - - newinitd "${FILESDIR}"/schroot.initd schroot - newconfd "${FILESDIR}"/schroot.confd schroot - newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf - - if use doc; then - docinto html/sbuild - dodoc "${BUILD_DIR}"/doc/sbuild/html/* - docinto html/schroot - dodoc "${BUILD_DIR}"/doc/schroot/html/* - fi - - if use pam; then - rm -f "${ED}"/etc/pam.d/schroot - pamd_mimic_system schroot auth account session - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild b/dev-util/schroot/schroot-1.6.13_p2.ebuild new file mode 100644 index 000000000000..c1283549302e --- /dev/null +++ b/dev-util/schroot/schroot-1.6.13_p2.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 cmake pam tmpfiles + +MY_P=${PN}_${PV/_p/-} + +DESCRIPTION="Utility to execute commands in a chroot environment" +HOMEPAGE="https://codeberg.org/shelter/reschroot" +SRC_URI="https://codeberg.org/shelter/reschroot/archive/release/re${P/%_p*}.tar.gz -> ${P/%_p*}.tar.gz + mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.debian.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="btrfs +dchroot debug doc lvm nls pam test zfs" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/boost:= + >=sys-apps/util-linux-2.16 + btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) + lvm? ( sys-fs/lvm2 ) + pam? ( sys-libs/pam ) + zfs? ( sys-fs/zfs ) +" + +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + sys-apps/groff + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) + nls? ( + >=app-text/po4a-0.40 + sys-devel/gettext + ) + test? ( >=dev-util/cppunit-1.10.0 ) +" +RDEPEND="${COMMON_DEPEND} + sys-apps/debianutils + dchroot? ( !sys-apps/dchroot ) + nls? ( virtual/libintl ) +" + +S="${WORKDIR}/re${PN}" + +src_unpack() { + unpack "${P/%_p*}".tar.gz + cd "${S}" + unpack ${MY_P}.debian.tar.xz +} + +src_prepare() { + sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die + eapply "${S}"/debian/patches/*.patch + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -Dbtrfs-snapshot=$(usex btrfs) + -Ddchroot=$(usex dchroot) + -Ddchroot-dsa=$(usex dchroot) + -Ddebug=$(usex debug) + -Ddoxygen=$(usex doc) + -Dlvm-snapshot=$(usex lvm) + -Dnls=$(usex nls) + -Dpam=$(usex pam) + -Dtest=$(usex test) + -Dzfs-snapshot=$(usex zfs) + -Dbash_completion_dir="$(get_bashcompdir)" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" + -DSCHROOT_MOUNT_DIR="${EPREFIX}/run/${PN}/mount" + -DBoost_NO_BOOST_CMAKE=ON # https://bugs.gentoo.org/791712 and https://bugs.gentoo.org/752120 + ) + if ! use nls; then + mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usev doc) +} + +src_test() { + if [[ ${EUID} -ne 0 ]]; then + ewarn "Disabling tests because you are not root" + return 0 + fi + # -j1 to prevent race between test/setup-test-data and test/cleanup-test-data + cmake_src_test -j1 +} + +src_install() { + cmake_src_install + + # debian-stype PS1 for chroot + # checks for /etc/debian_chroot file, which is created by schroot + insinto /etc/bash/bashrc.d + doins "${FILESDIR}/schroot_prompt.sh" + + # gentoo /var/tmp/portage handler + # e.g. portage.base.tmpdir=/var/tmp/portage in config file + # will use a subdirectory of hosts $PORTAGE_TMPDIR + exeinto /etc/schroot/setup.d + doexe "${FILESDIR}/11gentoo" + + # support for zfs clone options. + # zfs.clone.options=com.sun:auto-snapshot=false + if use zfs; then + exeinto /etc/schroot/setup.d + doexe "${FILESDIR}/06zfscloneopts" + fi + + keepdir /var/lib/schroot/{session,unpack,union/{overlay,underlay}} + + docinto contrib/setup.d + dodoc contrib/setup.d/05customdir contrib/setup.d/09fsck contrib/setup.d/10mount-ssh + + newdoc debian/schroot.NEWS NEWS.debian + + newinitd "${FILESDIR}"/schroot.initd schroot + newconfd "${FILESDIR}"/schroot.confd schroot + newtmpfiles "${FILESDIR}"/schroot.tmpfilesd schroot.conf + + if use doc; then + docinto html/sbuild + dodoc "${BUILD_DIR}"/doc/sbuild/html/* + docinto html/schroot + dodoc "${BUILD_DIR}"/doc/schroot/html/* + fi + + if use pam; then + rm -f "${ED}"/etc/pam.d/schroot + pamd_mimic_system schroot auth account session + fi +} + +pkg_postinst() { + tmpfiles_process ${PN}.conf +} -- cgit v1.2.3