From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9557C139085 for ; Sun, 15 Jan 2017 16:57:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCC9323409E; Sun, 15 Jan 2017 16:57:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A62B323409B for ; Sun, 15 Jan 2017 16:57:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B053340F27 for ; Sun, 15 Jan 2017 16:57:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C16B9281C for ; Sun, 15 Jan 2017 16:57:50 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1484499469.fe5a79f2b150f550213f8e22d41fdf0a826a0b9a.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/qwt/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/qwt/qwt-6.1.2-r1.ebuild x11-libs/qwt/qwt-6.1.2-r2.ebuild X-VCS-Directories: x11-libs/qwt/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: fe5a79f2b150f550213f8e22d41fdf0a826a0b9a X-VCS-Branch: master Date: Sun, 15 Jan 2017 16:57:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 604bec86-7898-405a-b585-48305a40d31d X-Archives-Hash: 75a3fee2fd64fe48c3fca5323ec0dda4 commit: fe5a79f2b150f550213f8e22d41fdf0a826a0b9a Author: Justin Lecher gentoo org> AuthorDate: Sun Jan 15 16:56:42 2017 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Jan 15 16:57:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5a79f2 x11-libs/qwt: Backport changes Fixes doc installation Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=595938 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Justin Lecher gentoo.org> .../qwt/{qwt-6.1.2-r1.ebuild => qwt-6.1.2-r2.ebuild} | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r2.ebuild similarity index 91% rename from x11-libs/qwt/qwt-6.1.2-r1.ebuild rename to x11-libs/qwt/qwt-6.1.2-r2.ebuild index 4bb636e..a4f1191 100644 --- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild +++ b/x11-libs/qwt/qwt-6.1.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils multibuild multilib qmake-utils @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2" LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -SLOT="6" +SLOT="6/1.2" IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg" REQUIRED_USE="|| ( qt4 qt5 )" @@ -144,7 +144,7 @@ src_configure() { ;; esac } - multibuild_parallel_foreach_variant run_in_build_dir configuration + multibuild_foreach_variant run_in_build_dir configuration } src_compile() { @@ -178,11 +178,19 @@ src_install () { if use mathml; then sed \ - -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \ + -e "s: -L\"${WORKDIR}\".* -lqwt6: -lqwt6:g" \ -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die fi - use doc && dohtml -r doc/html/* + if use doc; then + dohtml -r doc/html/* + else + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi + + mkdir -p "${ED}"/usr/share/man/ || die + mv "${ED}"/usr/share/doc/${PF}/man/man3 "${ED}"/usr/share/man/ && \ + rmdir "${ED}"/usr/share/doc/${PF}/man || die if use examples; then # don't build examples - fix the qt files to build once installed