gentoo resync : 21.06.2020

3 files changed, 16 insertions, 50 deletions

diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 3ccc47699440..cff556a86fef 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,9 +1,5 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
-DIST libhubbub-0.3.3-src.tar.gz 783945 BLAKE2B 826b089708dea8a88a522f9889f81e420feb6c616ef7ad826303eca3ab39d4940cbc8bcbfcf61c979dc488d77b4d32fb24c0602b73ed28ea4e8076f369c93388 SHA512 28a5668257eda8cf1ca0395505522eb0f847a4cceee46de067fcfb171baa114876156a7e2671fff93602b2de63c640095e1a940e4725afb24bd14b4fd5f64526
-DIST libhubbub-0.3.5-src.tar.gz 784526 BLAKE2B a7ba1be85ab01761894a1f2904fbcfbada0280c06ad0834288366f9ce42407a61978bbd775367cc064e367ad78bc792db66ad0e034ae6903c8ad5b44a1fc4d08 SHA512 57feb6ae74381e6b2c5c8a82aef7bcc5faf4a8303e41e39f4ba081a198c6f1225ec9952734ec97f20ba1b4fa3830543e43f4c2d2715b7a8467c19224a968073b
 DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libhubbub-0.3.3.ebuild 813 BLAKE2B 50d1b0f9d5a81647359ad8c0c43cfd1752fe70ebd4663f6d33122b23061ed72a6cb563eaedb42a01b0ff2a925da2f305b29892917ea78c09a4465712ff99cb76 SHA512 e73c622d5df44f6447bf9bb499a0bb513c9156b40f67ba04fa2a08f0aa1c36c333cec9d2454de35d3d0d3620bfb5aa27c51e9974e1f7f00b440a1674aed42f64
-EBUILD libhubbub-0.3.5-r1.ebuild 1140 BLAKE2B 4c92376ec7450896597e8b582ede11da5ca8ab72590741404b3c79f5fbcbc55b72a8371c0a4e18400185cf79c0799a9fb1cc9dd986366f01b5085de15c20e010 SHA512 fdada0957a19b27dd8b76c807f7308db5976f09f81e026d5bc1df83749abf969121c6c1dfa690b9fe5ffc524e47e13d97b05aecb933710855221474056cafb63
+EBUILD libhubbub-0.3.6-r1.ebuild 1261 BLAKE2B d87a370618d95268d7b3dc9b5c02dddfb580ee8b5ac3aa925bef47dcaeb3117778e8be6a322a349ed35206102c5c4a9c91b0f0f406583eb84f60f04912ce3b4e SHA512 ef93f90d5f1fb78bee0b891fc9e9516f8313ee669205b75aa92d9c2aef23641f764c608826fdb393869bc1a964d06609b0f902448affe826637f5b71ae1d418e
 EBUILD libhubbub-0.3.6.ebuild 1184 BLAKE2B 46be9c562a28e3ee7f93a54b108a745fdfe8ebdee68c1927a810a0016b8f68c2acae92b27953abee7251cc274c3d8513139e2faabb475b983d8d49f805963505 SHA512 bd94104437b4b4799115d15e2b36c3684c235773bc3bbd2b8b4fed74fc9ef987e0510a51e860ebbe99c292c2c54ceb2f7476e2ae4681299a7954540166f6288e
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libhubbub/libhubbub-0.3.3.ebuild b/net-libs/libhubbub/libhubbub-0.3.3.ebuild
deleted file mode 100644
index 7c1047c179c8..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~ppc x86 ~m68k-mint"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	!net-libs/hubbub"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-lang/perl
-		>=dev-libs/json-c-0.10-r1[${MULTILIB_USEDEP}] )"
-
-DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
-
-src_prepare() {
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-
-	netsurf_src_prepare
-}
diff --git a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
index 1ac38dd958a4..758a9a08d909 100644
--- a/net-libs/libhubbub/libhubbub-0.3.5-r1.ebuild
+++ b/net-libs/libhubbub/libhubbub-0.3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,27 +6,26 @@ EAPI=7
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="HTML5 compliant parsing library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/"
+HOMEPAGE="https://www.netsurf-browser.org/projects/hubbub/"
 SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~m68k-mint"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~m68k-mint"
 IUSE="doc test"
-RESTRICT="!test? ( test )"
 
-RDEPEND="
-	>=dev-libs/libparserutils-0.2.1-r1
-	!net-libs/hubbub"
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-util/netsurf-buildsystem
 	virtual/pkgconfig
-	test? (
-		dev-lang/perl
-		<dev-libs/json-c-0.13
-	)"
+	test? ( dev-lang/perl )
+"
+RDEPEND="dev-libs/libparserutils:="
+DEPEND="${RDEPEND}
+	test? ( dev-libs/json-c )"
+RESTRICT="!test? ( test )"
 
 DOCS=( README docs/{Architecture,Macros,Todo,Treebuilder,Updated} )
+PATCHES=( "${FILESDIR}/libhubbub-0.3.6-json-c.patch" )
 
 src_prepare() {
 	default
@@ -43,6 +42,7 @@ _emake() {
 
 src_compile() {
 	_emake
+	use doc && _emake docs
 }
 
 src_test() {
@@ -50,5 +50,7 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
+	use doc && HTML_DOCS=( docs/html/. )
+	einstalldocs
 }