Add a local description for the bindist USE flag; remove old; remove stray file.

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

6 files changed, 27 insertions, 277 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index f0140a8112de..169131528d40 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.395 2012/12/23 09:40:46 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.396 2012/12/30 11:58:43 flameeyes Exp $
+
+  30 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/gnutls-3.0.20-parallelmake.patch, -gnutls-3.1.3.ebuild,
+  -gnutls-3.1.5.ebuild, metadata.xml:
+  Add a local description for the bindist USE flag; remove old; remove stray
+  file.
 
   23 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> gnutls-3.1.5-r1.ebuild:
   Revert bug#438222, multilib issue, thanks for Alexander E. Patrakov
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 08bd11375f7f..17c7eb53a6f8 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,15 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnutls-2.12.20-AF_UNIX.patch 1041 SHA256 bd56d19bd1713ef3ddfca7768c2528aacb0c7425cd21f87d69b3d674504562a1 SHA512 a1564ace509fed3b0608ae66859979a364b173006fd43d77678dccb70577bbfd54953aa8c706aca77540ec28c3426a332e86c40722bbc7b4a23f9f50bee0478b WHIRLPOOL 9e27f8e7e82fdd53a11f1f7dfd10790f4d2c67d74bc68d9ce55718a57ef80d391f8fadab93f6186597c52ecedcef2d3f1ff16a77778aedd50545e5829e626baf
 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.0.20-parallelmake.patch 1126 SHA256 00acad9ae1420d2d9179ecdf8af22ffc19175a147420305e60e9c8b21e996608 SHA512 b530d9926083477c1e8dcbe4fa144474bc49a4bd48d7a8cf9f4fca216104c5b4c63066e7eea825f4fcc0fb8d28089d682cd7392bdfad4fd254c46858860c1427 WHIRLPOOL 85021d65f2e05aa47543e21df0613e9a099a590ec27fdadb7a5a140f70d50b8c0d5676f5d822eda9161d4480381dfc3864f205475f6160ffdd7d9eae69f4d949
 AUX gnutls-3.1.3-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
-DIST gnutls-3.1.3.tar.xz 4890796 SHA256 fcb236c663489d3dba5a3f41486810f3889eb4508403ebeeb58b79f0b34bce39 SHA512 aaef62ab0426975210ec037749c2feb0afdc35045a650e5c6cec9cf2fd27f948641f4af21029395f37d7044c2c1978bc035ce60d26fa5d6f48f9dff191739aa7 WHIRLPOOL aaa5e3b34c67a6882c05310e6acfe2c3fd97f8a8c7ad16f57ae3188c287047be978349928db23408ec3466c23340dcaa92d2f3c1462e730e90093e72734db2be
 DIST gnutls-3.1.5.tar.xz 4959212 SHA256 2f095984dd9cbbf4dce417ecd81640fe47732322d025062b2c9a189d022de0d3 SHA512 388581faf377ea38b2050f70b2051f252fe6f2ac6c021f317e4ad0444a083ef89ae41779faf2f75a221368a24fc7e000123499a4045dd93cb7d0eea33b9f7a84 WHIRLPOOL 69e5e4a29d227ae8e8d2ba9accce7f8eafbf165a28cd08b7d71b4fe4a544aacf7bf747c4b5ac33902e8916320ffe5f5b1d409fe42988d99b0c726184e87bbfa8
 EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd04900dd83f5d1bfbcd69a11549e55 SHA512 6aa65bd7b955de2d84119c1d78d2c112bae99f90ff568b30ec2fa6c31fd659a2b8df7ec3a37fa11697d32d14bc8a7e12c2177b002863d272ee2c751adc259275 WHIRLPOOL 2f5547bab0891526543100f41e54eab92fbd4244f087e4e4ffa6014a6e0489930ae246583807402f510b1a262f79f00839153cb8a76d95773e7354f8da743528
-EBUILD gnutls-3.1.3.ebuild 2925 SHA256 46c0da1da60ca1d2d120a0c5f7a3c008db94c4b9a60fdffcbbf3e782ac504dd8 SHA512 2c1622b33c9d10ab591725a0b95d0407ff786d8175eb83768d2a5d583a18e911bcc846a74868c553c50076c6727e80e5010abc81ed526546a66194ce00c9f5fb WHIRLPOOL c3fa6a3ca84a2946a74c8edd182c9ad21c8d92cf6a1732db0cc4e018d0fa7d11a19292b7ffad01632bfec880445cdd7ce994fa03d2a0dfa61e8f34d46b76c309
 EBUILD gnutls-3.1.5-r1.ebuild 3127 SHA256 d841c0c1f1d58b1414a586b8b5473033b843271b755392d491243f41442ed224 SHA512 97104c210dbd4451dc78334132939972ad4c4963e94ad24f34d6ffce7270b5b205fa58f4c2d6fa3d4a267fe578a8657f244961dcee3b9359ea0caecc5d174d82 WHIRLPOOL c3b4e4a68b6e0f474035b9e74bf3dcd93e9f147d51bdf923b74107c0bcf28e8fa8717933ccc6df72dbca47411b4c57f716f45769c2984331cd293efc6f5ce08a
