gentoo resync : 18.11.2018

3 files changed, 34 insertions, 26 deletions

diff --git a/media-libs/libnsbmp/Manifest b/media-libs/libnsbmp/Manifest
index 8fa0ee38e112..ab6f029b800d 100644
--- a/media-libs/libnsbmp/Manifest
+++ b/media-libs/libnsbmp/Manifest
@@ -1,4 +1,3 @@
 DIST libnsbmp-0.1.5-src.tar.gz 463299 BLAKE2B a9aa4f682262c4bfb5007c623e3da324f9ce2ddb732737b8217def899e8507ae41589607a1e0b71b34190542981ad4286f64f87795f0043049626c101001fd85 SHA512 2998de98db05a04fb860fdea258961d66aebc78d58614054311ed4cafa2f265472ad19789ab1e343d39ca293e0a304baee4941bd04948d9cc7c39bdadb0756e6
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libnsbmp-0.1.5.ebuild 514 BLAKE2B 52547b69038b98714b0cee0953a13af5311fbfcefc9efe27c3993c9124a7c5e806355dd9b7182b5a10228bb8778c5529aa5055225e1f09b64e1bce93e38af388 SHA512 ad0e0d1a3659cd55aedf35db47fc5d29029e9ae6b63a8ae6033243cd89f8ff30e71d6e62459b16a61587c975c419fa38fdfad3c59417fbca1e8c34f56e82d8ad
+EBUILD libnsbmp-0.1.5-r1.ebuild 728 BLAKE2B 0fce13ee31ad844d3361f949b7b2a89100f7fba5a3d584e1571fad603c2ba530925d76dc390f587489de089267275aeef6c1920893abfefa77690d2cc4f5137f SHA512 3723574519b88124db341b4ac90d1339cba3cfc3eeebf8496a18889b846079429682e9e644e56ca8d6ae224afe70b0d4614caa83919bb188a1eafa8e78914d30
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libnsbmp/libnsbmp-0.1.5-r1.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..55b1adcdc1ef
--- /dev/null
+++ b/media-libs/libnsbmp/libnsbmp-0.1.5-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/libnsbmp/"
+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/libnsbmp/libnsbmp-0.1.5.ebuild b/media-libs/libnsbmp/libnsbmp-0.1.5.ebuild
deleted file mode 100644
index aef68809045d..000000000000
--- a/media-libs/libnsbmp/libnsbmp-0.1.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="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/"
-
-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
-}