From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Thu, 20 Oct 2011 11:40:28 +0000 (+0000)
Subject: Remove old 1.1.3 ebuild; revbump 1.1.4 to use new init scripts that are OpenRC-specif... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1cf399dbec6e74a9aa187dbdf658db36fe8167e;p=gentoo.git

Remove old 1.1.3 ebuild; revbump 1.1.4 to use new init scripts that are OpenRC-specific, and thus much shorter. The WATERMARK option has been dropped from ekey-egd-linux, as it should be set in sysctl.conf instead.

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64
---

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index 1c0d7be8a5ed..4c3dab867d3c 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for app-crypt/ekeyd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.24 2011/09/05 20:10:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.25 2011/10/20 11:40:28 flameeyes Exp $
+
+*ekeyd-1.1.4-r1 (20 Oct 2011)
+
+  20 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/ekeyd-1.1.1-earlyboot.patch, -ekeyd-1.1.3-r4.ebuild,
+  -files/ekeyd-1.1.3-format.patch, -files/ekeyd-1.1.3-libusb_compat.patch,
+  -files/ekeyd-1.1.3-slashes.patch, -ekeyd-1.1.4.ebuild,
+  +ekeyd-1.1.4-r1.ebuild, +files/ekey-egd-linux.conf.2,
+  +files/ekey-egd-linux.init.2, +files/ekey-ulusbd.conf.2,
+  +files/ekey-ulusbd.init.2, +files/ekeyd.init.2, -files/ekey-egd-linux.conf,
+  -files/ekey-egd-linux.init, -files/ekey-ulusbd.conf, -files/ekey-ulusbd.init,
+  -files/ekeyd.init:
+  Remove old 1.1.3 ebuild; revbump 1.1.4 to use new init scripts that are
+  OpenRC-specific, and thus much shorter. The WATERMARK option has been dropped
+  from ekey-egd-linux, as it should be set in sysctl.conf instead.
 
 *ekeyd-1.1.4 (05 Sep 2011)
 
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index acdfc7eb5d25..f751fbff3c28 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX ekey-egd-linux.conf 335 RMD160 96164d1942f3cff760bc9381bec911d3d85ca0e6 SHA1 15bdfc53f94562ec0a27c0ee6f902449b84c05c0 SHA256 4ead2b30c583d004b2a9505404de12816fbae872f048d0025fe75bc0596e029e
-AUX ekey-egd-linux.init 929 RMD160 96a61d0adb02e83fdd179f86eb10acc5b102763a SHA1 38a5a844de687907fede871f24b48f1128f056ae SHA256 8ae6539a8db41ba7eaf7e0e41151032038b9c414d0dcdeb82cb414a5a643a4b7
-AUX ekey-ulusbd.conf 579 RMD160 0fb73018df4b96197fb1bd245f98e078b9e84501 SHA1 c7b287b34080c6cc941e217e21768f290803ca98 SHA256 7077c2634fe54d1c1a6af9f48d4e76b53b8c8f2b110c44ec50a4998f7e797fa9
-AUX ekey-ulusbd.init 1044 RMD160 8d367b69b2ab785603329039005e3e04d0a5858e SHA1 acece8401daf5d0d9c73e4efd3262f2fd2887391 SHA256 454def35bf7bb2e8e1927a33415f51832f45714e5db411c1d0374331e07e802c
-AUX ekeyd-1.1.1-earlyboot.patch 1526 RMD160 66512d44326f6b4ccb3971dd83a5888dc8175a47 SHA1 9ac7a0ab0ff4f800d373f16173a0a40d282a6030 SHA256 00d346ba22afcefafbed9ee1a53c38460db732839a2ed9b5a32ac5bb250987c3
-AUX ekeyd-1.1.3-format.patch 936 RMD160 7892a5922e0d567bf44f317def74f6105f51a2f5 SHA1 502563468f2cc0cc69e5de4c4cce39ac38f15e9d SHA256 7f72253b8b62a4db87945349441a661d7edbacfdae1cc9777ded62bb8782e106
-AUX ekeyd-1.1.3-libusb_compat.patch 658 RMD160 356e27996ac6efbda56002d2dabaae9fce234e95 SHA1 e035db0258b7162a1ed7a69a343628a92c4a78a8 SHA256 5b82fe0d834ccfe674fdee2582a9097e4f0bea5b766e0c287808c7f4b3bc77e2
-AUX ekeyd-1.1.3-slashes.patch 1820 RMD160 4ed9ac60240fae3d9cd1c5f06f372fa7808a704b SHA1 fc12e503bb70ca88d7e7a6a6ad423a95a114d6a1 SHA256 170dd74ef68b470e7a7082a7f5ec6356563daff7167e89413710940ae3a5952b
+AUX ekey-egd-linux.conf.2 266 RMD160 ba5ee792e41de072ad183888ae7b0cf4f3dd58db SHA1 72ecc7516374620561c6efc691f09f2b98a019e5 SHA256 89b5cf30b7cad64503f85c6bfc7e3868245870aae659d79dd05cc50869b5eaa8
+AUX ekey-egd-linux.init.2 576 RMD160 6e27c57ddd4c461a13c97ae9ff4042072ff92254 SHA1 cd685c6a6275cd931b77976468916a9a01db9b75 SHA256 b527d0f658644a13552359678e346ddc41839478ce51cfc018db830c8af79d07
+AUX ekey-ulusbd.conf.2 613 RMD160 b9a22d307153fffa273544e244812f1d765dd01c SHA1 5079806fda10bb74ceddf4543eba087711eef677 SHA256 d12e3ada8c979b4605aede3001e3735fcfdc7fea4a64e408df5d185380050a06
+AUX ekey-ulusbd.init.2 1017 RMD160 f6c7bbee96f6c1f5bd7c752cec8182d699e503ed SHA1 266b1f3a911a3a39fdc8c370cbc9e0d1b0a412bf SHA256 0383865a5d543296822836fa150a83ddbf63bf0b7c8a7fbc6266af099d176502
 AUX ekeyd-1.1.4-gentoo.patch 6264 RMD160 849f75357760cb965b865e06becbccdc2add0298 SHA1 70761c8f3edd0057a5537f6c4b449501b57e0311 SHA256 d9232e67977c3d80858ce81f44dd36f8d26d9622ca194e71bf927863aa419e58
