gentoo resync : 18.11.2018

3 files changed, 43 insertions, 30 deletions

diff --git a/dev-libs/libwapcaplet/Manifest b/dev-libs/libwapcaplet/Manifest
index af4868f98e97..0a55d472eabd 100644
--- a/dev-libs/libwapcaplet/Manifest
+++ b/dev-libs/libwapcaplet/Manifest
@@ -1,5 +1,4 @@
 AUX libwapcaplet-0.4.1-makefile.patch 391 BLAKE2B 0536fdc5fd0e8bca72b0fc33198eba058cefc253d9e6ca112e2d7d0cdfb082a024c739e101eec03470319ce766694507d6d4ed2cd3b1810242c5313e8b3af5ad SHA512 62d0e6b7a5ec8c5e5c695933a886002bf81c5ac73e2f47917d9942932045cf66f5023eac039e21b8cf915a145dba2d3c12da4a85e9ae1a7340e522f36bdc3157
 DIST libwapcaplet-0.4.1-src.tar.gz 31448 BLAKE2B a686a357dc84135da902380de17b0f8415a682cdb258ea0a8f7899581d23f6fef3aa1600e2657aa728b5689a8fa31a3fe489a7ce8a339adf958c3c25f6151a04 SHA512 49efb958ee79e932916a956844970780723cc71b4b2e5f442507566b2d632cc17c67d984018b48ae31a9bd7d92797766e39110dec02937b45ead26523e8cc2e1
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libwapcaplet-0.4.1.ebuild 590 BLAKE2B 7fc9397fd01c7ea2a3b2edfc8eeb65e08d1887341319b124d99f3f2601a4c1665078460057543869c100bdbbe77d88cb0b4fd3a85513f01de8d0d889bc9fdafb SHA512 bc9e8f242a7edf3ff2749f4712ca7707587958bedbe963f712f1bdcf943cb099826f484025e91b48a7ebd8dbadca6c0d87320262f6c9f2adfebcb72cdf1b260e
+EBUILD libwapcaplet-0.4.1-r1.ebuild 824 BLAKE2B 1798a009f4dd3f30873fe420097839ab80359531f69c9e6b9417c4826862fbc48427d8566a949651535f262c8f169f179a8cd9b44068cd073817b7dd189316bf SHA512 f8bc0540edd329f073012a9108761a34267da95986b7e6150b172a90c1d20a5adb8e39a84a7d2068a2a2ee4be1cbdc88f494f3aa94c12171a37e7938c5e76905
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..dd35cf940da6
--- /dev/null
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="string internment library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE="test"
+
+DEPEND="
+	dev-util/netsurf-buildsystem
+	test? ( >=dev-libs/check-0.9.11 )"
+
+PATCHES=(
+	# bug 664288
+	"${FILESDIR}/${PN}-0.4.1-makefile.patch"
+)
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
deleted file mode 100644
index 4e1c13da9b4d..000000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NETSURF_BUILDSYSTEM=buildsystem-1.7
-inherit netsurf
-
-DESCRIPTION="string internment library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE="test"
-
-DEPEND="test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
-	# bug 664288
-	"${FILESDIR}/${PN}-0.4.1-makefile.patch"
-)
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}