x11-libs/cairo: RDEPEND on sys-libs/binutils-libs is needed (#528088)

Package-Manager: portage-2.2.22

diff --git a/x11-libs/cairo/cairo-1.14.2-r1.ebuild b/x11-libs/cairo/cairo-1.14.2-r1.ebuild
new file mode 100644 (file)
index 0000000..12d34b3
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.14.2-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+       inherit git-r3
+       EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+       SRC_URI=""
+else
+       SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+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"
+# 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
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+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}]
+       sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+       >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+       >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+       directfb? ( dev-libs/DirectFB )
+       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}] media-libs/opengl-apple ) )
+       X? (
+               >=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}]
+       )
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+       )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       >=sys-devel/libtool-2
+       X? (
+               >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+       )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#      doc? (
+#              >=dev-util/gtk-doc-1.6
+#              ~app-text/docbook-xml-dtd-4.2
+#      )"
+
+REQUIRED_USE="
+       gles2? ( !opengl )
+       xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+       /usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+       epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+       # tests and perf tools require X, bug #483574
+       if ! use X; then
+               sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+       fi
+
+       epatch_user
+
+       # Slightly messed build system YAY
+       if [[ ${PV} == *9999* ]]; then
+               touch boilerplate/Makefile.am.features
+               touch src/Makefile.am.features
+               touch ChangeLog
+       fi
+
+       eautoreconf
+}
+
+multilib_src_configure() {
+       local myopts
+
+       [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+       use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+       # TODO: remove this (and add USE-dep) when DirectFB is converted,
+       # bug #484248 -- but beware of the circular dep.
+       if ! multilib_is_native_abi; then
+               myopts+=" --disable-directfb"
+       fi
+
+       # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+       if ! multilib_is_native_abi; then
+               myopts+=" --disable-qt"
+       fi
+
+       # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+       ECONF_SOURCE="${S}" \
+       econf \
+               --disable-dependency-tracking \
+               $(use_with X x) \
+               $(use_enable X tee) \
+               $(use_enable X xlib) \
+               $(use_enable X xlib-xrender) \
+               $(use_enable aqua quartz) \
+               $(use_enable aqua quartz-image) \
+               $(use_enable debug test-surfaces) \
+               $(use_enable directfb) \
+               $(use_enable gles2 glesv2) \
+               $(use_enable glib gobject) \
+               $(use_enable opengl gl) \
+               $(use_enable static-libs static) \
+               $(use_enable svg) \
+               $(use_enable valgrind) \
+               $(use_enable xcb) \
+               $(use_enable xcb xcb-shm) \
+               $(use_enable xlib-xcb) \
+               --enable-ft \
+               --enable-pdf \
+               --enable-png \
+               --enable-ps \
+               --disable-drm \
+               --disable-gallium \
+               --disable-qt \
+               --disable-vg \
+               ${myopts}
+}
+
+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 4301ec8c2211f5f7cd4d7717c3eb74cc3da65ea8..12d34b3af80361c67fefe4980f9c7687827386ae 100644 (file)
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -30,6 +30,7 @@ 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}]
+       sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
        >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
        >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
        directfb? ( dev-libs/DirectFB )