change description, better way of selecting mmx.

diff --git a/media-gfx/optipng/ChangeLog b/media-gfx/optipng/ChangeLog
index 79a791b1c9fa1af7e68985d3edfe52d587b627dd..549e38da0742d79ea778c28a93c57b8dfba69cf5 100644 (file)
--- a/media-gfx/optipng/ChangeLog
+++ b/media-gfx/optipng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/optipng
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.7 2004/06/02 22:54:30 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/ChangeLog,v 1.8 2004/06/03 08:25:00 taviso Exp $
+
+  03 Jun 2004; Tavis Ormandy <taviso@gentoo.org> optipng-0.4.5.ebuild,
+  files/optipng-0.4.5-more-makefile-options.diff:
+  use ifeq syntax instead of setting env vars.
 
 *optipng-0.4.5 (02 Jun 2004)
 

diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index cf3dc4fa74d2fb330695f806ba39a89d207c6032..59b3d77a57e33a9608cbedc21409de9874a054ff 100644 (file)
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,11 +1,11 @@
 MD5 b3baa13bb3accb81ba7461967a9d2e75 optipng-0.4.3-r1.ebuild 1783
 MD5 6394bac8d59dd1981322344337db62ef optipng-0.4.3.ebuild 1782
-MD5 115f1b3428bee195ae595033d80aaebc optipng-0.4.5.ebuild 2149
-MD5 6c70b6f56a43e42dc185046b21425f1f ChangeLog 1130
+MD5 e232f65702f4313f2ee92a87530a912d optipng-0.4.5.ebuild 2156
+MD5 bcbe33d6c458eb301d5198da310ce44e ChangeLog 1299
 MD5 d1fd781dd463a1e5d87df46fad732ec6 metadata.xml 400
 MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3-r1 65
 MD5 776935461c2653df2b47f23f7b7c60d7 files/digest-optipng-0.4.3 65
 MD5 cbb26191f6029021230a63ee5ac9a062 files/digest-optipng-0.4.5 65
 MD5 eab5451d70e601bb80438372adbcc3cd files/optipng-more-makefile-options.diff 1423
 MD5 ae0b66a3fd8e8cff827c907900a5d63c files/optipng-0.4.3-r1-more-makefile-options.diff 1552
-MD5 6caa91a8b407efd3ebfe1d2460a3cd96 files/optipng-0.4.5-more-makefile-options.diff 2094
+MD5 95e87b9aa8430dbe8d14268fb922a818 files/optipng-0.4.5-more-makefile-options.diff 2271

diff --git a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
index 4506ea2673b5fb02f1d72a32b06eda8e7f5321ea..91f16e1b2b051ff2032ddbfd9bf5de654563acd8 100644 (file)
--- a/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
+++ b/media-gfx/optipng/files/optipng-0.4.5-more-makefile-options.diff
@@ -1,5 +1,5 @@
 --- optipng-0.4.5.orig/src/scripts/Makefile.gcc        2004-05-31 10:38:00.000000000 +0100
-+++ optipng-0.4.5/src/scripts/Makefile.gcc     2004-06-02 23:49:49.134972424 +0100
++++ optipng-0.4.5/src/scripts/Makefile.gcc     2004-06-03 09:21:38.958025528 +0100
 @@ -3,22 +3,40 @@
  
  all: optipng
@@ -47,13 +47,19 @@
  
  libpng.a: ../lib-cos/libpng/libpng.a
        cp ../lib-cos/libpng/libpng.a libpng.a
-@@ -28,10 +46,10 @@
+@@ -27,11 +45,14 @@
+       cp ../lib-cos/zlib/libz.a libz.a
  
  ../lib-cos/libpng/libpng.a: ../lib-cos/zlib/libz.a
-       cd ../lib-cos/libpng; \
+-      cd ../lib-cos/libpng; \
 -      ${MAKE} -f scripts/makefile.gcc; \
-+      ${MAKE} -f scripts/${pngmake}; \
-       cd ../../src
+-      cd ../../src
++ifeq (${usemmx},1)
++      cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcmmx; cd ../../src
++else
++      cd ../lib-cos/libpng; ${MAKE} -f scripts/makefile.gcc; cd ../../src
++endif
++
  
  ../lib-cos/zlib/libz.a:
        cd ../lib-cos/zlib; \

diff --git a/media-gfx/optipng/optipng-0.4.5.ebuild b/media-gfx/optipng/optipng-0.4.5.ebuild
index a74e1a4d4a62c9df13977fa6ddc5d62cd225da95..7bf25da5eabd688bfff3ac4b899a6893aa0defdd 100644 (file)
--- a/media-gfx/optipng/optipng-0.4.5.ebuild
+++ b/media-gfx/optipng/optipng-0.4.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.1 2004/06/02 22:54:30 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/optipng/optipng-0.4.5.ebuild,v 1.2 2004/06/03 08:25:00 taviso Exp $
 
 inherit eutils flag-o-matic
 
-DESCRIPTION="PNG optimizing utility"
+DESCRIPTION="Find the optimal compression settings for your png files"
 SRC_URI="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/${P}.tar.gz"
 HOMEPAGE="http://www.cs.toronto.edu/~cosmin/pngtech/optipng/"
 
@@ -41,9 +41,9 @@ src_compile() {
                # do amd64/ia64 support mmx?
                use x86 || ewarn "mmx flag set, but not on x86?"
 
-               pngmake=makefile.gcmmx
+               usemmx=1
        else
-               pngmake=makefile.gcc
+               usemmx=0
        fi
 
        # only defined in bundled zlib?
@@ -51,7 +51,7 @@ src_compile() {
                append-flags -DZ_RLE=3
        fi
 
-       export pngmake LDFLAGS
+       export usemmx LDFLAGS
 
        # some logic to decide which version to build...
        if ! use ext-png; then