-EBUILD gnutls-3.1.5.ebuild 2932 SHA256 3e4c4589db3257d362fccd10bc1812f82202a31d7a302d39eb411d857920eeaa SHA512 2d8c628764cb17a94c883f92bd9bbd45218eaf49789a3b24f9d5a99401c7ce89bfdbb15d719090511a35cbd5967c0b349fcef557a8bc5db1c8f15e17b8d43e56 WHIRLPOOL a70324a288c1183fb82c72492d6736fd7ec1ef345a31bb56da5428cc120544caec5672c267dab8e6afaf0e8539aea1b505a97265a4fdadde4f250c5d5697f36d
-MISC ChangeLog 58973 SHA256 1bc0c0c99831517856937fb1529f314db0674c191fa0ac70a8af1531019c4aaf SHA512 30896dc7fbe7330f03758e05c39961fc1e684607e7c1859cb16de5fb9eb3a82ccbb493f1df8e8ac2ef13d9ce58fe48b913dba71af09945440be02b4c90bea0df WHIRLPOOL 9c3705baf055921a71c86dc449073b2ab55aa3f9a2be874135de08c2cc84bb3636ebdcf50cbb7d0eaacfa9bc55c48d21a818603bd38975a8cc93dc9eac447df0
-MISC metadata.xml 608 SHA256 358aeb9effbe98a9a7b7107b17a6d88d3c81365c2e87e5378a622d85e40d89eb SHA512 704b47d97a7decd410a31f71199b44b2bd6c6bd370dd6280120346426bfe568ab5e70f37404bc02c20c009d0f262d3c2629d289ef0c89556482d6a143a4e2f9c WHIRLPOOL f6f1528d14bb711e7da63c4960b865815ce3a242a13e64526bc01e74e48ebb8bd099895537921e94e8586eb12e7827dfc4dfdecc6e0c61946f167a624e24b991
+MISC ChangeLog 59221 SHA256 e4e8ab81f3e457222c31ddeb3bd4ea0cb59441cc9c50c3c5408132a8731a15fe SHA512 eec22bcbb7fb9b5b228b21a2593c6a51c086d7a08fcdcf44609dbff1a373d6b079421ef78182e6d4be49205820acb1542770fcc29ea83e882be2b5915ffba053 WHIRLPOOL 704be9cecf7723250e5be68159eb34e33d58ed6d83ec6c557e2b2ef26e4f01cfa127f017ada93e4a8f87e5db0ec4c8d07b9024ff53de667f56b90c0fa64832e0
+MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ4CzFAAoJEBzRPIrUMBNCjZsH/jWKX3D13gwXv2YDksCxQY8o
+Q7uJ+a9/opa9uudB6lU47Y1xzvpOenvj80AGNlL4q3ZtKadkbzs5OB8tMtVSA+/o
+IYtH/OcgWI2B9rreKJz9YPrNHh+To24ppqm9dVwUQRXsiGHNh6ICOCmzY+9Y277y
+PUEWVubF0tkKFR+PhOGmmORq4JjPWoDfIW5JzOA5EQXwHSNUdwNOz8DZWhQR6bNh
+ApHRH53oJjJPl/rDoBHmp8E0i0d+f2XIiFav776V1xPqSj/JrWDLTeoYMtAqrYeC
+MHpTduDrgctwNG/wQx1LETQOVm7w/27X0NDo3aEpcE3jjixboiqEuu9AGFsxsgs=
+=Gg9u
+-----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/files/gnutls-3.0.20-parallelmake.patch b/net-libs/gnutls/files/gnutls-3.0.20-parallelmake.patch
deleted file mode 100644
index 8d43e8a938d1..000000000000
--- a/net-libs/gnutls/files/gnutls-3.0.20-parallelmake.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b05bf9461093b0a60c3dde4b7ad6e959d12c3ff8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
-Date: Fri, 15 Jun 2012 11:46:12 -0700
-Subject: [PATCH] build: make sure to declare the generated source files as
- BUILT_SOURCES
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This allows proper building when using parallel make on a multi-core
-system.
-
-Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
----
- src/Makefile.am |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5550f3b..8b3b578 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -150,6 +150,9 @@ libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
- 
- endif # ENABLE_PKCS11
- 
-+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
-+
- ocsptool-args.c: $(srcdir)/args-std.def $(srcdir)/ocsptool-args.def
- 	-autogen ocsptool-args.def
- p11tool-args.c: $(srcdir)/args-std.def $(srcdir)/p11tool-args.def
--- 
-1.7.8.6
-
diff --git a/net-libs/gnutls/gnutls-3.1.3.ebuild b/net-libs/gnutls/gnutls-3.1.3.ebuild
deleted file mode 100644
index 91857ebf70af..000000000000
--- a/net-libs/gnutls/gnutls-3.1.3.ebuild
+++ /dev/null
@@ -1,118 +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.3.ebuild,v 1.3 2012/11/04 05:22:29 radhermit 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"
-
-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}"/${P}-guile-parallelmake.patch
-
-	# support user patches
-	epatch_user
-
-	eautoreconf
-
-	# Use sane .so versioning on FreeBSD.
-	elibtoolize
-}
-
-src_configure() {
-	# 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) \
-		${myconf} \
-		--without-tpm
-}
-
-src_test() {
-	# let it build in parallel
-	emake check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	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.5.ebuild b/net-libs/gnutls/gnutls-3.1.5.ebuild
deleted file mode 100644
index 726ce2aa912d..000000000000
--- a/net-libs/gnutls/gnutls-3.1.5.ebuild
+++ /dev/null
@@ -1,118 +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.ebuild,v 1.1 2012/11/24 19:16:35 flameeyes 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"
-
-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() {
-	# 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) \
-		${myconf} \
-		--without-tpm
-}
-
-src_test() {
-	# let it build in parallel
-	emake check
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-
-	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/metadata.xml b/net-libs/gnutls/metadata.xml
index 4f067acde275..f082e627160b 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -13,5 +13,9 @@
       Build libgnutls-dane, implementing DNS-based Authentication of
       Named Entities. Requires <pkg>net-dns/unbound</pkg>.
     </flag>
+    <flag name="bindist">
+      Disallow building LZO support, because of a license
+      incompatibility with <pkg>dev-libs/lzo</pkg>.
+    </flag>
   </use>
 </pkgmetadata>