From f92a7ea8a9957b94887bd608f1cc40a03295e691 Mon Sep 17 00:00:00 2001 From: Erik Mackdanz Date: Sat, 13 Oct 2018 17:40:31 -0500 Subject: sys-fs/lxcfs: Remove old versions Signed-off-by: Erik Mackdanz Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- sys-fs/lxcfs/Manifest | 2 - .../lxcfs/files/lxcfs-2.0.4-fusermount-path.patch | 11 ---- sys-fs/lxcfs/files/lxcfs-2.0.4.initd | 26 -------- .../lxcfs/files/lxcfs-2.0.6-fusermount-path.patch | 11 ---- sys-fs/lxcfs/files/lxcfs-2.0.6.initd | 26 -------- sys-fs/lxcfs/lxcfs-2.0.4.ebuild | 70 ---------------------- sys-fs/lxcfs/lxcfs-2.0.6.ebuild | 70 ---------------------- 7 files changed, 216 deletions(-) delete mode 100644 sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch delete mode 100644 sys-fs/lxcfs/files/lxcfs-2.0.4.initd delete mode 100644 sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch delete mode 100644 sys-fs/lxcfs/files/lxcfs-2.0.6.initd delete mode 100644 sys-fs/lxcfs/lxcfs-2.0.4.ebuild delete mode 100644 sys-fs/lxcfs/lxcfs-2.0.6.ebuild diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index cc84b00c2c36..8b3d028d5c34 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -1,4 +1,2 @@ -DIST lxcfs-2.0.4.tar.gz 52639 BLAKE2B 4ef8509b05ac98338003801afeb67a15fcfd1270f90e7b5d1970c4171b9296b77e116f91ec29ec29f3feb0e03c5f2ddf49d014824869aa6cf9897441ebac17a3 SHA512 1c701fbd60799a1f7ad7e809c2e52ef0d26ed44e96c2c0376d3c4eb203aafb99ddcaff015f3fa8cc9c1219449210f6bf93844cc568de3a9f55cb8801328cec90 -DIST lxcfs-2.0.6.tar.gz 62632 BLAKE2B 2bc76de0a7e2657b0d73e79260bfaf5a1ba070a4571d81a7c26d3637fc93937c824496119ff32fbfa56b6f97deca4bb145a952862aff148932531c489eea57a9 SHA512 52baf15eb9dc2b694085635f7d8e5c6f1207099173cda607d758b8837a720e4808cacbf83f900a6734d3260d34abafbebdcbb0618cb3cf67c5d304f50d66244d DIST lxcfs-3.0.0.tar.gz 49219 BLAKE2B c21cd9983e9175bf3a31bafd8a29ddd6a6a549226bd432636dd4ea48bf6268c403f236ca39739a989cd89fa7b0b05043c179ca328fd739f5a9d56e27907a7a60 SHA512 99fe11e99c2e487d6ecd9a8484be6413563ddcb33740631ee6fe1b60d3d2d62cea1bb44d1ef6dc45283f5b3d20cd680d48ea3cb5ad17f0c3e7ba6ed56186c42f DIST lxcfs-3.0.2.tar.gz 49809 BLAKE2B dc73149b92ac040c56de5f4c11aafdf6e744ffd2b17e22ee9c784663ff102dedd74453581a77027037955238e081c596377c28b6066012fa32ee575e6a4c57fa SHA512 2065bbd68fd2974fe28c861b1e77c62a501da85e1bfc19eeafa49fd88c66e8e75ae007781c8bd05caf43fb3b80ad12c81c0f0f03d27ab1131e0cfe6d48443218 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 deleted file mode 100644 index 61d3494fb7f3..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.4-fusermount-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /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 deleted file mode 100644 index dd556894b7fc..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.4.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 deleted file mode 100644 index 61d3494fb7f3..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.6-fusermount-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /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 deleted file mode 100644 index dfc5725f693f..000000000000 --- a/sys-fs/lxcfs/files/lxcfs-2.0.6.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 deleted file mode 100644 index 82ea9915b320..000000000000 --- a/sys-fs/lxcfs/lxcfs-2.0.4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 deleted file mode 100644 index bc296b6a704e..000000000000 --- a/sys-fs/lxcfs/lxcfs-2.0.6.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# 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 -} -- cgit v1.2.3-65-gdbad