Version bump; remove old.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

6 files changed, 31 insertions, 176 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 7610374e8ec1..3ee9df7e86f5 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.409 2013/02/21 18:43:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.410 2013/02/27 19:42:12 flameeyes Exp $
+
+*gnutls-3.1.9 (27 Feb 2013)
+
+  27 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org> +gnutls-3.1.9.ebuild,
+  -files/gnutls-3.1.3-guile-parallelmake.patch,
+  -files/gnutls-3.1.6-danetool.patch, -gnutls-3.1.5-r1.ebuild,
+  -gnutls-3.1.6.ebuild:
+  Version bump; remove old.
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> gnutls-3.1.8.ebuild:
   Add ~arm-linux keyword.
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 79ec16decd4b..3acdb28eccc0 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -5,24 +5,24 @@ AUX gnutls-2.12.20-AF_UNIX.patch 1041 SHA256 bd56d19bd1713ef3ddfca7768c2528aacb0
 AUX gnutls-2.12.20-glibc-2.16.patch 938 SHA256 9e0383563d5a358680aab3ddf1464d207fa9ea40baeb4d970017730abb7b97aa SHA512 d4216cc1ace84dfab32ac524cd7acc35b14f5c488d1b3716984894c5408667c82d0a4d494149c6a3c5805a6a901831d8df62d12de61d7b93d183520c9b6d93c3 WHIRLPOOL 71e268ab79ff0ad5d7bc0148b37a1070bc3b2ef09fe01e24eb060d04a6f2d03e209750a3853386f53f2d84c9843a6e66c49aab33fbdc6ef645ef2bb3c4882676
 AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d6b6d62ef243491e85164ff513ac SHA512 a0552276b356fd63e802a886e1243ef6341c6b8d1857814a0b2a686fd605d7c03316965cdfcdb70162547033efe9f2d1c17e442a30925d97ef691c2d573eba68 WHIRLPOOL 4ed528cb20705d91db05f0c533cbfd0356fa3292393eba75b45a22457cb23da80639ef739d889af4f64038a97553f3f990cc08f5e31608b1dc83c74b0e1c46d3
-AUX gnutls-3.1.3-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
-AUX gnutls-3.1.6-danetool.patch 538 SHA256 21b5e83d7314d4756b3a59f6ff891c5488c946eac9f95ca34ccf4ab706bacbf7 SHA512 6a74d40f886471b20c2640f4253e585cf416c115272d49e619366ad68f141e17986756e1d0efb11129a23f370a0a36b11dd22b591aac758e495e2fbb4121932b WHIRLPOOL f3900375996ad2077d7ff605e1aa471afe60b4f077fe450cd9f4e159769bbeeaccaee7ac594386f6551e57b5a409089adc637fb1b27f662ac36c53419efcdd95
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
 DIST gnutls-2.12.23.tar.bz2 7279415 SHA256 dfa67a7e40727eb0913e75f3c44911d5d8cd58d1ead5acfe73dd933fc0d17ed2 SHA512 7780e9ca7b592350ce9b11e53a63d3212320402d8ad2462bfbc0e69aec4a48bb372a1925627abb7996535c87c90e3d79537ea118c8bb36d26aae8e19eaae3a06 WHIRLPOOL 8cab909c961760c72b478d5cbe75633ce0d26190fdece018e9f33b171879753ed38348c33c00fda7b5f3a6b596a5439fb62f1c82a891e9e62fee5bb784cf7e11