-AUX ekeyd.init 1080 RMD160 3798f08e4a086effca39cc023d01c4fbe8c89677 SHA1 74143026afd4730b8b190d2a9d0ce8be80ac8adf SHA256 76b42c721a5315d81392531bc428a4351539ca6682a9336b110c7bc148a31780
-DIST ekeyd-1.1.3.tar.gz 95173 RMD160 0af970891d8da67b5b0737fbac9d626a38ccb41a SHA1 a0119105d3804b76df0dd6a5e18e80db3193ece8 SHA256 07c20450e7ab139b723945e3aa0748f55209c0da097253b25074149c847044e4
+AUX ekeyd.init.2 810 RMD160 8fce03feb3cd12eeca1f7ffc83120a347f4cff53 SHA1 185b387282b89ad86c8b73935562715526319d77 SHA256 a38169a3071fc3c2b7a736ff38c4e637c3ea4fb81b9bb36723dd24d13cc719ba
 DIST ekeyd-1.1.4.tar.gz 100911 RMD160 1b25b8c19271ade48ded95178bcb50fd0ed9c763 SHA1 b6281f04980de0d78e2b5b59cd3ee193802f76d3 SHA256 147ca4ff964ab7b344a08d3cd6f9b1bf03ba18776a1941d603681d8102cce0c8
-EBUILD ekeyd-1.1.3-r4.ebuild 6384 RMD160 cbabdcf5f123f37f282d956d2970153d7b3b852d SHA1 2a98331ddb54948263101293b19f2297a3218e75 SHA256 d4161f870dce104ec3a7748ef8973b3dca6a0c12cc8bb466e4d26f88cd841f7c
-EBUILD ekeyd-1.1.4.ebuild 5658 RMD160 3cd38704c9554a18e6161bc6281ea290820dcd8c SHA1 8b38db0f92523b7b20acb493c0d7df7815163f58 SHA256 fded9f58d2e85e650089e73aefdaabb1a886cbd56d4afa3d78ed8c9e353ee2fa
-MISC ChangeLog 6229 RMD160 55d13b777b22b74b3b5d93a9bc38bc8400b3bcfb SHA1 e543fa0ebe46f295026dd3ad31887255763673da SHA256 c65b8725d2e2a8c0aaf59933b6da343a7ddb93890ae12da4b1ad868ae61edeb6
+EBUILD ekeyd-1.1.4-r1.ebuild 5708 RMD160 7342330c269a492e82eac098f31c60756fba33ea SHA1 324dcbd2275ac06a5ee0f4c6f55ae427e0434d60 SHA256 2113b8c9bb80ac867beb2eb50bdb4674d7b0a0b1edeada11473cfa3af95e2bd0
+MISC ChangeLog 7026 RMD160 6aa2fafda42dc0235aba18d1157d58b1d009afc6 SHA1 473ec0bd11641a53edc5f793f4d359b5c6ed473f SHA256 b333e233504b7c1795cae78ed59e596f2409d6d9ca726a80bda30fc846f647c8
 MISC metadata.xml 861 RMD160 3c47de327694901f3518e0d26ed35062be2515bb SHA1 f7d605f74a0c1a012f582387cce50a4b7bd1c5f9 SHA256 5c9988b5d8012785e6154fab1570b4b1938968ab8b5340b308fcb123b9c512ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk58+f8ACgkQfXuS5UK5QB3UuQP9ETxHuyoT5BOPYH52mNQ/RfU/
