Fixed gcc-4 compilation problem, see bug #120801.

(Portage version: 2.1_pre4-r1)

6 files changed, 253 insertions, 7 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index e6519306381a..5ded7f9372ae 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.26 2006/01/23 19:50:01 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.27 2006/01/31 13:11:36 ehmsen Exp $
+
+  31 Jan 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/djvu-3.5.16-gcc41-hash.patch, +files/djvu-3.5.16-gcc41.patch,
+  djvu-3.5.16.ebuild:
+  Fixed gcc-4 compilation problem thanks to Kristiaan Lenaerts 
+  <kristiaan.lenaerts@gmail.com>, see bug #120801.
 
 *djvu-3.5.16 (23 Jan 2006)
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 5879b9aea8ca..f535e3a32da7 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,11 +1,39 @@
-MD5 935f474421de4acc8c34dc99b232f6d3 ChangeLog 3135
+MD5 0b2517c3011c4d7ac493713002e2d35d ChangeLog 3393
+RMD160 9e55d89af4a9f6279253522828741f1744d20d0e ChangeLog 3393
+SHA256 3ee3209865e8ed3ba3a0335c0b42ae2ff59333a94fc58cdbb2ffee266ce5aca8 ChangeLog 3393
 MD5 9755fe91fba4e4fd0fcc505b688975ad djvu-3.5.12.ebuild 1044
+RMD160 21871b4f191ea10ef5b77d9aefd2c068e12563f8 djvu-3.5.12.ebuild 1044
+SHA256 376b19f33797c21652d8771fae46760ebf70d1321daa7f0627de36d0799aa0e5 djvu-3.5.12.ebuild 1044
 MD5 214930004dd850e115ab479b188d43be djvu-3.5.14-r1.ebuild 1575
+RMD160 26fa332e1669280cd4a35f8f14bb14776653045d djvu-3.5.14-r1.ebuild 1575
+SHA256 49552c608b5708041b4dee2cf1aa6dd91ad76e8e20e1362b015b34898d31379f djvu-3.5.14-r1.ebuild 1575
 MD5 986cb703c5675d7e0fd2df81fdb6bb64 djvu-3.5.14.ebuild 1108
-MD5 2ebb850fe5d7eb146111456753932875 djvu-3.5.16.ebuild 1764
+RMD160 437ca73fa680ac88359bee4589736a72114fc20c djvu-3.5.14.ebuild 1108
+SHA256 1d8f0e7df2abae07d4338e56d2f1d36678c5f34d4ff7263a74d4874f195a23e9 djvu-3.5.14.ebuild 1108
+MD5 07291e562af5da7e63888377dec6fc72 djvu-3.5.16.ebuild 1800
+RMD160 8c09124431d9c835b958e2a4c6b11201a0e5162a djvu-3.5.16.ebuild 1800
+SHA256 be348cc6bd34210aabdd2fbcb646230f80f32dfb65d1f240d5d8727b7d4d8f12 djvu-3.5.16.ebuild 1800
 MD5 376a63d9cbc58a7737d37680734f0ee0 files/digest-djvu-3.5.12 69
+RMD160 c6a301fad55fa16d877b279ce64ceba26fca1c71 files/digest-djvu-3.5.12 69
+SHA256 94022678deee51e3b2ec2c610d10da719eada16b6d887364918f9a9d925b3c4b files/digest-djvu-3.5.12 69
 MD5 4a5cc41ce600d15a29fd720f279aaaf1 files/digest-djvu-3.5.14 69
+RMD160 2b5e7dfdad9eb37645a127c54ba719df07d66db2 files/digest-djvu-3.5.14 69
+SHA256 c3de1f090b2f539cc684365cd1fc0bcf46b2a260ca8fc8e1eae70eb45c4b25e1 files/digest-djvu-3.5.14 69
 MD5 4a5cc41ce600d15a29fd720f279aaaf1 files/digest-djvu-3.5.14-r1 69
-MD5 9d143101f8c3e394b08fef327d262e26 files/digest-djvu-3.5.16 69
+RMD160 2b5e7dfdad9eb37645a127c54ba719df07d66db2 files/digest-djvu-3.5.14-r1 69
+SHA256 c3de1f090b2f539cc684365cd1fc0bcf46b2a260ca8fc8e1eae70eb45c4b25e1 files/digest-djvu-3.5.14-r1 69
+MD5 dec1ec502133f2d0684352a381bfeb91 files/digest-djvu-3.5.16 253
+RMD160 9a4e4f1f5c0399c9264d4151d70e067c35c42c9b files/digest-djvu-3.5.16 253
+SHA256 9f3a365ecf587dbc824623175b8843ca4dac458dd710ae7ef8432a4760e1e782 files/digest-djvu-3.5.16 253
+MD5 8b63d5bd9cc44163e6e9ab5dac8c0477 files/djvu-3.5.16-gcc41-hash.patch 4158
+RMD160 50f7df203aa9d3fbf8049dab8b748d481908fd2d files/djvu-3.5.16-gcc41-hash.patch 4158
+SHA256 92b9778c5f1b0b7b2a1d819e31546765bf32a8fadafd23e114977b28b910e568 files/djvu-3.5.16-gcc41-hash.patch 4158
+MD5 24b806f27bb6ea3af18cbf288a784d8c files/djvu-3.5.16-gcc41.patch 1101
+RMD160 aacb8ee4217323b36b7e0ce7d15cbaa8a86b7a5e files/djvu-3.5.16-gcc41.patch 1101
+SHA256 febb7593e80136ec3b25817ab620efd1754b4b063a4800bec57f2f3e9c096571 files/djvu-3.5.16-gcc41.patch 1101
 MD5 0da6de34d8db09192d2c881416108427 files/gentoo-acdesktop.m4 2491
+RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 files/gentoo-acdesktop.m4 2491
+SHA256 0a9ec40c7ebe2a75025cd832a1d6eba25dc904593702e4e312662eb689ae5eef files/gentoo-acdesktop.m4 2491
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
diff --git a/app-text/djvu/djvu-3.5.16.ebuild b/app-text/djvu/djvu-3.5.16.ebuild
index d65aac0aa3d7..b6d8c60ee9a9 100644
--- a/app-text/djvu/djvu-3.5.16.ebuild
+++ b/app-text/djvu/djvu-3.5.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.16.ebuild,v 1.1 2006/01/23 19:50:01 ehmsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.16.ebuild,v 1.2 2006/01/31 13:11:36 ehmsen Exp $
 
-inherit nsplugins flag-o-matic fdo-mime
+inherit nsplugins flag-o-matic fdo-mime eutils
 
 MY_P="${PN}libre-${PV}"
 
@@ -23,11 +23,15 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
+	cd ${S}
+
+	# gcc 4.1 compilation fixes
+	epatch ${FILESDIR}/${P}-gcc41-hash.patch || die
+	epatch ${FILESDIR}/${P}-gcc41.patch || die
 
 	# Replace autochecking acdesktop.m4 with a gentoo-specific one
 	cp ${FILESDIR}/gentoo-acdesktop.m4 ${S}/gui/desktop/acdesktop.m4
 
-	cd ${S}
 	aclocal -I config -I gui/desktop || die "aclocal failed"
 	autoconf || die "autoconf failed"
 	libtoolize --copy --force
diff --git a/app-text/djvu/files/digest-djvu-3.5.16 b/app-text/djvu/files/digest-djvu-3.5.16
index 405a43141371..1ccbfc349293 100644
--- a/app-text/djvu/files/digest-djvu-3.5.16
+++ b/app-text/djvu/files/digest-djvu-3.5.16
@@ -1 +1,3 @@
 MD5 5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz 1803961
