gentoo resync : 25.08.2020

4 files changed, 10 insertions, 13 deletions

diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index ce66c2fe477c..e10584463ae2 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,7 +1,7 @@
 DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
 DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
 DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
-EBUILD libnspsl-0.1.3-r1.ebuild 726 BLAKE2B d476ae693c24bd71b289cf13e5494850b24b35c6ee1e206b1b2eaf6525f4fab352fc8cc8edcd2d62d1a6c5903879761751dc8b84e109949f72d3fd8d026cde43 SHA512 eaa00f9e818a32a56c31f48232ebfb9d2b1a6bd9657fe4d2fcbd1a8d913663bfd4121c94b2cacf2de099470ddf08114d4743edb2b5ce382392275472b036a270
-EBUILD libnspsl-0.1.5.ebuild 727 BLAKE2B 88c017e94018428786e302321a864cc5ae1cb02080dfd297d36ab4145de976e0d536c8ebc0b3d0094ea24792791694c59a8c5a3303f99f203354cb676c83cbd9 SHA512 fc4237d96028eebf1d80254c57a319ec23bc74fd6111c21640df0e07a773182dc38232e891d48a6e447d452bbd35556c1793eabea7bd636d4144ac66df7bfb20
-EBUILD libnspsl-0.1.6.ebuild 702 BLAKE2B cd926de85f162e1f3e5fbb4bd4c8f1f18adc288b427e3a45e277770d6a4e99b887e4506e8bd1852ea735548a053638714e7b057da86645f0cc4bac313e3fba73 SHA512 27efb4329cdf769bc847fd1ce680845ce1e53c1762b5bde84f135aebbfdbddebba803da2d89bdac6c77206439c722cb7fde443a6213b8807b7b8495804c8d2ad
+EBUILD libnspsl-0.1.3-r2.ebuild 660 BLAKE2B 1c61886e5bfd90cb9eddccbe6a283f498da984330b3a4aad26e86ccc0115ffeb2d6293aafb940a6e4cdc6784261bd604d2427a1b3153140227b941eda7f48b33 SHA512 1c7378c13da02fdc15e202ae6bde0e3bcef55fe6dcd1914380daf74c6a5fd3d1974957588aae82100ca83ed0d2db5832e3aab40ddfbe9daccc89463996b112ea
+EBUILD libnspsl-0.1.5-r1.ebuild 661 BLAKE2B d25718b28467c756d00dc011204af06cf614018a4039d90ef277cc3c3d33e2890ea14a5eb5a3482027f3cbbf2caa2170dc418eafbd01820aecb6efd06640fda8 SHA512 5119a462a08efb130423b14cbac976fa87fa9da403467d9581c609a96f1f91242fe86673c1de5e4ec1552a59cfaf389ba8c2404cb7a7f1f4e0b7209a94a9de76
+EBUILD libnspsl-0.1.6-r1.ebuild 637 BLAKE2B a7da2993a5d76c99f7dc143f9160cd234ef88b6d0f743bfb4034a78f59e335d91d5b064b6d27e03b77ac02d72308cb3eb2988b4553bacabe4890a563b77269aa SHA512 0513d7610641efc165fcc7e8c48ee78068fddc04d0f376f21df65aae00389ef653717d02ddcaea0ba6a639eaa9d2454995a9a70495a18c3aca87afa5c1d9a01a
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
index ce2346f93d91..2d2bcaa165a1 100644
--- a/media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.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="decoding library for BMP and ICO image file formats, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/"
@@ -19,7 +19,6 @@ DEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -29,5 +28,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libnspsl/libnspsl-0.1.5.ebuild b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
index c7c011b72c72..01b50983133a 100644
--- a/media-libs/libnspsl/libnspsl-0.1.5.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.5-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="decoding library for BMP and ICO image file formats, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/"
@@ -19,7 +19,6 @@ BDEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -29,5 +28,5 @@ src_compile() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/media-libs/libnspsl/libnspsl-0.1.6.ebuild b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
index aa9ede7b9c22..c6381ffa9d9b 100644
--- a/media-libs/libnspsl/libnspsl-0.1.6.ebuild
+++ b/media-libs/libnspsl/libnspsl-0.1.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="C library for decoding BMP and ICO images"
 HOMEPAGE="http://www.netsurf-browser.org/projects/"
@@ -19,7 +19,6 @@ BDEPEND="
 	virtual/pkgconfig"
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }