gentoo (leap year) resync : 29.02.2020

4 files changed, 2 insertions, 279 deletions

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 2498b9341f2a..4ecb6780a117 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,11 +1,7 @@
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 AUX schroot.tmpfilesd 91 BLAKE2B f731cf3cb0037ec35f8144d2667f3a12fbfcef088454d165cfcdc63d34f433eb7abc9442917c0cccaf48b66cab028db0b04edbd9d1cb2864d257213fe54fd3e6 SHA512 381d715e2a1443d0115a6fa35cc7d43205a1dfa432f40e4903d944c219b8f5f0b076fb93c90c159f1f7edd5cf8a8766653a41e168940da92bae0b186c93eff96
-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
-EBUILD schroot-1.6.10-r4.ebuild 3783 BLAKE2B 6c8840c351a7b42d165c18da51ec73eeab354852c7af75b7a7cc80d3173d02750df3ede79e4ea50ed2136f0696555a95f463d87eb1bc63421f8c8555b0407043 SHA512 e2e410cc7f218c190a09f1515520f7ee40b72ec088e3739576dd05f0ece0d16d24a2bd004f07a0f64f2bd42794ab4cb58934ab69a145e8e5b14e8e0b46c8fe28
-EBUILD schroot-1.6.10-r5.ebuild 2783 BLAKE2B 7147a31fcd4e67a4170cefc1294361106cd747a34bad9621301ccde606b1bf284ee606e6c7d3f795e329304424312edd5212eb3711d549378225938a2f284ef0 SHA512 62c2abb5407c6964327026b09ae2a3e918074c08a1b1cf05fb78465f067f2b3b95be1e7f24390d0600f4fc9d0053db3e1d0a682dc8adc0bb4097c1f8f87ee5ac
-EBUILD schroot-1.6.10_p7.ebuild 2854 BLAKE2B ba3181eea961e4f64c1b725645118164741cd4b3851c6364cd01557d065b7654bc8cba95f4deb73c951732e1acbbbd58a0b5d12b473db78d3d040ff5876e2963 SHA512 a125c3a9047d81d40242d0cb5c807a4ac7b07510ce05eb4bd1b567a5efaafa89c7ec0bdc17a7002057b4502f5b17c6391a1fa76c83aca6c51d9e11aa8d51264b
+EBUILD schroot-1.6.10_p7.ebuild 2852 BLAKE2B 0f55571f601dd192cd0f8c799d114ed28479a9e24f1676c90bd061d3782e1a1ad7c69de4e312373c5e234a283e6152378d657f7740a558c3e71cae9424812847 SHA512 bcc610e39ebebe568fb07c31b82bb95f0022ecc8953205c2f8d1c107086598ee3032aaa8afecd5ad91f08e5c4b39e8f8d59653f770b6fe46860da102f3e76860
 MISC metadata.xml 615 BLAKE2B 8f6cde0f4bd1d00fed8330dd097b9ce0de021621af06aee3534e9cdaf79ae9353c27d831916d4e53ecfe11f264a3a9111001aff469471d75e1c51a04d55be4d2 SHA512 3ed685c418e1f8aa15d1a50e695aa71c2c2d48888a0b888a06d830c40a617a804d3c2c5f0f0ff14cea4206aee821239b63df273ccaf7452246112c931e6a923b
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
deleted file mode 100644
index 3f08febeed95..000000000000
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils pam versionator bash-completion-r1
-
-MY_P=${PN}_${PV}
-DEB_REL=2
-
-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}-${DEB_REL}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-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 )
-"
-
-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 )
-"
-
-PATCHES=(
-	"${S}/debian/patches/Add-support-for-more-compression-formats.patch"
-	"${S}/debian/patches/Add-SESSION_SOURCE-and-CHROOT_SESSION_SOURCE.patch"
-	"${S}/debian/patches/10mount-Move-mount-directory-to-var-run.patch"
-	"${S}/debian/patches/Support-union-mounts-with-overlay-as-in-Linux-4.0.patch"
-	"${S}/debian/patches/GCC5-fixes-on-regexes.patch"
-)
-
-src_unpack() {
-	unpack ${MY_P}.orig.tar.xz
-	cd "${S}"
-	unpack ${MY_P}-${DEB_REL}.debian.tar.xz
-}
-
-src_prepare() {
-	sed -i -e 's/warn(/message(WARNING /' man/CMakeLists.txt || die
-	sed -i -e '/^have schroot/d' etc/bash_completion/schroot || die
-
-	cmake-utils_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)
-		-Dbash_completion_dir="$(get_bashcompdir)"
-		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
-		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
-	)
-	if ! use nls; then
-		mycmakeargs+=(-DPO4A_EXECUTABLE=NOTFOUND)
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile all $(usev doc)
-}
-
-src_test() {
-	if [[ $EUID -ne 0 ]]; then
-		ewarn "Disabling tests because you are not root"
-		return 0
-	fi
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/doc/${PF}/contrib/setup.d
-	doins 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
-
-	if use doc; then
-		docinto html/sbuild
-		dohtml "${BUILD_DIR}"/doc/sbuild/html/*
-		docinto html/schroot
-		dohtml "${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() {
-	if [[ ${REPLACING_VERSIONS} == 1.[24]* ]]; then
-		elog "Please read /usr/share/doc/${PF}/NEWS.debian* for important"
-		elog "upgrade information."
-	fi
-	# If installing to a running system, upgrading from <=1.6.10-r3, then
-	# make sure that the runtime dirs are still visible to the new install
-	if [[ ${ROOT} == / && ${REPLACING_VERSIONS} ]] && ! version_is_at_least 1.6.10-r4 ${REPLACING_VERSIONS}; then
-		ln -s "${EPREFIX}"/var/lib/schroot "${EPREFIX}"/var/run/schroot
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		for dir in $(find "${EROOT}"/var/lib/schroot/mount -maxdepth 1 -type d | tac); do
-			rmdir "$dir" || elog "Failed to remove session mount directory $dir: Please check for any stray mounts or data under this directory and remove by hand."
-		done
-	fi
-}
diff --git a/dev-util/schroot/schroot-1.6.10-r5.ebuild b/dev-util/schroot/schroot-1.6.10-r5.ebuild
deleted file mode 100644
index 9752f1064497..000000000000
--- a/dev-util/schroot/schroot-1.6.10-r5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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}
-DEB_REL=6
-
-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}-${DEB_REL}.debian.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="btrfs +dchroot debug doc lvm nls pam test"
-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 )
-"
-
-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 )
-"
-
-src_unpack() {
-	unpack ${MY_P}.orig.tar.xz
-	cd "${S}"
-	unpack ${MY_P}-${DEB_REL}.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)
-		-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
-}
diff --git a/dev-util/schroot/schroot-1.6.10_p7.ebuild b/dev-util/schroot/schroot-1.6.10_p7.ebuild
index 37c1dd419a13..549e21110c25 100644
--- a/dev-util/schroot/schroot-1.6.10_p7.ebuild
+++ b/dev-util/schroot/schroot-1.6.10_p7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P/%-*/}.orig.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test zfs"
 RESTRICT="!test? ( test )"