gentoo resync : 09.06.2018

3 files changed, 5 insertions, 136 deletions

diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 77394d1034ed..8a8d5463d2aa 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,9 +1,7 @@
 AUX schroot-1.6.10-cmake-add-additional-regex-tests.patch 2283 BLAKE2B bbdf631d09fa45c0befdc31c33b821fc5cfb1cc282bee28913a3fb7cc7f48908199e2c16793b3611c0c1287979f78b0d90c03fc1baa22e221d2a57ecb828eb81 SHA512 e68698dbace2e79c9e89525f22314fb75a42568cbeeac570334956b14051ed8dddbdffb3bdd769f77a6609159377a64df7de5041aff7512d100bbdd72aa6d4c0
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
-DIST schroot_1.6.10-1.debian.tar.xz 27108 BLAKE2B ee4f35767975f2713053c6aae9c1ccb472ef541a3a6d9c335a8a8cd923dc90b78eb45bf1fa1ece590cee94e0d629e0365cc592ec8e966bbdd7f0c4414f55b80b SHA512 2b989054485f397c7de4f9d5e625f2bb2d4738ecb087ff83903a247696a2c98dea611e9743d4ae6bee401b122c21aac4f5e220b5e544f9968f94d6f326fadfa6
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
 DIST schroot_1.6.10.orig.tar.xz 797328 BLAKE2B 1f91531f22c5b0a75e5bb74effc660efe4819acc59b007355c12a01c0a1de12674881dd0fbbcab00575a02629662fca799d48f5b967eb527812ed8c08ff9ad28 SHA512 25155989c7811ab4c7bf3cdceaa8d0ffb12f08388143891def96fcd205f1cc401dad9a74f0e9a9ef8610d50174ff8319a8368401431dc87e1a11c0241e61fcbe
-EBUILD schroot-1.6.10-r3.ebuild 2930 BLAKE2B 2d5d19a149d394f3a773189d0464ea9f7446b1668957559f71403fe0178b03cb9bcf026eb9ee41d093a9fddba8316bc0f2a9a5129899d3d8a9470603e89e6171 SHA512 cbec9893b42377c72674632b4bc4774c4def3ee0834d863c82ea27435822805b5d52c07f845bf27946377f23e3f79471321ad2258c61fb932ea8d24ae493157f
-EBUILD schroot-1.6.10-r4.ebuild 3762 BLAKE2B fd4c3cde279d5a40278a4de2ebb5facbd5c4f5a58d95056331c91705ed07b57d7079ae18679c812c55df4f5c9c1302c1c85bab730633e43ebcfa26db401858e8 SHA512 0bf878ab01c421189efcada441fac7aa815f9e729e080355fac5f5bbb35f939b4452bbea09c933583758b3206264c51d9a67d53e616e27785b357ec7654ea408
+EBUILD schroot-1.6.10-r4.ebuild 3759 BLAKE2B f389b68a46ca5edb2054ecaff03d28873d689b3d6f8a8a0cce45e65a5be7cec4e78fc5346c2e4f33572d41b0b6934fb607a201bc294a47ba595211c062c171b9 SHA512 a9dd8c9c35e5d64bc0e686cfedce9295cd24589758d966dd15b9046f588973822c4f97c2cb288f9e98654e6167c4786109d7c859e47c3836d6286d35c4d1401a
 MISC metadata.xml 451 BLAKE2B c37cf286c387974fb9d4d9145724da0340d8846ee772548915fbfc24530567b7fda09fdb845a6918ff70e55c6d33621d586da51a8ed222de820035a1eea71eb1 SHA512 372b1bc77d13fde4eff8f5e45bab2a3c75152d05c7fbc272e5bb119e2edf9f8931acb426ca06b413cbcd7b4476424fdbc9eec49b865dd9cd2990bed88201d40a
diff --git a/dev-util/schroot/schroot-1.6.10-r3.ebuild b/dev-util/schroot/schroot-1.6.10-r3.ebuild
deleted file mode 100644
index 003cb75a0647..000000000000
--- a/dev-util/schroot/schroot-1.6.10-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils eutils pam versionator bash-completion-r1
-
-MY_P=${PN}_${PV}
-DEB_REL=1
-
-DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://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"
-
-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=(
-	"${FILESDIR}/${PN}-1.6.10-cmake-add-additional-regex-tests.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=(
-		$(cmake-utils_use btrfs btrfs-snapshot)
-		$(cmake-utils_use dchroot dchroot)
-		$(cmake-utils_use dchroot dchroot-dsa)
-		$(cmake-utils_use debug debug)
-		$(cmake-utils_use doc doxygen)
-		$(cmake-utils_use lvm lvm-snapshot)
-		$(cmake-utils_use nls nls)
-		$(cmake-utils_use pam pam)
-		$(cmake-utils_use test 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
-}
diff --git a/dev-util/schroot/schroot-1.6.10-r4.ebuild b/dev-util/schroot/schroot-1.6.10-r4.ebuild
index 280d789e5202..432388f071b4 100644
--- a/dev-util/schroot/schroot-1.6.10-r4.ebuild
+++ b/dev-util/schroot/schroot-1.6.10-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 inherit cmake-utils eutils pam versionator bash-completion-r1
 
@@ -9,13 +9,13 @@ MY_P=${PN}_${PV}
 DEB_REL=2
 
 DESCRIPTION="Utility to execute commands in a chroot environment"
-HOMEPAGE="http://packages.debian.org/source/sid/schroot"
+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"
+KEYWORDS="amd64 ~arm x86"
 IUSE="btrfs +dchroot debug doc lvm nls pam test"
 
 COMMON_DEPEND="