make sure we actually use the USE flags we say we support and add support for zlib...

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 20aac1b6469d371243b062fd5619d53d9d0307f5..f9e0f6f2c6e1036904be87c6829d0a0e3541ce26 100644 (file)
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 MD5 4795c0cb40349fb84538fe52668f893c imlib2-1.2.0-r2.ebuild 1149
-MD5 af00a1d98fecac5d7e58d817c90ffe27 imlib2-9999.ebuild 966
+MD5 d435738585d7bf314614846b9415f313 imlib2-9999.ebuild 1196
 MD5 0c36280f1141c2ab86d0bd09ceec038a metadata.xml 2284
 MD5 e68c73c340a2db933bdaa907fc074c49 imlib2-1.2.1.004.ebuild 1065
 MD5 79da67e250cc153a8a523e4bc2209843 imlib2-1.2.0.007-r2.ebuild 1203
@@ -18,7 +18,7 @@ MD5 1d4f605193247283ce4fac45d2a10c58 files/digest-imlib2-1.2.0.007-r2 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHmPzgIKl8Uu19MoRAmonAJ93Z4RBeNgJCitB1Ij/2dZuxbrCXgCeLBkW
-roWXA8Hn/ergpm3IzeVqCKk=
-=3XA0
+iD8DBQFDHnB3gIKl8Uu19MoRAk02AJ4jtxTsTCWqK++7lL2JR0MD5NvUAgCZAW8u
+G+dcPrpNuKnb2dFh0XDS+oA=
+=Inmc
 -----END PGP SIGNATURE-----

diff --git a/media-libs/imlib2/imlib2-9999.ebuild b/media-libs/imlib2/imlib2-9999.ebuild
index 0b47f257514161ac4274e2e98a3232559df31cf1..42bf497bb6b97125afcafbecc5615d96a214000b 100644 (file)
--- a/media-libs/imlib2/imlib2-9999.ebuild
+++ b/media-libs/imlib2/imlib2-9999.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.9 2005/08/30 00:46:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-9999.ebuild,v 1.10 2005/09/07 04:44:48 vapier Exp $
 
-inherit enlightenment
+inherit enlightenment toolchain-funcs
 
 MY_P=${P/_/-}
 DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
 HOMEPAGE="http://www.enlightenment.org/Libraries/Imlib2.html"
 
-IUSE="X gif jpeg mmx mp3 png tiff"
+IUSE="X bzip2 gif jpeg mmx mp3 png tiff zlib"
 
 DEPEND="=media-libs/freetype-2*
+       bzip2? ( app-arch/bzip2 )
+       zlib? ( sys-libs/zlib )
        gif? ( >=media-libs/giflib-4.1.0 )
        png? ( >=media-libs/libpng-1.2.1 )
        jpeg? ( media-libs/jpeg )
@@ -20,15 +22,21 @@ DEPEND="=media-libs/freetype-2*
 
 src_compile() {
        local mymmx=""
-       if [[ ${ARCH} == "amd64" ]] ; then
+       if [[ $(tc-ARCH) == "amd64" ]] ; then
                mymmx="--enable-amd64 --disable-mmx"
        else
-               mymmx=$(use_enable mmx)
+               mymmx="--disable-amd64 $(use_enable mmx)"
        fi
 
        export MY_ECONF="
-               ${mymmx} \
                $(use_with X x) \
+               $(use_with jpeg) \
+               $(use_with png) \
+               $(use_with tiff) \
+               $(use_with zlib) \
+               $(use_with bzip2) \
+               $(use_with mp3 id3) \
+               ${mymmx} \
        "
        enlightenment_src_compile
 }