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 56AD1138334 for ; Wed, 3 Apr 2019 21:23:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F1D0E090F; Wed, 3 Apr 2019 21:23:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 24DB8E090F for ; Wed, 3 Apr 2019 21:23:15 +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 00EA0335C94 for ; Wed, 3 Apr 2019 21:23:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9358D570 for ; Wed, 3 Apr 2019 21:23:11 +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: <1554325716.3d263dd208da4574cc7bc14dc5f6ee3cc9cc1b66.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libXcm/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libXcm/libXcm-9999.ebuild X-VCS-Directories: media-libs/libXcm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3d263dd208da4574cc7bc14dc5f6ee3cc9cc1b66 X-VCS-Branch: master Date: Wed, 3 Apr 2019 21:23:11 +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: ac58d77c-1759-4a4c-8738-e1ebac3a6b4c X-Archives-Hash: 0f30652027dcb8f80604f84fd261f03d commit: 3d263dd208da4574cc7bc14dc5f6ee3cc9cc1b66 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 3 21:08:36 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 3 21:08:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d263dd2 media-libs/libXcm: EAPI-7 bump, drop multilib-minimal Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libXcm/libXcm-9999.ebuild | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild index d39e3f05a31..dff600917b0 100644 --- a/media-libs/libXcm/libXcm-9999.ebuild +++ b/media-libs/libXcm/libXcm-9999.ebuild @@ -1,49 +1,48 @@ -# 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 autotools if [[ ${PV} = *9999 ]]; then - GITECLASS="git-r3" EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git" + inherit git-r3 +else + SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" + S="${WORKDIR}/${P,,}" fi -inherit autotools multilib-minimal ${GITECLASS} -unset GITECLASS DESCRIPTION="Reference implementation of the X Color Management specification" -HOMEPAGE="http://www.oyranos.org/libxcm/" -[[ ${PV} != *9999 ]] && \ -SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://www.oyranos.org/libxcm/" LICENSE="MIT" SLOT="0" -KEYWORDS="" IUSE="static-libs X" RDEPEND=" X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXmu[${MULTILIB_USEDEP}] + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXmu ) " DEPEND="${RDEPEND} x11-base/xorg-proto" -[[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}" - src_prepare() { default eautoreconf - multilib_copy_sources } -multilib_src_configure() { +src_configure() { econf \ $(use_enable static-libs static) \ $(use_with X x11) } -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die +src_install() { + default + find "${D}" -name '*.la' -type f -delete || die }