From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-934821-garchives=archives.gentoo.org@lists.gentoo.org>
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 7D9D5139694
for <garchives@archives.gentoo.org>; Sun, 26 Feb 2017 00:15:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A9DB1E0C48;
Sun, 26 Feb 2017 00:15:06 +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-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 79925E0C48
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Feb 2017 00:15:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E58D333BF1B
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Feb 2017 00:15:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3367554A6
for <gentoo-commits@lists.gentoo.org>; Sun, 26 Feb 2017 00:15:03 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
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" <mattst88@gentoo.org>
Message-ID: <1488068093.7de1e4b63e45169100547609744aa4cd32ccdfb4.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.14.8.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: 7de1e4b63e45169100547609744aa4cd32ccdfb4
X-VCS-Branch: master
Date: Sun, 26 Feb 2017 00:15:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 941ef308-efa5-4147-a3e9-18d159059710
X-Archives-Hash: e05958e6c7e2f711521b5b7af37ae0ff
commit: 7de1e4b63e45169100547609744aa4cd32ccdfb4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 00:10:50 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 00:14:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de1e4b6
x11-libs/cairo: Drop USE=xlib-xcb flag from unstable versions.
Has caused no end of problems. See bugs 441878, 476306, 477444, 477530,
508232.
x11-libs/cairo/cairo-1.14.8.ebuild | 17 ++---------------
x11-libs/cairo/cairo-9999.ebuild | 17 ++---------------
2 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.14.8.ebuild b/x11-libs/cairo/cairo-1.14.8.ebuild
index acdfced63d..023f08cfa8 100644
--- a/x11-libs/cairo/cairo-1.14.8.ebuild
+++ b/x11-libs/cairo/cairo-1.14.8.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb"
# 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
@@ -63,7 +63,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="
gles2? ( !opengl )
- xlib-xcb? ( xcb )
"
MULTILIB_WRAPPED_HEADERS=(
@@ -133,7 +132,6 @@ multilib_src_configure() {
$(use_enable valgrind) \
$(use_enable xcb) \
$(use_enable xcb xcb-shm) \
- $(use_enable xlib-xcb) \
--enable-ft \
--enable-pdf \
--enable-png \
@@ -142,6 +140,7 @@ multilib_src_configure() {
--disable-gallium \
--disable-qt \
--disable-vg \
+ --disable-xlib-xcb \
${myopts}
}
@@ -149,15 +148,3 @@ multilib_src_install_all() {
prune_libtool_files --all
einstalldocs
}
-
-pkg_postinst() {
- if use !xlib-xcb; then
- if has_version net-misc/nxserver-freenx \
- || has_version net-misc/x2goserver; then
- ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
- ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
- ewarn "applications that are running inside NX sessions. For details, see"
- ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
- fi
- fi
-}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 7ec16d48f5..39c733894b 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -19,7 +19,7 @@ DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg utils valgrind xcb xlib-xcb"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg utils valgrind xcb"
# 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
@@ -64,7 +64,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="
gles2? ( !opengl )
- xlib-xcb? ( xcb )
"
MULTILIB_WRAPPED_HEADERS=(
@@ -136,7 +135,6 @@ multilib_src_configure() {
$(use_enable valgrind) \
$(use_enable xcb) \
$(use_enable xcb xcb-shm) \
- $(use_enable xlib-xcb) \
--enable-ft \
--enable-pdf \
--enable-png \
@@ -145,6 +143,7 @@ multilib_src_configure() {
--disable-gallium \
--disable-qt \
--disable-vg \
+ --disable-xlib-xcb \
${myopts}
}
@@ -152,15 +151,3 @@ multilib_src_install_all() {
prune_libtool_files --all
einstalldocs
}
-
-pkg_postinst() {
- if use !xlib-xcb; then
- if has_version net-misc/nxserver-freenx \
- || has_version net-misc/x2goserver; then
- ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
- ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
- ewarn "applications that are running inside NX sessions. For details, see"
- ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
- fi
- fi
-}