[patch] diff htmldoc-1.9.8.ebuild htmldoc-1.9.10.ebuild

htmldoc-1.9.8-to-1.9.10.ebuild.diff (text/plain), 2.54 KB, created by mehw on 2020-11-22 06:15:30 UTC

4,5c4,5
< EAPI=6
< inherit toolchain-funcs xdg-utils
---
> EAPI=7
> inherit autotools toolchain-funcs xdg-utils
8c8
< HOMEPAGE="https://www.msweet.org/htmldoc/index.html"
---
> HOMEPAGE="https://www.msweet.org/htmldoc/ https://github.com/michaelrsweet/htmldoc"
10c10
< IUSE="fltk ssl"
---
> IUSE="fltk gnutls ssl"
13c13
< KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
---
> KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
21c21
< 	ssl? ( net-libs/gnutls )
---
> 	gnutls? ( net-libs/gnutls )
24c24,37
< 	ssl? ( virtual/pkgconfig )"
---
> 	gnutls? ( virtual/pkgconfig )"
> 
> # NOTE: configure.ac already includes a test for dev-libs/libgcrypt,
> #       it may become a replacement for net-libs/gnutls in the future.
> #
> #       ssl? ( || ( gnutls gcrypt ) )
> #       gnutls? ( !gcrypt )
> #       gcrypt? ( !gnutls )
> #       gnutls? ( ssl )
> #       gcrypt? ( ssl )
> REQUIRED_USE="
> 	ssl? ( gnutls )
> 	gnutls? ( ssl )
> "
28c41
< 	"${FILESDIR}/$P-desktop.patch"
---
> 	"${FILESDIR}/${PN}-1.9.8-desktop.patch"
31c44
< 	"${FILESDIR}/$P-makeflags.patch"
---
> 	"${FILESDIR}/${PN}-1.9.8-makeflags.patch"
37c50,54
< 	# make sure not to use the libs htmldoc ships with
---
> 	# Make sure not to use the libs htmldoc ships with. Even when,
> 	# respectively, --disable-localjpeg, --disable-localpng, and
> 	# --disable-localzlib are given, configure searches for local
> 	# libraries when they are not found on the system. By removing
> 	# them, we force an error if they are not alredy installed.
41,42c58,61
< 	# autotoolized =(
< 	for file in configure doc/Makefile doc/htmldoc.man; do
---
> 	# autotoolized =( Also, config.h.in should be created by autoheader,
> 	# but is is not right now; configure creates config.h directly, and
> 	# patching config.h.in isn't required, we do it anyway as remainder.
> 	for file in configure.ac config.h.in doc/*; do
50a70,74
> 
> 	sed -i 's#INSTALL_STRIP="-s"#INSTALL_STRIP=""#' configure.ac || \
> 		die "Cannot remove the \"strip\" flag (-s) from configure.ac"
> 
> 	eautoreconf
54,56c78,89
< 	CC=$(tc-getCC) CXX=$(tc-getCXX)	DSTROOT="${D}" econf \
< 		$(use_with fltk gui) \
< 		$(use_enable ssl) $(use_enable ssl gnutls)
---
> 	# NOTE: --enable-cdsassl is for Darwin only.
> 	CC=$(tc-getCC) \
> 	CXX=$(tc-getCXX) \
> 	DSTROOT="${D}" \
> 	econf \
> 		$(use_enable ssl) \
> 		$(use_enable gnutls) \
> 		--disable-cdsassl \
> 		--disable-localjpeg \
> 		--disable-localzlib \
> 		--disable-localpng \
> 		$(use_with fltk gui)
60c93
< 	emake DSTROOT="${D}" STRIPPROG="/bin/true" install
---
> 	emake DSTROOT="${D}" install