Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 712358 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-28 / +49 lines)
Lines 4-5 Link Here
4
EAPI=6
4
EAPI=7
5
inherit toolchain-funcs xdg-utils
5
inherit autotools toolchain-funcs xdg-utils
6
--
Line 8 Link Here
8
HOMEPAGE="https://www.msweet.org/htmldoc/index.html"
8
HOMEPAGE="https://www.msweet.org/htmldoc/ https://github.com/michaelrsweet/htmldoc"
9
--
Line 10 Link Here
10
IUSE="fltk ssl"
10
IUSE="fltk gnutls ssl"
11
--
Line 13 Link Here
13
KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
13
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
14
--
Line 21 Link Here
21
	ssl? ( net-libs/gnutls )
21
	gnutls? ( net-libs/gnutls )
22
--
Line 24 Link Here
24
	ssl? ( virtual/pkgconfig )"
24
	gnutls? ( virtual/pkgconfig )"
25
--
25
26
# NOTE: configure.ac already includes a test for dev-libs/libgcrypt,
27
#       it may become a replacement for net-libs/gnutls in the future.
28
#
29
#       ssl? ( || ( gnutls gcrypt ) )
30
#       gnutls? ( !gcrypt )
31
#       gcrypt? ( !gnutls )
32
#       gnutls? ( ssl )
33
#       gcrypt? ( ssl )
34
REQUIRED_USE="
35
	ssl? ( gnutls )
36
	gnutls? ( ssl )
37
"
Line 28 Link Here
28
	"${FILESDIR}/$P-desktop.patch"
41
	"${FILESDIR}/${PN}-1.9.8-desktop.patch"
29
--
Line 31 Link Here
31
	"${FILESDIR}/$P-makeflags.patch"
44
	"${FILESDIR}/${PN}-1.9.8-makeflags.patch"
32
--
Line 37 Link Here
37
	# make sure not to use the libs htmldoc ships with
50
	# Make sure not to use the libs htmldoc ships with. Even when,
38
--
51
	# respectively, --disable-localjpeg, --disable-localpng, and
52
	# --disable-localzlib are given, configure searches for local
53
	# libraries when they are not found on the system. By removing
54
	# them, we force an error if they are not alredy installed.
Lines 41-42 Link Here
41
	# autotoolized =(
58
	# autotoolized =( Also, config.h.in should be created by autoheader,
42
	for file in configure doc/Makefile doc/htmldoc.man; do
59
	# but is is not right now; configure creates config.h directly, and
43
--
60
	# patching config.h.in isn't required, we do it anyway as remainder.
61
	for file in configure.ac config.h.in doc/*; do
Line 51 Link Here
70
71
	sed -i 's#INSTALL_STRIP="-s"#INSTALL_STRIP=""#' configure.ac || \
72
		die "Cannot remove the \"strip\" flag (-s) from configure.ac"
73
74
	eautoreconf
Lines 54-56 Link Here
54
	CC=$(tc-getCC) CXX=$(tc-getCXX)	DSTROOT="${D}" econf \
78
	# NOTE: --enable-cdsassl is for Darwin only.
55
		$(use_with fltk gui) \
79
	CC=$(tc-getCC) \
56
		$(use_enable ssl) $(use_enable ssl gnutls)
80
	CXX=$(tc-getCXX) \
57
--
81
	DSTROOT="${D}" \
82
	econf \
83
		$(use_enable ssl) \
84
		$(use_enable gnutls) \
85
		--disable-cdsassl \
86
		--disable-localjpeg \
87
		--disable-localzlib \
88
		--disable-localpng \
89
		$(use_with fltk gui)
Line 60 Link Here
60
	emake DSTROOT="${D}" STRIPPROG="/bin/true" install
93
	emake DSTROOT="${D}" install
61
--

Return to bug 712358