Changed the way the src dir variables are defined and exported.

Package-Manager: portage-1.589-cvs

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index e0942cd99bc6b1b51021b19f7278b70b7a38b9ce..94f7750f6597e0600c5b913f985a774c44a9599a 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
+MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
+MD5 1409e15605d9e85ecd9e151911beacfd splashutils-1.1.9.6-r1.ebuild 6008
+MD5 13b41917218dff90a78e1d3a582b86f7 splashutils-0.9.1.ebuild 3195
 MD5 648a7028f9de26e875716c4d5d60fa5a ChangeLog 10186
-MD5 d4d393d10196781338f83d0a795065ae files/digest-splashutils-0.9.1 378
+MD5 d2366bbd1460487cfbd09faa5df47e68 splashutils-1.1.9.7.ebuild 6271
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 1b03f7bbbe2db156b7b1a54d51d76ea0 splashutils-1.1.9.9-r1.ebuild 6234
 MD5 ae39d33c3d0a3a91709b168706326abf files/digest-splashutils-1.1.9.6-r1 547
+MD5 887e148191dfd124be52f9682e391c78 files/digest-splashutils-1.1.9.9-r1 483
 MD5 742f8fdebf8589f4a4c6af91fffc7fae files/digest-splashutils-1.1.9.7 547
 MD5 c55d25b2df1c791c0fa802c0de31af73 files/digest-splashutils-1.1.9.8 547
 MD5 227086af2d5e8360c3e2f23cdbfb97eb files/digest-splashutils-1.1.9.9 548
-MD5 887e148191dfd124be52f9682e391c78 files/digest-splashutils-1.1.9.9-r1 483
+MD5 d4d393d10196781338f83d0a795065ae files/digest-splashutils-0.9.1 378
 MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.patch 10294
-MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
-MD5 13b41917218dff90a78e1d3a582b86f7 splashutils-0.9.1.ebuild 3195
-MD5 1409e15605d9e85ecd9e151911beacfd splashutils-1.1.9.6-r1.ebuild 6008
-MD5 d2366bbd1460487cfbd09faa5df47e68 splashutils-1.1.9.7.ebuild 6271
-MD5 4180e756570d9f26db82b36b42c8cbc3 splashutils-1.1.9.8.ebuild 6287
-MD5 9359b897f1bea00ba6c6a1030a92098a splashutils-1.1.9.9-r1.ebuild 6074
-MD5 98fd11c248eba6f1f945bc2d7e530664 splashutils-1.1.9.9.ebuild 6323
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIYn9I1lqEGTUzyQRAkJNAJoCp94pWDJHBBRxz2goH754igX+PwCfTvrE
-FaDAIje0tuZSVEKt/isHj54=
-=1HdN
+iD8DBQFDIiA6chej4aZK9/cRAue8AJ9zbHgH1M7vHyQB56T/7hvyJ+UTlgCfRmH/
+ModMF5QjwcCAx8AIb4eBP6E=
+=dRrC
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
index 14c947df14a12b4a38a724f5a3a1c36d0cbc53e6..75f75406a41da544c6091073b181f9d967b57ef9 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.4 2005/09/09 13:11:05 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.5 2005/09/09 23:52:10 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -11,6 +11,11 @@ V_PNG="1.2.8"
 V_ZLIB="1.2.3"
 V_FT="2.1.9"
 
+ZLIBSRC="libs/zlib-${V_ZLIB}"
+LPNGSRC="libs/libpng-${V_PNG}"
+JPEGSRC="libs/jpeg-${V_JPEG}"
+FT2SRC="libs/freetype-${V_FT}"
+
 IUSE="hardened png truetype kdgraphics"
 
 DESCRIPTION="Framebuffer splash utilities."
@@ -120,7 +125,7 @@ src_compile() {
        cd ${SM}
        emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
        cd ${S}
-       export ZLIBSRC="libs/zlib-${V_ZLIB}"
+       export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
        emake -j1 LIB=$(get_libdir) || die "failed to build splashutils"
 }
 
@@ -128,6 +133,7 @@ src_install() {
        cd ${SM}
        make DESTDIR=${D} install || die
 
+       export ZLIBSRC LPNGSRC JPEGSRC FT2SRC
        cd ${S}
        make DESTDIR=${D} install || die