gentoo resync : 22.01.2021

4 files changed, 68 insertions, 5 deletions

diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index a287a6dab1aa..9f1d50a74104 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,5 @@
 DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
-EBUILD htmldoc-1.8.30.ebuild 1117 BLAKE2B e2541de911f24741b3456f02fe4af773e8c918fc3125d2be67276baa2715be6b0d59b6c0e2d4e1714474e0f24755e3b645515dcfaeedd7d90e152a2cdfac346f SHA512 e901762a07d850837ed43f80986d4e63fc724de5f973b71cf10e231e1a462cea693995016e17432a93b9a5767264dd37690b1701a3159d969d71e8f986453e8f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
+EBUILD htmldoc-1.8.30.ebuild 1111 BLAKE2B a5b0b23b01e65a7e525a7d2a078728d4a6e08f0c16659724c3a05d82c64a78261b90b82b14f4704b13745d324589311c28215a0bb982b52698a61c46c9e5e336 SHA512 809df0ddefdbd700eb51e7d23a81b24390f497a7592bd93b737ffd41416ae317ae6d5b3d1e83c29f0ebb667af49188037d87f98c1e7987e440751589080ae7b4
+EBUILD htmldoc-1.9.11-r1.ebuild 1380 BLAKE2B 79e277f05ef278ae821f7539d6fa34d976913e11050a19977c5246b83bbdaa6b845db1c9be80213aac2ff5e00ec7d84ef51d5729b9a33727e34f763972b45a21 SHA512 41f78a9c16e5325ab896d085abc2e6b290252ff0be9f5d96fa559743db3dff7dfb734c21260997aeb9dbb8b2495573a05ded4d6a273ef3f5bbeaff7b025bc6d1
+MISC metadata.xml 253 BLAKE2B 866785a39539e5da350fc5ce3c2039b8e906bb106c7eab83df24a7a66f576e530ade48e9d63e1115ff5cb55617da9bb615f164ffc46f5f16bb93055419d4229e SHA512 cc9791ffe80b6f6064de254903f73d298247a57455a3031fc089abdf5a291a0546e6d8f64fb7886ce5d543af487971149ccf68092a8418e25ed58feece9fc033
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 61956c4652b9..cbff036765a3 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs xdg
 
 DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
 SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
 IUSE="fltk"
 SLOT="0"
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
new file mode 100644
index 000000000000..0ae71c6d5922
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs xdg
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
+
+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}"
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Make sure not to use the libs htmldoc ships with
+	rm -r jpeg png zlib || die "failed to unbundle jpeg, png, and zlib"
+
+	# Fix the documentation path in a few places. Some Makefiles aren't
+	# autotoolized =(
+	for file in configure doc/Makefile doc/htmldoc.man; do
+		sed -i "${file}" \
+			-e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+		|| die "failed to fix documentation path in ${file}"
+	done
+}
+
+src_configure() {
+	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() {
+	emake STRIPPROG="true" DSTROOT="${ED}" install
+}
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
index 6f49eba8f496..f6208173d9c3 100644
--- a/app-text/htmldoc/metadata.xml
+++ b/app-text/htmldoc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">michaelrsweet/htmldoc</remote-id>
+	</upstream>
 </pkgmetadata>