4 files changed, 10 insertions, 13 deletions
diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index f6053ada946e..3d78ffcca306 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -2,7 +2,7 @@ AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
 DIST libwapcaplet-0.4.2-src.tar.gz 31492 BLAKE2B 1c3b74a15fddf895ac63c15302737915fcbff89d83e990d779d2874778d00c3ec453a7bf0e362f942216c68a3e006c6318ace83164c49cafede73af1ae7a2808 SHA512 296a5f4471366b58089632c10943c0a1c1da8bd3b54231f2204b1159052b5bd5f45769fb2e12e438a29bf39aeea9719773d0b38fbf40fce193c2fb4f0f70ab09
 DIST libwapcaplet-0.4.3-src.tar.gz 31766 BLAKE2B 7a51b27911192b0697d6eebe9e98abf720a76daa0e0ce0eb6148186e21e36d3b1853d3b24c8fa325ecaa4ed69d8262a9282ef77ba028d316dd16a225a6766d64 SHA512 b4cc8b0dac86c87b1806acfcf5c4734955eb797cb04ea67f764bae32fdecfd3ee4d8ad0f2f3f0a1813c9684b7120dbb97ecf11f29de0d60a7bd45d96c1a451cb
-EBUILD libwapcaplet-0.4.1-r1.ebuild 867 BLAKE2B 98fb4ed30894cf7d52563e632a391d432351e2094dc9b06e8463a5a9205ec7c20caed14c27a2b114f7fb3ce25cb4470154dffe9cc11eb2293994520c2ced9b6e SHA512 15b7ba560f2c305eb77616bf7f16ac6c9d55d5e520e4ba9222723960cdc79b3a51ef8ac0341e782fd56d0289597576e9b885232357dba021dd2db7ab8e536b91
-EBUILD libwapcaplet-0.4.2.ebuild 879 BLAKE2B 2ede4e264670db8f439b9670bc818cf7ec45d8c4d67cfe6e63832450c3f9dc618cec5fc1e32445dda8255704697e4d486295d606475634b8b2166f2fef7367b2 SHA512 7da40ed15625bc1de1a1d7fb56ac3cb1bd5759ee629e118d9b769466c9ecf1532a53ef7d8c9a62f908ab3a30051ea1bad8c945f40fb9b4ede5ffd73c9613f6fd
-EBUILD libwapcaplet-0.4.3.ebuild 878 BLAKE2B fe8f1ac79389d38d8447359187bab4f46963fafa629cb2eda5fc5a2f121564d211ad55fb31d1c4882b6395c4cd9c780918fe356be78c1bd68dc3750a09ae0a39 SHA512 72c0a0f0b04efe6aa9279f9d0e79b2ded5ed9101016cc9ab96696df84b2664b9806035c237c93800ecea65c7c05a960df4b9f077b6215b47c64fcb774015b8e6
+EBUILD libwapcaplet-0.4.1-r2.ebuild 801 BLAKE2B 1ef469d0b68d673ac0da023f6a5a70cc61aff43d17c7c7817ca51439ddb1c72ebd8ffae447352060626c2ef7df9405b8873331306bdf8390ffee17cddc2f5aa3 SHA512 04340ae18d8a0aeca656d17450614d52b867be13d1a07d0e3a2c96ea0ed3421fbdd7d3bc9c217d6ba76517a3a069102264fd2a041f5a1e156faa3ef5a2d76863
+EBUILD libwapcaplet-0.4.2-r1.ebuild 813 BLAKE2B 2a01407f8f0e41f694b78d286a0d4781c39c4651661dc2747f764fc8d92613878610f45031374ffe8f3c27658d3e892cf571e480de0f442ef573dc824f79d213 SHA512 68b123666f50cf309fe00ba5fdff3577868dba72413c71d63ad93f8ee9b087cc3c140ce1502e9d00529ebb5fea79574138afbaba849119dd38d44f77e2fbd571
+EBUILD libwapcaplet-0.4.3-r1.ebuild 813 BLAKE2B 2a01407f8f0e41f694b78d286a0d4781c39c4651661dc2747f764fc8d92613878610f45031374ffe8f3c27658d3e892cf571e480de0f442ef573dc824f79d213 SHA512 68b123666f50cf309fe00ba5fdff3577868dba72413c71d63ad93f8ee9b087cc3c140ce1502e9d00529ebb5fea79574138afbaba849119dd38d44f77e2fbd571
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r2.ebuild
index fbad93ecf82d..d553e7e2201b 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-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="string internment library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
@@ -25,7 +25,6 @@ PATCHES=(
 )
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -39,5 +38,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild
index 8b442d55ff3a..cb74894bb4bd 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.3.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit netsurf
 
 DESCRIPTION="string internment library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
@@ -27,7 +27,6 @@ PATCHES=(
 )
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
index 439cde67cbfc..cb74894bb4bd 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.2.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.3-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="string internment library, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
@@ -27,7 +27,6 @@ PATCHES=(
 )
 
 _emake() {
-	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
 	netsurf_define_makeconf
 	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
 }
@@ -41,5 +40,5 @@ src_test() {
 }
 
 src_install() {
-	_emake DESTDIR="${ED}" install
+	_emake DESTDIR="${D}" install
 }