[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/

[Georgy Yakovlev]

commit:     83f8cc0edff0c74dcee86924f323d8520639e553
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 07:50:25 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 07:51:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f8cc0e

dev-util/schroot: bump to 1.6.20_p7, with zfs support

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 dev-util/schroot/Manifest                 |   1 +
 dev-util/schroot/metadata.xml             |   1 +
 dev-util/schroot/schroot-1.6.10_p7.ebuild | 129 ++++++++++++++++++++++++++++++
 3 files changed, 131 insertions(+)

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index e0894c0588e..721e99dc717 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,3 +1,4 @@
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10-6.debian.tar.xz 76576 BLAKE2B 719c994703df8fb391b3a8c8f83a5afea4247b4f817e16317b6ed0ba7ec0f962d669c4d50a120eabdd9054b1a31bb58cc426324108cf77fe5b1aec0024bc03c2 SHA512 44177da262c0a8a511534aba964196cdb5a8a7ec094727122954638c29cdc9b80ef0a1ffb709c4841918effb44fe2c0f8912ae87cfa9e4696dbbe9f55adb1211
+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

diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index 2cca4eb6a23..ff1941a852c 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -9,5 +9,6 @@
 		<flag name="btrfs">Enable support for chroots using btrfs snapshots</flag>
 		<flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg></flag>
 		<flag name="lvm">Enable support for chroots using LVM snapshots</flag>
+		<flag name="zfs">Enable support for chroots using ZFS shapshots/clones</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild b/dev-util/schroot/schroot-1.6.10_p7.ebuild
new file mode 100644
index 00000000000..37c1dd419a1
--- /dev/null
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 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 ~ppc64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.42.0:=
+	>=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"
+	)
+	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 /usr/share/doc/${PF}/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
+}