Fix GCC 4.1 build error. Bug #178134 by Jochen Schlick.

Package-Manager: portage-2.1.2.7

4 files changed, 37 insertions, 19 deletions

diff --git a/app-crypt/steghide/ChangeLog b/app-crypt/steghide/ChangeLog
index 181fd4e1b242..f9c5c293898a 100644
--- a/app-crypt/steghide/ChangeLog
+++ b/app-crypt/steghide/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/steghide
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.13 2006/08/16 00:39:09 squinky86 Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.14 2007/05/12 04:13:16 dirtyepic Exp $
+
+  12 May 2007; Ryan Hill <dirtyepic@gentoo.org>
+  files/steghide-0.5.1-gcc4.patch, metadata.xml:
+  Fix GCC 4.1 build error.  Bug #178134 by Jochen Schlick.
 
   16 Aug 2006; Jon Hood <squinky86@gentoo.org> steghide-0.5.1.ebuild:
   Stable on amd64, bug #143891. Thanks postmodern <brodigan@pdx.edu>.
diff --git a/app-crypt/steghide/Manifest b/app-crypt/steghide/Manifest
index 146f72a52a8a..bc337efc93c1 100644
--- a/app-crypt/steghide/Manifest
+++ b/app-crypt/steghide/Manifest
@@ -6,23 +6,23 @@ AUX steghide-0.5.1-gcc34.patch 1382 RMD160 aa39da995620f3e74881c1f66ed93291850d0
 MD5 db8d5a881ddb5a95162c7b6e6ebf25c1 files/steghide-0.5.1-gcc34.patch 1382
 RMD160 aa39da995620f3e74881c1f66ed93291850d08d6 files/steghide-0.5.1-gcc34.patch 1382
 SHA256 0fb9315bb2aa910d55f8c3ff0d93498f93e8327901e77e0ef64f55493d885f1d files/steghide-0.5.1-gcc34.patch 1382
-AUX steghide-0.5.1-gcc4.patch 1480 RMD160 558af43133820d74dc8538caf534e7410823d911 SHA1 3e6d2503f0204c07cefa14b49ff32bd9294ba024 SHA256 9e11d17a893fff28b89c0ae7635d031981b1409f344d696978f7179a5a2d1fc8
-MD5 4cd5ffafd317fa6bd4f0ab66926e8583 files/steghide-0.5.1-gcc4.patch 1480
-RMD160 558af43133820d74dc8538caf534e7410823d911 files/steghide-0.5.1-gcc4.patch 1480
-SHA256 9e11d17a893fff28b89c0ae7635d031981b1409f344d696978f7179a5a2d1fc8 files/steghide-0.5.1-gcc4.patch 1480
+AUX steghide-0.5.1-gcc4.patch 1969 RMD160 0ad63bf95da30fec6fe501f8f65d049affca03ea SHA1 bf8be70b2fb763f4db4646f28ffaf52331ff2ced SHA256 bcc1f7709c2c9912006a96ed701b1c6af919281c098fde1ec0bd74a013909ea7
+MD5 64643ac3b5b9554ce232249b2b22dcc0 files/steghide-0.5.1-gcc4.patch 1969
+RMD160 0ad63bf95da30fec6fe501f8f65d049affca03ea files/steghide-0.5.1-gcc4.patch 1969
+SHA256 bcc1f7709c2c9912006a96ed701b1c6af919281c098fde1ec0bd74a013909ea7 files/steghide-0.5.1-gcc4.patch 1969
 DIST steghide-0.5.1.tar.bz2 392761 RMD160 b40448baf46b16e6131a30b7e07d14c4f61db15a SHA1 b741dffbb5c3d0b2d13eebec1b083fc50f974b68 SHA256 a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1
 EBUILD steghide-0.5.1.ebuild 908 RMD160 0edd196501137160858807c82cc49f36e9fb8d40 SHA1 bbee85af4a167684d18e815160013d47ede9c93d SHA256 53ee0ea8aa0ea40f27efda8582c51df6d261462b290557490da979b327f5fb01
 MD5 1c96faff0dfdfb49b239193b39320159 steghide-0.5.1.ebuild 908
 RMD160 0edd196501137160858807c82cc49f36e9fb8d40 steghide-0.5.1.ebuild 908
 SHA256 53ee0ea8aa0ea40f27efda8582c51df6d261462b290557490da979b327f5fb01 steghide-0.5.1.ebuild 908
