Version bump to 1.12.18.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

3 files changed, 199 insertions, 15 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 316ab8cc6d5b..f22cfb59486e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.387 2014/12/08 19:19:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.388 2014/12/08 19:24:49 mattst88 Exp $
+
+*cairo-1.12.18 (08 Dec 2014)
+
+  08 Dec 2014; Matt Turner <mattst88@gentoo.org> +cairo-1.12.18.ebuild:
+  Version bump to 1.12.18.
 
   08 Dec 2014; Matt Turner <mattst88@gentoo.org> cairo-9999.ebuild:
   Reenable parallel make, and drop legacy-drivers USE.
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 6e67302289f8..2f750f3fbfaa 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -19,29 +19,31 @@ AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b1347026
 DIST cairo-1.10.2.tar.gz 23558405 SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 SHA512 8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a WHIRLPOOL 8ee0e6f2f520a8e5e046a311926f07a49dd7b730b66b49684ce0ea296b9b5822a80a194b8eff56c73d92da850faa15fed925a1df41b3ea28e3841530548d4ef5
 DIST cairo-1.12.14.tar.xz 42132464 SHA256 96d0d1e3f9b74d2ca3469ff187c5e5f25649b1ad35cf06f4f3a83847dff4ac13 SHA512 c676973ab98e018291aeced53bcda9b192202f1a7d65c845798decfaee015f40600f4db32c8977ba4a3e6ff8dc10478f6fd06e83be7e6cca610be8aafd125ee0 WHIRLPOOL 36fbe32711de3b6ae213e819c456e22fa0d629f3a6d99cdad8d2c77a810f9a758191c0d10e6933bf57e60b3b5573e9bceb0b0955512d2e2c981e98eac6907709
 DIST cairo-1.12.16.tar.xz 35889824 SHA256 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846 SHA512 35389305ba0906e2e1beab92966650fc7d7f8f41231e355ea2bf8693a333946f0693c125d1c50681e12b7f2aff85ae1fdcf957f3d83bc7eaacd52569884c6b2f WHIRLPOOL 00c5e237ac67c2287f90f204456178dcd123126c42669fa63e3dc04fbf9b46d867c554b8f2ecaf803a2553c388661fda5efc4803d6c1f30d7d8fc75fff06cde0
+DIST cairo-1.12.18.tar.xz 38276736 SHA256 dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6 SHA512 238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2 WHIRLPOOL e4408a3f6185f1d7e0f1c95f4beb266c48722ba075329621c1a6a6f2ad3114c334ceb6b242d661d7d3e7e7a3b3fcd013c5806c17b637bfa7a59895cc70fc66cf
 EBUILD cairo-1.10.2-r3.ebuild 4382 SHA256 1656fb57c943b71b588ca8427320067fdf91ae83331e8c4dead61a2461c83c18 SHA512 8392faa29b007706de4c2b6d61e3507bfcbccc07689239c7eb98e8b19547d4c656b18f507188e1d150a63f18782d864ecd4c5d70abff7c22033a4be5e775d9bf WHIRLPOOL 515c656ea979ed756b38f42db19b839f679c52a9f349a84430aaf31467634f66355d8a2d41a578d39e2ea6179c4baec94b73eefdba5905b8c291269070a00fb7
 EBUILD cairo-1.12.14-r4.ebuild 4232 SHA256 a9500a5fa9b6d903037ee11953945799c5031f8c568e03c3cf5464159223620c SHA512 b5804488072756fc86fcd4c35d536b9bad30456319df6f0fec9cf8061ae8a76cebe79c2d002f22e26300ae8a71b7057f847a8b1951307bb46a863dfaa60694db WHIRLPOOL 64dcd45bd8e7e4cc5f8956e31724f32596cc840cad495c7b79ab224f91259c6ec0708b819166b85fd01d06387e43522d3e8660cfc4c95c9af8344adc4460663c
 EBUILD cairo-1.12.16-r2.ebuild 5491 SHA256 67a756c661a62d5fc1c81638dd95b80a8774d39d8c26e73fa12f5b850de1a785 SHA512 bbd0d9a8a2486607a1edc6576f40a92503ebdc86223a5c31b5f5a319d88735fce18a643f4801ff40713a3a9b1b803f67b5974ca70d542973772085ce70a6cd5b WHIRLPOOL d7228036b8924d765c2b9637688cbe97b9abe9b56c44e96c1bdbac09a183dc60a836eba30f39a1fc13a12dd0b05f3fb5d1af9387aa716e5178dc68a0e58b442e
 EBUILD cairo-1.12.16-r3.ebuild 6319 SHA256 744195ffd3e0b6642952020b90420a540573c1c8f47bffb9cfd9f77a7edccbcb SHA512 6acd16eb8cde5e2840481fa483e713904eb55e06e5c4871eaa6870dbd462a326d699add667f3027926ce5fba8747422e86b420a41bee074f8ea5bd62fdc0acb2 WHIRLPOOL 018160c7ff32778ca4da60124c2b2c892e37d0d10ec0ca58e932b93f2f1c0c21b2a04f96adb0db52defda8ad13b1ddf75804eaa642732748bcdba4b824adb530
 EBUILD cairo-1.12.16-r4.ebuild 6282 SHA256 0f62952b384a75909bd2c1431e1f36f724920cacfe7a69f8bf8ede87756add33 SHA512 a05b2071def409e2b86520173439ce08865b0b10208e414a4af4046f7e9bb195161b3f4bb1372278f2973a82d9bc1384ae9c697ed3ecc820e74f07dd67f9e872 WHIRLPOOL 37da1d8d043ca5271045648d1a7657cb22a2b64c0839239e8f16e40825916eee4255b22e4fe477696a5ee335cf58d5e260acf65aa7165a2f9d8bf0cd2cc9679f
 EBUILD cairo-1.12.16.ebuild 4115 SHA256 510a7314d31ee86b1cdc198cc2feae538b577582961b38c1bcab35e8e8da1a17 SHA512 a7964920b7dc9b8fcd3826207fa53046e41d67d3486a73f32cd4183ebf2d9ac500398a0d73604c9d234139344653d66ad8b24eb91e1d48d814c1fa70ba179c29 WHIRLPOOL 1df6b4bae51c564a862e763b0ffb6726ce9ab983bf7fe353e7bfb8f34d32cdd56a2c889efc55d70174061a0b3d8744ef9abb282870e6bae4d119b9331841a40d
