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 9C9F1138334 for ; Tue, 30 Oct 2018 14:01:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D200E0653; Tue, 30 Oct 2018 14:01:53 +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 4CD73E0653 for ; Tue, 30 Oct 2018 14:01:53 +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 4D723335CD5 for ; Tue, 30 Oct 2018 14:01:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD51B44D for ; Tue, 30 Oct 2018 14:01:48 +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: <1540908082.76c3bd643515a6398f211c45b1c70a87341d3143.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-r1.ebuild x11-libs/cairo/cairo-1.16.0.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: 76c3bd643515a6398f211c45b1c70a87341d3143 X-VCS-Branch: master Date: Tue, 30 Oct 2018 14:01:48 +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: ad93a5cd-2f46-478e-b647-a8b8cb78f3ac X-Archives-Hash: b69fdc4048f101d1a61672b27271b611 commit: 76c3bd643515a6398f211c45b1c70a87341d3143 Author: Matt Turner gentoo org> AuthorDate: Tue Oct 30 14:00:51 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 30 14:01:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c3bd64 x11-libs/cairo: Build cairo script unconditionally Lots of reverse dependencies need it, at least optionally. Saving the lzo dependency is not a worthy goal, so let's just reenable it instead of forcing reverse dependencies to change. Closes: https://bugs.gentoo.org/669196 Closes: https://bugs.gentoo.org/669448 Closes: https://bugs.gentoo.org/669952 Signed-off-by: Matt Turner gentoo.org> x11-libs/cairo/{cairo-1.16.0.ebuild => cairo-1.16.0-r1.ebuild} | 3 +-- x11-libs/cairo/cairo-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/x11-libs/cairo/cairo-1.16.0.ebuild b/x11-libs/cairo/cairo-1.16.0-r1.ebuild similarity index 97% rename from x11-libs/cairo/cairo-1.16.0.ebuild rename to x11-libs/cairo/cairo-1.16.0-r1.ebuild index ecceec47019..52e56a49b8f 100644 --- a/x11-libs/cairo/cairo-1.16.0.ebuild +++ b/x11-libs/cairo/cairo-1.16.0-r1.ebuild @@ -26,6 +26,7 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" RESTRICT="test" RDEPEND=" + >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] @@ -35,7 +36,6 @@ RDEPEND=" gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) - utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -106,7 +106,6 @@ multilib_src_configure() { $(use_enable static-libs static) \ $(use_enable svg) \ $(use_enable utils interpreter) \ - $(use_enable utils script) \ $(use_enable utils trace) \ $(use_enable valgrind) \ $(use_enable xcb) \ diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index ecceec47019..52e56a49b8f 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -26,6 +26,7 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" RESTRICT="test" RDEPEND=" + >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] @@ -35,7 +36,6 @@ RDEPEND=" gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) - utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -106,7 +106,6 @@ multilib_src_configure() { $(use_enable static-libs static) \ $(use_enable svg) \ $(use_enable utils interpreter) \ - $(use_enable utils script) \ $(use_enable utils trace) \ $(use_enable valgrind) \ $(use_enable xcb) \