3 files changed, 35 insertions, 30 deletions
diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest
index d62e2f9541e2..86596ab293b8 100644
--- a/dev-libs/libutf8proc/Manifest
+++ b/dev-libs/libutf8proc/Manifest
@@ -1,5 +1,4 @@
 AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b
 DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libutf8proc-2.2.0_p1.ebuild 620 BLAKE2B e4926d0a420ec2795d5ce3b7cc0151260c40bcb76fd2cb26bbe433f11c9e35d3fc1c3a3dcfee56595940fa2906dcd3395782ac5ec0c1c9ee992ba90de52eea9d SHA512 aafb3c0ecb9a4c4075ecb3d187545dd396d93b8afdbe11390623d8ac795c04732898626a648fdf80dfffe91be9991c85c1c3341e5890dc0c8606a34654ce7041
+EBUILD libutf8proc-2.2.0_p1-r1.ebuild 725 BLAKE2B d717b965640c71dc30c7c318ca7bbd0f15dacdc4c5ff8883ae0316fbbb52fd1319632eed75a0edb54bd4e424bb78b3fa3f08807ac6d3d91c43eb82ec746e479e SHA512 121136c2a39c0d4e77804ca9f46d82d6f1ff40df8e2f860cdf3b75a6af9eb99bbf5584744ae56fa70d3de5f4a2de82e24e4fce93842a53d5cd6e454efcf5cd7a
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
new file mode 100644
index 000000000000..bfc2a2dc1b40
--- /dev/null
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P="${P/_p/-}"
+DESCRIPTION="mapping tool for UTF-8 strings"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-util/netsurf-buildsystem"
+
+S="${WORKDIR}/${MY_P}"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.ebuild
deleted file mode 100644
index 003cd696a2f6..000000000000
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1.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="mapping tool for UTF-8 strings"
-HOMEPAGE="http://www.netsurf-browser.org/"
-SRC_URI="${NETSURF_BUILDSYSTEM_SRC_URI}
-	http://download.netsurf-browser.org/libs/releases/${P/_p/-}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P/_p/-}"
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}