+EBUILD cairo-1.12.18.ebuild 5464 SHA256 f1b97bc294bd8968aa6c267d10281289c331d3431d44ca0a8dbe6876330cfb74 SHA512 348fa3e375d5abe3e33c96f09b93a01f85f21ad33582764e1167423d93d9bb0a2c13aadb8c5c644ec6015e5c688135205b8b3d9d7e1cf6b0bdf6495ea4d67d6c WHIRLPOOL 8af04631aa30762fe7fe946f90f29a6b4d47bf5aa6568fc0011dab175acc40d7305fbbb0ef874eafeaea2951ce58f8cc94737814eec5b358994f20303b853025
 EBUILD cairo-9999.ebuild 5462 SHA256 681b98d612b0b1ff38232d7c3e52163c1a49fadea7fd16e4fdbec667d5263f54 SHA512 6378111ef1ba487f604da81aa3cb59aca05ab1ede95d2d112540faa35e2e98b52207907d46c45f5bbe5e66ce1fffc27e5742b06d3d10e1740fff29b53e2ec52d WHIRLPOOL 24d4bff085a2f94f4579cfb6364f3a4a4fedbcc55c975c4d41ce7b33974a707cd942f9f93e584d952edd919fd8259d53401d4ff6135320a3ab05f81627cad3cc
-MISC ChangeLog 57926 SHA256 1605137fded0cb8217cf904ef3153a9e297cb08eb45bf1d31a02e4fc8057defb SHA512 f9d53786c8bf151666a9bf14296f528ac3b5856b1e84426da222fdc49668bf121ebba2a9dff8a8d25eb561ac1e4d0c8ea3db54cd830bf16432d39417e8602f0b WHIRLPOOL 36bc251900b58c5e8661f8b0d32c06afe063088bd6c80a77041a0ce4681eef00c26bcbaf78120f2486ff21005d09d691ce7c1ba77ccae1999f29d2214241b8c0
+MISC ChangeLog 58056 SHA256 eec4307465737018bc35129ab9dca950d9662185196d8a6a18d4de10efac9fb7 SHA512 ba84826bd3a297513535e98dbfc0c1ebfed2b6fe7d7e2e313ce6efe439b03fcba3c7ddcdad7354c970cedc5673bf066e0ac5de0cf7691c2c2d2307a127ca0d85 WHIRLPOOL 3d0310e38cdc82485d8c264034f4effde9bca463e11fc5aada0cb7a8b1b796b503f780a634485ed9273dcf055a62343a665c03b8e3a542812846ebadb9319d7b
 MISC metadata.xml 1512 SHA256 e608340ec4a70a7ed36558825b916661bc659e8e8b588a89c2b94f57fb62822e SHA512 616bfa3ee0b43f91d9104f19e756e97a2e68edc65b2eb293864d15a099068e3f5359f0edaf91fff5a2470b82d303d37e4227a7df65b3f3601362f1268501f94f WHIRLPOOL 8e279a5124dd7073add02094a5363046d47e435b4e274a765cb936d33599cf13e16758fe3f57ef316a8137dd574681a99d4b5bf8074554606d7d36afadaa3f91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhfnlAAoJEA/daC2XTKcqrUEQAIzZM+5M826MJ+O3Y4sMUDT7
