commit: e11b1bbe1fa76a8d129a4e3836fabbca5530a81f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 03:28:25 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 16 20:36:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11b1bbe
x11-libs/cairo: Drop old versions
x11-libs/cairo/Manifest | 2 -
x11-libs/cairo/cairo-1.14.2.ebuild | 158 ------------------------------------
x11-libs/cairo/cairo-1.14.6.ebuild | 160 -------------------------------------
x11-libs/cairo/metadata.xml | 1 -
4 files changed, 321 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index eaf39627464..de31adf5185 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,3 +1 @@
-DIST cairo-1.14.2.tar.xz 35376404 SHA256
c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb SHA512
74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200
WHIRLPOOL
fd57e1f474280a1df7a641bdcbe4dc5e5a71bd53b9e46e54302c7858e3bc0081fd1145f19133152819d259611096e4cca034c9caa73a748a507de9094f81a519
-DIST cairo-1.14.6.tar.xz 36040596 SHA256
613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 SHA512
e2aa17a33b95b68d407b53ac321cca15b0c148eb49b8639c75b2af1e75e7b417a2168ea978dabb8581b341f0f45dc042d3b1a56b01ab525b1984015f0865316b
WHIRLPOOL
cf58eff36277d013225e5a76a9f0d8530012502a3f125c417085ddc9ad7997ab180468783ae6a702a15ac4a3f4c0b5406170a6e6504785bf7de3a9e3b511b48f
DIST cairo-1.14.8.tar.xz 35392464 SHA256
d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20 SHA512
dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
WHIRLPOOL
dd4088b8610cac7c9fe9c7dd2135830f423276aaa98fc52c94f6540778c2d43d8dfae9844fd1ecba920ac9eb96500d01bb09bedc3867287ad38c9e1adf067549
diff --git a/x11-libs/cairo/cairo-1.14.2.ebuild
b/x11-libs/cairo/cairo-1.14.2.ebuild
deleted file mode 100644
index 23e65ce9dc7..00000000000
--- a/x11-libs/cairo/cairo-1.14.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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/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-1.14.6.ebuild
b/x11-libs/cairo/cairo-1.14.6.ebuild
deleted file mode 100644
index 5ab223ac439..00000000000
--- a/x11-libs/cairo/cairo-1.14.6.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~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"
- [[ ${CHOST} == *-darwin* ]] && 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/metadata.xml b/x11-libs/cairo/metadata.xml
index 3366d22f6cf..38e0470af0c 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -15,7 +15,6 @@
<flag name="glib">Compile with GLib Object System support</flag>
<flag name="utils">Build support for Cairo script and trace
utilities</flag>
<flag name="valgrind">Built-in support to mark memory regions</flag>
- <flag name="xlib-xcb">Use XCB renderer backend for acceleration over xlib.
Enabling this may solve or introduce display corruption problems.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
