Fix typo in Paul Bredbury's name. Remove old revision.

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

3 files changed, 3 insertions, 149 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index e8ed01f0a7e1..3ed5154a782d 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,6 @@
 # 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.303 2012/07/25 08:44:33 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.304 2012/07/29 12:28:46 yngwin Exp $
 
 *cairo-1.10.2-r3 (25 Jul 2012)
 *cairo-1.12.2-r2 (25 Jul 2012)
@@ -31,7 +31,7 @@
   +files/cairo-respect-fontconfig.patch, metadata.xml:
   Take over maintainership, since spatz is being retired. Add back qt-
   surface.patch to 1.12.2 (bug #418133). Add respect-fontconfig patch by Paul
-  Bradbury (https://bugs.freedesktop.org/show_bug.cgi?id=11838#c8).
+  Bredbury (https://bugs.freedesktop.org/show_bug.cgi?id=11838#c8).
 
   14 Jul 2012; Doug Goldstein <cardoe@gentoo.org> cairo-1.12.2.ebuild,
   cairo-9999.ebuild:
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 07ae75309a3e..3f8fd9d9f8c5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -13,9 +13,8 @@ DIST cairo-1.8-lcd_filter.patch.bz2 7067 SHA256 6965d46df45d8382d122170a0f1dfaeb
 DIST cairo-1.8.10.tar.gz 7102657 SHA256 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
 EBUILD cairo-1.10.2-r2.ebuild 4269 SHA256 f563b262de85b4666c67e7fddf46ceb81404d7d8752514700b29504b01ae6cb9 SHA512 01c96a748740629f1d8d68db07d7aeef7dbd87b7bc3b5877cb4cb07e813c3f0ace7e949bbd19d83f795540a1caebb8fe01b795bc414b610ba3e6caf1d42f55ad WHIRLPOOL d35d7a07f50b66c8bcf9ebcd02fccec4212278e1f39cc59891914945b2b668ebc4220c0fe814a5488c7e84dc3fa21c1c2429653cc2fe871a350892d4d256d09e
 EBUILD cairo-1.10.2-r3.ebuild 4394 SHA256 b311e00a61be445cd8ce7477d1b142bd0248697cba9c2c3c500137189f068b41 SHA512 ed1c5f02fc830eeec26427bc01c46e1f1e63f153c2d223f6303ac921b1371d0bba601f5b081e03ec0d28de8ea227d53069a52356aa9d18fa4111a07e71cae3b8 WHIRLPOOL 3d9816cdc1c2e8c92d547448f3b6083e8e66aba8f42c1e85f06ba59a822543c700306f25ff091069eb93ff9817430b32356c5fe12b12b390ba32d9b052c5bbdd
-EBUILD cairo-1.12.2-r1.ebuild 3821 SHA256 7c4e0eb7ea2396ad673fad6a18cbd7fb309d1847536dd98b800ad911daa48bbf SHA512 019e2284a676b439975add36cd098e6b1dd9006827e425c5e5e3c68aeea4060afdef0b53dadbd1d42e2e43affdbc4796d65ddb11373774cb531a121222e1aa42 WHIRLPOOL 44b355a777bedd8b487b3c1f002791d4d21a124215f9a29d793f6f6427c0d9fa07e4d25177df4133b2ae2cdca596ceab0136c3161120fc99f53f173c2901a824
 EBUILD cairo-1.12.2-r2.ebuild 3794 SHA256 99cbfcfee84961942439642b61eeb213df6782d13dc583640d4cacc39df9ee30 SHA512 2dde521a5a5c20b8a657a690cd2bf52370d57147a6725b51a3aafdec86df623a81cc2737baa8cbc775b24e2f24607c0f0150aced5732a3f9bd133b027c8cee09 WHIRLPOOL b6c2e9bd425c276bfe7d15a393fbf0b1a26ca819c94916bec7e9ec630e0b9e492939d83dc618cd569ef804318faf020d6536060c2393a7fe55183335625fd82b
 EBUILD cairo-1.8.10.ebuild 3440 SHA256 41ef25a612af32eb6e7654e3f669f0f4030942bd84eb2db4da38278cb564794f SHA512 fecfac9a9766877355eae58566fc162e6b927f81ffd34e946904de0ea60fb207c55e1f9f4b4735fc09d59e914fd096861ecaf3859a88a57f2dd53bff8c8cfb86 WHIRLPOOL 1d3e24e04238260d090c3de9d8dc60b21d93fba9363ac94633c5220e0169aeebf02eb0f7152690ae276c928bea0ba4783a3ebf2809882362c6a5bd53aeef37fa
 EBUILD cairo-9999.ebuild 3817 SHA256 d9048b6251f2749a71a804d9a54cd985dc22aa175efc859eeec1c6dbe6a17f1c SHA512 fad64130fd5dec7b8c6bc92681b8432ac66f90eb162e96ba4bf91aac2da0abd18ca4ae050b36876ad244694362fde49c4ac7b70d501626979386468740921906 WHIRLPOOL b2aa186b014782aa973859f7a611b98f83f92db67d5ec8896cada468b5b43110db34f9c653747e3bb08ec7bdac6e502341fd85e7c16466b1fd3ea4647ecbcc1e
-MISC ChangeLog 43460 SHA256 9e46f36e51c887808893f70a73fe885aa990c856a26cd41adb9834ee5c542ede SHA512 d726ff439745ab486a84817a760b1e84d8ce887999b0173d36336057aa5c76e0cec04f2ec5e5911e5d032bc3e8ba846546362278e9512198e11745ce0dc7ba63 WHIRLPOOL 6c331fb5493ffeba2d2c0aea6b4693eb710712c0d9eacf208708408b000af38b4c1f6d842920f3df19f604d693eb84f5b9fe5ad0be2b69a6b02e06b663ef4cdc
+MISC ChangeLog 43460 SHA256 d7ad4a970648d5638221fd851b4cc09773d73ad7a4abb680dd3bbb54a7b7fccc SHA512 43563c6015a60c9bbb0f3a99bd867ff43397cfd934d8f52e39050dad7ab029e9d16ef0e4c553c8da861fee7053d3967c2e47840880c0ff913c9d1939d4ea8260 WHIRLPOOL 907623c065f62e3f6dff239f62974ac47a65f762227743e2ec1d6e4a1ee60c74e74d775b39c75f1fe2b56032550580bcf288c15ac34ae08adb9b5ec991b08cf4
 MISC metadata.xml 958 SHA256 34cc9c511683c03054b582ff5ce62e1a75a79cc472d83ff37f20e4d0d352064c SHA512 c541701c99a94d60f5dd22f27160ede89781411641c5772ba94fd24566b95ffc56bf90d06586d8038b4c1445f896cc295a7a03f27bc2e0e6fc9f489be678ef23 WHIRLPOOL c96181f0119d73c0084fd659d6aa3a9dd2d8ac3194d35efd23bf46e8e9f3d7aa00b11130c736f2578cfe20695fd41254dad03002db28ec6337ba57ada4aee2b3
diff --git a/x11-libs/cairo/cairo-1.12.2-r1.ebuild b/x11-libs/cairo/cairo-1.12.2-r1.ebuild
deleted file mode 100644
index c2cbf900d6bc..000000000000
--- a/x11-libs/cairo/cairo-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,145 +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-r1.ebuild,v 1.3 2012/07/24 14:12:30 yngwin 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
-	epatch "${FILESDIR}"/${PN}-1.10.2-qt-surface.patch
-	epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
-	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
-}
-
-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
-}