gentoo resync : 18.11.2018

3 files changed, 34 insertions, 25 deletions

diff --git a/dev-libs/nsgenbind/Manifest b/dev-libs/nsgenbind/Manifest
index 4b171dedc8f5..b05a5e151b4d 100644
--- a/dev-libs/nsgenbind/Manifest
+++ b/dev-libs/nsgenbind/Manifest
@@ -1,4 +1,3 @@
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 DIST nsgenbind-0.6-src.tar.gz 106862 BLAKE2B 9b40ae6298921736f7d876ae664207eb71102adbe44f4072ea46b08b63cb5cf608df4c96f3ade1c8cca964d8d8b32d68aad25431f6fd455eb8392d8313faa9e9 SHA512 3083b48e48fcf8c7f32b09d040998470d5917469e020c4ccbfb8ffdb7d1252fd27dd02f590f5a2485c6984cdbc005ea87adf0db45077aee0a91f68037c542ffb
-EBUILD nsgenbind-0.6.ebuild 490 BLAKE2B 745aca365d2097f0cffb3e1df5324b9ad6308a529f8647299b024a0a3a637b5f4b26737094474e04950310ef9b54315d86972a3dc0e9f30dbcf9da026134902d SHA512 cc986e21c41262fa74d8e90907e7ad69882345529a3a02c46ceedc2605aa6074b3ac3944e28bd4a9a36b621de51e7757d454707dd0c627c5dfdc7ac4bdaa3167
+EBUILD nsgenbind-0.6-r1.ebuild 682 BLAKE2B fdfacb0d276501a54ae61c71cb449745fe16f03a3021d7dc93acf8b7ca8594c89e5d5c1ce36814f2ee70396b6ed7377c478256c3bfe777d06e3058a037884107 SHA512 6ae5f18ba63b0639d8fe0846969ecd0f5d2a475efee3f06179de3685d916f75c45fb43751fca0c2fba5debe5af5cdbef02df7135ec978e72fec77b0ba64d6e73
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/nsgenbind/nsgenbind-0.6-r1.ebuild b/dev-libs/nsgenbind/nsgenbind-0.6-r1.ebuild
new file mode 100644
index 000000000000..50477a5ac2c0
--- /dev/null
+++ b/dev-libs/nsgenbind/nsgenbind-0.6-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
+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
+	virtual/yacc"
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=binary $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/nsgenbind/nsgenbind-0.6.ebuild b/dev-libs/nsgenbind/nsgenbind-0.6.ebuild
deleted file mode 100644
index e0ee94d77258..000000000000
--- a/dev-libs/nsgenbind/nsgenbind-0.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NETSURF_COMPONENT_TYPE=binary
-NETSURF_BUILDSYSTEM=buildsystem-1.7
-inherit netsurf
-
-DESCRIPTION="generate javascript to dom bindings from w3c webidl files"
-HOMEPAGE="http://www.netsurf-browser.org/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc"
-IUSE=""
-
-DEPEND="virtual/yacc"
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}