-fX4Qz7MdZW/Ks6PH4De/9aG+ockHLRgtznXNIwRD2T6iiN/tc1G3qWoDLoOuKs3a
-jtB2sCSWQrPfeSURpnnIRsetXz5MAU2U0XJVYuKhor0NdPQIiSdIJtDTjIpHACpE
-KMd/ftTKZOB8Dt990iiKhoJfthpNlLXKvUbDDqLQ36xO4WqZAHMCQEci7Vm/q27U
-dTWOVydowE5jpGxuuJ0sKHWVB1bSxxiwaelaFmxU50Gq/LBJfOJxC22MxNbJtSoY
-lj6pBs3hSOT942VJVIb+Mw98S8Wxk9MvuPON/0hu2KbOWeV83YgAnG4lfvfMalSb
-69C3/KaVf9iTpDdUE6XwJjCaX/x4CS0/yU/nar8hnMYzIXlwaWHEr0IEEJNVJBhE
-3d3JJWrR9BjVm3zRQQC24+iDGGn50ggvg8RTlK0KLVAuHNpb5rSYwhmRhMpkCtuz
-5HT1UEwxA6otl5+GGagcAJ++0KQ+Qg+hdCmG2pMy/pWi3fpwBs0Uw23JpD8/4Ns/
-+Tvpx7WG56nGGLXY5Sg4PD+yg5WT0DsC4ZbWJRKuaRRFho+f7CVHNWUKgxwr6ha9
-KpydI4L7tR9Agn2EMFX4Jga4YdDTobss5Cv1GxiRgu+hPzEo810mNzQ6Ca8QvIxB
-acYU+a6wtSlgIVkyleJ5
-=J0ga
+iQIcBAEBCAAGBQJUhfsSAAoJEA/daC2XTKcqJg0QAL/lF5QSrnIJ8YczqVNmb5CN
+LwKtsZZe6w/e+tfD+JfMSQXmT3C5uVuHpyQCXQNYq5gksXYnrylP0jRIr8LkhFZy
+HAeJE0cflQKBf9rK+FDMH+wgLjWFjiz3cL0ZOdHnrZV2I3BueUMzkw4s7fCZvIen
+x9Sow2GH3i/JA1FMAmj5sf0YA6O3SHqgPUP7glhsmf8QHcltfmKy35KqKHOtZ5q/
+J32sSb+zi4gws0Y0nntL1MP+i2NYRWJdWjeH+pSUvAtMwJnlgFqHV6RiKUkoF17T
+3bmTXyWdERpF28TGyabDopEWF/jupBWiqPavBvu1CSTqdZ+RawYCmhWEGcnlw4W0
+xxiVFYvAlbyUrWthF50nwbUBv+5e8M3e3EKy1NVvHm6nqdyurdL+b9FTMlzvQVpN
+g/ASVtycSdF52p/dWWuGW8in57Pv/krUmnbggHbEfB9vPvbfH5lQ2GSy2T+bFsxQ
+7+6yEacP29QaabQ3jr1HjFz2V4oYEP5pkJku5TdqYN9tonVVtd68q7YS7kzuUFip
+IlJaXUxbNSAA9QlC2AtBU0lMZ3POaxYCPra+Xy++r5HzCfB7GYloGKSg0BbQ1TQ2
+djDkhhDx0Fw70gNjrCEbeBfUBwJMSG+tWCv0jMmZ6bx1+hMAnM5SlkEkRUhWDq1s
+e/n7rLAW7yejnhw5G7xF
+=HtDm
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.12.18.ebuild b/x11-libs/cairo/cairo-1.12.18.ebuild
new file mode 100644
index 000000000000..705bc379ff5f
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.18.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.18.ebuild,v 1.1 2014/12/08 19:24:49 mattst88 Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	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 drm gallium gles2 +glib opengl openvg qt4 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 ) )
+	openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
+	qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
+	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}]
+		drm? (
+			>=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+			gallium? ( >=media-libs/mesa-9.1.6[gallium,${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}]
+		drm? (
+			>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+			>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+#	doc? (
+#		>=dev-util/gtk-doc-1.6
+#		~app-text/docbook-xml-dtd-4.2
+#	)"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+	drm? ( X )
+	gallium? ( drm )
+	gles2? ( !opengl )
+	openvg? ( || ( gles2 opengl ) )
+	xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/cairo/cairo-features.h
+	/usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.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
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	# upgraded to an eautoreconf for the above interix patch.
+	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 drm) \
+		$(use_enable directfb) \
+		$(use_enable gallium) \
+		$(use_enable gles2 glesv2) \
+		$(use_enable glib gobject) \
+		$(use_enable openvg vg) \
+		$(use_enable opengl gl) \
+		$(use_enable qt4 qt) \
+		$(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 \
+		${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
+}