Version bump (just applies the same patch we did), use autotools-utils, use proper license value.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

4 files changed, 18 insertions, 57 deletions

diff --git a/sys-apps/haveged/ChangeLog b/sys-apps/haveged/ChangeLog
index e00917518f18..cc8deb2a8d12 100644
--- a/sys-apps/haveged/ChangeLog
+++ b/sys-apps/haveged/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/haveged
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.25 2013/01/25 16:58:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/ChangeLog,v 1.26 2013/02/24 06:41:10 flameeyes Exp $
+
+*haveged-1.7a (24 Feb 2013)
+
+  24 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +haveged-1.7a.ebuild,
+  -files/haveged-1.7-build.patch, -haveged-1.6.ebuild, -haveged-1.7.ebuild:
+  Version bump (just applies the same patch we did), use autotools-utils, use
+  proper license value.
 
 *haveged-1.7 (25 Jan 2013)
 
diff --git a/sys-apps/haveged/files/haveged-1.7-build.patch b/sys-apps/haveged/files/haveged-1.7-build.patch
deleted file mode 100644
index c32d1927e1f2..000000000000
--- a/sys-apps/haveged/files/haveged-1.7-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: haveged-1.7/src/Makefile.am
-===================================================================
---- haveged-1.7.orig/src/Makefile.am
-+++ haveged-1.7/src/Makefile.am
-@@ -27,7 +27,7 @@ pkginclude_HEADERS = havege.h
- 
- haveged_SOURCES = haveged.c haveged.h
- 
--haveged_LDADD = @HA_LDFLAGS@ $(top_builddir)/src/libhavege.la
-+haveged_LDADD = @HA_LDFLAGS@ libhavege.la
- ##libtool_end##
- 
- MAINTAINERCLEANFILES = Makefile.in
diff --git a/sys-apps/haveged/haveged-1.6.ebuild b/sys-apps/haveged/haveged-1.6.ebuild
deleted file mode 100644
index 739b50681d64..000000000000
--- a/sys-apps/haveged/haveged-1.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.6.ebuild,v 1.1 2013/01/06 17:50:44 flameeyes 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_test() {
-	emake check
-}
-
-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.7.ebuild b/sys-apps/haveged/haveged-1.7a.ebuild
index 3ce91f020d42..c1a7f80846e7 100644
--- a/sys-apps/haveged/haveged-1.7.ebuild
+++ b/sys-apps/haveged/haveged-1.7a.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.7.ebuild,v 1.1 2013/01/25 16:58:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/haveged/haveged-1.7a.ebuild,v 1.1 2013/02/24 06:41:10 flameeyes Exp $
 
 EAPI=5
 
-inherit eutils autotools
+inherit eutils autotools-utils
 
 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"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -18,18 +18,18 @@ IUSE=""
 DEPEND=""
 RDEPEND="!<sys-apps/openrc-0.11.8"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-}
-
 src_configure() {
-	econf --bindir=/usr/sbin --enable-nistest \
+	local myeconfargs=(
+		--bindir=/usr/sbin
+		--enable-nistest
 		--disable-static
+	)
+
+	autotools-utils_src_configure
 }
 
 src_install() {
-	default
+	autotools-utils_src_install
 
 	rm -rf "${D}"/usr/lib*/*.la