Add epatch_user (bug #414987). Fix whitespace. Drop old ebuilds.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

7 files changed, 13 insertions, 452 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index dd0216dd9a8e..468ea1221ae5 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.299 2012/07/24 13:08:01 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.300 2012/07/24 13:55:46 yngwin Exp $
+
+  24 Jul 2012; Ben de Groot <yngwin@gentoo.org> -cairo-1.10.2-r2.ebuild,
+  -cairo-1.12.0.ebuild, -cairo-1.12.2.ebuild, cairo-1.10.2-r1.ebuild,
+  cairo-1.12.2-r1.ebuild:
+  Add epatch_user (bug #414987). Fix whitespace. Drop old ebuilds.
 
 *cairo-1.12.2-r1 (24 Jul 2012)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 607ee479191a..9412608d6be1 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -6,16 +6,12 @@ AUX cairo-1.8.10-libpng14.patch 426 SHA256 b090f829d3b9fb69b83bfa094552335b83829
 AUX cairo-1.8.8-interix.patch 619 SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 SHA512 651b73124ee5b65e2735deefde36727122e9c513da134441be923fb875aedfd3dbd81de8652e3919f3fa04d1de13dee6ec28e4fcd687aaec427d3b0dd94ac703 WHIRLPOOL a1803cbd8f32a8e926a8af932e099c5275920e3e09f7a53ee49898823e81ee7a2533a4db8d2125f200fa409d98fb8e2cbdeb01f00f64b7ba64ba8dffb8487bc3
 AUX cairo-respect-fontconfig.patch 538 SHA256 1732f21adfe5ab291d987b7537b13470266253f599901a4707d27fd2b3d66734 SHA512 4d4d473f956b56f11b31f513de06751dcc77342e0f04ecf37064a74b8217f9d3536c0a8a41b09e580f34576ff2d06815b4cbc2bc091c201f947965509677415e WHIRLPOOL c7d8f364a787b095054507a6dceafe08e8112322853e261303adc07b79a9070be63200dbd4ff465943e2303126bcd7eec51b0f6c53f1d4e9a49fd363acbccde2
 DIST cairo-1.10.2.tar.gz 23558405 SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 SHA512 8be4b9ce002f039014d747cc2b48c6a6dfac78df74ebc5ad711a8f36572b819b2c6da3cc4732d0ca93e9052b4b3bb42a146f5e7e346b75dde695d44477b19c9a WHIRLPOOL 8ee0e6f2f520a8e5e046a311926f07a49dd7b730b66b49684ce0ea296b9b5822a80a194b8eff56c73d92da850faa15fed925a1df41b3ea28e3841530548d4ef5
-DIST cairo-1.12.0.tar.gz 63084508 SHA256 af65b766dff11bcf3cba1f92d92a1bc28f78dc2944908a5930a026af06510099
 DIST cairo-1.12.2.tar.xz 42051584 SHA256 b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96 SHA512 149e55e206175220448c520624980ba0081a3e2336202f6c5d5ba9098a51c01f6d89843c3c3f0d5bed3473a5ff49dee6530e2cacec93a94c9d78767cb881f847 WHIRLPOOL 89c773c1b82909a02332731a4e16e401ec20779205189503c08a1bf25946733c2b02415555f520ab3ca64202fb7e0ef3a5fbea39676436aafeb42d977a6e3897
 DIST cairo-1.8-lcd_filter.patch.bz2 7067 SHA256 6965d46df45d8382d122170a0f1dfaeb25bd68adc998b42f62397123e5795d1d
 DIST cairo-1.8.10.tar.gz 7102657 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
-EBUILD cairo-1.10.2-r1.ebuild 4143 SHA256 f52c24bf2a3867ff449452e893e06d813ef2a80ced505b61b297f2afcd780e1d SHA512 b7a043b4a223afea9946166ae34f50cc059b1f9ba268f0270a88b313b05f0fbe56ec1b243a1b46e8deb86f584126960dbc0a7234aaee43235fd50a917c09aeda WHIRLPOOL 11ca7cb7025b1f5c213c59b994e14a2efc23bcc1e1d772bb1496ee930b869ec632ec6f0b25960fb0c6b3b1b678f7a69cd569a18defb71ccf084696762edebf09
-EBUILD cairo-1.10.2-r2.ebuild 4256 SHA256 022eb87121821ae601434fdb4483cd28fea03b1dbdc60a89bfb80943ccb9a420 SHA512 d4b0dd3c7a8e86749d29bcd0027d1718bcb32482d7991470f339be89987496b6996901b99889aa67128f9bd6cea832d5742570d2d0bf6bb1ca776acfeee02ff8 WHIRLPOOL 37853ab694aa155f361a905333c865abc5b0ff4852561c0fc5447adbb5ce6167b1c8fb38e8bc3db717bdfb0968f6df31d89cdb6cd51526df1f052c8ebb4e5908
-EBUILD cairo-1.12.0.ebuild 3702 SHA256 182cf62b27ae72b20f7324c0ed1ac8c4ea350ed7026b0c2bb68a3a6031aa6bbf SHA512 d31f5c1596beef000be6adf69ed9873173fb13d056a3232e52ad63864f3a6bd1cf91054f0ea521e98ff40634659da1b3ec14165d9f224ae775cfbe81cb488c70 WHIRLPOOL e998b45bd04b359b8f98ad79b067bda190de23a177d3e7adda0d92e4d93dac9c78e40de12701eee60d777f47d574672f953a6559aeef577a29a3bf1f12bdcd9f
-EBUILD cairo-1.12.2-r1.ebuild 3809 SHA256 ae712de9a82195cb12a721184540e58900dc6170894fc2d3edf65fd104450a9e SHA512 8e9a95ec9ebe4e90cf6d25d352d174ba82a40d89ff647a1e8333a830eb168c1bd9cfee9dd4973560f965369965786fd423dbb10f6705e386089835df428249c4 WHIRLPOOL 580b782d88ceab662d0eef4574f8401a70a7f6b7b8aa9ca6051a4135e7b9ff4323bba4bb0a009550608dabe3beb3ba867f3de407ffc05bf2cab9ab376ae813e4
-EBUILD cairo-1.12.2.ebuild 3700 SHA256 4337b0de95462ab99634b11a8e828eee470ddbc4698a6b4a349e90550c171fd3 SHA512 dc8349a1b208fe18185a59abd6cb1e96d621f65309c4f6033a3f3722a91493bb81691789885dfc07c0a55225da331ece8b47107943330b24239074cc1e5fd9c3 WHIRLPOOL 428e6e132b743d50cd29466ac6653ee7666ee81aa8a7a1ccc634bf8e7a260081445b230f5d7ed07150d82a243e8519b1f28ab9bb29bb6366d489d5827a32cd6f
+EBUILD cairo-1.10.2-r1.ebuild 4156 SHA256 58e50e154608f317cff097a32f96628f9a4060fe094c9a576d194b8ebaa329ea SHA512 01ffccee53771680f8390ead9167388c3b253538e564f25ace7afe07f0a27d8f8f7987ceb16546bd999fbbd13f1fabf443a46396273c45988d6eda7e01a59d31 WHIRLPOOL d74ec977af60e45d61e406fa4f5a960427e110811fb43102e7f8343b2cddd46f19a16a236a6dac4c0cc7393df22ec088805342297541514f109ff1ea2f6b0164
+EBUILD cairo-1.12.2-r1.ebuild 3808 SHA256 4125794762c6913d21deb50ca34d9dba510ff6a829d8853c96148861cf88780b SHA512 1e247c963456e740823025604fb87de1725ed110a4b01f3f268cc37974387874ba3bb6f494b7c481824e1803576e123625fc1b95062ff20255883412c834f615 WHIRLPOOL a11786fe7aa6d45912bdba66dbc16f377bc7da5e16c7df367faaa72803a013887f300bccacb51f4734c5c2f0c7f40f25cd9ed95233e51d494670767e4f468589
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
 EBUILD cairo-9999.ebuild 3699 SHA256 81ab1ca237dd1870ec18b637af658d7f2715bfd49fae9ba5b98cab4f4102de60 SHA512 2e9a13d950e8dbf837a0a209661f9c3497ce75d54d17750c200c77f86e10acf6a48dd9aac3d47f8ba7feb7fbe66d51eafdc618fbc0cc11944c9c00c09539aa3c WHIRLPOOL 8a1187a88f3d78fca2964a26bb6c2fc766f28e4727524991245e5c10a9725ebd5ca67194c32fc5372963c5b932ab2bc2af42876de8f1d0a222097372fe66189a
-MISC ChangeLog 42609 SHA256 513036bde677e55d169e8515266c5bfca1d65b5323156dac295816f6e4729371 SHA512 4076ef0b5ed4089fbed8665273a4352d652679eeb64ed4c5ffb691dc9ad2c3e6a3d3178eadc21ad17e5a5452c6a2351916199607123744b92af92c21bcffbed4 WHIRLPOOL a96631c409a50691ad341462d393b13bfdc989abc8d9efdef6e8b5e1b3551dc318af1e877ee1e34cfc7586264338d5b8ea4fe4e3bd1a4a30180923bad47ae234
+MISC ChangeLog 42846 SHA256 0b9fbfbc55117051d724e9b4cbdc50ce6fc3ca7066f2def905d3be1072c55a10 SHA512 dfaa1e2ae3fc921034a8b49c4abe72e4259255e66ae2c2f55ac3a8c82082ce19a5ae8a2d9f365bdcd2385ba7679cd20aba0b13b3bad8967bf971bc3ae67a6b29 WHIRLPOOL 7c65b860fb10827abe017ad67779413302b83910aa0e4e8c3771c0e8b842019cf8a8c03e564fb956848f2b1a1389fd4948c747dd656c01e2b7f960f6bceb8877
 MISC metadata.xml 958 SHA256 34cc9c511683c03054b582ff5ce62e1a75a79cc472d83ff37f20e4d0d352064c SHA512 c541701c99a94d60f5dd22f27160ede89781411641c5772ba94fd24566b95ffc56bf90d06586d8038b4c1445f896cc295a7a03f27bc2e0e6fc9f489be678ef23 WHIRLPOOL c96181f0119d73c0084fd659d6aa3a9dd2d8ac3194d35efd23bf46e8e9f3d7aa00b11130c736f2578cfe20695fd41254dad03002db28ec6337ba57ada4aee2b3
diff --git a/x11-libs/cairo/cairo-1.10.2-r1.ebuild b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
index 987746eeec7b..40a58191a2bf 100644
--- a/x11-libs/cairo/cairo-1.10.2-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.15 2012/05/05 03:52:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r1.ebuild,v 1.16 2012/07/24 13:55:46 yngwin Exp $
 
 EAPI=3
 
@@ -65,6 +65,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
 	epatch "${FILESDIR}"/${P}-interix.patch
+	epatch_user
 
 	# Slightly messed build system YAY
 	if [[ ${PV} == *9999* ]]; then
diff --git a/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/x11-libs/cairo/cairo-1.10.2-r2.ebuild
deleted file mode 100644
index f9e0d140ce0a..000000000000
--- a/x11-libs/cairo/cairo-1.10.2-r2.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r2.ebuild,v 1.11 2012/05/29 15:45:00 ranger Exp $
-
-EAPI=3
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-[[ ${PV} == *9999 ]] && GIT_ECLASS="git"
-
-inherit eutils flag-o-matic autotools ${GIT_ECLASS}
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sys-libs/zlib
-	>=x11-libs/pixman-0.18.4
-	directfb? ( dev-libs/DirectFB )
-	glib? ( dev-libs/glib:2 )
-	opengl? ( virtual/opengl )
-	openvg? ( media-libs/mesa[gallium] )
-	qt4? ( >=x11-libs/qt-gui-4.8:4 )
-	svg? ( dev-libs/libxml2 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft
-		drm? (
-			>=sys-fs/udev-136
-			gallium? ( media-libs/mesa[gallium] )
-		)
-	)
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
-	X? (
-		x11-proto/renderproto
-		drm? (
-			x11-proto/xproto
-			>=x11-proto/xextproto-7.1
-		)
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-	epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch
-	epatch "${FILESDIR}"/${P}-interix.patch
-	epatch "${FILESDIR}"/${P}-qt-surface.patch
-
-	# 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
-}
-
-src_configure() {
-	local myopts
-
-	# SuperH doesn't have native atomics yet
-	use sh && myopts+=" --disable-atomic"
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
-	# tracing fails to compile, because Solaris' libelf doesn't do large files
-	[[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace"
-
-	# 128-bits long arithemetic functions are missing
-	[[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=*
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	if use X; then
-		myopts+="
-			--enable-tee=yes
-			$(use_enable drm)
-		"
-
-		if use drm; then
-			myopts+="
-				$(use_enable gallium)
-				$(use_enable xcb xcb-drm)
-			"
-		else
-			use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now."
-			myopts+="
-				--disable-gallium
-				--disable-xcb-drm
-			"
-		fi
-	else
-		use drm && ewarn "drm use requires X use enabled. So disabling for now."
-		myopts+="
-			--disable-drm
-			--disable-gallium
-			--disable-xcb-drm
-		"
-	fi
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# --disable-xcb-lib:
-	#	do not override good xlib backed by hardforcing rendering over xcb
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(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 glib gobject) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install || die
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/x11-libs/cairo/cairo-1.12.0.ebuild b/x11-libs/cairo/cairo-1.12.0.ebuild
deleted file mode 100644
index f6d6c9b73e19..000000000000
--- a/x11-libs/cairo/cairo-1.12.0.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.0.ebuild,v 1.6 2012/05/29 13:38:33 aballier Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-[[ ${PV} == *9999 ]] && GIT_ECLASS="git-2"
-
-inherit eutils flag-o-matic autotools ${GIT_ECLASS}
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sys-libs/zlib
-	>=x11-libs/pixman-0.18.4
-	directfb? ( dev-libs/DirectFB )
-	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( virtual/opengl )
-	openvg? ( media-libs/mesa[openvg] )
-	qt4? ( >=x11-libs/qt-gui-4.8:4 )
-	svg? ( dev-libs/libxml2 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft
-		drm? (
-			>=sys-fs/udev-136
-			gallium? ( media-libs/mesa[gallium] )
-		)
-	)
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
-	X? (
-		x11-proto/renderproto
-		drm? (
-			x11-proto/xproto
-			>=x11-proto/xextproto-7.1
-		)
-	)"
-
-# drm module requires X
-# for gallium we need to enable drm
-REQUIRED_USE="
-	drm? ( X )
-	gallium? ( drm )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-
-	# 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
-}
-
-src_configure() {
-	local myopts
-
-	# SuperH doesn't have native atomics yet
-	use sh && myopts+=" --disable-atomic"
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	use X && myopts+=" --enable-tee=yes"
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# --disable-xcb-lib:
-	#	do not override good xlib backed by hardforcing rendering over xcb
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(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 glib gobject) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		$(use_enable drm) \
-		$(use_enable gallium) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/x11-libs/cairo/cairo-1.12.2-r1.ebuild b/x11-libs/cairo/cairo-1.12.2-r1.ebuild
index 041ce27ba732..9e293ae463cc 100644
--- a/x11-libs/cairo/cairo-1.12.2-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2-r1.ebuild,v 1.1 2012/07/24 13:08:01 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2-r1.ebuild,v 1.2 2012/07/24 13:55:46 yngwin Exp $
 
 EAPI=4
 
@@ -73,7 +73,7 @@ REQUIRED_USE="
 "
 
 src_prepare() {
- 	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
+	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
 	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
 	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
 
diff --git a/x11-libs/cairo/cairo-1.12.2.ebuild b/x11-libs/cairo/cairo-1.12.2.ebuild
deleted file mode 100644
index eb03479c4972..000000000000
--- a/x11-libs/cairo/cairo-1.12.2.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.12.2.ebuild,v 1.6 2012/07/14 20:01:53 cardoe Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic autotools
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-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 doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0
-	sys-libs/zlib
-	>=x11-libs/pixman-0.18.4
-	directfb? ( dev-libs/DirectFB )
-	glib? ( >=dev-libs/glib-2.28.6:2 )
-	opengl? ( virtual/opengl )
-	openvg? ( media-libs/mesa[openvg] )
-	qt4? ( >=x11-libs/qt-gui-4.8:4 )
-	svg? ( dev-libs/libxml2 )
-	X? (
-		>=x11-libs/libXrender-0.6
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXft
-		drm? (
-			>=sys-fs/udev-136
-			gallium? ( media-libs/mesa[gallium] )
-		)
-	)
-	xcb? (
-		x11-libs/libxcb
-		x11-libs/xcb-util
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/libtool-2
-	doc? (
-		>=dev-util/gtk-doc-1.6
-		~app-text/docbook-xml-dtd-4.2
-	)
-	X? (
-		x11-proto/renderproto
-		drm? (
-			x11-proto/xproto
-			>=x11-proto/xextproto-7.1
-		)
-	)"
-
-# drm module requires X
-# for gallium we need to enable drm
-REQUIRED_USE="
-	drm? ( X )
-	gallium? ( drm )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch
-
-	# 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
-}
-
-src_configure() {
-	local myopts
-
-	# SuperH doesn't have native atomics yet
-	use sh && myopts+=" --disable-atomic"
-
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-	# http://bugs.freedesktop.org/show_bug.cgi?id=15463
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D_POSIX_PTHREAD_SEMANTICS
-
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	use X && myopts+=" --enable-tee=yes"
-
-	use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
-	# --disable-xcb-lib:
-	#	do not override good xlib backed by hardforcing rendering over xcb
-	econf \
-		--disable-dependency-tracking \
-		$(use_with X x) \
-		$(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 glib gobject) \
-		$(use_enable doc gtk-doc) \
-		$(use_enable openvg vg) \
-		$(use_enable opengl gl) \
-		$(use_enable qt4 qt) \
-		$(use_enable static-libs static) \
-		$(use_enable svg) \
-		$(use_enable xcb) \
-		$(use_enable xcb xcb-shm) \
-		$(use_enable drm) \
-		$(use_enable gallium) \
-		--enable-ft \
-		--enable-pdf \
-		--enable-png \
-		--enable-ps \
-		--disable-xlib-xcb \
-		${myopts}
-}
-
-src_install() {
-	# parallel make install fails
-	emake -j1 DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README
-}