-DIST gnutls-3.1.5.tar.xz 4959212 SHA256 2f095984dd9cbbf4dce417ecd81640fe47732322d025062b2c9a189d022de0d3 SHA512 388581faf377ea38b2050f70b2051f252fe6f2ac6c021f317e4ad0444a083ef89ae41779faf2f75a221368a24fc7e000123499a4045dd93cb7d0eea33b9f7a84 WHIRLPOOL 69e5e4a29d227ae8e8d2ba9accce7f8eafbf165a28cd08b7d71b4fe4a544aacf7bf747c4b5ac33902e8916320ffe5f5b1d409fe42988d99b0c726184e87bbfa8
-DIST gnutls-3.1.6.tar.xz 5023376 SHA256 83039b8c243ebaa4c31c96c823c88c8c1576de4a7d0d04e10d93527a535e5e7f SHA512 417d2fee727e163b967a5bcb43dcd846b645369d9c30785217062c25f617e67535a1efcf3ff1c8cbc3f2fc20fcc033eea48d57d827b502d270981275b6127417 WHIRLPOOL d34e88f45bc03cc4422507035edbcd906662d7b3d13758160133fe71a34565198af5d2c62fc241f83a5df8bebb41fb1dfb4b12b78a2eb78431f1f8ae192c0eec
 DIST gnutls-3.1.8.tar.xz 5049716 SHA256 28341a70cbb469cbcd5709294449347ae2360cb44484a5d45eb2f7af47e6021d SHA512 d9743282304489935aca01f499bfb6eca49eee90959c738e93c9bc9fb72129ededdd4cd168c8b089089cfc312dc86516c7593de43dea1181c10ab899a7510b98 WHIRLPOOL a0bd7ba6b2384e7df28cb296c5f743cad7d4338f02630728a28b60902a3acadd33526c23a3d84854b6b4543597bdacb502e1a2a85f7cba1cf2af287fdc4ff75e
+DIST gnutls-3.1.9.tar.xz 5060152 SHA256 a1e510bc817c8aa6df5fe304aeee6e95e8dcdabc6bfd37f29ad7f247962dffa2 SHA512 d70d9f667d370d6d2e110b170801e33945408ca8656f96d59d976fe7f988f6ab123eda9f137be166516634378ae265d84f99a3437e18c020436dd03f4a0cd30d WHIRLPOOL 604dbcba5a95dbc2faa453f08fbff1dfebc37a5f68f4ae3a93253cbd0a48bcda9f643c1992b0d195185bf8c9b459207fad05891f031e735412d62246d390650b
 EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd04900dd83f5d1bfbcd69a11549e55 SHA512 6aa65bd7b955de2d84119c1d78d2c112bae99f90ff568b30ec2fa6c31fd659a2b8df7ec3a37fa11697d32d14bc8a7e12c2177b002863d272ee2c751adc259275 WHIRLPOOL 2f5547bab0891526543100f41e54eab92fbd4244f087e4e4ffa6014a6e0489930ae246583807402f510b1a262f79f00839153cb8a76d95773e7354f8da743528
 EBUILD gnutls-2.12.23.ebuild 3412 SHA256 7759008812c2fd4d3c7b99f6ab7e0bd71f3666b5095bd638eec8fc342d374b39 SHA512 dc9239fee45109e6679eef8780006720989cde13f5b02b0dee2b3170de1bd9ec8ac955803d6aba4f7c742b2064f1fdc05a54d3630f0b77698dd8905cfae02553 WHIRLPOOL 29c63d77b18d7f88a918b1a25345f35e3e1db4578f4eb85a1d85421276c348829ea61c8472f3d8d5defb7735bf1b0c37403fbdc426d79c33fc5b8d5af33e2969