-MISC ChangeLog 1719 RMD160 02d25402bdea68b7d0b7c7f2b648b39123e08c2d SHA1 c340c499a9e6dfc4b98e061847d9db429f76c051 SHA256 9058cd6c0effff58663155aa66e331297d116d587d3657b3dc1b82627ed8bbf9
-MD5 d85edd471e06aabb6a92391b2aa47c2a ChangeLog 1719
-RMD160 02d25402bdea68b7d0b7c7f2b648b39123e08c2d ChangeLog 1719
-SHA256 9058cd6c0effff58663155aa66e331297d116d587d3657b3dc1b82627ed8bbf9 ChangeLog 1719
-MISC metadata.xml 255 RMD160 dc2f473150f679251855a9d3e8c71c187ff01c53 SHA1 47c58071d2023c8f8a27fffefe67022d3bd23060 SHA256 9588dfeb60c604e03a8888abdf87022686ae1246bad2b310702371d14b33ea9d
-MD5 42fab2a1850b10b79aaf27a057465cb9 metadata.xml 255
-RMD160 dc2f473150f679251855a9d3e8c71c187ff01c53 metadata.xml 255
-SHA256 9588dfeb60c604e03a8888abdf87022686ae1246bad2b310702371d14b33ea9d metadata.xml 255
+MISC ChangeLog 1876 RMD160 7e58f5f224909454be1bae6f8de55329ca6592d7 SHA1 b32ec52674987c43b55b1772b7e5dd8c37efaac1 SHA256 3e719b204aee74670a4a74610a1197d42edaa9e223c27b107a8670b169fd7dc5
+MD5 6b5f9d8a865f21c714131557e69fdcc0 ChangeLog 1876
+RMD160 7e58f5f224909454be1bae6f8de55329ca6592d7 ChangeLog 1876
+SHA256 3e719b204aee74670a4a74610a1197d42edaa9e223c27b107a8670b169fd7dc5 ChangeLog 1876
+MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
+RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
+SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 metadata.xml 236
 MD5 2a490a9b25fe75f7cfbe9f4932c8b2d5 files/digest-steghide-0.5.1 247
 RMD160 d4e18bb7b1be4eabc750bf2e602513e63c25a8a3 files/digest-steghide-0.5.1 247
 SHA256 161bac2be100efd766887f951436f5edfec7ae14c80d494dd02c19bf55b3aa94 files/digest-steghide-0.5.1 247
diff --git a/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch b/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
index 098a6d32d06d..a8df1735e9d4 100644
--- a/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
+++ b/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
@@ -1,6 +1,6 @@
-diff -ur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
---- steghide-0.5.1-orig/src/AuData.h	2006-03-10 02:17:19.000000000 -0500
-+++ steghide-0.5.1/src/AuData.h	2006-03-10 02:19:01.000000000 -0500
+diff -Naur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
+--- steghide-0.5.1-orig/src/AuData.h	2003-09-28 09:30:29.000000000 -0600
++++ steghide-0.5.1/src/AuData.h	2007-05-11 22:04:56.000000000 -0600
 @@ -26,22 +26,30 @@
  
  // AuMuLawAudioData
@@ -32,3 +32,15 @@ diff -ur steghide-0.5.1-orig/src/AuData.h steghide-0.5.1/src/AuData.h
  inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
  
  #endif // ndef SH_AUDATA_H
+diff -Naur steghide-0.5.1-orig/src/MHashPP.cc steghide-0.5.1/src/MHashPP.cc
+--- steghide-0.5.1-orig/src/MHashPP.cc	2003-10-05 04:17:50.000000000 -0600
++++ steghide-0.5.1/src/MHashPP.cc	2007-05-11 22:07:01.000000000 -0600
+@@ -120,7 +120,7 @@
+ 
+ std::string MHashPP::getAlgorithmName (hashid id)
+ {
+-	char *name = mhash_get_hash_name (id) ;
++	char *name = (char *) mhash_get_hash_name (id) ;
+ 	std::string retval ;
+ 	if (name == NULL) {
+ 		retval = std::string ("<algorithm not found>") ;
diff --git a/app-crypt/steghide/metadata.xml b/app-crypt/steghide/metadata.xml
index da5b114b3fbf..9f3fdee2246b 100644
--- a/app-crypt/steghide/metadata.xml
+++ b/app-crypt/steghide/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<longdescription>A steganography program that hides data within media files.</longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>