+RMD160 7b4aaf69665d7ee33ec5476be88b3d9e075a26f0 djvulibre-3.5.16.tar.gz 1803961
+SHA256 3d90cdb7ad4c0481ec90796f12cfaf5240c4d73ba59e158d8ee333fec0837b58 djvulibre-3.5.16.tar.gz 1803961
diff --git a/app-text/djvu/files/djvu-3.5.16-gcc41-hash.patch b/app-text/djvu/files/djvu-3.5.16-gcc41-hash.patch
new file mode 100644
index 000000000000..f11a8bdfec38
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.16-gcc41-hash.patch
@@ -0,0 +1,180 @@
+--- libdjvu/GContainer.h.old	2006-01-29 11:04:51.000000000 +0100
++++ libdjvu/GContainer.h	2006-01-29 11:05:32.000000000 +0100
+@@ -134,6 +134,88 @@
+ //@{
+ 
+ 
++// ------------------------------------------------------------
++// HASH FUNCTIONS
++// ------------------------------------------------------------
++
++
++/** @name Hash functions
++    These functions let you use template class \Ref{GMap} with the
++    corresponding elementary types. The returned hash code may be reduced to
++    an arbitrary range by computing its remainder modulo the upper bound of
++    the range.
++    @memo Hash functions for elementary types. */
++//@{
++
++/** Hashing function (unsigned int). */
++static inline unsigned int 
++hash(const unsigned int & x) 
++{ 
++  return x; 
++}
++
++/** Hashing function (int). */
++static inline unsigned int 
++hash(const int & x) 
++{ 
++  return (unsigned int)x;
++}
++
++/** Hashing function (long). */
++static inline unsigned int
++hash(const long & x) 
++{ 
++  return (unsigned int)x;
++}
++
++/** Hashing function (unsigned long). */
++static inline unsigned int
++hash(const unsigned long & x) 
++{ 
++  return (unsigned int)x;
++}
++
++/** Hashing function (void *). */
++static inline unsigned int 
++hash(void * const & x) 
++{ 
++  return (unsigned long) x; 
++}
++
++/** Hashing function (const void *). */
++static inline unsigned int 
++hash(const void * const & x) 
++{ 
++  return (unsigned long) x; 
++}
++
++/** Hashing function (float). */
++static inline unsigned int
++hash(const float & x) 
++{ 
++  // optimizer will get rid of unnecessary code  
++  unsigned int *addr = (unsigned int*)&x;
++  if (sizeof(float)<2*sizeof(unsigned int))
++    return addr[0];
++  else
++    return addr[0]^addr[1];
++}
++
++/** Hashing function (double). */
++static inline unsigned int
++hash(const double & x) 
++{ 
++  // optimizer will get rid of unnecessary code
++  unsigned int *addr = (unsigned int*)&x;
++  if (sizeof(double)<2*sizeof(unsigned int))
++    return addr[0];
++  else if (sizeof(double)<4*sizeof(unsigned int))
++    return addr[0]^addr[1];
++  else
++    return addr[0]^addr[1]^addr[2]^addr[3];    
++}
++
++
+ 
+ // ------------------------------------------------------------
+ // HELPER CLASSES
+@@ -1266,88 +1348,6 @@
+ };
+ 
+ 
+-// ------------------------------------------------------------
+-// HASH FUNCTIONS
+-// ------------------------------------------------------------
+-
+-
+-/** @name Hash functions
+-    These functions let you use template class \Ref{GMap} with the
+-    corresponding elementary types. The returned hash code may be reduced to
+-    an arbitrary range by computing its remainder modulo the upper bound of
+-    the range.
+-    @memo Hash functions for elementary types. */
+-//@{
+-
+-/** Hashing function (unsigned int). */
+-static inline unsigned int 
+-hash(const unsigned int & x) 
+-{ 
+-  return x; 
+-}
+-
+-/** Hashing function (int). */
+-static inline unsigned int 
+-hash(const int & x) 
+-{ 
+-  return (unsigned int)x;
+-}
+-
+-/** Hashing function (long). */
+-static inline unsigned int
+-hash(const long & x) 
+-{ 
+-  return (unsigned int)x;
+-}
+-
+-/** Hashing function (unsigned long). */
+-static inline unsigned int
+-hash(const unsigned long & x) 
+-{ 
+-  return (unsigned int)x;
+-}
+-
+-/** Hashing function (void *). */
+-static inline unsigned int 
+-hash(void * const & x) 
+-{ 
+-  return (unsigned long) x; 
+-}
+-
+-/** Hashing function (const void *). */
+-static inline unsigned int 
+-hash(const void * const & x) 
+-{ 
+-  return (unsigned long) x; 
+-}
+-
+-/** Hashing function (float). */
+-static inline unsigned int
+-hash(const float & x) 
+-{ 
+-  // optimizer will get rid of unnecessary code  
+-  unsigned int *addr = (unsigned int*)&x;
+-  if (sizeof(float)<2*sizeof(unsigned int))
+-    return addr[0];
+-  else
+-    return addr[0]^addr[1];
+-}
+-
+-/** Hashing function (double). */
+-static inline unsigned int
+-hash(const double & x) 
+-{ 
+-  // optimizer will get rid of unnecessary code
+-  unsigned int *addr = (unsigned int*)&x;
+-  if (sizeof(double)<2*sizeof(unsigned int))
+-    return addr[0];
+-  else if (sizeof(double)<4*sizeof(unsigned int))
+-    return addr[0]^addr[1];
+-  else
+-    return addr[0]^addr[1]^addr[2]^addr[3];    
+-}
+-
+-
+ //@}
+ //@}
+ //@}
diff --git a/app-text/djvu/files/djvu-3.5.16-gcc41.patch b/app-text/djvu/files/djvu-3.5.16-gcc41.patch
new file mode 100644
index 000000000000..922acf2be5c3
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.16-gcc41.patch
@@ -0,0 +1,26 @@
+--- libdjvu/GURL.h.old	2006-01-29 10:22:53.000000000 +0100
++++ libdjvu/GURL.h	2006-01-29 10:24:04.000000000 +0100
+@@ -278,10 +278,10 @@
+       //@}
+ 
+       /// Returns TRUE if #gurl1# and #gurl2# are the same
+-   bool	GURL::operator==(const GURL & gurl2) const;
++   bool	operator==(const GURL & gurl2) const;
+ 
+       /// Returns TRUE if #gurl1# and #gurl2# are different
+-   bool	GURL::operator!=(const GURL & gurl2) const;
++   bool	operator!=(const GURL & gurl2) const;
+ 
+       /// Assignment operator
+    GURL &	operator=(const GURL & url);
+--- libdjvu/ByteStream.h.old	2006-01-29 10:24:38.000000000 +0100
++++ libdjvu/ByteStream.h	2006-01-29 10:24:55.000000000 +0100
+@@ -242,7 +242,7 @@
+       and writes it to the specified stream. */
+   void formatmessage( const char *fmt, ... );
+   /** Looks up the message and writes it to the specified stream. */
+-  void ByteStream::writemessage( const char *message );
++  void writemessage( const char *message );
+   /** Writes a one-byte integer to a ByteStream. */
+   void write8 (unsigned int card8);
+   /** Writes a two-bytes integer to a ByteStream.