-5acWHFAKw7kdLAfKKjxIdkWyp78YdBVQQOwdDLqar/QK6OW4Xa2U9GK1cWrNg5HW
-rV1SENO7esny5FAqYDO5aPkxxN72DvBn99a5keKQVxOn3yb0d/IvRU+2BMfkjAdu
-KhvGB/Gkg1B3OK19KrQ=
-=Z/j6
+iEYEARECAAYFAk6gCK0ACgkQAiZjviIA2XhVswCeK7UkpWBTYZCDMKB/Bc8hCvWt
+wBQAoJfR/8CuUMV8WgEHGjIzwyqs95rS
+=bXHD
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ekeyd/ekeyd-1.1.3-r4.ebuild b/app-crypt/ekeyd/ekeyd-1.1.3-r4.ebuild
deleted file mode 100644
index 62a881f24557..000000000000
--- a/app-crypt/ekeyd/ekeyd-1.1.3-r4.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.3-r4.ebuild,v 1.2 2011/04/08 11:14:49 flameeyes Exp $
-
-EAPI=4
-
-inherit multilib linux-info toolchain-funcs
-
-DESCRIPTION="Entropy Key userspace daemon"
-HOMEPAGE="http://www.entropykey.co.uk/"
-SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
-
-LICENSE="as-is" # yes, truly
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-IUSE="usb kernel_linux munin minimal"
-
-EKEYD_RDEPEND="dev-lang/lua
-		usb? ( virtual/libusb:0 )"
-EKEYD_DEPEND="${EKEYD_RDEPEND}"
-EKEYD_RDEPEND="${EKEYD_RDEPEND}
-	dev-lua/luasocket
-	kernel_linux? ( sys-fs/udev )
-	usb? ( !kernel_linux? ( sys-apps/usbutils ) )
-	munin? ( net-analyzer/munin )"
-
-RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-	!app-crypt/ekey-egd-linux"
-DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
-
-CONFIG_CHECK="~USB_ACM"
-
-REQUIRED_USE="minimal? ( !munin !usb )"
-
-pkg_setup() {
-	if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	# - avoid using -Werror;
-	sed -i \
-		-e 's:-Werror::' \
-		daemon/Makefile || die
-
-	epatch "${FILESDIR}"/${PN}-1.1.1-earlyboot.patch
-	epatch "${FILESDIR}"/${P}-libusb_compat.patch
-	epatch "${FILESDIR}"/${P}-slashes.patch
-	epatch "${FILESDIR}"/${P}-format.patch
-
-	# Stupid multilib hack; remove it once Gentoo has sane paths for
-	# udev directories.
-	if [[ $(get_libdir) != lib ]]; then
-		sed -i -e "s:/lib/udev/:/$(get_libdir)/udev/:" \
-			doc/*.rules || die
-	fi
-
-	# We moved the binaries around
-	sed -i -e 's:$BINPATH/ekey-ulusbd:/usr/libexec/ekey-ulusbd:' \
-		doc/ekeyd-udev || die
-}
-
-src_compile() {
-	local osname
-
-	# Override automatic detection: upstream provides this with uname,
-	# we don't like using uname.
-	case ${CHOST} in
-		*-linux-*)
-			osname=linux;;
-		*-freebsd*)
-			osname=freebsd;;
-		*-kfrebsd-gnu)
-			osname=gnukfreebsd;;
-		*-openbsd*)
-			osname=openbsd;;
-		*)
-			die "Unsupported operating system!"
-			;;
-	esac
-
-	# We don't slot LUA so we don't really need to have the variables
-	# set at all.
-	emake -C daemon \
-		CC="$(tc-getCC)" \
-		LUA_V= LUA_INC= \
-		OSNAME=${osname} \
-		OPT="${CFLAGS}" \
-		BUILD_ULUSBD=$(use usb && echo yes || echo no) \
-		$(use minimal && echo egd-linux) \
-		|| die "emake failed"
-}
-
-src_install() {
-	exeinto /usr/libexec
-	newexe "${S}"/daemon/egd-linux ekey-egd-linux || die
-	doman daemon/ekey-egd-linux.8 || die
-
-	newconfd "${FILESDIR}"/ekey-egd-linux.conf ekey-egd-linux || die
-	newinitd "${FILESDIR}"/ekey-egd-linux.init ekey-egd-linux || die
-
-	use minimal && return
-	# from here on, install everything that is not part of the minimal
-	# support.
-
-	emake -C daemon \
-		DESTDIR="${D}" \
-		BUILD_ULUSBD=$(use usb && echo yes || echo no) \
-		MANZCMD=cat MANZEXT= \
-		install || die "emake install failed"
-
-	# We move the daemons around to avoid polluting the available
-	# commands.
-	dodir /usr/libexec
-	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN} || die
-
-	if use usb; then
-		if ! use kernel_linux; then
-			newinitd "${FILESDIR}"/ekey-ulusbd.init ekey-ulusbd || die
-			newconfd "${FILESDIR}"/ekey-ulusbd.conf ekey-ulusbd || die
-		fi
-		doman daemon/ekey-ulusbd.8 || die
-	fi
-
-	dodoc daemon/README* AUTHORS WARNING ChangeLog || die
-
-	if use kernel_linux; then
-		local rules=doc/60-UDEKEY01.rules
-		use usb && rules=doc/60-UDEKEY01-UDS.rules
-
-		insinto /$(get_libdir)/udev/rules.d
-		newins ${rules} 70-${PN}.rules || die
-
-		exeinto /$(get_libdir)/udev
-		doexe doc/ekeyd-udev || die
-	fi
-
-	if use munin; then
-		exeinto /usr/libexec/munin/plugins
-		doexe munin/ekeyd_stat_
-
-		insinto /etc/munin/plugin-conf.d
-		newins munin/plugin-conf.d_ekeyd ekeyd
-	fi
-}
-
-pkg_postinst() {
-	elog "${CATEGORY}/${PN} now install also the EGD client service ekey-egd-linux."
-	elog "To use this service, you need enable EGDTCPSocket for the ekeyd service"
-	elog "managing the key(s)."
-	elog ""
-	elog "The daemon will send more entropy to the kernel once the available pool"
-	elog "falls below the value set in the kernel.random.write_wakeup_threshold"
-	elog "sysctl entry."
-	elog ""
-	elog "You can change the watermark in /etc/conf.d/ekey-egd-linux; if you do"
-	elog "it will require write access to the kernel's sysctl."
-
-	use minimal && return
-	# from here on, document everything that is not part of the minimal
-	# support.
-
-	elog ""
-	elog "To make use of your EntropyKey, make sure to execute ekey-rekey"
-	elog "the first time, and then start the ekeyd service."
-	elog ""
-	elog "By default ekeyd will feed the entropy directly to the kernel's pool;"
-	elog "if your system has jumps in load average, you might prefer using the"
-	elog "EGD compatibility mode, by enabling EGDTCPSocket for ekeyd and then"
-	elog "starting the ekey-egd-linux service."
-	elog ""
-	elog "The same applies if you intend to provide entropy for multiple hosts"
-	elog "over the network. If you want to have the ekey-egd-linux service on"
-	elog "other hosts, you can enable the 'minimal' USE flag."
-	elog ""
-	elog "The service supports multiplexing if you wish to use multiple"
-	elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
-	elog "and it'll be looking for /etc/entropykey/identifier.conf"
-	elog ""
-
-	if use usb; then
-		if use kernel_linux; then
-			elog "You're going to use the userland USB daemon, the udev rules"
-			elog "will be used accordingly. If you want to use the CDC driver"
-			elog "please disable the usb USE flag."
-		else
-			elog "You're going to use the userland USB daemon, since your OS"
-			elog "does not support udev, you should start the ekey-ulusbd"
-			elog "service before ekeyd."
-		fi
-
-		ewarn "The userland USB daemon has multiple known issues. If you can,"
-		ewarn "please consider disabling the 'usb' USE flag and instead use the"
-		ewarn "CDC-ACM access method."
-	else
-		if use kernel_linux; then
-			elog "Some versions of Linux have a faulty CDC ACM driver that stops"
-			elog "EntropyKey from working properly; please check the compatibility"
-			elog "table at http://www.entropykey.co.uk/download/"
-		else
-			elog "Make sure your operating system supports the CDC ACM driver"
-			elog "or otherwise you won't be able to use the EntropyKey."
-		fi
-		elog ""
-		elog "If you're unsure about the working state of the CDC ACM driver"
-		elog "enable the usb USE flag and use the userland USB daemon"
-	fi
-}
diff --git a/app-crypt/ekeyd/ekeyd-1.1.4.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild
similarity index 89%
rename from app-crypt/ekeyd/ekeyd-1.1.4.ebuild
rename to app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild
index 25ab3039075e..6c6a6fdb7e8d 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.4.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4.ebuild,v 1.1 2011/09/05 20:10:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r1.ebuild,v 1.1 2011/10/20 11:40:28 flameeyes Exp $
 
 EAPI=4
 
@@ -28,7 +28,8 @@ EKEYD_RDEPEND="${EKEYD_RDEPEND}
 	munin? ( net-analyzer/munin )"
 
 RDEPEND="!minimal? ( ${EKEYD_RDEPEND} )
-	!app-crypt/ekey-egd-linux"
+	!app-crypt/ekey-egd-linux
+	sys-apps/openrc"
 DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
 
 CONFIG_CHECK="~USB_ACM"
@@ -80,8 +81,8 @@ src_install() {
 	newexe host/egd-linux   ekey-egd-linux
 	newman host/egd-linux.8 ekey-egd-linux.8
 
-	newconfd "${FILESDIR}"/ekey-egd-linux.conf ekey-egd-linux
-	newinitd "${FILESDIR}"/ekey-egd-linux.init ekey-egd-linux
+	newconfd "${FILESDIR}"/ekey-egd-linux.conf.2 ekey-egd-linux
+	newinitd "${FILESDIR}"/ekey-egd-linux.init.2 ekey-egd-linux
 
 	dodoc doc/* AUTHORS ChangeLog THANKS
 
@@ -99,11 +100,11 @@ src_install() {
 	dodir /usr/libexec
 	mv "${D}"/usr/sbin/ekey*d "${D}"/usr/libexec
 
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
+	newinitd "${FILESDIR}"/${PN}.init.2 ${PN}
 
 	if use usb && ! use kernel_linux; then
-		newinitd "${FILESDIR}"/ekey-ulusbd.init ekey-ulusbd
-		newconfd "${FILESDIR}"/ekey-ulusbd.conf ekey-ulusbd
+		newinitd "${FILESDIR}"/ekey-ulusbd.init.2 ekey-ulusbd
+		newconfd "${FILESDIR}"/ekey-ulusbd.conf.2 ekey-ulusbd
 	fi
 
 	if use kernel_linux; then
@@ -135,8 +136,8 @@ pkg_postinst() {
 	elog "falls below the value set in the kernel.random.write_wakeup_threshold"
 	elog "sysctl entry."
 	elog ""
-	elog "You can change the watermark in /etc/conf.d/ekey-egd-linux; if you do"
-	elog "it will require write access to the kernel's sysctl."
+	ewarn "Since version 1.1.4-r1, ekey-egd-linux will *not* set the watermark for"
+	ewarn "you, instead you'll have to configure the sysctl in /etc/sysctl.conf"
 
 	use minimal && return
 	# from here on, document everything that is not part of the minimal
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.conf b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
similarity index 79%
rename from app-crypt/ekeyd/files/ekey-egd-linux.conf
rename to app-crypt/ekeyd/files/ekey-egd-linux.conf.2
index 0f72288ac534..8c0b089d94b5 100644
--- a/app-crypt/ekeyd/files/ekey-egd-linux.conf
+++ b/app-crypt/ekeyd/files/ekey-egd-linux.conf.2
@@ -8,5 +8,3 @@
 #RECONNECTINTERVAL=10
 # Set the number of 1024 bit blocks to request each time
 #BLOCKS=2
-# Low level entropy to trigger egd-linux entropy read
-WATERMARK=1024
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.init b/app-crypt/ekeyd/files/ekey-egd-linux.init
deleted file mode 100644
index c3a2a9914ba6..000000000000
--- a/app-crypt/ekeyd/files/ekey-egd-linux.init
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-egd-linux.init,v 1.1 2011/04/08 02:39:27 flameeyes Exp $
-
-: ${HOST:=localhost}
-: ${PORT:=8888}
-: ${RECONNECTINTERVAL:=10}
-: ${BLOCKS:=2}
-
-depend() {
-	 use net
-	 after ekeyd
-
-	 provide entropy
-}
-
-start() {
-	ebegin "Starting EntropyKey EGD client"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /usr/libexec/ekey-egd-linux -- \
-		-H ${HOST} -p ${PORT} \
-		-r ${RECONNECTINTERVAL} \
-		-b ${BLOCKS} \
-		-D "/var/run/${SVCNAME}.pid"
-
-	[ -n "${WATERMARK}" ] && \
-		sysctl "kernel.random.write_wakeup_threshold=$WATERMARK" >/dev/null 2>&1
-
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping EntropyKey EGD client"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /usr/libexec/ekey-egd-linux
-	eend $?
-}
diff --git a/app-crypt/ekeyd/files/ekey-egd-linux.init.2 b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
new file mode 100644
index 000000000000..91ca2edb775e
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekey-egd-linux.init.2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-egd-linux.init.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
+
+: ${HOST:=localhost}
+: ${PORT:=8888}
+: ${RECONNECTINTERVAL:=10}
+: ${BLOCKS:=2}
+
+description="EntropyKey EGD client"
+
+pidfile=/var/run/$SVCNAME.pid
+
+command=/usr/libexec/ekey-egd-linux
+command_args="-H ${HOST} -p ${PORT} -r ${RECONNECTINTERVAL} -b ${BLOCKS} -D ${pidfile}"
+
+depend() {
+	 use net
+	 after ekeyd
+
+	 provide entropy
+}
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.conf b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
similarity index 72%
rename from app-crypt/ekeyd/files/ekey-ulusbd.conf
rename to app-crypt/ekeyd/files/ekey-ulusbd.conf.2
index 1a6100854df8..7ed730152b7c 100644
--- a/app-crypt/ekeyd/files/ekey-ulusbd.conf
+++ b/app-crypt/ekeyd/files/ekey-ulusbd.conf.2
@@ -1,6 +1,6 @@
-# Copyright 2009 Gentoo Foundation
+# Copyright 2009-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf,v 1.2 2009/09/29 12:03:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.conf.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
 
 # The userland USB daemon has to know the USB path of the EntopyKey to
 # work properly; in alternative to providing these statically, they
@@ -13,4 +13,5 @@ EKEY_SERIAL=""
 #USB_BUS=""
 #USB_DEV=""
 
-SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
+# this is set by default
+# SOCKET_PATH="/var/run/ekey-ulusbd-${EKEY_SERIAL}"
diff --git a/app-crypt/ekeyd/files/ekey-ulusbd.init b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
similarity index 51%
rename from app-crypt/ekeyd/files/ekey-ulusbd.init
rename to app-crypt/ekeyd/files/ekey-ulusbd.init.2
index 9b6faf8e81b9..fd7192d10f0b 100644
--- a/app-crypt/ekeyd/files/ekey-ulusbd.init
+++ b/app-crypt/ekeyd/files/ekey-ulusbd.init.2
@@ -1,13 +1,21 @@
 #!/sbin/runscript
-# Copyright 2009 Gentoo Foundation
+# Copyright 2009-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init,v 1.3 2009/10/04 11:43:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekey-ulusbd.init.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
 
 INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "ekey-ulusbd" ]; then
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekey-ulusbd" ]; then
 	INSTANCE="ekey-ulusbd"
 fi
 
+: ${SOCKET_PATH:=/var/run/ekey-ulusbd-${EKEY_SERIAL}}
+
+description="EntropyKey Userland USB Daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+command=/usr/libexec/ekey-ulusbd
+command_args="-P ${pidfile} -p ${SOCKET_PATH}"
+
 depend() {
 	 need localmount
 }
@@ -23,20 +31,11 @@ start() {
 		USB_DEV=$2
 	fi
 
-	ebegin "Starting EntropyKey Userland USB Daemon"
+	ebegin "Starting ${description}"
 	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /usr/libexec/ekey-ulusbd -- \
-		-P "/var/run/${SVCNAME}.pid" \
-		-p "${SOCKET_PATH}" \
+		--start --pidfile ${pidfile} \
+		--exec ${command} -- \
+		${command_args} \
 		-b $(printf %03d ${USB_BUS}) -d $(printf %03d ${USB_DEV}) -D
 	eend $?
 }
-
-stop() {
-	ebegin "Stopping EntropyKey daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /usr/libexec/ekey-ulusbd
-	eend $?
-}
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.1-earlyboot.patch b/app-crypt/ekeyd/files/ekeyd-1.1.1-earlyboot.patch
deleted file mode 100644
index d415373e0769..000000000000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.1-earlyboot.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: ekeyd-1.1.1/doc/ekeyd-udev
-===================================================================
---- ekeyd-1.1.1.orig/doc/ekeyd-udev
-+++ ekeyd-1.1.1/doc/ekeyd-udev
-@@ -6,19 +6,20 @@ if test "x$SUBSYSTEM" = "xtty"; then
-   $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
- else
-   if test "x$ACTION" = "xadd"; then
--    mkdir -p /var/run/entropykeys
-+    mkdir -p /dev/entropykey
-+    mkdir -p /dev/.ekeyd-ulusb
-     if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
-       exit 0
-     fi
--    if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
--      kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
-+    if test -r "/dev/.ekeyd-ulusb/${ENTROPY_KEY_SERIAL}.pid"; then
-+      kill $(cat "/dev/.ekeyd-ulusb/${ENTROPY_KEY_SERIAL}.pid") || true
-     fi
--    $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
-+    /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekeyd-ulusb/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
-   fi
--  $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
-+  $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
-   if test "x$ACTION" = "xremove"; then
--    rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
--    rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
-+    rm "/dev/.ekeyd-ulusb/${ENTROPYKEY_KEY_SERIAL}.pid"
-+    rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
-   fi
- fi
- 
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.3-format.patch b/app-crypt/ekeyd/files/ekeyd-1.1.3-format.patch
deleted file mode 100644
index a705dd503e0c..000000000000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.3-format.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ekeyd-1.1.3/daemon/ekeyd.c
-===================================================================
---- ekeyd-1.1.3.orig/daemon/ekeyd.c
-+++ ekeyd-1.1.3/daemon/ekeyd.c
-@@ -203,7 +203,7 @@ open_foldback_output(void)
-     return (output_stream != NULL);
- }
- 
--static const char *usage=
-+static const char usage[]=
-     "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
-     "Entropy Key Daemon\n\n"
-     "\t-f Read configuration from configfile\n"
-Index: ekeyd-1.1.3/daemon/ekey-setkey.c
-===================================================================
---- ekeyd-1.1.3.orig/daemon/ekey-setkey.c
-+++ ekeyd-1.1.3/daemon/ekey-setkey.c
-@@ -79,7 +79,7 @@ calc_mac(uint8_t *snum, uint8_t *mkey, u
-     return mac;
- }
- 
--static const char *usage =
-+static const char usage[] =
-     "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
-     "       [-s <serial>] <path>\n"
-     "Entropy key device long term session key tool\n\n"
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.3-libusb_compat.patch b/app-crypt/ekeyd/files/ekeyd-1.1.3-libusb_compat.patch
deleted file mode 100644
index e97f4e12ba3e..000000000000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.3-libusb_compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: ekeyd-1.1.3/daemon/ekey-ulusbd.c
-===================================================================
---- ekeyd-1.1.3.orig/daemon/ekey-ulusbd.c
-+++ ekeyd-1.1.3/daemon/ekey-ulusbd.c
-@@ -100,7 +100,8 @@ find_usb_device(char *busmatch, char *de
- 
- #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
-     if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
--        if (r != -ENODATA) {
-+        /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
-+        if (r != -ENODATA && r != -ENOENT) {
-             fprintf(stderr, 
-                     "Unable to detach Entropy Key at %s/%s from kernel\n", 
-                     busmatch, devmatch);
diff --git a/app-crypt/ekeyd/files/ekeyd-1.1.3-slashes.patch b/app-crypt/ekeyd/files/ekeyd-1.1.3-slashes.patch
deleted file mode 100644
index fc709108bc74..000000000000
--- a/app-crypt/ekeyd/files/ekeyd-1.1.3-slashes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ekeyd-1.1.3/doc/60-UDEKEY01.rules
-===================================================================
---- ekeyd-1.1.3.orig/doc/60-UDEKEY01.rules
-+++ ekeyd-1.1.3/doc/60-UDEKEY01.rules
-@@ -2,7 +2,7 @@
- 
- # Detect an Entropy Key being inserted
- ACTION=="add|change", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
--ACTION=="add|change", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
-+ACTION=="add|change", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
- 
- # Add the /dev/entropykey/FOO symbolic link
- ACTION=="add|change", ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"
-Index: ekeyd-1.1.3/doc/60-UDEKEY01-UDS.rules
-===================================================================
---- ekeyd-1.1.3.orig/doc/60-UDEKEY01-UDS.rules
-+++ ekeyd-1.1.3/doc/60-UDEKEY01-UDS.rules
-@@ -3,7 +3,7 @@
- 
- # Detect an Entropy Key being inserted
- # ACTION=="add", SUBSYSTEM=="usb", DEVTYPE=="usb_device", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
--ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
-+ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c '/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT} | /bin/sed -e s:/:_:g'"
- 
- # And tell the ekeyd about the new device.
- ACTION=="add|change", ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/ekeyd-udev"
diff --git a/app-crypt/ekeyd/files/ekeyd.init b/app-crypt/ekeyd/files/ekeyd.init
deleted file mode 100644
index 897f3ac77e95..000000000000
--- a/app-crypt/ekeyd/files/ekeyd.init
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/runscript
-# Copyright 2009-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekeyd.init,v 1.4 2011/04/08 02:39:27 flameeyes Exp $
-
-INSTANCE="${SVCNAME#*.}"
-if [ -z "${INSTANCE}" ] || [ "${SVCNAME}" = "ekeyd" ]; then
-	INSTANCE="ekeyd"
-fi
-
-depend() {
-	 use udev ekey-ulusbd
-	 need localmount
-
-	 local cfgfile="/etc/entropykey/${INSTANCE}.conf"
-	 config "${cfgfile}"
-
-	 # quickly parse the configuration file; we only provide entropy
-	 # if we're not using the egd server/client split method.
-	 if sed -e 's:--.*::' "${cfgfile}" | grep -q SetOutputToKernel; then
-		 provide entropy
-	 fi
-}
-
-start() {
-	ebegin "Starting EntropyKey daemon"
-	start-stop-daemon \
-		--start --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /usr/libexec/ekeyd -- \
-		-f "/etc/entropykey/${INSTANCE}.conf" \
-		-p "/var/run/${SVCNAME}.pid"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping EntropyKey daemon"
-	start-stop-daemon \
-		--stop --pidfile "/var/run/${SVCNAME}.pid" \
-		--exec /usr/libexec/ekeyd
-	eend $?
-}
-
diff --git a/app-crypt/ekeyd/files/ekeyd.init.2 b/app-crypt/ekeyd/files/ekeyd.init.2
new file mode 100644
index 000000000000..a3f372cc8444
--- /dev/null
+++ b/app-crypt/ekeyd/files/ekeyd.init.2
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/files/ekeyd.init.2,v 1.1 2011/10/20 11:40:27 flameeyes Exp $
+
+INSTANCE="${SVCNAME#*.}"
+if [ -z "${INSTANCE}" -o "${SVCNAME}" = "ekeyd" ]; then
+	INSTANCE="ekeyd"
+fi
+
+description="EntropyKey daemon"
+
+pidfile=/var/run/$SVCNAME.pid
+cfgfile=/etc/entropykey/${INSTANCE}.conf
+
+command=/usr/libexec/ekeyd
+command_args="-f ${cfgfile} -p ${pidfile}"
+
+depend() {
+	 config $cfgfile
+
+	 use udev ekey-ulusbd
+	 need localmount
+
+	 # quickly parse the configuration file; we only provide entropy
+	 # if we're not using the egd server/client split method.
+	 if sed -e 's:--.*::' "${cfgfile}" | grep -q SetOutputToKernel; then
+		 provide entropy
+	 fi
+}