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 98616138334 for ; Tue, 1 Oct 2019 23:43:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BB6CE09AD; Tue, 1 Oct 2019 23:43:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 437AEE09AD for ; Tue, 1 Oct 2019 23:43:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1906C34B78A for ; Tue, 1 Oct 2019 23:43:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB10E83C for ; Tue, 1 Oct 2019 23:43:41 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1569973385.367965f5030239eadac2ca3d3f5f97dd483889f6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libmspub/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/libmspub/libmspub-9999.ebuild X-VCS-Directories: app-text/libmspub/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 367965f5030239eadac2ca3d3f5f97dd483889f6 X-VCS-Branch: master Date: Tue, 1 Oct 2019 23:43:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6459cdef-1d47-4154-979f-c30bedf26206 X-Archives-Hash: 8cb0ddbb851ed260c48e7d450a8a56bd commit: 367965f5030239eadac2ca3d3f5f97dd483889f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 1 23:32:18 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 1 23:43:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=367965f5 app-text/libmspub: EAPI-7 bump, consolidate live build switch Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> app-text/libmspub/libmspub-9999.ebuild | 38 ++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild index c627cd0bee6..2035408ee17 100644 --- a/app-text/libmspub/libmspub-9999.ebuild +++ b/app-text/libmspub/libmspub-9999.ebuild @@ -1,26 +1,28 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic -EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git" -[[ ${PV} == 9999 ]] && inherit autotools git-r3 - +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git" + inherit autotools git-r3 +else + SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi DESCRIPTION="Library parsing Microsoft Publisher documents" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub" -[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" - -# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" - IUSE="doc static-libs" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" RDEPEND=" dev-libs/icu:= dev-libs/librevenge @@ -29,27 +31,27 @@ RDEPEND=" DEPEND="${RDEPEND} dev-libs/boost sys-devel/libtool - virtual/pkgconfig - doc? ( app-doc/doxygen ) " src_prepare() { default [[ -d m4 ]] || mkdir "m4" - [[ ${PV} == 9999 ]] && eautoreconf + [[ ${PV} == *9999 ]] && eautoreconf } src_configure() { # bug 619044 append-cxxflags -std=c++14 - econf \ - --disable-werror \ - $(use_with doc docs) \ + local myeconfargs=( + --disable-werror + $(use_with doc docs) $(use_enable static-libs static) + ) + econf "${myeconfargs[@]}" } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${D}" -name '*.la' -type f -delete || die }