From 40347598ee0fda0f336f6048a4623200b449a631 Mon Sep 17 00:00:00 2001
From: Jason Zaman <perfinion@gentoo.org>
Date: Fri, 20 Jul 2018 11:41:47 +0800
Subject: sys-fs/cachefilesd: fix systemd unit path

Closes: https://bugs.gentoo.org/593088
Package-Manager: Portage-2.3.40, Repoman-2.3.9
---
 sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild | 61 ++++++++++++++++++++++++
 sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild    | 60 -----------------------
 2 files changed, 61 insertions(+), 60 deletions(-)
 create mode 100644 sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
 delete mode 100644 sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild

(limited to 'sys-fs/cachefilesd')

diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
new file mode 100644
index 000000000000..7a797a7857f2
--- /dev/null
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Provides a caching directory on an already mounted filesystem"
+HOMEPAGE="https://people.redhat.com/~dhowells/fscache/"
+SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
+DEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.9-makefile.patch
+)
+
+src_prepare() {
+	default
+	if ! use selinux; then
+		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
+	fi
+
+	tc-export CC
+	append-flags -fpie
+}
+
+src_install() {
+	default
+
+	if use selinux; then
+		insinto /usr/share/doc/${P}
+		doins -r selinux
+	fi
+
+	dodoc howto.txt
+
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	newinitd "${FILESDIR}"/${PN}-3.init ${PN}
+
+	sed -i 's@ExecStart=/usr@ExecStart=@' ${PN}.service || die "failed to fix path"
+	systemd_dounit ${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d ${PN}.conf
+}
+
+pkg_postinst() {
+	[[ -d /var/cache/fscache ]] && return
+	elog "Before CacheFiles can be used, a directory for local storage"
+	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
+	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
+	elog "extended attributes (mount -o user_xattr)."
+	echo ""
+	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
+	elog "to the mount options of your network mounts, and let it fly!"
+}
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
deleted file mode 100644
index 629ffd58c2cf..000000000000
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Provides a caching directory on an already mounted filesystem"
-HOMEPAGE="https://people.redhat.com/~dhowells/fscache/"
-SRC_URI="https://people.redhat.com/~dhowells/fscache/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-cachefilesd )"
-DEPEND=""
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.9-makefile.patch
-)
-
-src_prepare() {
-	default
-	if ! use selinux; then
-		sed -e '/^secctx/s:^:#:g' -i cachefilesd.conf || die
-	fi
-
-	tc-export CC
-	append-flags -fpie
-}
-
-src_install() {
-	default
-
-	if use selinux; then
-		insinto /usr/share/doc/${P}
-		doins -r selinux
-	fi
-
-	dodoc howto.txt
-
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-	newinitd "${FILESDIR}"/${PN}-3.init ${PN}
-
-	systemd_dounit ${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d ${PN}.conf
-}
-
-pkg_postinst() {
-	[[ -d /var/cache/fscache ]] && return
-	elog "Before CacheFiles can be used, a directory for local storage"
-	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
-	elog "uses /var/cache/fscache.  The filesystem mounted there must support"
-	elog "extended attributes (mount -o user_xattr)."
-	echo ""
-	elog "Once that is taken care of, start the daemon, add -o ...,fsc"
-	elog "to the mount options of your network mounts, and let it fly!"
-}
-- 
cgit v1.2.3-65-gdbad