Version bump, add ChangeLog to the list of installed doc files. Cleanup old versions.

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

4 files changed, 16 insertions, 165 deletions

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index 8578d2e0fb1b..6b9d5cf88448 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/ekeyd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.14 2010/08/25 12:55:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.15 2010/09/24 11:43:26 flameeyes Exp $
+
+*ekeyd-1.1.3 (24 Sep 2010)
+
+  24 Sep 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekeyd-1.1.1-r1.ebuild, -ekeyd-1.1.2.ebuild, +ekeyd-1.1.3.ebuild:
+  Version bump, add ChangeLog to the list of installed doc files. Cleanup
+  old versions.
 
 *ekeyd-1.1.2 (25 Aug 2010)
 
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index fc03d90d18fa..9dd83386de4f 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -5,16 +5,14 @@ AUX ekey-ulusbd.conf 579 RMD160 0fb73018df4b96197fb1bd245f98e078b9e84501 SHA1 c7
 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.init 781 RMD160 9f7f426544b116224cbb523d27bee17d378acf2d SHA1 9017e3ddfa29b2b4319a61245f1cf8400f0f06c4 SHA256 441af4b871a17184196a5dbf5263b40291185646ed199c2495662f4da2ea9f86
-DIST ekeyd-1.1.1.tar.gz 92588 RMD160 ed93590eb8e0cafb540c0a2bd59cb3f79b5481b5 SHA1 b7848a3c3f4f9a878ab0c83de6e4faa55b4541e3 SHA256 cb2931c6a357ed98aa227b750e502ced64c992b01a79a0bc58d63e81b209f8d0
-DIST ekeyd-1.1.2.tar.gz 94291 RMD160 eb628db63095a8414a275b4b7ece8b98c6a2ed22 SHA1 d465a0d9bdb8bcb88d5caa3ffe4a5e88bbcbc806 SHA256 e26c89421f398ecebe4f6e89186e97e830041e1b721a2d28a5da1873b2ac8b00
-EBUILD ekeyd-1.1.1-r1.ebuild 4132 RMD160 340ee507510ac8d70ce11601e2e1e6f5e5e8b06e SHA1 eb74967f4c2c7a4b3a70de1e8f708190c4909fd4 SHA256 b501e893d1dc9475f16ac5b213552605d335bdabe631092be60e5c0d606a58b2
-EBUILD ekeyd-1.1.2.ebuild 4136 RMD160 8cbead8b2e51196fb34dfdda45f261362fb74097 SHA1 4dd32380ca606206b5b24e9453d7b7e2ce009cda SHA256 84cd9bcab3a972bcb509036aaa6c054463b8632f05c797f29d11b7de8f92156d
-MISC ChangeLog 3661 RMD160 dcac60e13ffecd3548f8acb787a3f2fffaa19d46 SHA1 844d607a88c985c1586fcd3a7503aa5f2b430902 SHA256 6d814c5dbdbbb43116ccf15e453a618cf20bcea01d35f52da7346b57dbb86209
+DIST ekeyd-1.1.3.tar.gz 95173 RMD160 0af970891d8da67b5b0737fbac9d626a38ccb41a SHA1 a0119105d3804b76df0dd6a5e18e80db3193ece8 SHA256 07c20450e7ab139b723945e3aa0748f55209c0da097253b25074149c847044e4
+EBUILD ekeyd-1.1.3.ebuild 4146 RMD160 4b71c1f56fa5fe2223252d04723c9faa648e4fa3 SHA1 90aa886ae71a7e035ece217800f9ea15e0df4de2 SHA256 fec902a9e6f1a4d31cd6b283e2b1f6235497db00aaed50e9f4e46ea98d65ba72
+MISC ChangeLog 3904 RMD160 3a661dd4602912b4ffc8beb13c56d90422388f05 SHA1 a1cefad3c68762600f0877faab500a81ab245e9e SHA256 68d9cc7900e77bf2e6f79258b67bd69051f474f5c21f70ff438888d76b7537d2
 MISC metadata.xml 401 RMD160 988224226b2b1e56ca024b6866deb0291faf3ab7 SHA1 17ae474fa2c6964cc4feab7173ec86f1062b9197 SHA256 3e04add274d3b051cdc073d9b3b8272861caff36bec655e6c86cf2a4fabb66c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx1EwAACgkQAiZjviIA2XiSwQCfbUcH7bZh4E0JDPysCzDYBzNB
-dRoAnjmFhwWLYMpMXyUMsu8oDeDkrzRi
-=jnAf
+iEYEARECAAYFAkycjuEACgkQAiZjviIA2XiGnwCcD3NF+QVi0CRlmYQj//Ri4rsS
+MK4AoNlb1tZYG9tlF0H2T17x0/SriJOk
+=8GBF
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ekeyd/ekeyd-1.1.1-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.1-r1.ebuild
deleted file mode 100644
index 5f65a39d0c8c..000000000000
--- a/app-crypt/ekeyd/ekeyd-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.1-r1.ebuild,v 1.1 2010/08/07 19:11:05 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
-
-	epatch "${FILESDIR}"/${P}-earlyboot.patch
-
-	# 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
-}
diff --git a/app-crypt/ekeyd/ekeyd-1.1.2.ebuild b/app-crypt/ekeyd/ekeyd-1.1.3.ebuild
index 5cbfc2c9869d..9aef1e3d9955 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.2.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.2.ebuild,v 1.1 2010/08/25 12:55:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.3.ebuild,v 1.1 2010/09/24 11:43:26 flameeyes Exp $
 
 EAPI=2
 
@@ -104,7 +104,7 @@ src_install() {
 		doman daemon/ekey-ulusbd.8 || die
 	fi
 
-	dodoc daemon/README* AUTHORS WARNING || die
+	dodoc daemon/README* AUTHORS WARNING ChangeLog || die
 
 	if use kernel_linux; then
 		insinto /etc/udev/rules.d