From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/
Date: Mon, 18 Jan 2021 16:20:59 +0000 (UTC) [thread overview]
Message-ID: <1610986857.b2bc8bae175d3f227a459509b0cdbc6401ab8dc9.sam@gentoo> (raw)
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() {
next reply other threads:[~2021-01-18 16:21 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 16:20 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 2:50 [gentoo-commits] repo/gentoo:master commit in: app-text/htmldoc/ John Helmert III
2022-12-18 19:50 Arthur Zamarin
2022-12-18 12:46 Sam James
2022-12-18 11:44 Sam James
2022-12-18 11:37 Sam James
2022-11-16 17:23 John Helmert III
2021-06-01 0:40 Sam James
2021-01-24 20:21 Sam James
2021-01-24 13:35 Sam James
2021-01-24 13:33 Sam James
2021-01-22 20:29 Sam James
2021-01-22 16:53 Agostino Sarubbo
2021-01-18 16:23 Sam James
2021-01-18 16:23 Sam James
2021-01-18 16:23 Sam James
2021-01-18 16:02 Sam James
2020-09-20 13:51 David Seifert
2017-09-02 14:46 Michael Palimaka
2017-06-30 7:29 Sergei Trofimovich
2017-05-06 5:55 Michael Orlitzky
2017-01-19 10:40 Aaron Bauman
2017-01-14 12:47 Jeroen Roovers
2016-12-02 14:21 Tobias Klausmann
2016-12-01 12:53 Agostino Sarubbo
2016-12-01 12:51 Agostino Sarubbo
2016-06-02 7:34 Andrew Savchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1610986857.b2bc8bae175d3f227a459509b0cdbc6401ab8dc9.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox