gentoo resync : 18.11.2018

3 files changed, 34 insertions, 25 deletions

diff --git a/media-libs/librosprite/Manifest b/media-libs/librosprite/Manifest
index 8e448b81fbb2..816fb6277e31 100644
--- a/media-libs/librosprite/Manifest
+++ b/media-libs/librosprite/Manifest
@@ -1,5 +1,4 @@
 AUX librosprite-0.1.2-Werror.patch 393 BLAKE2B dc5794093ac33e7b65ca42a9ab4dd967cc44b9c8e890d404021f995cbaf7fe83be2549377c503dc8d7b3dc692f3a48eeffcd1709d9cad840b4f9522b4b9fab15 SHA512 1f72277eadc2c958ff58c9a23e78bf5a8198c76502cba45e5619413f3dba4243e7a5f8650a11436cc87dd9e63257a874cf8b1805b4dcfe5f3db88733ff08e1fe
 DIST librosprite-0.1.3-src.tar.gz 32816 BLAKE2B 553f5046eac8b7de5940e812103a545ee1d599bcc30d4fd6bb14449e0718364132e76e3992b224d0d2dd3c7582100fe6d9e4d433f245a89b23e3f15542329e0e SHA512 ab039ab12df7f527a86a76247bc5cb70ebe550591f81a1b987abef73fb3c6bd25c9a36afe17bd6717f4f33b1a133d847bb5acad53057aa3c406efe4ebcdc601b
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD librosprite-0.1.3.ebuild 504 BLAKE2B fb4f75e7d876b2f57f90657ff5de5fad63e3390d85a07d62dfe0fc2c7a6b88a371b9159a141c446ffcc218353dbdc0578db085350f1061ef2640e9a578d6c8ff SHA512 d2604e5c4f9ab6744d807e40af1349c01aae3c3eadd27818a4aeae508ac994444f849124bf9cd8e3fa5d9ba0204995d055003554b5efe341bc8f09daadb9ef3e
+EBUILD librosprite-0.1.3-r1.ebuild 736 BLAKE2B 6f4ac236f29ba4988f19b7acbbda22d23b30629686413e8c5759afb80142e38aa58b779085bd2b4fa03dee79304756462b8dc6c88754e0a1429077c961f2811c SHA512 d30d025802e6c024f29eaace3dd690ccb627a62a7eb1718180b4e24052fcc8239554fccc5e1f6a6d704f1dab9296f6866a4ad641623f8ad89da598532f2e6a03
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/librosprite/librosprite-0.1.3-r1.ebuild b/media-libs/librosprite/librosprite-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..b1caf0f8beff
--- /dev/null
+++ b/media-libs/librosprite/librosprite-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="framebuffer abstraction library, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/librosprite/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
+IUSE=""
+
+DEPEND="dev-util/netsurf-buildsystem"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.2-Werror.patch )
+
+_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/librosprite/librosprite-0.1.3.ebuild b/media-libs/librosprite/librosprite-0.1.3.ebuild
deleted file mode 100644
index 1f18c60fddd5..000000000000
--- a/media-libs/librosprite/librosprite-0.1.3.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_BUILDSYSTEM=buildsystem-1.7
-inherit netsurf
-
-DESCRIPTION="framebuffer abstraction library, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/librosprite/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.2-Werror.patch )
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}