--- gnutls-3.3.10-r2.ebuild.orig	2015-02-06 22:01:14.000000000 +0300
+++ gnutls-3.3.10-r2.ebuild	2015-02-23 23:12:22.000000000 +0300
@@ -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 system-libopts 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
@@ -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
+	system-libopts? ( sys-devel/autogen )
 	crywrap? ( net-dns/libidn )
 	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
@@ -38,6 +38,7 @@
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.11.6
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	sys-devel/autogen
 	doc? ( dev-util/gtk-doc )
 	nls? ( sys-devel/gettext )
 	test? ( app-misc/datefudge )"
@@ -96,6 +97,7 @@
 		--enable-heartbeat-support \
 		$(use_enable cxx) \
 		$(use_enable dane libdane) \
+		$(use_enable !system-libopts local-libopts) \
 		$(multilib_native_use_enable doc gtk-doc) \
 		$(multilib_native_use_enable doc gtk-doc-pdf) \
 		$(multilib_native_use_enable guile) \