add notice about revdep-rebuild. add DirectFB backend support. Clean up warnings.

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 29 insertions, 25 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 62ab420dfba2..5aa7380e8277 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.74 2006/07/01 08:06:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.75 2006/07/09 07:21:38 cardoe Exp $
+
+  09 Jul 2006; Doug Goldstein <cardoe@gentoo.org> cairo-1.2.0.ebuild:
+  add notice about revdep-rebuild. add DirectFB backend support. Clean up warnings.
 
 *cairo-1.2.0 (01 Jul 2006)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e7a64186f56b..03b4d96f046e 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -34,14 +34,14 @@ EBUILD cairo-1.1.8.ebuild 1482 RMD160 671d45d956c9282e1d231c4e26263391a09d398c S
 MD5 6964c5286d99ee6615b9ddb8ee1a23b1 cairo-1.1.8.ebuild 1482
 RMD160 671d45d956c9282e1d231c4e26263391a09d398c cairo-1.1.8.ebuild 1482
 SHA256 5780f5ea60252a27976923019fa50832eb631096c21756afb0498c42cb2d6b3a cairo-1.1.8.ebuild 1482
-EBUILD cairo-1.2.0.ebuild 1626 RMD160 aa4ca3d04340932854132486fef14dc88115e240 SHA1 c675f67c56bdaa646de2e05b7efad23c6e67d95f SHA256 e712d9a9f736e6063609a554e4ab1f9795f1016c3dfdb7e7314257a25bd36f95
-MD5 7945356492074f9ebcdddaec40b7daa5 cairo-1.2.0.ebuild 1626
-RMD160 aa4ca3d04340932854132486fef14dc88115e240 cairo-1.2.0.ebuild 1626
-SHA256 e712d9a9f736e6063609a554e4ab1f9795f1016c3dfdb7e7314257a25bd36f95 cairo-1.2.0.ebuild 1626
-MISC ChangeLog 10835 RMD160 0c6e956901d9eb3cb89b8e3febea7596a4ad22f4 SHA1 873fe1ddc2446f5883a4155be196dc2cc8f37772 SHA256 537a08ad81c70b3543507d81eb4414e8899f7ad41abbb29e54fece67fb062571
-MD5 1f4c2b3f2f50fa8e0b091a3d380b9848 ChangeLog 10835
-RMD160 0c6e956901d9eb3cb89b8e3febea7596a4ad22f4 ChangeLog 10835
-SHA256 537a08ad81c70b3543507d81eb4414e8899f7ad41abbb29e54fece67fb062571 ChangeLog 10835
+EBUILD cairo-1.2.0.ebuild 1741 RMD160 1fae1b6442367c1091ba84e1115704ca4e184140 SHA1 f42e232694691ae77a8da21d67247931a376adc0 SHA256 08a40e0c0bd451f4e975e7c6a6149c3752b3a8c0ae10b8c31e61be74571c2b92
+MD5 e932a0dead3b557eb6f30cc98613b8fb cairo-1.2.0.ebuild 1741
+RMD160 1fae1b6442367c1091ba84e1115704ca4e184140 cairo-1.2.0.ebuild 1741
+SHA256 08a40e0c0bd451f4e975e7c6a6149c3752b3a8c0ae10b8c31e61be74571c2b92 cairo-1.2.0.ebuild 1741
+MISC ChangeLog 10990 RMD160 8d0869b4bf8db7544be5c847226c8190efe925eb SHA1 dba6bdcced346baaa858ff6aa6c0acc98be1ee46 SHA256 2e50a73bfa2a2b17b965ca16e171f12963dd2cb51584bcfcec317e86586b7cc6
+MD5 52e8685a16db498352f09a711ae4bd8d ChangeLog 10990
+RMD160 8d0869b4bf8db7544be5c847226c8190efe925eb ChangeLog 10990
+SHA256 2e50a73bfa2a2b17b965ca16e171f12963dd2cb51584bcfcec317e86586b7cc6 ChangeLog 10990
 MISC metadata.xml 295 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 SHA1 f293511dbc2dfb8ead2b4c8c9d36203bcafd7261 SHA256 446934aa9e0ef514e2fdc11bcd45c350c6bfd93ee22ce63317a3c29c88bd29a3
 MD5 b9452f52e8bc190de74b4a7b1ff862ab metadata.xml 295
 RMD160 7614ff3a3ccd865defe12fb5f73c200af43c49c8 metadata.xml 295
@@ -65,9 +65,9 @@ MD5 fec76d54197dd9fd812361ccec8b8a57 files/digest-cairo-1.2.0 238
 RMD160 f858848d1266606cd3f597503fafe30ea96bf200 files/digest-cairo-1.2.0 238
 SHA256 81e48ff30b661a76970966ce0b8e51bfe867a69d835b890fdd84bb680259e36b files/digest-cairo-1.2.0 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEpi0QoeSe8B0zEfwRAuhTAJwPY2Yc0tJ/5fD648ncJ3oWs6c7mQCfRT8g
-z6jB/TVQyCNpPev3V0srHow=
-=sKdT
+iD8DBQFEsK6ZoeSe8B0zEfwRAqsGAJ9soCIfnLvs9t8ImRBPhtH1K3fvRwCgimOd
+CeqgdTo2fZM7bDMWADaZgqc=
+=wRcB
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.2.0.ebuild b/x11-libs/cairo/cairo-1.2.0.ebuild
index aeaf97b4baa0..bd6fc1c5cfba 100644
--- a/x11-libs/cairo/cairo-1.2.0.ebuild
+++ b/x11-libs/cairo/cairo-1.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.0.ebuild,v 1.1 2006/07/01 08:06:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.0.ebuild,v 1.2 2006/07/09 07:21:38 cardoe Exp $
 
-inherit eutils autotools
+inherit eutils flag-o-matic
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -11,7 +11,7 @@ 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc glitz pdf png svg X"
+IUSE="directfb doc glitz pdf png svg X"
 
 RDEPEND="media-libs/fontconfig
 	>=media-libs/freetype-2.1.4
@@ -23,6 +23,7 @@ RDEPEND="media-libs/fontconfig
 		)
 		virtual/xft
 	)
+	directfb? ( dev-libs/DirectFB )
 	glitz? ( >=media-libs/glitz-0.5.1 )
 	png? ( media-libs/libpng )
 	pdf? (	>=app-text/poppler-bindings-0.4.1
@@ -37,16 +38,10 @@ DEPEND="${RDEPEND}
 		 ~app-text/docbook-xml-dtd-4.2 )"
 
 src_compile() {
-	echo
-	echo
-	echo
-	ewarn "This compiles but with tons of warnings.. but some Gentoo devs want this in masked.."
-	echo
-	echo
-	echo
-	echo
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
 
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
 		  $(use_enable png) $(use_enable svg) $(use_enable pdf) \
 		  $(use_enable glitz) --enable-freetype --enable-ps \
 		  || die "configure failed"
@@ -58,3 +53,9 @@ src_install() {
 	make DESTDIR="${D}" install || die "Installation failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
+
+pkg_postinst() {
+	echo
+	ewarn "You will most likely need to run revdep-rebuild after emerging this"
+	echo
+}