arm/s390/sh stable

Package-Manager: portage-2.1.1_pre4

diff --git a/media-libs/fontconfig/files/digest-fontconfig-2.2.2 b/media-libs/fontconfig/files/digest-fontconfig-2.2.2
index 93b5870488cb0f2f705236842f050173bac0afd2..c4eb09f7d260e10f1be6d571af0203fb88bab122 100644 (file)
--- a/media-libs/fontconfig/files/digest-fontconfig-2.2.2
+++ b/media-libs/fontconfig/files/digest-fontconfig-2.2.2
@@ -1 +1,3 @@
 MD5 af6e9a8addfa89aa68d703d5eb004185 fontconfig-2.2.2.tar.gz 743895
+RMD160 166037c3ef347b747400559a770ac1b62d0f19c4 fontconfig-2.2.2.tar.gz 743895
+SHA256 1cf4add79211ec9ae03cc28a83f04a9045d728a954038e5078df0d4911ff31b7 fontconfig-2.2.2.tar.gz 743895

diff --git a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
index 51f295aff5aabdf0bcb88336af94e92005befbce..1b0e88ab38562d4df781f1d3d636eece40721d41 100644 (file)
--- a/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.8 2006/08/03 22:06:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.3.2-r1.ebuild,v 1.9 2006/08/06 17:01:33 vapier Exp $
 
 inherit eutils libtool autotools
 
@@ -10,29 +10,27 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.gz"
 
 LICENSE="fontconfig"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ~ppc-macos ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 m68k ~mips ppc ~ppc-macos ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc"
 
 DEPEND=">=media-libs/freetype-2.1.4
        >=dev-libs/expat-1.95.3"
 
 src_unpack() {
-
        unpack ${A}
 
        cd "${S}"
        # alias for Symbol and dingbats font (#124238)
-       epatch ${FILESDIR}/${P}-symbol_alias.patch
+       epatch "${FILESDIR}"/${P}-symbol_alias.patch
        # fix pkgconfig includes (#83623)
-       epatch ${FILESDIR}/${P}-pkg_config.patch
+       epatch "${FILESDIR}"/${P}-pkg_config.patch
        # add docbook switch so we can disable it
-       epatch ${FILESDIR}/${P}-docbook.patch
+       epatch "${FILESDIR}"/${P}-docbook.patch
 
        eautoreconf
 
        # elibtoolize
        epunt_cxx #74077
-
 }
 
 src_compile() {
@@ -52,18 +50,16 @@ src_compile() {
        sed -i "s:fc-cache/fc-cache -f -v:sleep 0:" Makefile
 
        emake -j1 || die
-
 }
 
 src_install() {
-
        make DESTDIR="${D}" install || die
 
        insinto /etc/fonts
-       doins ${S}/fonts.conf
-       newins ${S}/fonts.conf fonts.conf.new
+       doins "${S}"/fonts.conf
+       newins "${S}"/fonts.conf fonts.conf.new
 
-       cd ${S}
+       cd "${S}"
        newman doc/fonts-conf.5 fonts-conf.5
        newman fc-cache/fc-cache.man fc-cache.1
        newman fc-list/fc-list.man fc-list.1