Revbump. Don't use deprecated start-stop-daemon options, bug 377843.

(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force)

5 files changed, 17 insertions, 89 deletions

diff --git a/app-crypt/cfs/ChangeLog b/app-crypt/cfs/ChangeLog
index 3d182cbb040f..95ba32960dfc 100644
--- a/app-crypt/cfs/ChangeLog
+++ b/app-crypt/cfs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/cfs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/ChangeLog,v 1.12 2010/08/10 22:30:13 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/ChangeLog,v 1.13 2011/12/31 19:54:19 idl0r Exp $
+
+*cfs-1.4.1.17-r3 (31 Dec 2011)
+*cfs-1.4.1.17-r2 (31 Dec 2011)
+
+  31 Dec 2011; Christian Ruppert <idl0r@gentoo.org> -cfs-1.4.1.14.ebuild,
+  -cfs-1.4.1.17.ebuild, -cfs-1.4.1.17-r1.ebuild, +cfs-1.4.1.17-r2.ebuild,
+  +cfs-1.4.1.17-r3.ebuild, files/cfsd.init:
+  Revbump. Don't use deprecated start-stop-daemon options, bug 377843.
 
 *cfs-1.4.1.17-r1 (10 Aug 2010)
 
diff --git a/app-crypt/cfs/cfs-1.4.1.14.ebuild b/app-crypt/cfs/cfs-1.4.1.14.ebuild
deleted file mode 100644
index bf94aa29ebbb..000000000000
--- a/app-crypt/cfs/cfs-1.4.1.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.14.ebuild,v 1.8 2008/12/17 00:15:51 halcy0n Exp $
-
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-3)"
-DEB_PV="$(get_version_component_range 4)"
-
-# This is a port of the Debian port of CFS which includes several
-# useful patches.  Many thanks to the Debian developers.
-
-DESCRIPTION="Cryptographic Filesystem"
-HOMEPAGE="http://packages.debian.org/unstable/utils/cfs
-	http://www.crypto.com/software/"
-SRC_URI="mirror://debian/pool/main/c/cfs/cfs_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/c/cfs/cfs_${MY_PV}-${DEB_PV}.diff.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-DEPEND="net-fs/nfs-utils"
-
-S=${WORKDIR}/${PN}-${MY_PV}.orig
-
-# Originally from the common-lisp-common.eclass:
-
-do-debian-credits() {
-	docinto debian
-	for i in copyright README.Debian changelog; do
-		# be silent, since all files are not always present
-		dodoc "${S}"/debian/${i} &>/dev/null || true
-	done
-	docinto .
-}
-
-cfsd-running() {
-	test -n "$(mount |grep '\(/var/cfs\|/var/lib/cfs/\.cfsfs\)')"
-}
-
-pkg_setup() {
-	if cfsd-running; then
-		eerror "It seems that the null directory or CFS root is currently in use."
-		eerror "You must shutdown CFS before merging this port or at least unmount"
-		eerror "the CFS root before using this port."
-		die "cfs is still running!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch cfs_${MY_PV}-${DEB_PV}.diff
-}
-
-src_compile() {
-	make cfs COPT="${CFLAGS} -DPROTOTYPES -g" || die "make failed!"
-}
-
-src_install() {
-	make install_cfs BINDIR="${D}"/usr/bin ETCDIR="${D}"/usr/sbin || \
-		die "make install failed!"
-	newconfd "${FILESDIR}"/cfsd.conf cfsd
-#	exeinto /var/lib/cfs
-#	doexe debian/cfs_*mount.sh
-	keepdir /var/run/cfs
-	keepdir /var/cfs
-	keepdir /var/lib/cfs/.cfsfs
-	chmod 0 "${D}"/var/lib/cfs/.cfsfs
-	doman *.[18]
-	newinitd "${FILESDIR}"/cfsd.init cfsd
-	do-debian-credits
-	dodoc LEVELS README* VERSION
-	dodoc "${FILESDIR}"/README.Gentoo
-}
-
-pkg_postinst() {
-	rm -f /var/lib/cfs/.cfsfs/.keep
-	einfo "Please read the Gentoo README in /usr/share/doc/${PF}/ for"
-	einfo "information on how to get started with CFS on Gentoo."
-}
diff --git a/app-crypt/cfs/cfs-1.4.1.17.ebuild b/app-crypt/cfs/cfs-1.4.1.17-r2.ebuild
index b930b8818fbc..6ce8eb4da791 100644
--- a/app-crypt/cfs/cfs-1.4.1.17.ebuild
+++ b/app-crypt/cfs/cfs-1.4.1.17-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.17.ebuild,v 1.5 2008/12/17 00:15:51 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.17-r2.ebuild,v 1.1 2011/12/31 19:54:19 idl0r Exp $
 
 inherit eutils versionator
 
diff --git a/app-crypt/cfs/cfs-1.4.1.17-r1.ebuild b/app-crypt/cfs/cfs-1.4.1.17-r3.ebuild
index 8013fe118956..cbd34aebf7e1 100644
--- a/app-crypt/cfs/cfs-1.4.1.17-r1.ebuild
+++ b/app-crypt/cfs/cfs-1.4.1.17-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.17-r1.ebuild,v 1.1 2010/08/10 22:30:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/cfs-1.4.1.17-r3.ebuild,v 1.1 2011/12/31 19:54:19 idl0r Exp $
 
 inherit eutils versionator
 
diff --git a/app-crypt/cfs/files/cfsd.init b/app-crypt/cfs/files/cfsd.init
index a2d62771939f..603d80d3a635 100644
--- a/app-crypt/cfs/files/cfsd.init
+++ b/app-crypt/cfs/files/cfsd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/files/cfsd.init,v 1.2 2004/09/28 00:18:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/cfs/files/cfsd.init,v 1.3 2011/12/31 19:54:20 idl0r Exp $
 
 depend() {
 	need nfs
@@ -17,7 +17,7 @@ start() {
 
 stop() {
     ebegin "Stopping cfsd"
-    start-stop-daemon --oknodo --stop --pidfile /var/run/cfs.pid \
+    start-stop-daemon --stop --pidfile /var/run/cfs.pid \
         && rm -f /var/run/cfs.pid
 	eend $?
 }