From e214202fb31ba2a16256200f543f24a38fa767fe Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Wed, 30 Apr 2008 18:41:51 +0200 Subject: [PATCH] Add built_with_use checks for the ubuntu/newspr font flags. --- media-libs/fontconfig/Manifest | 2 +- media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild | 14 ++++-- x11-libs/cairo/Manifest | 2 +- x11-libs/cairo/cairo-1.6.4.ebuild | 54 +++++++++++++++--------- x11-libs/libXft/Manifest | 2 +- x11-libs/libXft/libXft-2.1.12.ebuild | 19 +++++++-- 6 files changed, 64 insertions(+), 29 deletions(-) diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 595b3fe..787ed61 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -5,4 +5,4 @@ AUX fontconfig-hinting-and-alising-confs.patch 2522 RMD160 880821e76889c06920b70 AUX fontconfig-lcd-filtering.patch 4687 RMD160 33e66a441c709954f494c8f074a4f42b28a28953 SHA1 a61ab4948cd107214ac88ab9aed4dae503e535dc SHA256 fa78d74e110759b44ca8dd7710bbc010b5a69f8c56a7ef8ba41571c0703e3de0 AUX fontconfig-monospace-lcd-filtering.patch 779 RMD160 a9cc6d358eff28dbf8c70afcaae1a60da07a6429 SHA1 7bd28a6b3b204d8720c7c7f0a30116b99b1b566b SHA256 ee37c48fc2cd015b5dd536905acf472d74011ee11673f459d99e330f9e3a1a13 DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62d9da SHA1 9ffad5f5eb2c5dd277bfed1cafc6e62aa0172842 SHA256 34c6badb4cb7eb496779d30616903de400fa244838ea39c2a7f63eaa5fdf0efe -EBUILD fontconfig-2.5.0-r1.ebuild 2919 RMD160 7e808083b17fdb7fd271ae71a796accaf83def98 SHA1 4c404cc2c5c20d2eaa0de2d113551eb82e13750c SHA256 16c1ca4ebd4b652ad5eff959ca68e092540f9483c6e349c79fc23df2e6502f40 +EBUILD fontconfig-2.5.0-r1.ebuild 3197 RMD160 1634704aa1d0960a2127a505278b2be2f1239e47 SHA1 c7b8dafc5adafd202ad7c8de1e44a59002a9688c SHA256 f5f06dc79ef581ad77a3afd7713b0a7be4fad7d3ca2bdb93a5ac7372910c1ef5 diff --git a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild index 99d79e9..e48696a 100644 --- a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild +++ b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild @@ -15,14 +15,22 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86- IUSE="doc xml +ubuntu" RDEPEND="newspr? ( >=media-libs/freetype-2.3.5-r2 ) - !newspr? ( media-libs/freetype ) - !xml? ( >=dev-libs/expat-1.95.3 ) - xml? ( >=dev-libs/libxml2-2.6 )" + !newspr? ( media-libs/freetype:2 ) + !xml? ( dev-libs/expat ) + xml? ( dev-libs/libxml2:2 )" DEPEND="${RDEPEND} dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils )" PDEPEND="app-admin/eselect-fontconfig" +pkg_setup () { + if use ubuntu && \ + ! built_with_use --missing false media-libs/freetype:2 ubuntu; then + eerror "You need to compile freetype-2 with the ubuntu USE before you can compile fontconfig with the ubuntu USE flag." + die "Please rebuild freetype-2 with ubuntu enabled." + fi +} + src_unpack() { unpack ${A} diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest index 7d7e798..a47f7c2 100644 --- a/x11-libs/cairo/Manifest +++ b/x11-libs/cairo/Manifest @@ -1,3 +1,3 @@ AUX cairo-1.6.4-0ubuntu1.diff.bz2 32420 RMD160 269d16e7933c2db397743a61fe906d9c4bdb8eb8 SHA1 e409a20d27769b8e87f3f760558f1ff1183008e3 SHA256 6723e29cfc163e47c366936912e8d3a3e1ad5ed95c24b4f9f565b5745ee99ec0 DIST cairo-1.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42 -EBUILD cairo-1.6.4.ebuild 2317 RMD160 02efa1e07d2618313daaa5c0ee17bb1a4efad754 SHA1 097d8449dd5a9e9ce40d45ce774c9c06074f7368 SHA256 038d7824e3f0a545c9fc0291d4291838f0fe0364a9911c11fb389f71433c6e6f +EBUILD cairo-1.6.4.ebuild 2627 RMD160 3eacd983ad9072e13ec13580dea434f87d2a1880 SHA1 eddd2a3e4aa84364dffd546698b8a95e11f813aa SHA256 2149720ba5377ac67c18702ba9cc4d83c37470e9d33b83ceba9a038e8c3c4081 diff --git a/x11-libs/cairo/cairo-1.6.4.ebuild b/x11-libs/cairo/cairo-1.6.4.ebuild index bfa99cd..8c10e69 100644 --- a/x11-libs/cairo/cairo-1.6.4.ebuild +++ b/x11-libs/cairo/cairo-1.6.4.ebuild @@ -3,6 +3,7 @@ # $Header: $ EAPI="1" + inherit eutils flag-o-matic libtool DESCRIPTION="A vector graphics library with cross-device output support" @@ -17,20 +18,22 @@ IUSE="debug directfb doc glitz +newspr opengl svg test X xcb" RDEPEND="media-libs/fontconfig newspr? ( >=media-libs/freetype-2.3.5-r2 ) !newspr? ( media-libs/freetype:2 ) - sys-libs/zlib - media-libs/libpng - >=x11-libs/pixman-0.10.0 - X? ( - x11-libs/libXrender - x11-libs/libXext - x11-libs/libX11 - virtual/xft - xcb? ( x11-libs/libxcb - x11-libs/xcb-util ) + sys-libs/zlib + media-libs/libpng + >=x11-libs/pixman-0.10.0 + X? ( + x11-libs/libXrender + x11-libs/libXext + x11-libs/libX11 + virtual/xft + xcb? ( + x11-libs/libxcb + x11-libs/xcb-util + ) ) - directfb? ( >=dev-libs/DirectFB-0.9.24 ) - glitz? ( >=media-libs/glitz-0.5.1 ) - svg? ( dev-libs/libxml2 )" + directfb? ( >=dev-libs/DirectFB-0.9.24 ) + glitz? ( >=media-libs/glitz-0.5.1 ) + svg? ( dev-libs/libxml2 )" DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.19 @@ -40,16 +43,27 @@ DEPEND="${RDEPEND} x11-libs/pango x11-libs/gtk+ svg? ( >=gnome-base/librsvg-2.15.0 ) - ) - X? ( x11-proto/renderproto - xcb? ( x11-proto/xcb-proto ) ) - doc? ( - >=dev-util/gtk-doc-1.6 - ~app-text/docbook-xml-dtd-4.2 - )" + ) + X? ( + x11-proto/renderproto + xcb? ( x11-proto/xcb-proto ) + ) + doc? ( + >=dev-util/gtk-doc-1.6 + app-text/docbook-xml-dtd:4.2 + )" RESTRICT="test" +pkg_setup () { + if use newspr && \ + ! built_with_use --missing false x11-libs/libXft newspr; then + eerror "You need to rebuild libXft with newspr USE enabled" + eerror "before you can compile cairo with newspr." + die "Please rebuild libXft with newspr enabled." + fi +} + src_unpack() { unpack ${A} cd "${S}" diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest index 5387b4c..a2db731 100644 --- a/x11-libs/libXft/Manifest +++ b/x11-libs/libXft/Manifest @@ -2,4 +2,4 @@ AUX libXft-dont_interfere_with_newspr.patch.bz2 5376 RMD160 e78e39d52c756787cd43 AUX libXft-embeddedbitmap-property.patch 980 RMD160 a35a7c585a104e2bfc862102a98d5a99a66abe5a SHA1 b21ce2ee5f26c496dbf0bdd162499cb1943717a2 SHA256 dfa0e49e6609c5ba182d838d0d6aa3cb5ec42b13510485a83c6e186f8465e41f AUX libXft-no-export-freetype.diff 728 RMD160 89d8b371817207de36b76eb2e4930995e45c396f SHA1 6cbc7928f812e67031863f9d0ef8df0f786f122b SHA256 38fd4192b118610674616f639a41619fc327ca72f7630a4c86cdeb257585901e DIST libXft-2.1.12.tar.bz2 260437 RMD160 98ee482a0bdb9d41bbea667ea84d00421e51424b SHA1 c55fb1b79e6e8459a343e4986f0607a438eff340 SHA256 68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986 -EBUILD libXft-2.1.12.ebuild 1009 RMD160 c849c1c8834bff645308bbfbff390c31d383be95 SHA1 93a918a2f0c51dbb3ba5859703dbd883b8dd2178 SHA256 2585878fec630d192678cf5be12906997721a432f9e69089ecd4a6a139bd0aac +EBUILD libXft-2.1.12.ebuild 1347 RMD160 f3bc6e3c8b1c034ad359be6f8d5ceb16df4713e7 SHA1 232a031d2c35d11ff80de2784b20eaed008c6a99 SHA256 efeb3333c8ae443535bc5503f1ac77eb79c41a0cb491db5b73b34e0760e0aef3 diff --git a/x11-libs/libXft/libXft-2.1.12.ebuild b/x11-libs/libXft/libXft-2.1.12.ebuild index b8a9853..c0b83dd 100644 --- a/x11-libs/libXft/libXft-2.1.12.ebuild +++ b/x11-libs/libXft/libXft-2.1.12.ebuild @@ -3,6 +3,7 @@ # $Header: $ EAPI="1" + inherit x-modular flag-o-matic DESCRIPTION="X.Org Xft library" @@ -15,12 +16,24 @@ RDEPEND="x11-libs/libXrender x11-libs/libX11 x11-libs/libXext x11-proto/xproto - newspr? ( >=media-libs/freetype-2.3.5-r2 ) - !newspr? ( media-libs/freetype ) - >=media-libs/fontconfig-2.2" + newspr? ( + >=media-libs/freetype-2.3.5-r2 + >=media-libs/fontconfig-2.5.0-r1 + ) + !newspr? ( + media-libs/freetype:2 + >=media-libs/fontconfig-2.2 + )" DEPEND="${RDEPEND}" pkg_setup() { + if use newspr && \ + ! built_with_use --missing false media-libs/fontconfig ubuntu; then + eerror "You need to rebuild fontconfig with ubuntu USE enabled" + eerror "before you can compile libXft with newspr." + die "Please rebuild fontconfig with ubuntu enabled." + fi + # No such function yet # x-modular_pkg_setup -- 2.11.4.GIT