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 AFF1B138334 for ; Tue, 1 Oct 2019 23:43:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 519CFE09A6; 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 292CDE09A6 for ; Tue, 1 Oct 2019 23:43:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 385DF34B78B 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 CE1B883D 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: <1569973386.a86c332a81f3a88a1a5449600c031e0e1ec9e745.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libfreehand/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libfreehand/libfreehand-9999.ebuild X-VCS-Directories: media-libs/libfreehand/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a86c332a81f3a88a1a5449600c031e0e1ec9e745 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: 22bacde0-a7c5-4ab6-bfaa-2c9f71ed6508 X-Archives-Hash: 85d7deb3099811c4ec3138c4e447dc8a commit: a86c332a81f3a88a1a5449600c031e0e1ec9e745 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 1 23:38:03 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Oct 1 23:43:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86c332a media-libs/libfreehand: EAPI-7 bump, consolidate live build switch Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libfreehand/libfreehand-9999.ebuild | 37 +++++++++++++++----------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/media-libs/libfreehand/libfreehand-9999.ebuild b/media-libs/libfreehand/libfreehand-9999.ebuild index be281349087..b0b78cb0249 100644 --- a/media-libs/libfreehand/libfreehand-9999.ebuild +++ b/media-libs/libfreehand/libfreehand-9999.ebuild @@ -1,23 +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/libfreehand.git" -[[ ${PV} == 9999 ]] && inherit autotools git-r3 - +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libfreehand.git" + inherit autotools git-r3 +else + SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi DESCRIPTION="Library for import of FreeHand drawings" HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand" -[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libfreehand/${P}.tar.xz" LICENSE="MPL-2.0" SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="doc static-libs test" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" RDEPEND=" dev-libs/librevenge sys-libs/zlib @@ -28,29 +33,29 @@ DEPEND="${RDEPEND} dev-util/gperf media-libs/lcms sys-devel/libtool - virtual/pkgconfig - doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) " src_prepare() { default [[ -d m4 ]] || mkdir "m4" - [[ ${PV} == 9999 ]] && eautoreconf + [[ ${PV} == *9999 ]] && eautoreconf } src_configure() { # bug 619762 append-cxxflags -std=c++14 - econf \ - --disable-werror \ - $(use_with doc docs) \ - $(use_enable static-libs static) \ + local myeconfargs=( + --disable-werror + $(use_with doc docs) + $(use_enable static-libs static) $(use_enable test tests) + ) + econf "${myeconfargs[@]}" } src_install() { default - find "${D}" -name '*.la' -delete || die + find "${D}" -name '*.la' -type f -delete || die }