gentoo resync : 05.04.2019

3 files changed, 2 insertions, 76 deletions

diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index c3df2501f6ab..42bb21d17d43 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,7 +1,5 @@
 AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
 AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
-DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218
 DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
-EBUILD lxcfs-3.0.2.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
-EBUILD lxcfs-3.0.3.ebuild 1736 BLAKE2B c0a4b0fde3609ec039a1c3afc69d71f7afc7c05324f1226305952622f524e558cbb9e56dd61dfcb0aaa72ccf78a4de9491cc887ae8f9c80cc166679c67133ce0 SHA512 09007915f2d9d1343b0318337cbc6146ee750e301fc4c70c127283fd8f389fa64e90ddc09068225d53ea30193a5f9b74d3bdedc4cddaf8df9bddf3eac27c6179
+EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild b/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
deleted file mode 100644
index f9c354a881a3..000000000000
--- a/sys-fs/lxcfs/lxcfs-3.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd vcs-snapshot
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lxc/lxcfs.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-RDEPEND="
-	dev-libs/glib:2
-	sys-fs/fuse:0
-"
-DEPEND="
-	sys-apps/help2man
-	${RDEPEND}
-"
-PATCHES="${FILESDIR}/${PN}-fusermount-path.patch"
-
-src_prepare() {
-	default
-	./bootstrap.sh || die "Failed to bootstrap configure files"
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	econf --localstatedir=/var
-}
-
-# Test suite fails for me
-# src_test() {
-# 	emake tests
-# 	tests/main.sh || die "Tests failed"
-# }
-
-src_install() {
-	default
-	keepdir /var/lib/lxcfs
-	newinitd "${FILESDIR}"/${PN}.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
-
-pkg_preinst() {
-	# In an upgrade situation merging /var/lib/lxcfs (an empty dir)
-	# fails because that is a live mountpoint when the service is
-	# running.  It's unnecessary anyway so skip the action.
-	[[ -d ${ROOT}/var/lib/lxcfs ]] && rm -rf ${D}/var
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Starting with version 3.0.0 the cgfs PAM module has moved, and"
-	einfo "will eventually be available in app-emulation/lxc.  See:"
-	einfo "https://brauner.github.io/2018/02/28/lxc-includes-cgroup-pam-module.html"
-	einfo "for more information."
-	einfo
-}
diff --git a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
index 4d89fb38cc5f..f9c354a881a3 100644
--- a/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
+++ b/sys-fs/lxcfs/lxcfs-3.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 # Omit all dbus.  Upstream appears to require it because systemd, but