commit: 4c23469e736594a8dac1738aa857aac7e246e5bd Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Wed Jan 24 20:45:45 2018 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Wed Jan 24 20:48:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c23469e
dev-libs/uriparser: Qt5, EAPI 6, fix USE="doc qt[45]" Closes: https://bugs.gentoo.org/645430 Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../files/uriparser-0.8.4-doc-install.patch | 13 +++++++++++ ...rser-0.8.4.ebuild => uriparser-0.8.4-r1.ebuild} | 25 ++++++++++++++++------ dev-libs/uriparser/uriparser-0.8.4.ebuild | 12 ++++++++++- 3 files changed, 42 insertions(+), 8 deletions(-) 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 00000000000..28cef94c642 --- /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.ebuild b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild similarity index 72% copy from dev-libs/uriparser/uriparser-0.8.4.ebuild copy to dev-libs/uriparser/uriparser-0.8.4-r1.ebuild index 97ad9a71617..84b47476abd 100644 --- a/dev-libs/uriparser/uriparser-0.8.4.ebuild +++ b/dev-libs/uriparser/uriparser-0.8.4-r1.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + +inherit autotools DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C" HOMEPAGE="http://uriparser.sourceforge.net/"; @@ -10,16 +12,26 @@ 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 qt4 test unicode" +IUSE="doc qt5 test unicode" RDEPEND="" DEPEND="virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 - qt4? ( dev-qt/qthelp:4 ) ) + 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 + eapply_user + eautoreconf +} + src_configure() { econf \ --disable-sizedown \ @@ -31,10 +43,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog THANKS + default - if use doc && use qt4; then + 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 97ad9a71617..11c9e1d5934 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 \
