Version bump.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

3 files changed, 165 insertions, 6 deletions

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index 9e85598bd7d3..8110ce30b61f 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/ekeyd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.7 2009/10/15 14:28:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.8 2009/11/09 15:01:03 flameeyes Exp $
+
+*ekeyd-1.1.0 (09 Nov 2009)
+
+  09 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org> +ekeyd-1.1.0.ebuild:
+  Version bump.
 
 *ekeyd-1.0.7 (15 Oct 2009)
 
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 87b96732997a..499fb0c93817 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -6,14 +6,16 @@ AUX ekey-ulusbd.init 1044 RMD160 8d367b69b2ab785603329039005e3e04d0a5858e SHA1 a
 AUX ekeyd.init 781 RMD160 9f7f426544b116224cbb523d27bee17d378acf2d SHA1 9017e3ddfa29b2b4319a61245f1cf8400f0f06c4 SHA256 441af4b871a17184196a5dbf5263b40291185646ed199c2495662f4da2ea9f86
 DIST ekeyd-1.0.6.tar.gz 88759 RMD160 ac8565bb80f35bd3cfe5800b9a7de94476ac2270 SHA1 a295e629ba9b9873199f0a51ce35c4399ebceb0e SHA256 49f8977e90ae0cd7aba624742d5202da5b2eb5cb6e88cd227143ce85edf948f0
 DIST ekeyd-1.0.7.tar.gz 88947 RMD160 6bffec5b3c7353d97cce45f7bd368eb2956b0f1b SHA1 b38b53fcab50d0efffc8899a27f04e7bea4715f9 SHA256 24e38e8ee1eb75e1d3384d09f5b3c06a9a167228ae30d41bfd455459a12c8dbb
+DIST ekeyd-1.1.0.tar.gz 89952 RMD160 8328772b8f4102ff4186205dab3c2f0d0441c16f SHA1 b742194809e5c120b3f22f36a4d2e08a4b641375 SHA256 98995f4f10870fc2af66d6cf47ba4fa6802069d2ccf9b06e5ed488fa4562929a
 EBUILD ekeyd-1.0.6-r1.ebuild 4087 RMD160 27d4ce700cc8d7a92c0df3e791ce227f92e39d1e SHA1 123ee2616ee62e42d32860da157327b8b40c212d SHA256 de5da9ee362de5cbc567a772178b025e3ea66538ee60760c390b938de17a58b6
 EBUILD ekeyd-1.0.7.ebuild 4084 RMD160 3b0d0a390fd66247b995e0eddab0e50701b722fb SHA1 cb61b48642078e5d275f2fea35622b2b0e94d1a0 SHA256 ebcc3427cc93339b1da239b42cc63c1efddd2f09528733c144166f7f0986dd64
-MISC ChangeLog 2142 RMD160 38b3f2d56bcc95589188313508f52f2e2cb556a3 SHA1 e3a9137509389fd0dfd038430c7462ff88058f32 SHA256 848e854750687aae2f79303ceb4ccb18ae136e9f75d09b7dc67b386a45c2e6c6
+EBUILD ekeyd-1.1.0.ebuild 4084 RMD160 d66cdbe08427e7adbe602e2340546d84d7b8610a SHA1 08ed7f5b1399466325241e63e839f2836f733599 SHA256 e06cc6c87d925e7f94ddf4530d120f4f41f53046e9e53e8000d16234f93deac4
+MISC ChangeLog 2264 RMD160 e509350def1ce3e39e4936ed7ffb39d997399c0e SHA1 e6e9e509793ab8a5c717c8da9d5b93a15bc9c79a SHA256 109ffffea1e208a61ec856a62ef9b8f59c98c681da9239142bd22360727caecc
 MISC metadata.xml 401 RMD160 988224226b2b1e56ca024b6866deb0291faf3ab7 SHA1 17ae474fa2c6964cc4feab7173ec86f1062b9197 SHA256 3e04add274d3b051cdc073d9b3b8272861caff36bec655e6c86cf2a4fabb66c4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrXMXwACgkQAiZjviIA2XhzVACfUZDoCBg8PMOihlU1C5pbvkAa
-vnAAoMJfF407fGcJJFzdo6A5Awx3TvUs
-=bpCS
+iEYEARECAAYFAkr4LqsACgkQAiZjviIA2XifLACgjLYFxFWoJzLm4pdZkSeT4ZrZ
+UAwAnArU+QBHCcWtfStvP+Ma+tDZcIgK
+=umzO
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ekeyd/ekeyd-1.1.0.ebuild b/app-crypt/ekeyd/ekeyd-1.1.0.ebuild
new file mode 100644
index 000000000000..b34abb2a43eb
--- /dev/null
+++ b/app-crypt/ekeyd/ekeyd-1.1.0.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.0.ebuild,v 1.1 2009/11/09 15:01:03 flameeyes Exp $
+
+EAPI=2
+
+inherit multilib linux-info
+
+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"
+
+RDEPEND="dev-lang/lua
+	usb? ( dev-libs/libusb:0 )"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-libs/luasocket
+	kernel_linux? ( sys-fs/udev )
+	usb? ( !kernel_linux? ( sys-apps/usbutils ) )"
+
+CONFIG_CHECK="USB_ACM"
+
+pkg_setup() {
+	if use kernel_linux && ! use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	# - avoid using -Werror;
+	# - don't gzip the man pages, this will also stop it from
+	#   installing them, so we'll do it by hand.
+	sed -i \
+		-e 's:-Werror::' \
+		-e '/gzip/d' \
+		daemon/Makefile || die
+
+	# 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 \
+		LUA_V= LUA_INC= \
+		OSNAME=${osname} \
+		OPT="${CFLAGS}" \
+		BUILD_ULUSBD=$(use usb && echo yes || echo no) \
+		|| die "emake failed"
+}
+
+src_install() {
+	emake -C daemon \
+		DESTDIR="${D}" \
+		BUILD_ULUSBD=$(use usb && echo yes || echo no) \
+		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
+
+	# Install them manually because we don't want them gzipped
+	doman daemon/{ekeyd,ekey-setkey,ekey-rekey,ekeydctl}.8 \
+		daemon/ekeyd.conf.5 || die
+
+	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 || die
+
+	if use kernel_linux; then
+		insinto /etc/udev/rules.d
+		if use usb; then
+			newins doc/60-UDEKEY01-UDS.rules 70-ekey-ulusbd.rules || die
+		else
+			newins doc/60-UDEKEY01.rules 70-${PN}.rules || die
+		fi
+
+		exeinto /$(get_libdir)/udev
+		doexe doc/ekeyd-udev || die
+	fi
+}
+
+pkg_postinst() {
+	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 "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/init.d/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
+	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
+}