gentoo resync : 22.10.2018

4 files changed, 21 insertions, 52 deletions

diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index a2731c543f4b..803eb0a57e7f 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,6 +1,4 @@
-DIST libdom-0.3.1-src.tar.gz 868959 BLAKE2B f132723aa9387b44cf2b07285eabb2f831103125a696a2a9d4a73275ea555663b26534b25f31f4da8211d6b70b2f4739d61934d8e9b33b3150d442c15249f538 SHA512 a7acd64a99145483274a44bd47af16474eadab5e6cf46847c61775c8d9fc03aa8cb4ad21fa63377b8c758c9556c140d626a2c3b2be31072fb5afdc2cee589e0c
-DIST libdom-0.3.2-src.tar.gz 869599 BLAKE2B 9a7a9cae1604624884be331e7d9ee578ffaa90a1fe4a29c97ef8f68e5ce40156ae87ad1345074b752a07298f8921955d786407d17d5d1dd612ec382e7daef72d SHA512 dd7a9e17539b0ac6088f6c395133296e2b200a5c6d342c8dd837e71d62826fa77cecf9b716e53102bd90b03c4653689c89e72683057dab0d62a530e940d6b6b3
-DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-EBUILD libdom-0.3.1.ebuild 1066 BLAKE2B 6a26b9cdd7b5ec0b818f8fe62556e023d6e0e38418ab06b9c53614611c13a534e429caa026134bb89969812f54dca6dff4a08c316478df9b11772c84bc19706d SHA512 ca234dbc7f51c92e2877a693b1bb713984f98032b85f664a522ea64e5047690814d528ada14433352ec7e8f730f7f6f1451cafb5fa455aeda5920ab30c74f476
-EBUILD libdom-0.3.2.ebuild 1066 BLAKE2B 6a26b9cdd7b5ec0b818f8fe62556e023d6e0e38418ab06b9c53614611c13a534e429caa026134bb89969812f54dca6dff4a08c316478df9b11772c84bc19706d SHA512 ca234dbc7f51c92e2877a693b1bb713984f98032b85f664a522ea64e5047690814d528ada14433352ec7e8f730f7f6f1451cafb5fa455aeda5920ab30c74f476
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
+DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
+EBUILD libdom-0.3.3.ebuild 1154 BLAKE2B 97f611afccded19c7292e00a39187662116fac41740a7ce5d8afdfb2b92b33e7d412f5ad7eed97d15b83e0e3b46889cdf566017d8bf724c24479a6f4ee064ad4 SHA512 2719a5b91644a7ff0628cfbeb3a9c63e627db62e19a717f308e8b704f04179b8481fe973e2e7168b92113d44f2494717c96493622f9ef7f02a67ca4d4cb20313
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/net-libs/libdom/libdom-0.3.2.ebuild b/net-libs/libdom/libdom-0.3.2.ebuild
deleted file mode 100644
index 460b2a411916..000000000000
--- a/net-libs/libdom/libdom-0.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-NETSURF_BUILDSYSTEM=buildsystem-1.5
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="expat test xml"
-
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.3.0[static-libs?,${MULTILIB_USEDEP}]
-	>=net-libs/libhubbub-0.3.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	xml? (
-		expat? ( >=dev-libs/expat-2.1.0-r3[static-libs?,${MULTILIB_USEDEP}] )
-		!expat? ( >=dev-libs/libxml2-2.9.1-r4[static-libs?,${MULTILIB_USEDEP}] )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-perl/XML-XPath
-		dev-perl/libxml-perl
-		dev-perl/Switch )"
-
-REQUIRED_USE="test? ( xml )"
-
-src_configure() {
-	netsurf_src_configure
-
-	netsurf_makeconf+=(
-		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no)
-		WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no)
-	)
-}
diff --git a/net-libs/libdom/libdom-0.3.1.ebuild b/net-libs/libdom/libdom-0.3.3.ebuild
index 460b2a411916..d245b9d4989f 100644
--- a/net-libs/libdom/libdom-0.3.1.ebuild
+++ b/net-libs/libdom/libdom-0.3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-NETSURF_BUILDSYSTEM=buildsystem-1.5
+NETSURF_BUILDSYSTEM=buildsystem-1.7
 inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
@@ -29,6 +29,12 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="test? ( xml )"
 
+src_prepare() {
+	# working around broken netsurf eclass
+	default
+	multilib_copy_sources
+}
+
 src_configure() {
 	netsurf_src_configure
 
diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/net-libs/libdom/metadata.xml
+++ b/net-libs/libdom/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>