diff options
author | Donnie Berkholz <donnie@supernova.(none)> | 2006-10-09 15:55:41 -0700 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-10-09 15:55:41 -0700 |
commit | 6c9d5f415fbe48760fabc6fef6ede3870a575ffe (patch) | |
tree | 00cc0f95deba3934e6225aed145910aa65d4c57d /x11-libs | |
parent | mesa: merge in changes from gentoo-x86 (diff) | |
download | dberkholz-6c9d5f415fbe48760fabc6fef6ede3870a575ffe.tar.gz dberkholz-6c9d5f415fbe48760fabc6fef6ede3870a575ffe.tar.bz2 dberkholz-6c9d5f415fbe48760fabc6fef6ede3870a575ffe.zip |
cairo: sync in changes from gentoo-x86
Diffstat (limited to 'x11-libs')
-rw-r--r-- | x11-libs/cairo/Manifest | 8 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-9999.ebuild | 69 |
2 files changed, 49 insertions, 28 deletions
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index 901a99d..da82b91 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,7 +1,7 @@ -EBUILD cairo-9999.ebuild 1328 RMD160 5cd04528f49ef7411aa5f1900de6936898bf84c4 SHA1 dcb962d5988c2e30d73295e49368f65e5077a7d8 SHA256 73455125636d40a93757f9227f35815f4b12f8830c577fcb2e1eb1c69701aa78 size 1328 -MD5 68024d46ec65c30cf8036a549ec066fe cairo-9999.ebuild 1328 -RMD160 5cd04528f49ef7411aa5f1900de6936898bf84c4 cairo-9999.ebuild 1328 -SHA256 73455125636d40a93757f9227f35815f4b12f8830c577fcb2e1eb1c69701aa78 cairo-9999.ebuild 1328 +EBUILD cairo-9999.ebuild 1954 RMD160 78762bf548105e58843b5688fd679133fdd8c04d SHA1 efaf377855ec0772de7f95a22cf283cae034de85 SHA256 0023f934fb07faf9ab659ebbdde4f02c1d8cd54f11e5ca61d00ba0c2911c655d +MD5 779b50950c47b33955d464990fc0b555 cairo-9999.ebuild 1954 +RMD160 78762bf548105e58843b5688fd679133fdd8c04d cairo-9999.ebuild 1954 +SHA256 0023f934fb07faf9ab659ebbdde4f02c1d8cd54f11e5ca61d00ba0c2911c655d cairo-9999.ebuild 1954 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-cairo-9999 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-cairo-9999 1 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-cairo-9999 1 diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 194f730..9dad0c6 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -1,48 +1,69 @@ # 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.1.6.ebuild,v 1.2 2006/05/20 20:08:16 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.4.ebuild,v 1.1 2006/08/26 01:06:47 cardoe Exp $ -inherit eutils autotools git +inherit eutils flag-o-matic autotools git EGIT_REPO_URI="git://git.cairographics.org/git/cairo" EGIT_BOOTSTRAP="eautoreconf" DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="http://cairographics.org/" +#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" -IUSE="doc glitz png X" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="directfb doc glitz pdf png svg X" + +# 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.1 - X? ( || ( - ( x11-libs/libXrender x11-libs/libX11 ) - virtual/x11 - ) - virtual/xft - ) - glitz? ( >=media-libs/glitz-0.5.1 ) - png? ( media-libs/libpng ) - !<x11-libs/cairo-0.2" + >=media-libs/freetype-2.1.4 + X? ( + || ( + ( + x11-libs/libXrender + x11-libs/libXext + x11-libs/libX11 + ) + virtual/x11 + ) + virtual/xft + ) + directfb? ( >=dev-libs/DirectFB-0.9.24 ) + glitz? ( >=media-libs/glitz-0.5.1 ) + png? ( media-libs/libpng ) + svg? ( dev-libs/libxml2 ) + !<x11-libs/cairo-0.2" DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - X? ( || ( x11-proto/renderproto virtual/x11 ) ) - doc? ( >=dev-util/gtk-doc-1.3 - ~app-text/docbook-xml-dtd-4.2 )" + >=dev-util/pkgconfig-0.9 + X? ( || ( x11-proto/renderproto virtual/x11 ) ) + doc? ( + >=dev-util/gtk-doc-1.3 + ~app-text/docbook-xml-dtd-4.2 + )" src_compile() { - econf $(use_enable X xlib) \ - $(use_enable png) \ - $(use_enable doc gtk-doc) \ - $(use_enable glitz) \ - --enable-freetype || die "./configure failed" + #gets rid of fbmmx.c inlining warnings + append-flags -finline-limit=1200 + + 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" - emake || die "Compilation failed" + emake || die "compile failed" } 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 +} |