--- gnutls-3.3.11.ebuild	2014-12-30 11:05:17.000000000 +0000
+++ gnutls-3.3.11-r0.ebuild	2015-01-07 12:01:23.618214525 +0000
@@ -16,7 +16,7 @@
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 +crywrap dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+IUSE="+cxx +crywrap dane doc examples guile nls pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
 # heartbeat support is not disabled until re-licensing happens fullyf
 
 # NOTICE: sys-devel/autogen is required at runtime as we
@@ -24,7 +24,7 @@
 RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
 	>=dev-libs/nettle-2.7[gmp,${MULTILIB_USEDEP}]
 	>=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	sys-devel/autogen
+	tools? ( sys-devel/autogen )
 	crywrap? ( net-dns/libidn )
 	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
@@ -55,6 +55,7 @@
 	sed -i \
 		-e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
 		doc/Makefile.am || die
+	for f in src/libopts/*.c; do echo > "$f"; done
 
 	# force regeneration of autogen-ed files
 	local file
@@ -113,9 +114,15 @@
 	fi
 }
 
+myopts() {
+	if ! use tools; then
+		echo bin_PROGRAMS=
+	fi
+}
+
 multilib_src_compile() {
 	if multilib_is_native_abi; then
-		default
+		emake $(myopts)
 
 		# symlink certtool for use in other ABIs
 		if use test; then
@@ -130,7 +137,10 @@
 }
 
 multilib_src_test() {
-	if multilib_is_native_abi; then
+	if ! use tools; then
+		# can't test without tools
+		true
+	elif multilib_is_native_abi; then
 		# parallel testing often fails
 		emake -j1 check
 	else
@@ -145,7 +155,7 @@
 
 multilib_src_install() {
 	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
+		emake $(myopts) DESTDIR="${D}" install
 	else
 		emake -C lib DESTDIR="${D}" install
 		emake -C extra DESTDIR="${D}" install