From b8b72de1475d53fbc8c44f7f07e273dc7872c835 Mon Sep 17 00:00:00 2001 From: Leonardo Valeri Manera Date: Mon, 14 Apr 2008 04:43:34 +0200 Subject: [PATCH] Convert to EAPI=1 --- media-libs/fontconfig/Manifest | 2 +- media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild | 14 ++++++++------ media-libs/freetype/Manifest | 2 +- media-libs/freetype/freetype-2.3.5-r2.ebuild | 11 ++++++----- x11-libs/cairo/Manifest | 2 +- x11-libs/cairo/cairo-1.6.4.ebuild | 8 +++++--- x11-libs/libXft/Manifest | 2 +- x11-libs/libXft/libXft-2.1.12.ebuild | 20 +++++++++----------- 8 files changed, 32 insertions(+), 29 deletions(-) diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 4987450..595b3fe 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 2852 RMD160 e71fceb1203afb77ecf8c9ec1ba3be64716abb4c SHA1 02438510791a22181b1c64742d43bb495b947ef4 SHA256 b2d26ddba91e4fc5bf272fcb02f0ce5660fa7b310f20f4a947d659ec188856af +EBUILD fontconfig-2.5.0-r1.ebuild 2919 RMD160 7e808083b17fdb7fd271ae71a796accaf83def98 SHA1 4c404cc2c5c20d2eaa0de2d113551eb82e13750c SHA256 16c1ca4ebd4b652ad5eff959ca68e092540f9483c6e349c79fc23df2e6502f40 diff --git a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild index f6ec76f..99d79e9 100644 --- a/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild +++ b/media-libs/fontconfig/fontconfig-2.5.0-r1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="1" inherit eutils libtool autotools DESCRIPTION="A library for configuring and customizing font access" @@ -11,14 +12,15 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.gz" LICENSE="fontconfig" SLOT="1.0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="doc xml ubuntu" +IUSE="doc xml +ubuntu" -RDEPEND=">=media-libs/freetype-2.1.4 - !xml? ( >=dev-libs/expat-1.95.3 ) - xml? ( >=dev-libs/libxml2-2.6 )" +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 )" DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( app-text/docbook-sgml-utils )" + dev-util/pkgconfig + doc? ( app-text/docbook-sgml-utils )" PDEPEND="app-admin/eselect-fontconfig" src_unpack() { diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index e53e217..a6ccab8 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -5,4 +5,4 @@ AUX freetype-bdflib-large-encodings.patch 808 RMD160 0e6ef92396ee14db0ed68a7922b DIST freetype-2.3.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e DIST freetype-doc-2.3.5.tar.bz2 98644 RMD160 d0a5cbe51eceb6c4a3a8eaaf4e3d99c2ca02266f SHA1 a3edb74195eee9384d0463104edde4881d73a308 SHA256 9c37aee42427feaaec7a276267f8c8ad771cb81033066bdf452c731fa41e4b0b DIST ft2demos-2.3.5.tar.bz2 157557 RMD160 7620d829a86d4125bc08d949cee13f8c383f6d88 SHA1 c528287137b534c38d0c2b94d3e76e6f9e8ff915 SHA256 f86d0d2906a2520d70460336002d20346c5013a973f3cedd049246715cef8e9f -EBUILD freetype-2.3.5-r2.ebuild 3554 RMD160 4ca00a91b923ad586dee0a334f0b7b510d314417 SHA1 6776ec5a5b70f6ac4b07f87b0152c0ddbbd90aca SHA256 c1d3f3184a50b91899f4e5fb9b9693ec1fbe841750d4d6d7fb69279ffe6c545d +EBUILD freetype-2.3.5-r2.ebuild 3463 RMD160 a07e1333600457a9032da5c5944b00b42e8d4639 SHA1 aad8d09af1d5d48c6b385afc61a73c3635413203 SHA256 138d80409808262a3e5c9d6f498532181f122ea0174f10551183eece4a9bd868 diff --git a/media-libs/freetype/freetype-2.3.5-r2.ebuild b/media-libs/freetype/freetype-2.3.5-r2.ebuild index 4a206d2..d0000ed 100644 --- a/media-libs/freetype/freetype-2.3.5-r2.ebuild +++ b/media-libs/freetype/freetype-2.3.5-r2.ebuild @@ -1,19 +1,20 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.3.5-r2.ebuild,v 1.8 2008/01/10 08:44:41 vapier Exp $ +# $Header: $ +EAPI="1" inherit eutils flag-o-matic libtool DESCRIPTION="A high-quality and portable font engine" HOMEPAGE="http://www.freetype.org/" SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2 - utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) - doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )" + utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2 ) + doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2 )" LICENSE="FTL GPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -IUSE="X bindist debug doc utils ubuntu" +IUSE="X bindist debug doc utils +ubuntu" DEPEND="X? ( x11-libs/libX11 x11-libs/libXau @@ -22,7 +23,7 @@ DEPEND="X? ( x11-libs/libX11 # We also need a recent fontconfig version to prevent segfaults. #166029 # July 3 2007 dirtyepic RDEPEND="${DEPEND} - !=media-libs/freetype-2.3.5-r2 ) + !newspr? ( media-libs/freetype ) + >=media-libs/fontconfig-2.2" DEPEND="${RDEPEND}" pkg_setup() { -- 2.11.4.GIT