gentoo resync : 16.09.2020

5 files changed, 3 insertions, 80 deletions

diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index f4815a8c8232..f4cd769e4bc5 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,9 +1,6 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
-AUX lxcfs.service 350 BLAKE2B 654b9053265ac16b28e0e5d04e0278070e8f6f2bc08be55f6a896c372f1b6c98c8872a0386c0dc71dee0a3afcf7cb3a7f5049d8f5a192dda983d7273eb2bdacf SHA512 3c8f44bdc2f9e5e23fa0a44b77ce3cb0cd5fd90fea6e82a46e7bac77d22a1d52a66c3d052ca9ea7319d1debe1a1808e01a34adb79fa4fd9f1024ab60139afc6c
-DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 DIST lxcfs-4.0.5.tar.gz 101842 BLAKE2B c916473e1b7ad42b8f69026a16810941c999d44ffcf1d456cb301411965f05e626338a5bde1e38fe99acd05f72bbcd5acbdcb2f65fa5ec183c967babcb8c70fd SHA512 5c44aa7f43071a4316cc8702928fde2c928bd5654c9ab4d540152839db0d7dd235a861f263da56f02611941d46d22eee98e0cdd52aeaeda99f3c79c754d420a1
-EBUILD lxcfs-4.0.3.ebuild 1248 BLAKE2B 0e37ad8f8b904f2fa2aead5fc24e316bd8d9f0b9a67c8db8f2351750f8308a7688bc4e78d662a533d16aa58b871fccfd21b33624e295a36de4fd32e1277ab8de SHA512 ea98650d13885fe5d5217ea2486c4042636377e862b71509a5de74ca028a27c7fe89c05ba663397164bea8bbd1ab845a97cfd910327b61e11879ccce2102cdd2
-EBUILD lxcfs-4.0.5.ebuild 1130 BLAKE2B 5b3b52a533f18cb23fd226189145bb2482918e67e0cfdde4c3b9398f83262df9cae1053fe6e2e0597e912606fa1cfd4ec53293feb480f5adf1b666ec761b7098 SHA512 bd182c749df79c21e2e5ea0a8742660d99b3c82c07f530b0a71a4d75313c078d198bdc49f43cd35f5ee5443983e13b2e72ca428e4331a98928c559a94a5a6965
-MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
+EBUILD lxcfs-4.0.5.ebuild 1129 BLAKE2B e70fa396777b48492042ade549ea7bf145872a81884ec992125e8fc69556f5ae19c4e30a7dc81b3559d6ba21ac9317ff73860b7e61440afe915010b5e3d56122 SHA512 61c3c09410a3e9f173847c3a6050fb589931fa7db15e9142b9d1fb71c9ca6fcb4d5732f4dd4c73f3229768175b920acfbfe21ac01edbe5578e2692191de828bd
+MISC metadata.xml 710 BLAKE2B d82ae0c425bf378faf05f11f4b1a22194ffaca6b94f9e7ac500bd8f72c62459706ac58562d2631b3983e06398313cce80c131b940cee50869ea911141785e6e1 SHA512 217ea0081e2829394781ebe266960f1a9c2a6162f8afad0b915284471d5657065d93845b518d8f1d280df085bd2a7d80f4f1a30e91964d91bda1e71f5cda90f9
diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service
deleted file mode 100644
index aea0d6d920fc..000000000000
--- a/sys-fs/lxcfs/files/lxcfs.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-Documentation=man:lxcfs(1)
-
-[Service]
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
-KillMode=process
-Restart=on-failure
-ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
-Delegate=yes
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
deleted file mode 100644
index de32fe294cb3..000000000000
--- a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-# acct-group/lxd needed for the fowners below.
-RDEPEND="dev-libs/glib:2
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	# Without with-distro ./configure will fail when cross-compiling
-	econf --localstatedir=/var --with-distro=gentoo
-}
-
-src_test() {
-	emake tests
-	tests/main.sh || die "Tests failed"
-}
-
-src_install() {
-	default
-
-	# Getting weird file collisions, 
-	# keepdir /var/lib/lxcfs
-	# fowners -R root:lxd /var/lib/lxcfs
-
-	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.5.ebuild b/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
index 3f5a924ec104..8c7b1f79d64f 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/glib:2
 	sys-fs/fuse:0"
diff --git a/sys-fs/lxcfs/metadata.xml b/sys-fs/lxcfs/metadata.xml
index 9ed77f5faf52..b40dcc8519b4 100644
--- a/sys-fs/lxcfs/metadata.xml
+++ b/sys-fs/lxcfs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>john@irc.tm</email>
-		<name>John Cooke</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>