gentoo resync : 25.08.2020

4 files changed, 10 insertions, 13 deletions

diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index 907336d5530e..3e93d0b2e227 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,7 +1,7 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
 DIST libcss-0.9.0-src.tar.gz 522267 BLAKE2B c104dd2cf859b908d68ac318d1da0430733b8813fbfbcb1f8f6a3d373e3a2ba1db6685542823fe0bef838619ec358f336f8eb07dc073a55a2f8c1907727295b9 SHA512 435dbca91aa2b91398dddbc1d9d035d104be193bb593907e3fff9320cc4f668f8aae54e0d5d0b7cd2ed9cb36fc02255fbe97bc9038b79fe505b581d6af1ded0d
 DIST libcss-0.9.1-src.tar.gz 522715 BLAKE2B 32206403f77997e6692eed00c9233e6f49f08efc2515901a8bef7590883e44ef320511368fe5a67968102911d849696a4419735c7f6691f0f272fcc3b9a000d8 SHA512 069b30e74ff03fc91666dd16f22a38effbb3e29f066fd0fbc09efdc26dd8678e3f31adeaf918c5596fb962c56335fb2ecdbde1aa6704fcbdec3c2f97d03e5bbe
-EBUILD libcss-0.8.0-r1.ebuild 1168 BLAKE2B d99b4f68d2f8d41a4e7bbd6b6f27477aa73f6c169da4233baabb979f9e241d42adb7844a64fb159fa6755b599db031b92321bf4376d766ab00686d73cc9b437b SHA512 ef75a38e7e7ee5b748153d6c293fe21a842c232d27ea5ae94d812f26b538f479d8d5ba79eec5e114b5c480c0a4ecb1f89094f3ccd1356bfb16c4ce143a954aa2
-EBUILD libcss-0.9.0.ebuild 1161 BLAKE2B b600f4767b8a0aafa73461cf9055e14e7622748d56dd1252b2e683c2f74908a58f4c89fa0e34be1981540b9eb591c038e90eb2379da8e3eb1966cbb66aaa3781 SHA512 1661619dfd405943e3f3b03fdfff39d96c79e5558e7b9f6d426aca1ac720c2df54654407240c0364610210285e20d7833bd41f47b81ec3717d8c7baf141d7bce
-EBUILD libcss-0.9.1.ebuild 1160 BLAKE2B d304fe46f6708bcf9c14992c8377753c518591f4c07686df81e52da752509e2b5b62dec063fa36ce91d304fbe55d596d8b298cb8f6180423b026b2db3e230bc8 SHA512 99d76d8a1448d53753d6501f5e9fefdb4ae0001de99d8b59776db8536d3456ec39242a6310d00cd62a1d6c3a8c30f8237f78394573c73c997db7d0ad99563ba5
+EBUILD libcss-0.8.0-r2.ebuild 1102 BLAKE2B d398d721d8b6fa481fe95e15afecbd1718c801356dc264b1dac4ce1ac2d2f20e47bf8def4f4537ffc3c30f0337975f3ea78b980d2fcb3b879e9c19d8f5b118a4 SHA512 ccb62c75f37dbf5d278ca4cf9f46375c4969831f7a3a0c133d66b7a3ace2475f8d4597c38845a991c0e71239f25c5cf162bad62d45a4b2bc1ab3d8b8f709a96f
+EBUILD libcss-0.9.0-r1.ebuild 1095 BLAKE2B 43432199078b9f7b5fca793ec25ff79c3b24800823d7b8d450bb08bb873a84744381f967bbc71db034bdcf859a425367c83c5be5c866ba8d2306e3a35d57aede SHA512 88ea117382adf65e1bab9b23f2a25caae2c96364ac576027233789cfcb77cd559b7fe6dd358e89aea490e8ba6c5b63cec0bb48a34c687258f129cc8a8252d1ca
+EBUILD libcss-0.9.1-r1.ebuild 1095 BLAKE2B 43432199078b9f7b5fca793ec25ff79c3b24800823d7b8d450bb08bb873a84744381f967bbc71db034bdcf859a425367c83c5be5c866ba8d2306e3a35d57aede SHA512 88ea117382adf65e1bab9b23f2a25caae2c96364ac576027233789cfcb77cd559b7fe6dd358e89aea490e8ba6c5b63cec0bb48a34c687258f129cc8a8252d1ca
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libcss/libcss-0.8.0-r1.ebuild b/dev-libs/libcss/libcss-0.8.0-r2.ebuild
index c90a2458ef4a..b388f262e7d5 100644
--- a/dev-libs/libcss/libcss-0.8.0-r1.ebuild
+++ b/dev-libs/libcss/libcss-0.8.0-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="CSS parser and selection engine, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
@@ -32,7 +32,6 @@ src_prepare() {
 }
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -46,5 +45,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/libcss/libcss-0.9.1.ebuild b/dev-libs/libcss/libcss-0.9.0-r1.ebuild
index decab3cc274c..03d454f91075 100644
--- a/dev-libs/libcss/libcss-0.9.1.ebuild
+++ b/dev-libs/libcss/libcss-0.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="CSS parser and selection engine, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
@@ -34,7 +34,6 @@ src_prepare() {
 }
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
diff --git a/dev-libs/libcss/libcss-0.9.0.ebuild b/dev-libs/libcss/libcss-0.9.1-r1.ebuild
index 5712c44a7e2f..03d454f91075 100644
--- a/dev-libs/libcss/libcss-0.9.0.ebuild
+++ b/dev-libs/libcss/libcss-0.9.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="CSS parser and selection engine, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
@@ -34,7 +34,6 @@ src_prepare() {
 }
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -48,5 +47,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }