gentoo resync : 18.11.2018

4 files changed, 53 insertions, 38 deletions

diff --git a/dev-libs/libparserutils/Manifest b/dev-libs/libparserutils/Manifest
index 6395938a9fd0..9ad079d3e615 100644
--- a/dev-libs/libparserutils/Manifest
+++ b/dev-libs/libparserutils/Manifest
@@ -1,7 +1,6 @@
 DIST libparserutils-0.2.3-src.tar.gz 74509 BLAKE2B b9b68a91823181e7a95ec94b1a117da27180afe4ff2b05da279cf59a0b126cefb78712cae382c24b377292e4b5802273b1f9bd8ac52969a3a693da635ec88f65 SHA512 b68cbf3a3260bacea10c8115a1c247de3d7220e94a7f73da84ee4b400678132d8db71b8e84fe92eacafc4945c111f049779c8fead4cf9bd98c6e96340943d270
 DIST libparserutils-0.2.4-src.tar.gz 74521 BLAKE2B 85e39d64bb8365f95da227e3a52ea2a2a85b0f913f861117b496bdff1556b8ca880189325995cf02eeb51f2db76c917a63f59ee1a1fed8fec6ce43dc16f9b66f SHA512 e6a7b618e00e2bc69a0de63c29cc809f250fbd1c10544523c563f4bb9ac3281e02ba36c096518fc0a9074dad49a05346b04cc85b7d972f88f2645af0f869cbc2
 DIST netsurf-buildsystem-1.5.tar.gz 38196 BLAKE2B 298ef39d45b98ae5ef57a22aed9f22bf96dfd6ad5475964c04451eaf28aca7f451b4906002c3e110ffcc951015169f02ffcd85f24e54b46c47b25e048115db1c SHA512 02d85e8f1d2101194a678f7ccf84051390953285a46951d7b327556f8df1a0c416620bd4c7a615e25de438d5d27cfffb69ec5d94eb8379a295dab4c85a96cae4
-DIST netsurf-buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD libparserutils-0.2.3.ebuild 570 BLAKE2B 831f0a7473a068b051550eb316c096dcd4b7e5007210eb86d23136967cf7be7769964ceedf1caa77065c1e9e0b3f9f8af2d03cc3274c12e0e29e2d0085d2c1e1 SHA512 cd4cf38173e2231dd443c3c534cf1470566e6ffb8645341d9679fed0d469125141a52a6bc4078035b6f81c6fcc5eaa8521217e6864584a0df1edbe956f0a870b
-EBUILD libparserutils-0.2.4.ebuild 661 BLAKE2B f2b19b287717c30aac118842f905e46729fd53a868269dd88bcb116f574f6d5215ee49ff8f4482dc527de3a734dccb5df24b032d8c3e930b49744e7a4a496c50 SHA512 9889ca7ce51056c1c2c2ff4b2ebc926a264697fe4389c855406c32f91e85ce9a4fc1969628b537383a2d29dd44daa1b26fc5c27365b69f4db5b551d86ee112f1
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD libparserutils-0.2.4-r1.ebuild 891 BLAKE2B bb8e0a6de6934ea05c806aaa3dd5f93ab54d8eebfecbbc9aee71628177e532cbadeb430f05b64b1f45a6e75a2bcdb4c2659b4fab5c4e878fe43f3ff4b093efa3 SHA512 c41f072d51ec61d63f69f2c9c48dfdf724014e7c17010aeb2d7c4b8cb4ceaa66cd02f8330d338a6149191ebeb2a5a12494bc97b9ff89cca1dc138cb84e0376a9
+MISC metadata.xml 351 BLAKE2B 874efc4523403eb768a93b6ad01c165fda3ce9e7b55fabba72fbe39efc632c1b9cbdc440819ad959c4ed40383ab7221372e357147eb7e1906474880b7f75dca2 SHA512 b70d3c086edb1523342a001fe46b5a630996047ea46dc9042e6f333ef771a6fd1ccec693fb0f0f842fc8a97300461a32fb363a1110e0f7166d1a0d72270cc6aa
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..f1bf560182ed
--- /dev/null
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="library for building efficient parsers, written in C"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
+IUSE="iconv test"
+
+DEPEND="
+	dev-util/netsurf-buildsystem
+	test? (	dev-lang/perl )"
+
+DOCS=( README docs/Todo )
+
+src_configure() {
+	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
+}
+
+_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
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install
+}
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4.ebuild
deleted file mode 100644
index 4f671e56ed9e..000000000000
--- a/dev-libs/libparserutils/libparserutils-0.2.4.ebuild
+++ /dev/null
@@ -1,31 +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 flag-o-matic netsurf
-
-DESCRIPTION="library for building efficient parsers, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~m68k-mint"
-IUSE="iconv test"
-
-DEPEND="test? (	dev-lang/perl )"
-
-DOCS=( README docs/Todo )
-
-src_prepare() {
-	# working around broken netsurf eclass
-	default
-	multilib_copy_sources
-}
-
-src_configure() {
-	netsurf_src_configure
-
-	append-cflags "-D$(usex iconv WITH WITHOUT)_ICONV_FILTER"
-}
diff --git a/dev-libs/libparserutils/metadata.xml b/dev-libs/libparserutils/metadata.xml
index a535b8852829..68674fe1b802 100644
--- a/dev-libs/libparserutils/metadata.xml
+++ b/dev-libs/libparserutils/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
 </pkgmetadata>