-EBUILD gnutls-3.1.5-r1.ebuild 3127 SHA256 d841c0c1f1d58b1414a586b8b5473033b843271b755392d491243f41442ed224 SHA512 97104c210dbd4451dc78334132939972ad4c4963e94ad24f34d6ffce7270b5b205fa58f4c2d6fa3d4a267fe578a8657f244961dcee3b9359ea0caecc5d174d82 WHIRLPOOL c3b4e4a68b6e0f474035b9e74bf3dcd93e9f147d51bdf923b74107c0bcf28e8fa8717933ccc6df72dbca47411b4c57f716f45769c2984331cd293efc6f5ce08a
-EBUILD gnutls-3.1.6.ebuild 3028 SHA256 fa8028adc8c02e2f33a53ea338f152b16186cb8151152ff6f7d77eba1d72360f SHA512 4a48804c6bef754f0327d8b109a8082171a96271e92bf3df89863524e288311b6b81a3b83593286bd4a44f37b978be493f81de9793f9ea827307c68785e128db WHIRLPOOL 9510ba3cc321140836dc27a8261f249907ed5c00a4b0fc1f5654fbca1ae36314673083008a4e9edc7488f476a5de1c4fdc3432f7e1d1ea98fed8b5206a6e1dc7
 EBUILD gnutls-3.1.8.ebuild 3114 SHA256 a5c050687a5ef5d2d8c88e27327db6afaf36bdb6a4cfb490b6e7d2ca26c96698 SHA512 c674a4550821760a47ebac5e9ef8ee495685367c8109f7c6c98e896e47de2639a4e669db2361c69b00eff15647107e8d604085c960d1fce0329d6175cdbefc7d WHIRLPOOL 5acb76a16a809119f134efff2b7f7e734c50fc0d70db74b9f2f7f3f9676134a0a33819241fc86569e8151284d4286c815f334858281fa924c1b5b4af06dd0420
