reinit the tree, so we can have metadata

8 files changed, 245 insertions, 0 deletions

diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
new file mode 100644
index 000000000000..dfcaa0688673
--- /dev/null
+++ b/sys-fs/lxcfs/Manifest
@@ -0,0 +1,10 @@
+AUX lxcfs-2.0.4-fusermount-path.patch 380 SHA256 74df135742f4d63b410e2ca14784c1970851fb93015eb427e7f13a85ecf71c28 SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426 WHIRLPOOL 29cf1f3590a563b35aae8097392198d9b62cc84b12157968e1d6153c5cc43124f29c05b9aec25706e825c407512253771b9cf036d2fe4f50234a9faf4be23c3a
+AUX lxcfs-2.0.4.initd 533 SHA256 68b8c235697be65b191ea3984f5bfddb41c312325b2f72e087080a61a61f3a13 SHA512 9c53354c9c11189e488baa396817cf5182be2c082e40ba458dc7b55b79e30a7ee0415ed319539e7f1ebc4df36530119935c88956d61b22071a65bc4ab412f71a WHIRLPOOL ca817bb4bd9bf2c6077653ae5b5af30c9df1cd11ebd7638ed256feed0de1f50e649e8abb86a299ca8a666e93ebc912af87bf76de17dd09ed38f305f875f7eb98
+AUX lxcfs-2.0.6-fusermount-path.patch 380 SHA256 74df135742f4d63b410e2ca14784c1970851fb93015eb427e7f13a85ecf71c28 SHA512 ce2f250cc6e8430dd928615d23a37edd136d559e42d2a695222372a2c4300d85753ddb6cc9d0b7a55d34f6f8a01bcf1951fdc815788cb5832bc59385cda43426 WHIRLPOOL 29cf1f3590a563b35aae8097392198d9b62cc84b12157968e1d6153c5cc43124f29c05b9aec25706e825c407512253771b9cf036d2fe4f50234a9faf4be23c3a
+AUX lxcfs-2.0.6.initd 533 SHA256 d5ebcdb6e03f54f1c49128a0a54d0e410acf03c4a6549e3767f4244eb0129b48 SHA512 6e52dedcc36d6db4529b796a4a881fd3966b165d2cefc6a64c638bd06b1b2ee29323e91ee2dd92d6b855e8ec6dd7c1e3d2c25af7dd047dae23ca817781cad5fc WHIRLPOOL cf9f2e9957663e9f783b1aaa07a0dd05419d94757fb2975bcc929b78e24b691151916d199ebc3966de6ca849d7f337d20d23b80eb5e300a9698a9a8e3fb836e3
+DIST lxcfs-2.0.4.tar.gz 52639 SHA256 9af8199dba2837542ede6e50489100220472241e4b355b685e66c9a72bbcf81a SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 WHIRLPOOL 1ac966bab786b00a236225e1856c46fa9d419e42853edcd1181fc3f43d54becb60435fa0679a6a0f838a5edeb920205e3baa734118a4b5d9587e547fd63e3704
+DIST lxcfs-2.0.6.tar.gz 62632 SHA256 be4ea891887aee2c04b2d9ff5dbb6866178cc1276119f5b116bf3f99c7750213 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d WHIRLPOOL 0d7fc69400678f03dd8ccb06fee643feaa62469e6287a6bc3935232f775bc93fa5c1d649e7747b3b09867f2678593eaf923c947499c549cfd6c40fcd28620a95
+EBUILD lxcfs-2.0.4.ebuild 1671 SHA256 a1d2023101dfb76e39a90cd2c56bf4b5446b2d0c170761c40e2df21905879bb8 SHA512 ffa8a2fd888dcf313f66facfd5c6035bb969876d30121ec56c6fcdd2ca384673b464fa4c8f6356d7a08f6896ad394a1ba8573ee9f142bc484c5f6dd5ed3da92d WHIRLPOOL 26132c041b5e84b418a379496c10bc53457ab79f8588b5ed0e1d2240ef7cb40d4b348b8dd71860cbb954e6325ddf2a0270666e41a4d241f5e919858a96b36938
+EBUILD lxcfs-2.0.6.ebuild 1671 SHA256 4ccf39406769910d627b27f5ae4a5532b37433ab18da240d326debd681d649ed SHA512 6de43babc7b874a71e1691713a51ea5e5721a9d94371bee396130d262186fa7935e0a48d9f12d098963e4111720decd58003bf042d80ef0abdfca4d86f5f1512 WHIRLPOOL 9330227b1d906bd01139f94d6fc40af1ef541f264bc659d774248bfff89712944be0ff6d2b2d242e67365b0eabef7717660ee614ddaf23c149263313e1ecb26f
+MISC ChangeLog 4036 SHA256 2c4724fa18d73a0cfcdbbf373c58cb181554c0a9bdfc832b6408570be66bfb0f SHA512 ffaaf8e74881ec5dc4eadc1b33ea05dcd29fa1ebd00b9f61d45b9c64ac29a0c8c06c5ef8129044148a0ef1c38f67fd1a36ad6a1625d5faae141df24e49548643 WHIRLPOOL 21ce0d797b7639995327bf506dae5342c92842134ce3c595ad8c82df28b886fb4b50dcdc5fda374a98ab424287039b2cee6f8163d88f38e26743ce2f97e37f6f
+MISC metadata.xml 676 SHA256 aa6cccfb428a2263d6e9162ebd0dfec0a20633ae16926f74c37923cccbc52bdf SHA512 e6976fff93a2bce13c0d3d4af30d29a9135eefecbb186bf5c0e219bd527fb34a8ab8746cd2d8c31d478c77a508400359aae1462ffa40cf832f8a86d212217bad WHIRLPOOL e91c8150c202f06dd9f45132bcb48b87cea8cc67f833a427adb2bc419ac170b6eb0d1f09c350070874d77a567266a85839edcfc125f9e9c73a7ca1fc947d8cf4
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
new file mode 100644
index 000000000000..61d3494fb7f3
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- /config/init/systemd/lxcfs.service.orig	2016-07-11 01:18:57.688074437 +0000
++++ /config/init/systemd/lxcfs.service	2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+ 
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd b/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
new file mode 100644
index 000000000000..dd556894b7fc
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.4.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+    ebegin "Starting lxcfs"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      -f -o allow_other /var/lib/lxcfs
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping lxcfs"
+    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    eend $?
+}
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
new file mode 100644
index 000000000000..61d3494fb7f3
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch
@@ -0,0 +1,11 @@
+--- /config/init/systemd/lxcfs.service.orig	2016-07-11 01:18:57.688074437 +0000
++++ /config/init/systemd/lxcfs.service	2016-07-11 01:19:48.516477185 +0000
+@@ -7,7 +7,7 @@
+ ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ KillMode=process
+ Restart=on-failure
+-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
++ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+ Delegate=yes
+ 
+ [Install]
diff --git a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
new file mode 100644
index 000000000000..dfc5725f693f
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-2.0.6.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+    ebegin "Starting lxcfs"
+
+    start-stop-daemon --start \
+		      --pidfile ${PIDFILE} \
+		      --exec ${DAEMON} \
+		      --background \
+		      --make-pidfile \
+		      -- \
+		      -f -o allow_other /var/lib/lxcfs
+
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping lxcfs"
+    start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+    eend $?
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild b/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
new file mode 100644
index 000000000000..82ea9915b320
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd vcs-snapshot versionator
+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
+	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+	UPSTREAM_PV=$(replace_version_separator 3 '.' )
+	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+IUSE="pam"
+
+# 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
+	virtual/pam
+"
+DEPEND="
+	sys-apps/help2man
+	${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+	default
+	./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+	use pam || pamflag="--with-pamdir=none"
+
+	# Without the localstatedir the filesystem isn't mounted correctly
+	econf --localstatedir=/var ${pamflag}
+}
+
+# Test suite fails for me
+# src_test() {
+# 	emake tests
+# 	tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+	default
+	dodir /var/lib/lxcfs
+	newinitd "${FILESDIR}"/${P}.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
+}
diff --git a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild b/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
new file mode 100644
index 000000000000..bc296b6a704e
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-2.0.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd vcs-snapshot versionator
+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
+	# e.g. upstream is 2.0.0.beta2, we want 2.0.0_beta2
+	UPSTREAM_PV=$(replace_version_separator 3 '.' )
+	SRC_URI="https://github.com/lxc/lxcfs/archive/${PN}-${UPSTREAM_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+IUSE="pam"
+
+# 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
+	virtual/pam
+"
+DEPEND="
+	sys-apps/help2man
+	${RDEPEND}
+"
+PATCHES="${FILESDIR}/${P}-fusermount-path.patch"
+
+src_prepare() {
+	default
+	./bootstrap.sh || die "Failed to bootstrap configure files"
+}
+
+src_configure() {
+	use pam || pamflag="--with-pamdir=none"
+
+	# Without the localstatedir the filesystem isn't mounted correctly
+	econf --localstatedir=/var ${pamflag}
+}
+
+# Test suite fails for me
+# src_test() {
+# 	emake tests
+# 	tests/main.sh || die "Tests failed"
+# }
+
+src_install() {
+	default
+	dodir /var/lib/lxcfs
+	newinitd "${FILESDIR}"/${P}.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
+}
diff --git a/sys-fs/lxcfs/metadata.xml b/sys-fs/lxcfs/metadata.xml
new file mode 100644
index 000000000000..82ba2497b614
--- /dev/null
+++ b/sys-fs/lxcfs/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>stasibear@gentoo.org</email>
+		<name>Erik Mackdanz</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>john@irc.tm</email>
+		<name>John Cooke</name>
+	</maintainer>
+	<longdescription>
+		LXCFS is a simple userspace filesystem designed to
+		provide a cgroupfs-like tree which is container aware
+		and a set of files which can be bind-mounted over
+		their /proc originals to provide cgroup-aware values.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">lxc/lxfs</remote-id>
+	</upstream>
+</pkgmetadata>