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

Package-Manager: portage-2.1.10.41/cvs/Linux i686
RepoMan-Options: --force

6 files changed, 21 insertions, 107 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/Manifest b/app-crypt/cfs/Manifest
index 38fb45637d71..6895e0177a12 100644
--- a/app-crypt/cfs/Manifest
+++ b/app-crypt/cfs/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX README.Gentoo 1584 RMD160 d1e5ed6ab7496e8cf67a768c6e4d284e6fa0d4d9 SHA1 3da888f5938d55ede9ccb866457fe1a7a2b4c1e3 SHA256 b8499aa748482950b72d1623519753b55ef1b3d01bb07cfa03c503df3482a733
 AUX cfsd.conf 341 RMD160 937c589da93c0ac762944958fac927f65aaddd4f SHA1 15632e7e695657913b0749946d77bfc8ca354f90 SHA256 d3839a8d9d551d38a9cc18f949a5fe8dd27f9daa36d83aa86e1ce5157f050c51
-AUX cfsd.init 671 RMD160 2cbdf921f424d010e592e9b80906fea576468228 SHA1 a9049b9b23272787269cfbdf1ecf2d88fe641916 SHA256 1344bbdb6ebca144bde0347f41328728cbc158ae0d2aedeeda617fac41edd8fa
-DIST cfs_1.4.1-14.diff.gz 17787 RMD160 6b26105f7fa7c34f40be4b6b881599b36bcefb35 SHA1 0edb8290903f77853747735f9aa13f48c4297fda SHA256 eefe6a9a4c7782c33eda14b93ab000eb7a5cc405a9af113284f93cdfd5564f7e
+AUX cfsd.init 659 RMD160 275b988e334c29ce49f46a2585bd50b85b1141ad SHA1 5d55b5059c68708cfc2c7955b6e14393c55543f8 SHA256 3cce5850d781b37baadb7ff0aff06f349f2238048dfe33fe11ac5ed4b5b58f97
 DIST cfs_1.4.1-17.diff.gz 18581 RMD160 9fcd6c905f29de64e538c2fbc76c2894e57f14b6 SHA1 427924e1ab9cd92b2118b62164344922de19f13a SHA256 c0938cd88dd603b6ade9dc3cd3073dcd8e3a08e8a16685e62e383681a9506ade
 DIST cfs_1.4.1.orig.tar.gz 98376 RMD160 c78b17d920a4c2c3b9382da533a87ca7bea9d8d5 SHA1 ef3dcebcd21071cb04634ce0b3214e7967dde188 SHA256 86b52891c2cff4c80e4c3779337e690c54a6b8e132611269576c3d8d31ec4e74
-EBUILD cfs-1.4.1.14.ebuild 2229 RMD160 0b0673381524381f1efc5194ee7d80bb4721276c SHA1 bc0a66b28ec7727b24c84fd4b646d8343d6c5c34 SHA256 463e24380b6a4cd8a7a9f252e6bf6aa573bca848f77119af207c5220993c53ac
-EBUILD cfs-1.4.1.17-r1.ebuild 2323 RMD160 67946c8acabb9b15f8fba45ae49f10776d549773 SHA1 842ccc36760c57314315a64111ae169262794b68 SHA256 66b156f082f9955050c44694915bd7d3cbde88155efeffedfaecf4f34761e0d4
-EBUILD cfs-1.4.1.17.ebuild 2226 RMD160 65e3d78076612c84fc2a1d4a991d1420433aa48c SHA1 7112630a5da11b639347c60f025f0d5db127256c SHA256 81bca9175b871d0376316245acc0a373cfc82bae58046a54a003ce546ae4ea6b
-MISC ChangeLog 1828 RMD160 8e2ee11022d1227efc5af3bf4584672c80fff446 SHA1 822a6e98524a1d7fd1cb15b15eb2409ed19f0d4c SHA256 0fe1c65a4cacdec10ef8e2115c6b0d9002606119a5d766e8559ad5c25affe43c
+EBUILD cfs-1.4.1.17-r2.ebuild 2227 RMD160 ef83f1d0669a84226ac34bf47145d33b123267fb SHA1 d994e06d1774b4e8bf65acefbce95d76205c2273 SHA256 853f351fee6a007647b910a56f70b63e3597fafd723fb527be15c8be7d15500a
+EBUILD cfs-1.4.1.17-r3.ebuild 2320 RMD160 9550aa38f24fccae293c2f0828c9a9e84ef4ffef SHA1 67f7b6eb9da212ea79d074cd76ccb2656772e717 SHA256 a5de3b5ff09fe5f516e49bc5dc56cc71f8a9a127b8f4a65bc02f669b5138c5f7
+MISC ChangeLog 2152 RMD160 a911bd2f069f28da947b865cb86a1dbce1ce9f5c SHA1 44cc373a9179197ca53e01da158e8a8064822493 SHA256 81a19c618b8c76510721ffe9c29fbbc0310f64f47b8d189c193243c6d135b8ed
 MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk58+f4ACgkQfXuS5UK5QB0/MAP+OhKWQJmrcoGdib4Kuj16Tk2D
-iJAZzFgwisEZTx0gbSZtdpYhB1p6CJ0VK2T26e+3KQhW1btLTtEoMGJArnIcgdjg
-jk46Jrq+cMvFhKWYkzwiEOgBDjtjHZ+R+/wcD/w01pP2Zf8/EnrQba4ir6EFP48B
-J6aLhjfTvG7Tz4aP4m8=
-=uMjh
------END PGP SIGNATURE-----
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 $?
 }