gentoo resync : 18.11.2018

3 files changed, 32 insertions, 26 deletions

diff --git a/dev-libs/libnsutils/Manifest b/dev-libs/libnsutils/Manifest
index 6866f9ba2e72..e808bb469036 100644
--- a/dev-libs/libnsutils/Manifest
+++ b/dev-libs/libnsutils/Manifest
@@ -1,4 +1,3 @@
 DIST libnsutils-0.0.5-src.tar.gz 7653 BLAKE2B 4f7810f436f5ffd33084bc67095f3cb48a7744ef6f9ab0d632cd7b87467ff8bca54809de5a8ea837a00429c951d4e701909bd5f185e1c600a7323393017596cb SHA512 b9611db39adf11aa4e29387614bf55e241c075a223c687f5520e5b6808cc392c847be1a1d74559928e385a93886c4a67158504342384a1b200cf9ce13c00db50
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libnsutils-0.0.5.ebuild 450 BLAKE2B 1e12f4ec6a27013cb85915277c30a5e2efd491bc37198d49302ac3582d9d53e4bd3f1beee776c52f711b706ad802fd1270378dc5ef64b1d46c0755f5800d2004 SHA512 a56aa01b66ccbbbf5e7ce44b852ce3745d8cf6cb6380743be0ccf9a00979506dc9fc159b29cec15e005038fada27888db583f6d6356ec840951f45fe659d1c3b
+EBUILD libnsutils-0.0.5-r1.ebuild 650 BLAKE2B 4ef8570d9b12b473d9dfb0128763ec91f44f866599838ff710c23c4f085f3ede6de55d5e2a85fe70ad0e2961ac88fa97504498dd60a8a2c1e6ef2fb293b80643 SHA512 47418aefc8f01a7243e27126cb43bb8ffb48a8ab271f462f9c5ce543b561b09f2f06f7a7021d611f35669bd83dfed45fce21b7bbef74f3eb13550c46f0b0ed0e
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libnsutils/libnsutils-0.0.5-r1.ebuild b/dev-libs/libnsutils/libnsutils-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..3d5b760770bb
--- /dev/null
+++ b/dev-libs/libnsutils/libnsutils-0.0.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="base64 and time library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc"
+IUSE=""
+
+DEPEND="dev-util/netsurf-buildsystem"
+
+_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/libnsutils/libnsutils-0.0.5.ebuild b/dev-libs/libnsutils/libnsutils-0.0.5.ebuild
deleted file mode 100644
index a984dac5bcef..000000000000
--- a/dev-libs/libnsutils/libnsutils-0.0.5.ebuild
+++ /dev/null
@@ -1,24 +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="base64 and time library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}