Added patch to rename the INFINITY variable to infinity to avoid problems where the...

Package-Manager: portage-2.0.53_rc5

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index b40daa4a9e5ed1cedd8da1e4ca6bc6011be8efed..ce49fc86a5c7bfaa739e3c434016b515178acc08 100644 (file)
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.71 2005/10/04 23:20:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.72 2005/10/10 14:45:24 flameeyes Exp $
+
+  10 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netpbm-10.29-infinity.patch, netpbm-10.29-r1.ebuild:
+  Added patch to rename the INFINITY variable to infinity to avoid problems
+  where the first is a system define.
 
   04 Oct 2005; Mike Frysinger <vapier@gentoo.org> netpbm-10.29-r1.ebuild:
   Redo some library options and merge Darwin support #74101.

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index b6f9933b79662fd8283310e27fc77a4d06db073e..424d508891cd0ddcadfa318119005e1f76e9cff0 100644 (file)
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,43 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e356185ae787b984b1502205834c74f4 netpbm-10.11.14.ebuild 2010
-MD5 bc37890e535cf2fcbe66043b92491072 netpbm-10.11.15.ebuild 2009
-MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
-MD5 f17a1fb0d30a71452e534e435c7295b2 netpbm-9.12-r4.ebuild 1343
-MD5 28ca860ea5e88498171e08bc22685c16 netpbm-10.11.5-r3.ebuild 1567
-MD5 232141f809b3f52bf76ed31cf6cc0771 netpbm-10.29-r1.ebuild 2869
-MD5 895b0e411f04f77b4f7c4d6eadff308a netpbm-10.29.ebuild 2431
-MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
-MD5 a936cf1a2061cebff85f7a54e12d6422 netpbm-10.20.ebuild 2273
-MD5 fc5b2c41ccdc4c486d3f7b65771753b5 netpbm-10.19.ebuild 1739
-MD5 6954228b2c54d3d9a7903c569e1b7097 ChangeLog 10205
-MD5 323b69ef703b303e44f51be5b762df65 netpbm-10.18.7.ebuild 2009
-MD5 e1d7f1307e675fbbfc3a07f2539c0708 netpbm-10.20-r1.ebuild 2442
+MD5 d847418534d91db6596d9e4f258b7750 ChangeLog 10438
+MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
+MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
+MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
+MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
+MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
+MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
+MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
+MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
+MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
+MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
 MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20 62
+MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20-r1 62
+MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
+MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
 MD5 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
-MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
-MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
 MD5 102062d84b1750c991d13e5528a9420b files/netpbm-10.29-build.patch 2278
-MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
-MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
-MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
+MD5 103e8f6f6474dcc4b17ee049111bc3f6 files/netpbm-10.29-infinity.patch 5840
 MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20-r1 62
 MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
-MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
-MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
-MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
-MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
-MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
-MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
-MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQw6bgIKl8Uu19MoRAqCDAJ47l5afUDTKnnClQjReVd7UhBCf5ACePp12
-zaTL4ZlJe7Ba/ngBlkX50tg=
-=onH0
------END PGP SIGNATURE-----
+MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
+MD5 e356185ae787b984b1502205834c74f4 netpbm-10.11.14.ebuild 2010
+MD5 bc37890e535cf2fcbe66043b92491072 netpbm-10.11.15.ebuild 2009
+MD5 28ca860ea5e88498171e08bc22685c16 netpbm-10.11.5-r3.ebuild 1567
+MD5 323b69ef703b303e44f51be5b762df65 netpbm-10.18.7.ebuild 2009
+MD5 fc5b2c41ccdc4c486d3f7b65771753b5 netpbm-10.19.ebuild 1739
+MD5 e1d7f1307e675fbbfc3a07f2539c0708 netpbm-10.20-r1.ebuild 2442
+MD5 a936cf1a2061cebff85f7a54e12d6422 netpbm-10.20.ebuild 2273
+MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
+MD5 afe8597a3abf7f8fac7d2d339830c423 netpbm-10.29-r1.ebuild 2922
+MD5 895b0e411f04f77b4f7c4d6eadff308a netpbm-10.29.ebuild 2431
+MD5 f17a1fb0d30a71452e534e435c7295b2 netpbm-9.12-r4.ebuild 1343

diff --git a/media-libs/netpbm/files/netpbm-10.29-infinity.patch b/media-libs/netpbm/files/netpbm-10.29-infinity.patch
new file mode 100644 (file)
index 0000000..00717dd
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.29-infinity.patch
@@ -0,0 +1,134 @@
+Index: netpbm-10.29/editor/pnmaddnoise.c
+===================================================================
+--- netpbm-10.29.orig/editor/pnmaddnoise.c
++++ netpbm-10.29/editor/pnmaddnoise.c
+@@ -252,14 +252,14 @@ laplacian_noise(FILE * const ifp,
+     int rows, cols, format, row;
+     double rtemp, gtemp, btemp;
+     double u, u1;
+-    double INFINITY;
++    double infinity;
+ 
+     double const EPSILON = 1.0e-5;
+     int const forceplain = 0;
+ 
+     pnm_readpnminit( ifp, &cols, &rows, &maxval, &format );
+     xelrow = pnm_allocrow( cols );
+-    INFINITY = (double) maxval;
++    infinity = (double) maxval;
+ 
+     pnm_writepnminit( stdout, cols, rows, maxval, format, forceplain );
+ 
+@@ -272,12 +272,12 @@ laplacian_noise(FILE * const ifp,
+                 u = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( u <= 0.5 ) {
+                     if ( u <= EPSILON )
+-                        rtemp = PPM_GETR( *xP ) - INFINITY;
++                        rtemp = PPM_GETR( *xP ) - infinity;
+                     else
+                         rtemp = PPM_GETR( *xP ) + lsigma * log( 2.0 * u );
+                 } else {
+                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
+-                        rtemp = PPM_GETR( *xP ) + INFINITY;
++                        rtemp = PPM_GETR( *xP ) + infinity;
+                     else
+                         rtemp = PPM_GETR( *xP ) - lsigma * log( 2.0 * u1 );
+                 }
+@@ -285,12 +285,12 @@ laplacian_noise(FILE * const ifp,
+                 u = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( u <= 0.5 ) {
+                     if ( u <= EPSILON )
+-                        gtemp = PPM_GETG( *xP ) - INFINITY;
++                        gtemp = PPM_GETG( *xP ) - infinity;
+                     else
+                         gtemp = PPM_GETG( *xP ) + lsigma * log( 2.0 * u );
+                 } else {
+                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
+-                        gtemp = PPM_GETG( *xP ) + INFINITY;
++                        gtemp = PPM_GETG( *xP ) + infinity;
+                     else
+                         gtemp = PPM_GETG( *xP ) - lsigma * log( 2.0 * u1 );
+                 }
+@@ -298,12 +298,12 @@ laplacian_noise(FILE * const ifp,
+                 u = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( u <= 0.5 ) {
+                     if ( u <= EPSILON )
+-                        btemp = PPM_GETB( *xP ) - INFINITY;
++                        btemp = PPM_GETB( *xP ) - infinity;
+                     else
+                         btemp = PPM_GETB( *xP ) + lsigma * log( 2.0 * u );
+                 } else {
+                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
+-                        btemp = PPM_GETB( *xP ) + INFINITY;
++                        btemp = PPM_GETB( *xP ) + infinity;
+                     else
+                         btemp = PPM_GETB( *xP ) - lsigma * log( 2.0 * u1 );
+                 }
+@@ -318,12 +318,12 @@ laplacian_noise(FILE * const ifp,
+                 u = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( u <= 0.5 ) {
+                     if ( u <= EPSILON )
+-                        gtemp = PNM_GET1( *xP ) - INFINITY;
++                        gtemp = PNM_GET1( *xP ) - infinity;
+                     else
+                         gtemp = PNM_GET1( *xP ) + lsigma * log( 2.0 * u );
+                 } else {
+                     if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON )
+-                        gtemp = PNM_GET1( *xP ) + INFINITY;
++                        gtemp = PNM_GET1( *xP ) + infinity;
+                     else
+                         gtemp = PNM_GET1( *xP ) - lsigma * log( 2.0 * u1 );
+                 }
+@@ -356,14 +356,14 @@ multiplicative_gaussian_noise(FILE * con
+     int rows, cols, format, row;
+     double rtemp, gtemp, btemp;
+     double uniform, rayleigh, gauss;
+-    double INFINITY;
++    double infinity;
+ 
+     double const EPSILON = 1.0e-5;
+     int const forceplain = 0;
+ 
+     pnm_readpnminit( ifp, &cols, &rows, &maxval, &format );
+     xelrow = pnm_allocrow( cols );
+-    INFINITY = (double) maxval;
++    infinity = (double) maxval;
+ 
+     pnm_writepnminit( stdout, cols, rows, maxval, format, forceplain );
+ 
+@@ -375,7 +375,7 @@ multiplicative_gaussian_noise(FILE * con
+             case PPM_TYPE:
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( uniform <= EPSILON )
+-                    rayleigh = INFINITY;
++                    rayleigh = infinity;
+                 else
+                     rayleigh = sqrt( -2.0 * log( uniform ) );
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+@@ -384,7 +384,7 @@ multiplicative_gaussian_noise(FILE * con
+ 
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( uniform <= EPSILON )
+-                    rayleigh = INFINITY;
++                    rayleigh = infinity;
+                 else
+                     rayleigh = sqrt( -2.0 * log( uniform ) );
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+@@ -393,7 +393,7 @@ multiplicative_gaussian_noise(FILE * con
+ 
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( uniform <= EPSILON )
+-                    rayleigh = INFINITY;
++                    rayleigh = infinity;
+                 else
+                     rayleigh = sqrt( -2.0 * log( uniform ) );
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+@@ -409,7 +409,7 @@ multiplicative_gaussian_noise(FILE * con
+             default:
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 
+                 if ( uniform <= EPSILON )
+-                    rayleigh = INFINITY;
++                    rayleigh = infinity;
+                 else
+                     rayleigh = sqrt( -2.0 * log( uniform ) );
+                 uniform = ( rand( ) & RANDOM_MASK ) / arand; 

diff --git a/media-libs/netpbm/netpbm-10.29-r1.ebuild b/media-libs/netpbm/netpbm-10.29-r1.ebuild
index 37c92dd9013b4a3955cb0a2aaa3b72ccf8e1191a..e5d775f2a83bf013bea5a36e4ac89f80ac073f87 100644 (file)
--- a/media-libs/netpbm/netpbm-10.29-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.29-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-libs/netpbm/netpbm-10.29-r1.ebuild,v 1.5 2005/10/04 23:20:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.29-r1.ebuild,v 1.6 2005/10/10 14:45:25 flameeyes Exp $
 
 inherit flag-o-matic toolchain-funcs eutils multilib
 
@@ -50,6 +50,7 @@ src_unpack() {
        epatch "${FILESDIR}"/netpbm-10.29-anytopnm.patch #105127
        epatch "${FILESDIR}"/netpbm-10.29-pnmtopng-alpha-check.patch #104434
        epatch "${FILESDIR}"/netpbm-10.29-build.patch
+       epatch "${FILESDIR}"/netpbm-10.29-infinity.patch
 
        rm -f configure
        cp Makefile.config.in Makefile.config