gentoo resync : 20.03.2021

4 files changed, 3 insertions, 116 deletions

diff --git a/net-libs/libhubbub/Manifest b/net-libs/libhubbub/Manifest
index 2fbad79323c4..f8d58796b08a 100644
--- a/net-libs/libhubbub/Manifest
+++ b/net-libs/libhubbub/Manifest
@@ -1,7 +1,4 @@
 AUX libhubbub-0.3.6-json-c.patch 860 BLAKE2B a70a81eb2e8a1c3c61f8990e80c000d7047dada87e6721e50309c0d81ee411dadd3840bce2c72dc019aa1c7804801eafa387aead11b820b203de901f1dd4253e SHA512 ecd28b596cbdd01029b299d0f378e85f854205abd7bfb592061576dde35195dcc84b37f7aafe5127f76fb22b633f9f4ba13ef7158c58a021067cb7502effbc14
-DIST libhubbub-0.3.6-src.tar.gz 784692 BLAKE2B a24b2c7b33849d6f4b25867f8b801d157f19257a055dd9a5a6c49de6c2fbd3f234f648d542b7938fab249e14bb6839997530c47b931379a94ab85ccd750b71e0 SHA512 6ccf9d9bbe8fc8de21570994c4a2f6f6c6943d2b00b8939d0ec9ec72cb3d653c40b58f509a1a81a5500fc8d3b4c49595aec509129bc993208b51b29486d0c14f
 DIST libhubbub-0.3.7-src.tar.gz 784780 BLAKE2B dd7bd85d3401d87c7bc72dad5d6d0439ab826cf97e76a29367a045215621cb66ff6e97f4028f552b7f395691087f53df077075dc65115a41a59eca476f73305d SHA512 d8ae4a8c4ded2c0e73902bfcf4d5d353154e27f236be0f6ea878cc2daed8a399378a4a9c2021f96106e1c822585b1daa09c9bd49c1551d3e87f37348865cfce1
-EBUILD libhubbub-0.3.6-r2.ebuild 1211 BLAKE2B b91a089735f061c872faf590e871073a2f6f8f2f25d9e1f12a33b61028137f32a6061b57258de0aa1927f644fa30e248edc1dcadaafc2aac52e51c18bca9be37 SHA512 3c810114105825733ae3f7a7bcc653ab42ec47d76988c431fd2710e838514ccdf96c061d5c7d976fc049fe223e229b244542bee70ce6b0708613397332fccf7b
-EBUILD libhubbub-0.3.6.ebuild 1171 BLAKE2B 4a56c42796cd81760dfe6e8086ba2a1f565af9902a52eca1be7456fde5e720da53c70c4e454e724bba285deedc25d58237c3824b78c1bc44ca6e93fef433cab1 SHA512 07d33b4f90767e16a5342a9921d1f14cc23f903f36d72891a6ee2c6f8ceb5932f7f5e9ef2da02ddf78dc6d56c5a2857509bb8e95b108a76542928d87ba57e047
 EBUILD libhubbub-0.3.7.ebuild 1206 BLAKE2B 011dd18bc170c5ca6a0cefc55143873edb274460a2744ae87b486e73bad11e2703ad963bf50e895bcbbfc5abbe43103261a0dd9dbeae4faa8bb758bd1ff46977 SHA512 b638f25b1057d6d645e8f54b7d3d57e122039aaca2cc271245b659cfb97b6625acc44d81816229f3ab7858129266911fa2d74b9cddf23638a4e1ad4e04348604
-MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
+MISC metadata.xml 387 BLAKE2B 68c4ddb99ffd1a19a850584a5e9affdcebf13cbdc2699dacd7462abebfa50183b1ab34a15e2763a4b64fd677e0339aff4a73d0d928d01269b6d818b54020df89 SHA512 7aff04737fac9b89f82c737ac35fc5edd128f405d3d1fb637b612452b8106e9ba5ef9fa112359c586799685905c07a61e0472a0a899a6fcde07c9e11e2eadfa6
diff --git a/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild b/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
deleted file mode 100644
index 7beafd98de26..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.6-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf flag-o-matic
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-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 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-BDEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	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
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-}
-
-_emake() {
-	netsurf_define_makeconf
-	append-cflags -Wno-error
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-	use doc && _emake docs
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-	use doc && HTML_DOCS=( docs/html/. )
-	einstalldocs
-}
diff --git a/net-libs/libhubbub/libhubbub-0.3.6.ebuild b/net-libs/libhubbub/libhubbub-0.3.6.ebuild
deleted file mode 100644
index d11754cb384d..000000000000
--- a/net-libs/libhubbub/libhubbub-0.3.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="HTML5 compliant parsing library, written in C"
-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 arm64 ppc ~ppc64 x86"
-IUSE="doc test"
-
-BDEPEND="
-	dev-util/netsurf-buildsystem
-	virtual/pkgconfig
-
-	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
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i test/tree2.c || die
-}
-
-_emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
-	netsurf_define_makeconf
-	append-cflags -Wno-error
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install
-}
diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 64b17e08bff5..d06f5db0340a 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>