-MISC ChangeLog 61154 SHA256 35f6beeec74687f7e137e6f0334c3774f56de88f6f09d4cf08bf34b3efcea89f SHA512 23a1a559c27f67461bf148e7ae3495d3c510a4071d887507c06127eb4bbc1536d2d551fa392935737f0955148fc01a81f8fec8ae1240207886a0af1168e72bdd WHIRLPOOL 3469295a0dd907b842108673f55fafe0a7744de21f36d1a858eac81d083a1cede2b983b916ec5c3e5453730e7e6bb1df9d111c52bf9bc8fbc378b1a242885e17
+EBUILD gnutls-3.1.9.ebuild 3116 SHA256 428d1db04b65d3cd6bacf8fc9a00ad1c0c53998f2873829969d318a071efb0c0 SHA512 fc1132e888031fcbe7c8dabd42b117c0ba3b1e380be4a95ff2610c9abca8b47bb69f1efa81d600ec466bc65adbdae8d9f90309bfe23d6b60e84d9eb29a740fda WHIRLPOOL 28c6e6abcd711a6fe73acde9ba81e8bb707d4d8cd6b9dd1fd3c8051746eafb8c13d1628974ffed4b894458b0ea10b5b318f74b3ff2fcf2be324effb43e476f04
+MISC ChangeLog 61427 SHA256 9e91da7e91dd45cb4ce34f9f3f1fe3ef3c98b065032d57e1a2aa1b0bf6428861 SHA512 739fea58294ac25edf54a9fde8feefba2810b08cbce5b61f39dadff5b4af8ee60b15349d964561d34a14a55ddba71e8dd8d753372ac0ec9258295479a9c4124f WHIRLPOOL 58987f5fbe47087cbb01b315ab1fa1cf2586c615d3ae9db175e32ddbc9a11ac65d973447c88d2e5353a258fac245b47c83d22923943dda04b93377f034446744
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEmasYACgkQ/ejvha5XGaOmjQCgnkdah7fWGuHkO55neASkXKVY
-pTIAniRbqzhdk45RRdQGwfrOHodI3D9J
-=RnTM
+iQEcBAEBCAAGBQJRLmGkAAoJEBzRPIrUMBNCqFYH/ibrZ1rYL4ncfotcSfmGLqi2
+tCQO4/WLADoIFODX541Ox4ayzaKcvJ9OKr1dnyg4PQCktT5zGnCx25caU/ADCxyL
+QrOAcZCmD4eGCHTxB4hSe+uRWiygtHpCwrv8LUFteQd0dPjXRn+jUcQ0yfWK+b5T
+kCF4JogluV37iHqA06AgKKXxuKU8f+lqSnFAdiZO6wu9X5Mxav/+hrVa6PPWPOe2
+QrEmXK1xNOjSSKpUuZhsad9EZ+6v34dQ7oSFj39JnVE6A+/JOg6GkJTdWO/wAlCS
+PWoU0Co3QXw8E26ND9CjYru1KhWXrXSLH0moKRknpe3e37NLanQaEO5QJFGsCd8=
+=ej2C
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.1.3-guile-parallelmake.patch b/net-libs/gnutls/files/gnutls-3.1.3-guile-parallelmake.patch
deleted file mode 100644
index 5bb085793deb..000000000000
--- a/net-libs/gnutls/files/gnutls-3.1.3-guile-parallelmake.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/guile/src/Makefile.am
-+++ b/guile/src/Makefile.am
-@@ -124,4 +124,7 @@
- 
- .c.x: $(BUILT_SOURCES)
- 	$(guile_snarf) -o $@ $< $(snarfcppopts)
-+core.x: core.c enums.h enum-map.i.c priorities.i.c smobs.h smob-types.i.c
-+errors.x: errors.c enums.h
-+extra.x: extra.c enums.h extra-enums.h extra-enum-map.i.c extra-smobs.h extra-smob-types.i.c smobs.h
diff --git a/net-libs/gnutls/files/gnutls-3.1.6-danetool.patch b/net-libs/gnutls/files/gnutls-3.1.6-danetool.patch
deleted file mode 100644
index 54524d894c2b..000000000000
--- a/net-libs/gnutls/files/gnutls-3.1.6-danetool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnutls-3.1.6/src/Makefile.am.org	2013-01-20 21:40:25.090856708 +0200
-+++ gnutls-3.1.6/src/Makefile.am	2013-01-20 21:42:24.348037683 +0200
-@@ -191,7 +191,7 @@ libcmd_tpmtool_la_LIBADD += $(LTLIBREADL
- endif # ENABLE_TROUSERS
- 
- BUILT_SOURCES = ocsptool-args.c p11tool-args.c psk-args.c cli-debug-args.c \
--		cli-args.c serv-args.c srptool-args.c certtool-args.c
-+		cli-args.c serv-args.c srptool-args.c certtool-args.c danetool-args.c
- 
- danetool-args.c: $(srcdir)/args-std.def $(srcdir)/danetool-args.def
- 	-autogen danetool-args.def
diff --git a/net-libs/gnutls/gnutls-3.1.5-r1.ebuild b/net-libs/gnutls/gnutls-3.1.5-r1.ebuild
deleted file mode 100644
index f85e4eee27a6..000000000000
--- a/net-libs/gnutls/gnutls-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.5-r1.ebuild,v 1.4 2012/12/23 09:40:46 alonbl Exp $
-
-EAPI=4
-
-inherit autotools libtool eutils
-
-DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
-HOMEPAGE="http://www.gnutls.org/"
-
-if [[ "${PV}" == *pre* ]]; then
-	SRC_URI="http://daily.josefsson.org/${P%.*}/${P%.*}-${PV#*pre}.tar.gz"
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-fi
-
-# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib"
-IUSE_LINGUAS="en cs de fi fr it ms nl pl sv uk vi zh_CN"
-for lingua in ${IUSE_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-unset lingua
-
-RDEPEND=">=dev-libs/libtasn1-2.14
-	>=dev-libs/nettle-2.5[gmp]
-	sys-devel/autogen
-	dane? ( net-dns/unbound )
-	guile? ( >=dev-scheme/guile-1.8[networking] )
-	nls? ( virtual/libintl )
-	pkcs11? ( >=app-crypt/p11-kit-0.11 )
-	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )
-	test? ( app-misc/datefudge )"
-
-S=${WORKDIR}/${P%_pre*}
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
-
-src_prepare() {
-	local dir file
-
-	# tests/suite directory is not distributed.
-	sed -i \
-		-e ':AC_CONFIG_FILES(\[tests/suite/Makefile\]):d' \
-		-e '/^AM_INIT_AUTOMAKE/s/-Werror//' \
-		configure.ac || die
-
-	sed -i \
-		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
-		doc/Makefile.am || die
-
-	for dir in m4 gl/m4; do
-		rm -f "${dir}/lt"* "${dir}/libtool.m4"
-	done
-	find . -name ltmain.sh -exec rm {} \;
-
-	# use system libopts
-	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
-
-	# force regeneration of autogen-ed files
-	for file in $(grep -l AutoGen-ed src/*.c) ; do
-		rm src/$(basename ${file} .c).{c,h} || die
-	done
-
-	epatch "${FILESDIR}"/${PN}-3.1.3-guile-parallelmake.patch
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
-
-	# TPM needs to be tested before being enabled
-	econf \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--disable-silent-rules \
-		--disable-valgrind-tests \
-		$(use_enable cxx) \
-		$(use_enable dane libdane) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable doc gtk-doc-pdf) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with pkcs11 p11-kit) \
-		$(use_with zlib) \
-		--without-tpm
-}
-
-src_test() {
-	# let it build in parallel
-	emake check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	dodoc doc/certtool.cfg
-
-	if use doc; then
-		dodoc doc/gnutls.pdf
-		dohtml doc/gnutls.html
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-}
diff --git a/net-libs/gnutls/gnutls-3.1.6.ebuild b/net-libs/gnutls/gnutls-3.1.9.ebuild
index a3c041c5f3e0..68edbc7b1c22 100644
--- a/net-libs/gnutls/gnutls-3.1.6.ebuild
+++ b/net-libs/gnutls/gnutls-3.1.9.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.6.ebuild,v 1.7 2013/01/20 19:56:21 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.1.9.ebuild,v 1.1 2013/02/27 19:42:12 flameeyes Exp $
 
-EAPI=4
+EAPI=5
 
-WANT_AUTOMAKE="1.11.6"
-
-inherit autotools libtool eutils
+inherit autotools libtool eutils versionator
 
 DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
 HOMEPAGE="http://www.gnutls.org/"
-SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${PV:0:3}/${P}.tar.xz"
+SRC_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 # LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
 
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
@@ -30,6 +30,7 @@ RDEPEND=">=dev-libs/libtasn1-2.14
 	pkcs11? ( >=app-crypt/p11-kit-0.11 )
 	zlib? ( >=sys-libs/zlib-1.2.3.1 )"
 DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.11.6
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
@@ -50,10 +51,8 @@ src_prepare() {
 		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
 		doc/Makefile.am || die
 
-	for dir in m4 gl/m4; do
-		rm -f "${dir}/lt"* "${dir}/libtool.m4"
-	done
-	find . -name ltmain.sh -exec rm {} \;
+	rm -f {m4,gl/m4}/{lt*,libtool.m4}
+	find . -name ltmain.sh -delete
 
 	# use system libopts
 	sed -i -e "/^enable_local_libopts/s/yes/no/" configure.ac || die
@@ -63,8 +62,6 @@ src_prepare() {
 		rm src/$(basename ${file} .c).{c,h} || die
 	done
 
-	epatch "${FILESDIR}/${P}-danetool.patch"
-
 	# support user patches
 	epatch_user
 
@@ -82,6 +79,7 @@ src_configure() {
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--disable-silent-rules \
 		--disable-valgrind-tests \
+		--enable-heartbeat-support \
 		$(use_enable cxx) \
 		$(use_enable dane libdane) \
 		$(use_enable doc gtk-doc) \
@@ -94,15 +92,10 @@ src_configure() {
 		--without-tpm
 }
 
-src_test() {
-	# let it build in parallel
-	emake check
-}
-
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete
 
 	dodoc doc/certtool.cfg