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 516FA138350 for ; Tue, 14 Jan 2020 21:20:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 555CEE0867; Tue, 14 Jan 2020 21:20:28 +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 E2C01E0867 for ; Tue, 14 Jan 2020 21:20:27 +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 2EAFD34E092 for ; Tue, 14 Jan 2020 21:20:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9933538 for ; Tue, 14 Jan 2020 21:20:23 +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: <1579036021.bb0ed566f6399041c55a6d409d5399f5b0ca9cb3.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: bb0ed566f6399041c55a6d409d5399f5b0ca9cb3 X-VCS-Branch: master Date: Tue, 14 Jan 2020 21:20:23 +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: d93bcf17-2f6b-4c66-9e5b-7edd847c049f X-Archives-Hash: 848024e0f647526389593cee6de81d20 commit: bb0ed566f6399041c55a6d409d5399f5b0ca9cb3 Author: Matt Turner gentoo org> AuthorDate: Tue Jan 14 21:07:01 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Jan 14 21:07:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0ed566 x11-libs/cairo: Drop IUSE=xcb Cairo's USE=X depends on libX11 which unconditionally depends on libxcb, so IUSE=xcb is pretty silly. I guess you could have built with USE="-X xcb" but why would you do that... Just include it within USE=X. Signed-off-by: Matt Turner gentoo.org> x11-libs/cairo/cairo-1.16.0-r3.ebuild | 10 ++++------ x11-libs/cairo/cairo-9999.ebuild | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild index 1c3590a8d2a..35ca0745c48 100644 --- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild +++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild @@ -18,7 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" +IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -43,8 +43,6 @@ RDEPEND=" >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - ) - xcb? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} @@ -110,14 +108,14 @@ multilib_src_configure() { $(use_enable svg) \ $(use_enable utils trace) \ $(use_enable valgrind) \ - $(use_enable xcb) \ - $(use_enable xcb xcb-shm) \ --enable-ft \ + --enable-interpreter \ --enable-pdf \ --enable-png \ --enable-ps \ --enable-script \ - --enable-interpreter \ + --enable-xcb + --enable-xcb-shm --disable-drm \ --disable-directfb \ --disable-gallium \ diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 6b69a9ab32b..45d38bca293 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -18,7 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="https://www.cairographics.org/ https://gitlab.freedesktop.org/cairo/cairo" LICENSE="|| ( LGPL-2.1 MPL-1.1 )" SLOT="0" -IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" +IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind" # gtk-doc regeneration doesn't seem to work with out-of-source builds #[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -43,8 +43,6 @@ RDEPEND=" >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - ) - xcb? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} @@ -108,14 +106,14 @@ multilib_src_configure() { $(use_enable svg) \ $(use_enable utils trace) \ $(use_enable valgrind) \ - $(use_enable xcb) \ - $(use_enable xcb xcb-shm) \ --enable-ft \ + --enable-interpreter \ --enable-pdf \ --enable-png \ --enable-ps \ --enable-script \ - --enable-interpreter \ + --enable-xcb + --enable-xcb-shm --disable-drm \ --disable-directfb \ --disable-gallium \