[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcss/

["Virgil Dupras" <vdupras@gentoo.org>]

commit:     4a30f653726e47062a9121017bed2c847a0534ab
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 16:32:48 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 18:04:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a30f653

dev-libs/libcss: drop netsurf eclass

Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-libs/libcss/Manifest                           |  1 -
 ...{libcss-0.8.0.ebuild => libcss-0.8.0-r1.ebuild} | 31 +++++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libcss/Manifest b/dev-libs/libcss/Manifest
index d1485c56f37..1b47081bce5 100644
--- a/dev-libs/libcss/Manifest
+++ b/dev-libs/libcss/Manifest
@@ -1,2 +1 @@
 DIST libcss-0.8.0-src.tar.gz 516474 BLAKE2B 937adc65f68fecece189e0f06cfd601ae2d76f0b4dcdbcb8a67f3f058c4355c19c12c088fb50ecf1e6bcd8436c867b1845b3da27bb44b5d1a009bd946bf5e53e SHA512 fb52920ce462f442dfafa7b0061fa465e6c04827d26186e8468855c2a40e8f34e6f0689d5eb58cb0b2ee0759d083fcff5c8c583e1d98693755003c352a22a4be
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58

diff --git a/dev-libs/libcss/libcss-0.8.0.ebuild b/dev-libs/libcss/libcss-0.8.0-r1.ebuild
similarity index 57%
rename from dev-libs/libcss/libcss-0.8.0.ebuild
rename to dev-libs/libcss/libcss-0.8.0-r1.ebuild
index b1007296de2..e0ce10bd74e 100644
--- a/dev-libs/libcss/libcss-0.8.0.ebuild
+++ b/dev-libs/libcss/libcss-0.8.0-r1.ebuild
@@ -1,32 +1,49 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-NETSURF_BUILDSYSTEM=buildsystem-1.7
-inherit netsurf
+inherit toolchain-funcs
 
 DESCRIPTION="CSS parser and selection engine, written in C"
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+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="test"
 
-RDEPEND=">=dev-libs/libparserutils-0.2.1-r1[static-libs?,${MULTILIB_USEDEP}]
-	>=dev-libs/libwapcaplet-0.4.0[static-libs?,${MULTILIB_USEDEP}]"
+RDEPEND="
+	>=dev-libs/libparserutils-0.2.1-r1
+	>=dev-libs/libwapcaplet-0.4.0"
 DEPEND="${RDEPEND}
+	dev-util/netsurf-buildsystem
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
 src_prepare() {
-	# working around broken netsurf eclass
 	default
 	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
 		-i src/parse/parse.c src/select/arena_hash.h || die
 	sed -e '1i#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"' \
 		-i src/parse/parse.c src/select/computed.c || die
+}
+
+_emake() {
+	source /usr/share/netsurf-buildsystem/gentoo-helpers.sh
+	netsurf_define_makeconf
+	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake test
+}
 
-	multilib_copy_sources
+src_install() {
+	_emake DESTDIR="${ED}" install
 }