Version bump, remove older versions (would be stabled only when upstream stops releasing new ones for a while).

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

5 files changed, 16 insertions, 316 deletions

diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index f1817d0118f8..f9818e2667d6 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2009/11/16 17:12:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.11 2009/11/17 23:03:37 flameeyes Exp $
+
+*ekeyd-1.1.1 (17 Nov 2009)
+
+  17 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ekeyd-1.0.6-r1.ebuild, -ekeyd-1.0.7.ebuild, -ekeyd-1.1.0.ebuild,
+  +ekeyd-1.1.1.ebuild:
+  Version bump, remove older versions (would be stabled only when upstream
+  stops releasing new ones for a while).
 
   16 Nov 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   ekeyd-1.0.6-r1.ebuild, ekeyd-1.0.7.ebuild, ekeyd-1.1.0.ebuild:
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 55af2a19d83d..537c93418a21 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -4,18 +4,14 @@ Hash: SHA1
 AUX ekey-ulusbd.conf 579 RMD160 0fb73018df4b96197fb1bd245f98e078b9e84501 SHA1 c7b287b34080c6cc941e217e21768f290803ca98 SHA256 7077c2634fe54d1c1a6af9f48d4e76b53b8c8f2b110c44ec50a4998f7e797fa9
 AUX ekey-ulusbd.init 1044 RMD160 8d367b69b2ab785603329039005e3e04d0a5858e SHA1 acece8401daf5d0d9c73e4efd3262f2fd2887391 SHA256 454def35bf7bb2e8e1927a33415f51832f45714e5db411c1d0374331e07e802c
 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 4284a505bdfb3825049d2f3c5319f3f1784ae319 SHA1 cfc44f5dc134190d7cd37728aeac691767329576 SHA256 a409499587ef02e7b0863331948e93ebd135c1f211e9522a75ea357899c9ad79
-EBUILD ekeyd-1.0.7.ebuild 4084 RMD160 4052cff60bc49e18728378a06305f578efa97d40 SHA1 3124fa44f1f43a6cbdd238ff473f95458003b58f SHA256 d4199200d494044e399ce8c9f30eb8df7c872ad8f00f12bb4300454f626d275c
-EBUILD ekeyd-1.1.0.ebuild 4084 RMD160 59e7ec349d8097ab4acc71929bf980ad8044e713 SHA1 4bf84e57e486a8923192bd18db7ba5ced66d45b0 SHA256 347033bbb9cb4ea4e1d2f6a05b62e91aec2972573504bee404369f5b01dc36cd
-MISC ChangeLog 2643 RMD160 a3a136109fcdbfad0b72b51bd4ab931e883125d3 SHA1 fea77dd8d0a50a3218949b8458b3c240c2a66156 SHA256 75923ed6514c5bd1436df0906e6aeb70e5937da8644d9b0542dac12a1fa3e25b
+DIST ekeyd-1.1.1.tar.gz 92588 RMD160 ed93590eb8e0cafb540c0a2bd59cb3f79b5481b5 SHA1 b7848a3c3f4f9a878ab0c83de6e4faa55b4541e3 SHA256 cb2931c6a357ed98aa227b750e502ced64c992b01a79a0bc58d63e81b209f8d0
+EBUILD ekeyd-1.1.1.ebuild 4084 RMD160 3ab1a8fc05fb098ecfc6d170a8976e90200caa8d SHA1 60fd2e891388ded04b372bffcd53f0b3a9bab339 SHA256 3cb4714dd0934d3416c88fbf74b04ac06b7d3b534e67b27625b6eb371f4b2082
+MISC ChangeLog 2935 RMD160 169a1b01db2822d002d03c2e683efdea879ecb68 SHA1 3beb6805dab0d419189891ecc0c20d7a47d9ac80 SHA256 de0278f0a328d2fe1fe4711cfebdcb5d6c5fa650feb503a23755221583a5f9bb
 MISC metadata.xml 401 RMD160 988224226b2b1e56ca024b6866deb0291faf3ab7 SHA1 17ae474fa2c6964cc4feab7173ec86f1062b9197 SHA256 3e04add274d3b051cdc073d9b3b8272861caff36bec655e6c86cf2a4fabb66c4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksBiAMACgkQAiZjviIA2XgSwwCcDph86QDYLMtZeFmqs8hdYaPl
-ynkAoMbvd/nNvOuPWHVEdxvIS623hi2Q
-=q7mJ
+iEYEARECAAYFAksDK80ACgkQAiZjviIA2XjRCwCgxVdayyx66sBaiDXE9/wVddA8
+B4YAmwZXmCPX+v55cyqh07SDRxUpU3hD
+=Ndaf
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ekeyd/ekeyd-1.0.6-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.0.6-r1.ebuild
deleted file mode 100644
index 1f7c0ffe6d0a..000000000000
--- a/app-crypt/ekeyd/ekeyd-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.0.6-r1.ebuild,v 1.4 2009/11/16 17:12:30 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? ( virtual/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
-}
diff --git a/app-crypt/ekeyd/ekeyd-1.1.0.ebuild b/app-crypt/ekeyd/ekeyd-1.1.0.ebuild
deleted file mode 100644
index ab65bb34b310..000000000000
--- a/app-crypt/ekeyd/ekeyd-1.1.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.3 2009/11/16 17:12:30 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? ( virtual/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
-}
diff --git a/app-crypt/ekeyd/ekeyd-1.0.7.ebuild b/app-crypt/ekeyd/ekeyd-1.1.1.ebuild
index d649097b6c50..6aebf52d267c 100644
--- a/app-crypt/ekeyd/ekeyd-1.0.7.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.7.ebuild,v 1.3 2009/11/16 17:12:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.1.ebuild,v 1.1 2009/11/17 23:03:37 flameeyes Exp $
 
 EAPI=2