Remove old versions; run tests in parallel if so chosen.

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

5 files changed, 10 insertions, 87 deletions

diff --git a/sys-apps/haveged/ChangeLog b/sys-apps/haveged/ChangeLog
index b8b5482fd16e..67ea7e5f2a27 100644
--- a/sys-apps/haveged/ChangeLog
+++ b/sys-apps/haveged/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/haveged
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.15 2012/04/14 12:44:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.16 2012/07/02 10:53:15 flameeyes Exp $
+
+  02 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/haveged-init.d,
+  -haveged-1.1.ebuild, -haveged-1.2.ebuild, haveged-1.4.ebuild:
+  Remove old versions; run tests in parallel if so chosen.
 
   14 Apr 2012; Agostino Sarubbo <ago@gentoo.org> haveged-1.3a.ebuild:
   Stable for amd64, wrt bug #406611
@@ -60,4 +64,3 @@
   05 Jan 2011; Robin H. Johnson <robbat2@gentoo.org> +haveged-1.01.ebuild,
   +files/haveged-conf.d, +files/haveged-init.d, +metadata.xml:
   Add another entropy daemon.
-
diff --git a/sys-apps/haveged/files/haveged-init.d b/sys-apps/haveged/files/haveged-init.d
deleted file mode 100644
index 23806781a504..000000000000
--- a/sys-apps/haveged/files/haveged-init.d
+++ /dev/null
@@ -1,26 +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/sys-apps/haveged/files/haveged-init.d,v 1.2 2011/04/08 01:50:53 flameeyes Exp $
-
-DAEMON=haveged
-HAVEGED_OPTS="-r 0 ${HAVEGED_OPTS}"
-PIDFILE=/var/run/${DAEMON}.pid
-
-depend() {
-	provide entropy
-}
-
-start() {
-	ebegin "Starting ${DAEMON}"
-	start-stop-daemon --start --quiet --exec "/usr/sbin/${DAEMON}" -- ${HAVEGED_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${DAEMON}"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend $?
-}
-
-# vim:ft=gentoo-init-d:
diff --git a/sys-apps/haveged/haveged-1.1.ebuild b/sys-apps/haveged/haveged-1.1.ebuild
deleted file mode 100644
index b5044a1aed66..000000000000
--- a/sys-apps/haveged/haveged-1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.1.ebuild,v 1.5 2012/01/26 23:26:58 darkside Exp $
-
-EAPI=4
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-RDEPEND=""
-
-src_configure() {
-	econf --bindir=/usr/sbin --enable-nistest
-}
-
-src_install() {
-	default
-	# This is a RedHat init script
-	rm -rf "${D}"/etc/init.d/haveged
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-}
diff --git a/sys-apps/haveged/haveged-1.2.ebuild b/sys-apps/haveged/haveged-1.2.ebuild
deleted file mode 100644
index abffd7182acf..000000000000
--- a/sys-apps/haveged/haveged-1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.2.ebuild,v 1.5 2012/02/10 13:00:11 tomka Exp $
-
-EAPI=4
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-devel/gcc"
-RDEPEND="sys-apps/openrc"
-
-src_configure() {
-	econf --bindir=/usr/sbin --enable-nistest
-}
-
-src_install() {
-	default
-	# This is a RedHat init script
-	rm -rf "${D}"/etc/init.d/haveged
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.2 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-}
diff --git a/sys-apps/haveged/haveged-1.4.ebuild b/sys-apps/haveged/haveged-1.4.ebuild
index f1ee5f7b3305..c8028c2c2e85 100644
--- a/sys-apps/haveged/haveged-1.4.ebuild
+++ b/sys-apps/haveged/haveged-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.4.ebuild,v 1.1 2012/04/13 13:21:57 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.4.ebuild,v 1.2 2012/07/02 10:53:15 flameeyes Exp $
 
 EAPI=4
 DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
@@ -21,6 +21,10 @@ src_configure() {
 	econf --bindir=/usr/sbin --enable-nistest
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 	# This is a RedHat init script