gentoo resync : 25.08.2020

4 files changed, 10 insertions, 13 deletions

diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index f6d62ec18ab5..d2199ed61db7 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,7 +1,7 @@
 DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
 DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
 DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
-EBUILD libdom-0.3.3-r1.ebuild 1219 BLAKE2B ee68ac1d36b1ab0949c4cde6b48f2401295a0511ee1a5cb3290a3e4dc6e9fdff9b0b046fbff6baac0716b62331fe43dd36864d555aa72a7083c0cca6deff45a8 SHA512 5866280d5f86a4ccfa9484093c32850476ebabc9c945902c398813e23869ee1f9291f07df48d5aa9ca57df1ff43053cfc0685ea9f9183b58cb60615a929d665b
-EBUILD libdom-0.4.0.ebuild 1201 BLAKE2B 1f326a228e12011d1a0bbb73b1f98dbe5a5728fe2cb7b5284151d07318c4da23e5964442f58d734f83d57bf223e8b18c3d6ee4efac1da275e43a8415529fb759 SHA512 477fdd247ba7a130992a0735c4a40a5c3a6baeb6d6880a3a82886ff9937b2fa561ae7dde3d95b7a54f245c917289d35c8ae6924565684f51b2bf82ca1a895abc
-EBUILD libdom-0.4.1.ebuild 1200 BLAKE2B f22cc4bba353a01f67c821d7cd0e0d2d82967aae2d2e5db4afec42823cd50d607ded0463597a619a02c6e447fc4e564e55b07239f0dd678f6932cec2feea571f SHA512 1b5ffc5789981f645c6850eb41ca22e3e49a5e7ed35e3bbea15f82d5b4f1d16f33dc15a890135059ba18fe86cb7880f5b591dbc2c04f57a2345fbe9ef92d4bad
+EBUILD libdom-0.3.3-r2.ebuild 1153 BLAKE2B 338308141873ed746da80039ef2d660440d5dd659b81ff3a749ad2332ec97500127d010e2c08dbb17518b08a2e87c967db3b9787185c761c5f7c63622168b339 SHA512 95fc72e00db9a7080847b3d5d9e56010756886c23ce4c0ece6dbeb33a35a94d261f3997913fb2ea9a4160ca6b8ad4070e2026baf4cbfdf1dc77a5e2d92bf31f9
+EBUILD libdom-0.4.0-r1.ebuild 1135 BLAKE2B d17f7e0a23a14782e2bd976b05b986ec1026461e9da8ab2130f186894daae94af3bada800ecbef521b5214a831348257681c41ef3f2e8626bfe369f2a089d086 SHA512 0a997f0b3dc5aa1e0880f9228be24db7fc502d51d2f7e9d375001e5c1e4c6eaa416f8694e11f59947bf95100b023dea8db77d07968b67ba25aad2e301cc8ef10
+EBUILD libdom-0.4.1-r1.ebuild 1135 BLAKE2B d17f7e0a23a14782e2bd976b05b986ec1026461e9da8ab2130f186894daae94af3bada800ecbef521b5214a831348257681c41ef3f2e8626bfe369f2a089d086 SHA512 0a997f0b3dc5aa1e0880f9228be24db7fc502d51d2f7e9d375001e5c1e4c6eaa416f8694e11f59947bf95100b023dea8db77d07968b67ba25aad2e301cc8ef10
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-libs/libdom/libdom-0.3.3-r1.ebuild b/net-libs/libdom/libdom-0.3.3-r2.ebuild
index 1a6947896f96..b5e782a5b834 100644
--- a/net-libs/libdom/libdom-0.3.3-r1.ebuild
+++ b/net-libs/libdom/libdom-0.3.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="test? ( xml )"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
@@ -52,5 +51,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/net-libs/libdom/libdom-0.4.1.ebuild b/net-libs/libdom/libdom-0.4.0-r1.ebuild
index cdf28536a5dc..d5902a58630c 100644
--- a/net-libs/libdom/libdom-0.4.1.ebuild
+++ b/net-libs/libdom/libdom-0.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
@@ -37,7 +37,6 @@ BDEPEND="
 REQUIRED_USE="test? ( xml )"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
diff --git a/net-libs/libdom/libdom-0.4.0.ebuild b/net-libs/libdom/libdom-0.4.1-r1.ebuild
index e9cb215757f4..d5902a58630c 100644
--- a/net-libs/libdom/libdom-0.4.0.ebuild
+++ b/net-libs/libdom/libdom-0.4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="implementation of the W3C DOM, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
@@ -37,7 +37,6 @@ BDEPEND="
 REQUIRED_USE="test? ( xml )"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
 		WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
@@ -54,5 +53,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }