gentoo resync : 18.11.2018

3 files changed, 34 insertions, 26 deletions

diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index b69964835672..6f38c96ab374 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,4 +1,3 @@
 DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libnspsl-0.1.3.ebuild 505 BLAKE2B 21a8cf413c9bfec9c96af6f03dd8f858149f7df1bff5a452728b78a4428bc034fa8f480660d76bdbdf311cdc1a3a552703276340b7385b29f427cd8f9774d02a SHA512 c20d17e999d3636b80dfe036aca368e83e45cae4db9e46164878c4c3688ee14a11b57a240223efd46f1f2c716425183dfc337f3e077984c9584212b010ecc2d3
+EBUILD libnspsl-0.1.3-r1.ebuild 719 BLAKE2B e2b0ba8782587d9f4007275a61bf547973ce18a90e65430cca6a031157626f7f937df1913c986741c10dab76f916483f827a23ab8f5ffa4103496050fc660e89 SHA512 f89a90b81f2457e2504d58af0580d158bfd6a194d98aa7bd06a6c6be0b1936d086ae723e5f76c7f4b6cc4990e9ec72a9d76b9eb31d44ff79214a6895d9898aef
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..fa3babe38bd1
--- /dev/null
+++ b/media-libs/libnspsl/libnspsl-0.1.3-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="decoding library for BMP and ICO image file formats, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/"
+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=""
+
+DEPEND="
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig"
+
+_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/media-libs/libnspsl/libnspsl-0.1.3.ebuild b/media-libs/libnspsl/libnspsl-0.1.3.ebuild
deleted file mode 100644
index 1ed50ca57f22..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.3.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="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=""
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}