Updated zlib to 1.2.3 (requested in bug #104118).

Package-Manager: portage-1.589-cvs

4 files changed, 15 insertions, 12 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 1a11db5dd95a..b69cab830d7f 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.45 2005/09/08 12:40:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.46 2005/09/09 11:33:50 spock Exp $
+
+  09 Sep 2005; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.1.9.9-r1.ebuild:
+  Updated zlib to 1.2.3 (requested in bug #104118).
 
   08 Sep 2005; Michał Januszewski <spock@gentoo.org>
   splashutils-1.1.9.9-r1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 7f6b52aafc11..b01c2c7ea38a 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -5,12 +5,12 @@ 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 e66992d176526bbd60376ec9e876cd29 ChangeLog 10046
+MD5 648a7028f9de26e875716c4d5d60fa5a ChangeLog 10186
 MD5 d2366bbd1460487cfbd09faa5df47e68 splashutils-1.1.9.7.ebuild 6271
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
-MD5 22e863641b5190904118af97c19945f0 splashutils-1.1.9.9-r1.ebuild 6104
+MD5 98cb6a039c2a8ded647132a5fb4934d3 splashutils-1.1.9.9-r1.ebuild 6061
 MD5 ae39d33c3d0a3a91709b168706326abf files/digest-splashutils-1.1.9.6-r1 547
-MD5 4646a20554f880fbb3fb47bb823f724b files/digest-splashutils-1.1.9.9-r1 483
+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
@@ -19,7 +19,7 @@ MD5 c9591cbde5eca614a8e1694ee01c315f files/splashutils-1.1.9.9-external-klibc.pa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDIDFychej4aZK9/cRAsWlAJ9B48keeAV3icCWs73hAsrhMdHRaQCeLFvD
-LUQbICirw8xVE7DydSWOkI4=
-=E8nG
+iD8DBQFDIXqKchej4aZK9/cRAmwpAJ9+DhEPJpGJtOUyXgUUTJFGfaKQgQCfZImH
+v2dp+6Agi8K926A549mx6uQ=
+=Td2s
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1 b/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
index a8d67902b41a..bf70d8ddfd23 100644
--- a/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
+++ b/media-gfx/splashutils/files/digest-splashutils-1.1.9.9-r1
@@ -4,4 +4,4 @@ MD5 f8e92992682bbaf8e6eb2316ac708bc0 miscsplashutils-0.1.3.tar.bz2 91825
 MD5 00cea4539bea4bd34cbf8b82ff9589cd libpng-1.2.8.tar.bz2 384970
 MD5 dbd5f3b47ed13132f04c685d608a7547 jpegsrc.v6b.tar.gz 613261
 MD5 ec1b903e4be5f073caa72458ea58c29c freetype-2.1.9.tar.bz2 992394
-MD5 8106069990476a3c5187301465bd7a60 zlib-1.2.1.tar.bz2 284152
+MD5 dee233bf288ee795ac96a98cc2e369b6 zlib-1.2.3.tar.bz2 425209
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 f5bf5ad50091..4bc814e35dc4 100644
--- 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.2 2005/09/08 12:40:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.9-r1.ebuild,v 1.3 2005/09/09 11:33:50 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -8,7 +8,7 @@ MISCSPLASH="miscsplashutils-0.1.3"
 GENTOOSPLASH="splashutils-gentoo-0.1.13"
 V_JPEG="6b"
 V_PNG="1.2.8"
-V_ZLIB="1.2.1"
+V_ZLIB="1.2.3"
 V_FT="2.1.9"
 
 IUSE="hardened png truetype kdgraphics"
@@ -116,12 +116,11 @@ src_compile() {
 	spl_conf_use truetype CONFIG_TTF_KERNEL
 	spl_conf_use kdgraphics CONFIG_SILENT_KD_GRAPHICS
 	sed -i -e "s/^CFLAGS[ \t]*=.*/CFLAGS = ${CFLAGS}/" Makefile
-		LIBCSRC="libs/klibc-${V_KLIBC}/klibc" \
-		|| die "failed to build splashutils"
 
 	cd ${SM}
 	emake LIB=$(get_libdir) || die "failed to build miscsplashutils"
 	cd ${S}
+	export ZLIBSRC="libs/zlib-${V_ZLIB}"
 	emake -j1 LIB=$(get_libdir) || die "failed to build splashutils"
 }