gentoo resync : 25.01.2018

4 files changed, 78 insertions, 2 deletions

diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index e9cfbd6aa281..bde7d20cda15 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,5 +1,7 @@
+AUX uriparser-0.8.4-doc-install.patch 615 BLAKE2B 593418040cd88f9753918320d6ee454fd2ddc5386a8190cd4da8e07c76e47ebb374df6b9a11d171815256927adb09b056927d33b19bd52b189842e9975817421 SHA512 80d77d07c43001c4e50363c66e05245ffc61fac35ee0c771019ae175e5eacd3c02fa050dcc910f5430c8531ea73fc289f7a18e989bff0dd7e14f7e438c6e28d1
 DIST uriparser-0.8.0.tar.bz2 433581 BLAKE2B 0f39f891634de86fe1696c5d000c6325203561347c83f3144fef2319c9dc58657d82b92bd8499efda15bfa966230f3c2ca4b9051caced0fe15c7e480e564ac86 SHA512 e80efc8484f0b67107cad317cef72db9de906a86020c3ab31178e06e958782f0a744fe257b1e6cd130dd25c6747e684ece93ce5f755864303df34c6b763d2e5b
 DIST uriparser-0.8.4.tar.bz2 358408 BLAKE2B 1f270442a4812fa3e86a495109f95cfac6980c8145a701990dbe6f6396743de9ce0dfbce7b9cff2b331e8c9038a2b6c5281d2e562596543b660c168d3e678187 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a
 EBUILD uriparser-0.8.0.ebuild 1101 BLAKE2B 1ce433e4c4b04b16f8d7d3b988795e42f3358bf7ef8b07f87d0eec3dea0b0d6be6655518ae950a04a21ca773c385085cb6c8b6222ff6d4d3f7314b35f7a559d7 SHA512 7a554f51d594177792b935b19b1b2b964936b5d27c9d50bc4faebc35479fca38f3d612273af6ca04a2d65e63263d06286dddcf84ef7fbd5b899ceb50f42f7c10
-EBUILD uriparser-0.8.4.ebuild 976 BLAKE2B b408b3abb8eca1b16822b7385a124e01b4021a7434037f6c03dbb2e49ed296ab2830f63d1fc1479f0799fe1562bc5fac386cb813042518f24fc11792bf950af1 SHA512 d356896c3040b0dd6e5935183ab0f26c996aacdae1725904800c49d4a23d6acbebd9d7919d07cf15f9edad7dde46526acc0ae19bbfb919d1bb230fb4a6a6eb99
+EBUILD uriparser-0.8.4-r1.ebuild 1068 BLAKE2B 797cd9004fb4ce9108c1acb48e3116f77672bdb530c6ce7fec178f76d4e49d0112453353be311cda2d786214d5a9a3525e07063bc08b5abd0de873995622d79e SHA512 4a906147237682d061aef5fefc5c5d77fb801d11aca5eca7e5def4fa05e0d373b35c98d2fe439b0e0f442aec5010dc79349611329e0377ec0b08ef40af05d044
+EBUILD uriparser-0.8.4.ebuild 1121 BLAKE2B c588049aae6874761ab9be7f69d0d847fdbba0a2fe8f9cb2e2747c4293c69f6b8c73eebe83c9bc2c4876cc50682950644fc0e9a4b25d10fafc029e27e9b134cf SHA512 f7d66431f203c3b5aa6c2c28443045db29d866f39c98675058140f16b810a5b8b277b7354cf1b3cb77bd0b29d783d27e360aa86de7d859fdd6e4a5e2c44aee9d
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
new file mode 100644
index 000000000000..28cef94c6423
--- /dev/null
+++ b/dev-libs/uriparser/files/uriparser-0.8.4-doc-install.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index ae5e101..012f0bc 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -24,7 +24,7 @@ distclean-local:
+ ## Install doc files
+ install-data-local:
+ 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/search"  ## Didn't work with installdirs-local
+-	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
++	$(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/"
+ 	$(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/"
+ 	-$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/"
+ 
diff --git a/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
new file mode 100644
index 000000000000..545d35ee9aa1
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="http://uriparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt5 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+	doc? ( >=app-doc/doxygen-1.5.8
+		qt5? ( dev-qt/qthelp:5 ) )
+	test? ( >=dev-util/cpptest-1.1.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-sizedown \
+		$(use_enable test) \
+		--enable-char \
+		$(use_enable unicode wchar_t) \
+		$(use_enable doc) \
+		--docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+	default
+
+	if use doc && use qt5; then
+		dodoc doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4.ebuild
index 97ad9a716173..11c9e1d59348 100644
--- a/dev-libs/uriparser/uriparser-0.8.4.ebuild
+++ b/dev-libs/uriparser/uriparser-0.8.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
+inherit epatch autotools
+
 DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
 HOMEPAGE="http://uriparser.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -20,6 +22,14 @@ DEPEND="virtual/pkgconfig
 
 REQUIRED_USE="test? ( unicode )"
 
+PATCHES=( "${FILESDIR}"/${P}-doc-install.patch )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	epatch_user
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		--disable-sizedown \