gentoo resync : 18.11.2018

3 files changed, 40 insertions, 31 deletions

diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index 9d4450690694..01b0e54cee3a 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -1,5 +1,4 @@
 AUX libsvgtiny-0.1.3-parallel-build.patch 406 BLAKE2B 1b7ef472490646196af762701b28636fcab2778ff4f77efc1e1c7d0736d73ca41703bf473333ee775e99df8eca24d4845e0bd03e117586e84b4a629af726b417 SHA512 1126b2985293432d9e8849ce85c27055d7fc96948657e9d8a35b41578ce1f014e6352798ccc605079b6ec4a1998899d91a240e7a338e277b092b83b4858d83d6
 DIST libsvgtiny-0.1.7-src.tar.gz 760963 BLAKE2B badf14e656e10a178a6b692659265644b636cc103ec92f89026638700293028e0b06b5e051c420911fd6c319a94bab68328b1d9f42cec69dc7926c2d31aeec67 SHA512 c13352325d32b6f41159b09607b12a373517672e9e4da6d26cbca9a7fb1896b6e5730aee53adaa51f0b49c35f7dd9e9ece6b1f0187a7f5494b5cc223acbe64ad
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD libsvgtiny-0.1.7.ebuild 714 BLAKE2B ff3ab89b720b2bea1a1d631c49f96546c2fbc585b6b9f81392028e09137092a188bf1001f712e62062f4f18c2c4010d8043174ab4268061c25f074fd3c941dbe SHA512 c7b0453507792fb57b8ac5867580ae5c4e6bdbe261505135e52d3b67f354d25447bf9550fc80dd433e78e7c1dc325941d3a5633365eb91d2862f2255e6d13b7e
+EBUILD libsvgtiny-0.1.7-r1.ebuild 874 BLAKE2B 9034132485234941ecdf44a9fd15fe4c01d66738c18e3d68aea2bc5775c2cfd8e2e0473f2a79d6d51f731145991f9bd63b2eb1cb5ccafc328f50ffc9a577f0ec SHA512 6950bf1d2ea98f656f10f124dbc9a78f87d75e16c5b631a96db511d8af5c9a9fe231ffdfb2b2194718e63be56848cbb1c2eacfdacbf1bd7c3e41d2df4ac86cd4
 MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..5e85fe7fbf29
--- /dev/null
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.7-r1.ebuild
@@ -0,0 +1,39 @@
+# 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/libsvgtiny/"
+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=""
+
+RDEPEND="
+	>=net-libs/libdom-0.1.2-r1[xml]
+	>=dev-libs/libwapcaplet-0.2.2-r1"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	dev-util/netsurf-buildsystem
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.1.3-parallel-build.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/libsvgtiny/libsvgtiny-0.1.7.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild
deleted file mode 100644
index c0ef6c188573..000000000000
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.7.ebuild
+++ /dev/null
@@ -1,29 +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/libsvgtiny/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~m68k-mint"
-IUSE=""
-
-RDEPEND=">=net-libs/libdom-0.1.2-r1[xml,static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.2.2-r1[static-libs?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.1.3-parallel-build.patch )
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}