Fix compilation with gcc-4; bug #106615

(Portage version: 2.1_pre4-r1)

5 files changed, 65 insertions, 9 deletions

diff --git a/app-crypt/steghide/ChangeLog b/app-crypt/steghide/ChangeLog
index ef9400f23cc7..25819e51227d 100644
--- a/app-crypt/steghide/ChangeLog
+++ b/app-crypt/steghide/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/steghide
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.10 2005/11/14 21:51:01 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.11 2006/03/10 07:22:54 halcy0n Exp $
+
+  10 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/steghide-0.5.1-gcc4.patch, steghide-0.5.1.ebuild:
+  Fix compilation with gcc-4; bug #106615
 
   14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> steghide-0.5.1.ebuild:
   Stable on ppc. See bug #111790.
diff --git a/app-crypt/steghide/Manifest b/app-crypt/steghide/Manifest
index 91efc4583604..8f42850d1453 100644
--- a/app-crypt/steghide/Manifest
+++ b/app-crypt/steghide/Manifest
@@ -1,6 +1,21 @@
 MD5 4256f9f60747459d48d54aa08ef8012c ChangeLog 1323
-MD5 d66bb10a2779986ec5b1a406328d8dfa files/digest-steghide-0.5.1 67
+RMD160 87eeda6486bcaa2334f4fefe5cb212a954660698 ChangeLog 1323
+SHA256 68653293e58311b7d536f142d10989ec0509f1ff448ff6cff6c5813f34d8f639 ChangeLog 1323
+MD5 2a490a9b25fe75f7cfbe9f4932c8b2d5 files/digest-steghide-0.5.1 247
+RMD160 d4e18bb7b1be4eabc750bf2e602513e63c25a8a3 files/digest-steghide-0.5.1 247
+SHA256 a8394a9e7b5009d12d5e6797987ddc0d7b4e74d211aa2a5b41a40135d8935a3b files/digest-steghide-0.5.1 247
 MD5 a3eadebb4365050f2a06531b246f830a files/fix-libtool-invocation.patch 407
+RMD160 3b02990cff5d10a11e02a73371197f57a47c2294 files/fix-libtool-invocation.patch 407
+SHA256 b1b75db8491e89f77a6584624bfeb284d59fb2aa857b833294c46cb7f3272745 files/fix-libtool-invocation.patch 407
 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
+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
 MD5 42fab2a1850b10b79aaf27a057465cb9 metadata.xml 255
-MD5 656bb52b80ce0fad083f97df75625ec0 steghide-0.5.1.ebuild 861
+RMD160 dc2f473150f679251855a9d3e8c71c187ff01c53 metadata.xml 255
+SHA256 9588dfeb60c604e03a8888abdf87022686ae1246bad2b310702371d14b33ea9d metadata.xml 255
+MD5 b94d68ee856b4738e1f60065adbfebe9 steghide-0.5.1.ebuild 905
+RMD160 713de45dfce84bd05b72c93d608f2fccd1c4ac5a steghide-0.5.1.ebuild 905
+SHA256 68a16ae19ff12aecce0dc1b141f461b80e71ef4537b79503634f26577ce25ec2 steghide-0.5.1.ebuild 905
diff --git a/app-crypt/steghide/files/digest-steghide-0.5.1 b/app-crypt/steghide/files/digest-steghide-0.5.1
index 6cc267893c5e..b7ece4418d93 100644
--- a/app-crypt/steghide/files/digest-steghide-0.5.1
+++ b/app-crypt/steghide/files/digest-steghide-0.5.1
@@ -1 +1,3 @@
 MD5 cf37f7ac51d36f66a8d6d155bbc90f17 steghide-0.5.1.tar.bz2 392761
+RMD160 b40448baf46b16e6131a30b7e07d14c4f61db15a steghide-0.5.1.tar.bz2 392761
+SHA256 a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1 steghide-0.5.1.tar.bz2 392761
diff --git a/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch b/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
new file mode 100644
index 000000000000..098a6d32d06d
--- /dev/null
+++ b/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
@@ -0,0 +1,34 @@
+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
+@@ -26,22 +26,30 @@
+ 
+ // AuMuLawAudioData
+ typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
++template<>
+ inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
++template<>
+ inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
+ 
+ // AuPCM8AudioData
+ typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
++template<>
+ inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
++template<>
+ inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
+ 
+ // AuPCM16AudioData
+ typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
++template<>
+ inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
++template<>
+ inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
+ 
+ // AuPCM32AudioData
+ typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
++template<>
+ inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
++template<>
+ inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
+ 
+ #endif // ndef SH_AUDATA_H
diff --git a/app-crypt/steghide/steghide-0.5.1.ebuild b/app-crypt/steghide/steghide-0.5.1.ebuild
index a769fbc2704a..6f68e73ee283 100644
--- a/app-crypt/steghide/steghide-0.5.1.ebuild
+++ b/app-crypt/steghide/steghide-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/steghide-0.5.1.ebuild,v 1.9 2005/11/14 21:51:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/steghide-0.5.1.ebuild,v 1.10 2006/03/10 07:22:56 halcy0n Exp $
 
 inherit eutils
 
@@ -19,15 +19,16 @@ DEPEND=">=app-crypt/mhash-0.8.18-r1
 
 src_unpack(){
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 }
 
 src_compile() {
 	econf || die "configure failed"
-	epatch ${FILESDIR}/fix-libtool-invocation.patch
+	epatch "${FILESDIR}"/fix-libtool-invocation.patch
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "installation failed"
+	make DESTDIR="${D}" install || die "installation failed"
 }