From 73473f340dfdec98140cd30a46e17b781d2a64fb Mon Sep 17 00:00:00 2001 From: James Cloos Date: Mon, 29 Sep 2008 02:44:15 -0400 Subject: Kludge around changes to cairo’s autogen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x11-libs/cairo/Manifest | 5 +---- x11-libs/cairo/cairo-9999.ebuild | 13 +++++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index f32926b..ecb34a4 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,4 +1 @@ -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 +EBUILD cairo-9999.ebuild 2154 RMD160 2f70944713eaf5a61aecd92a1fbb99835567abb6 SHA1 78674509d63ba64a1f8c5ee0ff220b20b4f9b4cb SHA256 f9b1f14ab88bb970bc4431061be86833739f705867a2ddf844b5087c22a3d8a9 diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 9dad0c6..e18525d 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.ebuild @@ -5,7 +5,7 @@ inherit eutils flag-o-matic autotools git EGIT_REPO_URI="git://git.cairographics.org/git/cairo" -EGIT_BOOTSTRAP="eautoreconf" +#EGIT_BOOTSTRAP="eautoreconf" DESCRIPTION="A vector graphics library with cross-device output support" HOMEPAGE="http://cairographics.org/" @@ -14,7 +14,7 @@ HOMEPAGE="http://cairographics.org/" 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="directfb doc glitz pdf png svg X" +IUSE="directfb doc glitz pdf png svg X xcb" # Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it RESTRICT="test" @@ -32,6 +32,7 @@ RDEPEND="media-libs/fontconfig ) virtual/xft ) + xcb? ( >=x11-libs/libxcb-1.1.90.1 ) directfb? ( >=dev-libs/DirectFB-0.9.24 ) glitz? ( >=media-libs/glitz-0.5.1 ) png? ( media-libs/libpng ) @@ -45,12 +46,20 @@ DEPEND="${RDEPEND} ~app-text/docbook-xml-dtd-4.2 )" +src_unpack() { + git_src_unpack + cd "${S}" + touch boilerplate/Makefile.am.features src/Makefile.am.features ChangeLog + eautoreconf +} + src_compile() { #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 xcb) \ $(use_enable glitz) --enable-freetype --enable-ps \ || die "configure failed" -- cgit v1.2.3