gentoo resync : 29.01.2021

3 files changed, 2 insertions, 48 deletions

diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 9f1d50a74104..501673f91237 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,5 +1,3 @@
-DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
 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
+EBUILD htmldoc-1.9.11-r1.ebuild 1376 BLAKE2B b09aefd7605db06c5b429d2cb68ca9192c50ad2880c7fe07f7e307a1a7ae67489bf26a0e809b5ca3396b2968f8a69f265656c5eb1718811754e815abe93bdee7 SHA512 1c678bdcbd3e222caa8bb925365adc06ae237638d70b37a34243e286dab248951fd5ecdf4942bee62332a049241d089717de28d0e9b4e02e88343e2e18c0b3a9
 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
deleted file mode 100644
index cbff036765a3..000000000000
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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"
-IUSE="fltk"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND=">=media-libs/libpng-1.4:0=
-	virtual/jpeg:0
-	fltk? ( x11-libs/fltk:1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# 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() {
-	CC=$(tc-getCC) CXX=$(tc-getCXX)	DSTROOT="${D}" econf $(use_with fltk gui)
-}
-
-src_install() {
-	emake DSTROOT="${D}" install
-}
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
index 0ae71c6d5922..f34baa19af19 100644
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="fltk ssl"
 
 BDEPEND="virtual/pkgconfig"