[gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/

[Sam James]

commit:     b2bc8bae175d3f227a459509b0cdbc6401ab8dc9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 16:17:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 16:20:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bc8bae

app-text/htmldoc: fix automagic dep on gnutls

* Forcibly disabled bundled libs (just to be sure)
* Make ssl optional (gnutls only)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{htmldoc-1.9.11.ebuild => htmldoc-1.9.11-r1.ebuild}   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app-text/htmldoc/htmldoc-1.9.11.ebuild 
b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
similarity index 78%
rename from app-text/htmldoc/htmldoc-1.9.11.ebuild
rename to app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index fb0d4a82ad1..b506567a49a 100644
--- a/app-text/htmldoc/htmldoc-1.9.11.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -9,14 +9,17 @@ DESCRIPTION="Convert HTML pages into a PDF document"
 HOMEPAGE="http://www.msweet.org/projects.php?Z1";
 
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz";
 
-IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fltk ssl"
 
+BDEPEND="virtual/pkgconfig"
 DEPEND="
        >=media-libs/libpng-1.4:0=
+       sys-libs/zlib
        virtual/jpeg:0
+       ssl? ( net-libs/gnutls )
        fltk? ( x11-libs/fltk:1 )
 "
 RDEPEND="${DEPEND}"
@@ -38,8 +41,16 @@ src_prepare() {
 }
 
 src_configure() {
-       CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf \
+       local myeconfargs=(
                $(use_with fltk gui)
+               $(use_enable ssl)
+               $(use_enable ssl gnutls)
+               --disable-localjpeg
+               --disable-localpng
+               --disable-localzlib
+       )
+
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf 
"${myeconfargs[@]}"
 }
 
 src_install() {