summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2015-07-13 19:08:22 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2015-07-13 19:08:22 +0000
commit87b6de7430763fd33d44f1bf1efe4e5bab050f54 (patch)
tree85af62f266d64469395f0b4a95afbe8d98a2b22b /net-libs
parentAdd symlink needed for starting avahi properly on systemd (#537000) (diff)
downloadgentoo-2-87b6de7430763fd33d44f1bf1efe4e5bab050f54.tar.gz
gentoo-2-87b6de7430763fd33d44f1bf1efe4e5bab050f54.tar.bz2
gentoo-2-87b6de7430763fd33d44f1bf1efe4e5bab050f54.zip
Add texinfo dependency and force doc USE as top level doc in configure, bug#554682
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/gnutls/ChangeLog10
-rw-r--r--net-libs/gnutls/gnutls-3.3.16-r1.ebuild (renamed from net-libs/gnutls/gnutls-3.3.16.ebuild)8
-rw-r--r--net-libs/gnutls/gnutls-3.4.3-r1.ebuild (renamed from net-libs/gnutls/gnutls-3.4.3.ebuild)8
3 files changed, 21 insertions, 5 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 5e74e919c2cd..7344a72c0dad 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.549 2015/07/12 14:33:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.550 2015/07/13 19:08:22 alonbl Exp $
+
+*gnutls-3.4.3-r1 (13 Jul 2015)
+*gnutls-3.3.16-r1 (13 Jul 2015)
+
+ 13 Jul 2015; Alon Bar-Lev <alonbl@gentoo.org> +gnutls-3.3.16-r1.ebuild,
+ +gnutls-3.4.3-r1.ebuild, -gnutls-3.3.16.ebuild, -gnutls-3.4.3.ebuild:
+ Add texinfo dependency and force doc USE as top level doc in configure,
+ bug#554682
*gnutls-3.3.16 (12 Jul 2015)
*gnutls-3.4.3 (12 Jul 2015)
diff --git a/net-libs/gnutls/gnutls-3.3.16.ebuild b/net-libs/gnutls/gnutls-3.3.16-r1.ebuild
index 708e61e248e6..8990e2b70dc1 100644
--- a/net-libs/gnutls/gnutls-3.3.16.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.16-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.16.ebuild,v 1.1 2015/07/12 14:33:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.3.16-r1.ebuild,v 1.1 2015/07/13 19:08:22 alonbl Exp $
EAPI=5
@@ -38,7 +38,10 @@ RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
>=sys-devel/automake-1.11.6
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- doc? ( dev-util/gtk-doc )
+ doc? (
+ sys-apps/texinfo
+ dev-util/gtk-doc
+ )
nls? ( sys-devel/gettext )
test? ( app-misc/datefudge )"
@@ -96,6 +99,7 @@ multilib_src_configure() {
--enable-heartbeat-support \
$(use_enable cxx) \
$(use_enable dane libdane) \
+ $(multilib_native_use_enable doc) \
$(multilib_native_use_enable doc gtk-doc) \
$(multilib_native_use_enable guile) \
$(multilib_native_use_enable crywrap) \
diff --git a/net-libs/gnutls/gnutls-3.4.3.ebuild b/net-libs/gnutls/gnutls-3.4.3-r1.ebuild
index 9829bd7cb7b5..b712b1d774e6 100644
--- a/net-libs/gnutls/gnutls-3.4.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.4.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.3.ebuild,v 1.1 2015/07/12 14:33:50 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.4.3-r1.ebuild,v 1.1 2015/07/13 19:08:22 alonbl Exp $
EAPI=5
@@ -38,7 +38,10 @@ RDEPEND=">=dev-libs/libtasn1-3.9[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
>=sys-devel/automake-1.11.6
>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- doc? ( dev-util/gtk-doc )
+ doc? (
+ sys-apps/texinfo
+ dev-util/gtk-doc
+ )
nls? ( sys-devel/gettext )
test? ( app-misc/datefudge )"
@@ -97,6 +100,7 @@ multilib_src_configure() {
$(use_enable cxx) \
$(use_enable dane libdane) \
$(multilib_native_use_enable tools) \
+ $(multilib_native_use_enable doc) \
$(multilib_native_use_enable doc gtk-doc) \
$(multilib_native_use_enable guile) \
$(multilib_native_use_enable crywrap) \