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 69843138350 for ; Mon, 13 Jan 2020 18:13:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0C30E089A; Mon, 13 Jan 2020 18:13:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 1D6C0E0A94 for ; Mon, 13 Jan 2020 18:13:39 +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 B2B5034DE87 for ; Mon, 13 Jan 2020 18:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43E2692 for ; Mon, 13 Jan 2020 18:13:36 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1578939204.9e9e288b6f0e95521aae6540d423ec015ec4a0cd.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/cairo/cairo-1.16.0-r3.ebuild x11-libs/cairo/cairo-9999.ebuild X-VCS-Directories: x11-libs/cairo/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9e9e288b6f0e95521aae6540d423ec015ec4a0cd X-VCS-Branch: master Date: Mon, 13 Jan 2020 18:13:36 +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: dde2decf-ab06-472b-ab52-d56be6629024 X-Archives-Hash: b4cae5a4ed242d3e8b1694f87419947b commit: 9e9e288b6f0e95521aae6540d423ec015ec4a0cd Author: Matt Turner gentoo org> AuthorDate: Mon Jan 13 17:51:43 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jan 13 18:13:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9e288b x11-libs/cairo: Port to EAPI=7 Thanks to David Michael. Closes: https://bugs.gentoo.org/705130 Signed-off-by: Matt Turner gentoo.org> x11-libs/cairo/cairo-1.16.0-r3.ebuild | 11 ++++++----- x11-libs/cairo/cairo-9999.ebuild | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild index b759d204805..1c3590a8d2a 100644 --- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild +++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils flag-o-matic autotools multilib-minimal +inherit flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -25,6 +25,9 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it RESTRICT="test" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/libtool-2" RDEPEND=" >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] @@ -45,8 +48,6 @@ RDEPEND=" >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/libtool-2 X? ( x11-base/xorg-proto )" #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} # doc? ( @@ -127,6 +128,6 @@ multilib_src_configure() { } multilib_src_install_all() { - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die einstalldocs } diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index f2e28c9ed36..6b69a9ab32b 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils flag-o-matic autotools multilib-minimal +inherit flag-o-matic autotools multilib-minimal if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -25,6 +25,9 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it RESTRICT="test" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/libtool-2" RDEPEND=" >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] @@ -45,8 +48,6 @@ RDEPEND=" >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/libtool-2 X? ( x11-base/xorg-proto )" #[[ ${PV} == *9999* ]] && DEPEND="${DEPEND} # doc? ( @@ -125,6 +126,6 @@ multilib_src_configure() { } multilib_src_install_all() { - prune_libtool_files --all + find "${D}" -name '*.la' -delete || die einstalldocs }