summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-08-01 18:53:13 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-08-01 18:53:13 +0000
commit8c04b56cda66eb5073e6cad161f69c39899199e4 (patch)
treed8c9bb9779b25e99864cf410a9aacb7217431b23 /app-crypt
parentSwitch to EAPI=4. Fix bug #376895. (diff)
downloadgentoo-2-8c04b56cda66eb5073e6cad161f69c39899199e4.tar.gz
gentoo-2-8c04b56cda66eb5073e6cad161f69c39899199e4.tar.bz2
gentoo-2-8c04b56cda66eb5073e6cad161f69c39899199e4.zip
app-crypt/steghide removal. Bug #319679
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/steghide/ChangeLog69
-rw-r--r--app-crypt/steghide/Manifest27
-rw-r--r--app-crypt/steghide/files/steghide-0.5.1-gcc34.patch29
-rw-r--r--app-crypt/steghide/files/steghide-0.5.1-gcc4.patch46
-rw-r--r--app-crypt/steghide/files/steghide-0.5.1-gcc43.patch349
-rw-r--r--app-crypt/steghide/metadata.xml9
-rw-r--r--app-crypt/steghide/steghide-0.5.1.ebuild43
7 files changed, 0 insertions, 572 deletions
diff --git a/app-crypt/steghide/ChangeLog b/app-crypt/steghide/ChangeLog
deleted file mode 100644
index cbe291d4193e..000000000000
--- a/app-crypt/steghide/ChangeLog
+++ /dev/null
@@ -1,69 +0,0 @@
-# ChangeLog for app-crypt/steghide
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/steghide/ChangeLog,v 1.20 2010/11/08 19:40:59 c1pher Exp $
-
- 08 Nov 2010; Dane Smith <c1pher@gentoo.org> steghide-0.5.1.ebuild,
- metadata.xml:
- Switched to virtual/jpeg wrt bug 327487. Added myself as a maintainer and
- added the packages to the crypto herd.
-
- 01 Apr 2010; Jonathan Callen <abcd@gentoo.org> steghide-0.5.1.ebuild:
- Bump to EAPI=3, add prefix keywords
-
- 22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> steghide-0.5.1.ebuild:
- Require SLOT="0" of media-libs/jpeg for headers.
-
- 25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml:
- Remove drizzt from metadata.xml (#149111)
-
- 17 Feb 2009; Timothy Redaelli <drizzt@gentoo.org> metadata.xml:
- Add myself as maintainer
-
- 13 May 2008; Samuli Suominen <drac@gentoo.org>
- +files/steghide-0.5.1-gcc43.patch, -files/fix-libtool-invocation.patch,
- steghide-0.5.1.ebuild:
- Fix building with GCC 4.3 wrt #221129, thanks to Peter Alfredsen.
-
- 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>.
-
- 27 Apr 2006; Alec Warner <antarus@gentoo.org> Manifest:
- Fixing duff SHA256 digests: Bug # 131293
-
- 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.
-
- 19 Aug 2005; Luis Medinas <metalgod@gentoo.org> steghide-0.5.1.ebuild:
- Added ~amd64 keywords.
-
- 08 Jul 2005; David Holm <dholm@gentoo.org> steghide-0.5.1.ebuild:
- Added to ~ppc.
-
- 29 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
- +files/steghide-0.5.1-gcc34.patch, steghide-0.5.1.ebuild:
- Adding patch so that steghide can be compiled with gcc-3.4. The patch is taken
- from Debian and can be found in bug 274184 in their bug tracking system. This
- fixes our bug 83840. Thanks to Thomas Beinicke <Merlin-TC@web.de> for
- reporting the bug.
-
- 30 Jul 2004; Tony Vroon <chainsaw@gentoo.org>
- +files/fix-libtool-invocation.patch, steghide-0.5.1.ebuild:
- Fix libtool invocation. Closes bug #52470.
-
- 16 Feb 2004; John Davis <zhen@gentoo.org> steghide-0.5.1.ebuild:
- marking stable for x86
-
-*steghide-0.5.1 (09 Dec 2003)
-
- 09 Dec 2003; zhen <zhen@gentoo.org> metadata.xml, steghide-0.5.1.ebuild:
- initial import, thanks to Eric Harney <eharney@clemson.edu> for the ebuild via
- bugzilla.
-
diff --git a/app-crypt/steghide/Manifest b/app-crypt/steghide/Manifest
deleted file mode 100644
index b4ea381da05b..000000000000
--- a/app-crypt/steghide/Manifest
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX steghide-0.5.1-gcc34.patch 1382 RMD160 aa39da995620f3e74881c1f66ed93291850d08d6 SHA1 7cdf517dda11ca57d3d0aa2377cb97858818f700 SHA256 0fb9315bb2aa910d55f8c3ff0d93498f93e8327901e77e0ef64f55493d885f1d
-AUX steghide-0.5.1-gcc4.patch 1969 RMD160 0ad63bf95da30fec6fe501f8f65d049affca03ea SHA1 bf8be70b2fb763f4db4646f28ffaf52331ff2ced SHA256 bcc1f7709c2c9912006a96ed701b1c6af919281c098fde1ec0bd74a013909ea7
-AUX steghide-0.5.1-gcc43.patch 10444 RMD160 e191cd5f32bafebdd088f133c0a0e76e8d7ee7b6 SHA1 31ad77e6dc1012fe79377c2b6b65059081fbb594 SHA256 a2039ea4b4628c5738aca57549e97a81b41c9bf050ee5a0e9c61a0885853d5e4
-DIST steghide-0.5.1.tar.bz2 392761 RMD160 b40448baf46b16e6131a30b7e07d14c4f61db15a SHA1 b741dffbb5c3d0b2d13eebec1b083fc50f974b68 SHA256 a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1
-EBUILD steghide-0.5.1.ebuild 1190 RMD160 e3e5983b3264472edbb8852bfb0957e2214f0efb SHA1 e165d4cafbffc8c5f7cd40164810d247632e47d9 SHA256 790aae253e68baeffc04d10df8acfcc85f541759640edd380e11fefb2e852a90
-MISC ChangeLog 2734 RMD160 beff6aab8383fee011623be926e80f3710dc8afb SHA1 b1185ee21393c6b7657d04fcfef6555c372ce55b SHA256 009212de47c48a4483b4a7b5a31be9905fa865dcb49c31c80da9f6e81d73c5ee
-MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJM2FJGAAoJEEsurZwMLhUx1bsP/Rhcm8+lqm7qtLd8z0/GBYn1
-RjPbSE7x9TxtOdu7TCi/xKkrega7GmCk73WOy85RgZPzwruUzfqgDoczMlyKOBHR
-GGAEbx0weoOt+AZXXAMul0xgOhFBQN95oK8XplhDVD0lkLksNSw+VqTx8U5nAZld
-GrYbKGE/JWtd71XyQpUZNRyENS4nhw0YrJCKGAqOtwApZw8HtyMntHwx7tW4QPba
-LmQPKmTH3c7wKLXrKRz75V9Z0m389f9fWuFax3ChQRJn20oedY6lwRcKH72FFJ+q
-ieNktUfWm3xMrAPD9rNTfoLqEcY7DjbpG6oINIH6QosS5TrP4VJLaCuDwf52QBTw
-9al9APFoECZimytzc31f4emkR9W3ErnYqetRBR71wfhfU0j2ui6BX89/fFV2ZQOX
-TTCzVSGjRjjtK2dXM4CMWHwNs5xI++E94pmWCq6tj39bBL0k2LNrjcmVG3qRsowp
-36AnMWbiljU8JWcgdSeG4qwnAeeQgFiqw9q3cBLF5mFz4+YqkGVExGReagkcm2nN
-asLOryhqMTuJJRQYDRquNSV5jeqbTDPyKnxr8VUHSFIWB5KR7SWAJpPKJzrRUzWz
-5/G+40djS2M2w3sBXfEboGsP5KkeqZIouz8v4upMTfzM5Hw/dVyp37mg/WUgyoOa
-agmkIQUktU9Yb6rFURWj
-=6t3G
------END PGP SIGNATURE-----
diff --git a/app-crypt/steghide/files/steghide-0.5.1-gcc34.patch b/app-crypt/steghide/files/steghide-0.5.1-gcc34.patch
deleted file mode 100644
index 01b49a50c743..000000000000
--- a/app-crypt/steghide/files/steghide-0.5.1-gcc34.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN ../tmp-orig/steghide-0.5.1/src/AuSampleValues.cc ./src/AuSampleValues.cc
---- ../tmp-orig/steghide-0.5.1/src/AuSampleValues.cc 2003-09-28 17:30:30.000000000 +0200
-+++ ./src/AuSampleValues.cc 2004-09-30 10:20:54.982240968 +0200
-@@ -21,17 +21,17 @@
- #include "AuSampleValues.h"
-
- // AuMuLawSampleValue
--const BYTE AuMuLawSampleValue::MinValue = 0 ;
--const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
-+template <> const BYTE AuMuLawSampleValue::MinValue = 0 ;
-+template <> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
-
- // AuPCM8SampleValue
--const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
--const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
-+template <> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
-+template <> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
-
- // AuPCM16SampleValue
--const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
--const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
-+template <> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
-+template <> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
-
- // AuPCM32SampleValue
--const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
--const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
-+template <> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
-+template <> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
diff --git a/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch b/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
deleted file mode 100644
index a8df1735e9d4..000000000000
--- a/app-crypt/steghide/files/steghide-0.5.1-gcc4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
- 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 -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/files/steghide-0.5.1-gcc43.patch b/app-crypt/steghide/files/steghide-0.5.1-gcc43.patch
deleted file mode 100644
index ca66b9c544f5..000000000000
--- a/app-crypt/steghide/files/steghide-0.5.1-gcc43.patch
+++ /dev/null
@@ -1,349 +0,0 @@
---- steghide-0.5.1.old/configure.in 2003-10-15 09:48:52.000000000 +0200
-+++ steghide-0.5.1.new/configure.in 2008-05-09 19:04:46.000000000 +0200
-@@ -7,27 +7,26 @@
- dnl checks for programs.
- AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_AWK
- AC_PROG_LN_S
-+AC_CXX_COMPILE_STDCXX_0X
-
- dnl GNU gettext
- AC_CHECK_FUNCS(strchr)
- AM_GNU_GETTEXT
- AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
-
- dnl check if debugging support is requested
--AC_MSG_CHECKING([wether to enable debugging])
-+AC_MSG_CHECKING([whether to enable debugging])
- AC_ARG_ENABLE(debug,[ --enable-debug enable debugging],
- if test "$enableval" = yes ;
- then
- AC_MSG_RESULT([yes])
- AC_DEFINE(DEBUG,1,[enable code used only for debugging])
-- CXXFLAGS="-O2 -Wall -g"
- else
- AC_MSG_RESULT([no])
-- CXXFLAGS="-O2 -Wall"
- fi
- ,
- AC_MSG_RESULT([no])
- CXXFLAGS="-O2 -Wall"
- )
-@@ -213,7 +212,18 @@
- echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
- echo "**********";
- AC_MSG_ERROR([[libmhash not found]])
- fi
-
-+dnl Should we add std=c++0x?
-+
-+if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;
-+then
-+ CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"
-+else
-+ CXXFLAGS="${CXXFLAGS} -Wall -Wextra"
-+fi
-+
-+AC_SUBST(CXXFLAGS)
-+
- dnl create Makefiles
- AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
---- steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 1970-01-01 01:00:00.000000000 +0100
-+++ steghide-0.5.1.new/m4/ac_cxx_compile_stdcxx_0x.m4 2008-05-09 19:04:46.000000000 +0200
-@@ -0,0 +1,107 @@
-+# ===========================================================================
-+# http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+# AC_CXX_COMPILE_STDCXX_0X
-+#
-+# DESCRIPTION
-+#
-+# Check for baseline language coverage in the compiler for the C++0x
-+# standard.
-+#
-+# LAST MODIFICATION
-+#
-+# 2008-04-17
-+#
-+# COPYLEFT
-+#
-+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-+#
-+# Copying and distribution of this file, with or without modification, are
-+# permitted in any medium without royalty provided the copyright notice
-+# and this notice are preserved.
-+
-+AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
-+ AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
-+ ac_cv_cxx_compile_cxx0x_native,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ AC_TRY_COMPILE([
-+ template <typename T>
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check<check<bool>> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check<int> check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
-+ AC_LANG_RESTORE
-+ ])
-+
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
-+ ac_cv_cxx_compile_cxx0x_cxx,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -std=c++0x"
-+ AC_TRY_COMPILE([
-+ template <typename T>
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check<check<bool>> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check<int> check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+
-+ AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
-+ ac_cv_cxx_compile_cxx0x_gxx,
-+ [AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+ ac_save_CXXFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
-+ AC_TRY_COMPILE([
-+ template <typename T>
-+ struct check
-+ {
-+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
-+ };
-+
-+ typedef check<check<bool>> right_angle_brackets;
-+
-+ int a;
-+ decltype(a) b;
-+
-+ typedef check<int> check_type;
-+ check_type c;
-+ check_type&& cr = c;],,
-+ ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
-+ CXXFLAGS="$ac_save_CXXFLAGS"
-+ AC_LANG_RESTORE
-+ ])
-+
-+ if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
-+ test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
-+ test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
-+ AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
-+ fi
-+])
---- steghide-0.5.1.old/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200
-+++ steghide-0.5.1.new/src/Arguments.cc 2008-05-09 19:04:44.000000000 +0200
-@@ -26,10 +26,12 @@
- #include "Terminal.h"
- #include "common.h"
- #include "error.h"
- #include "msg.h"
-
-+float Arguments::Default_Goal = 100.0 ;
-+
- // the global Arguments object
- Arguments Args ;
-
- Arguments::Arguments (int argc, char* argv[])
- {
---- steghide-0.5.1.old/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200
-+++ steghide-0.5.1.new/src/Arguments.h 2008-05-09 19:04:44.000000000 +0200
-@@ -98,11 +98,11 @@
- static const bool Default_EmbedEmbFn = true ;
- static const bool Default_Force = false ;
- static const VERBOSITY Default_Verbosity = NORMAL ;
- static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats
- static const unsigned int Max_Algorithm = 3 ;
-- static const float Default_Goal = 100.0 ;
-+ static float Default_Goal ;
- static const DEBUGCOMMAND Default_DebugCommand = NONE ;
- static const bool Default_Check = false ;
- static const unsigned int Default_DebugLevel = 0 ;
- static const unsigned int Default_GmlGraphRecDepth = 0 ;
- static const unsigned int Default_GmlStartVertex = 0 ;
---- steghide-0.5.1.old/src/EncryptionMode.h 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/EncryptionMode.h 2008-05-09 19:04:46.000000000 +0200
-@@ -69,11 +69,11 @@
- static const unsigned int NumValues = 8 ;
- IRep Value ;
-
- typedef struct struct_Translation {
- IRep irep ;
-- char* srep ;
-+ const char* srep ;
- } Translation ;
- static const Translation Translations[] ;
- } ;
-
- #endif // ndef SH_ENCMODE_H
---- steghide-0.5.1.old/src/Graph.cc 2003-10-11 23:54:26.000000000 +0200
-+++ steghide-0.5.1.new/src/Graph.cc 2008-05-09 19:04:46.000000000 +0200
-@@ -20,10 +20,12 @@
-
- #include <ctime>
- #include <list>
- #include <map>
- #include <vector>
-+#include <algorithm>
-+#include <climits>
-
- #include "BitString.h"
- #include "CvrStgFile.h"
- #include "Edge.h"
- #include "Graph.h"
---- steghide-0.5.1.old/src/Matching.cc 2003-10-11 23:54:30.000000000 +0200
-+++ steghide-0.5.1.new/src/Matching.cc 2008-05-09 19:04:46.000000000 +0200
-@@ -16,10 +16,11 @@
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-+#include <algorithm>
- #include "Edge.h"
- #include "Graph.h"
- #include "Matching.h"
- #include "ProgressOutput.h"
- #include "common.h"
---- steghide-0.5.1.old/src/ProgressOutput.cc 2003-10-11 11:20:51.000000000 +0200
-+++ steghide-0.5.1.new/src/ProgressOutput.cc 2008-05-09 19:04:44.000000000 +0200
-@@ -21,10 +21,12 @@
- #include <cmath>
-
- #include "ProgressOutput.h"
- #include "common.h"
-
-+float ProgressOutput::NoAvgWeight = 1.0 ;
-+
- ProgressOutput::ProgressOutput ()
- : Message("__nomessage__")
- {
- LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time
- }
---- steghide-0.5.1.old/src/ProgressOutput.h 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/ProgressOutput.h 2008-05-09 19:04:44.000000000 +0200
-@@ -60,13 +60,13 @@
- /**
- * update the output appending rate, [average edge weight], "done" and a newline
- * \param rate the rate of matched vertices
- * \param avgweight the average edge weight (is not printed if not given)
- **/
-- void done (float rate, float avgweight = NoAvgWeight) const ;
-+ void done (float rate, float avgweight = 1.0) const ;
-
-- static const float NoAvgWeight = -1.0 ;
-+ static float NoAvgWeight ;
-
- protected:
- std::string vcompose (const char *msgfmt, va_list ap) const ;
-
- private:
---- steghide-0.5.1.old/src/SMDConstructionHeuristic.cc 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/SMDConstructionHeuristic.cc 2008-05-09 19:04:46.000000000 +0200
-@@ -16,10 +16,12 @@
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-+#include <algorithm>
-+
- #include "Edge.h"
- #include "Graph.h"
- #include "Matching.h"
- #include "SMDConstructionHeuristic.h"
- #include "Vertex.h"
---- steghide-0.5.1.old/src/WavFile.cc 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/WavFile.cc 2008-05-09 19:04:46.000000000 +0200
-@@ -19,10 +19,11 @@
- */
-
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
-+#include <algorithm>
-
- #include "CvrStgFile.h"
- #include "DFSAPHeuristic.h"
- #include "SampleValueAdjacencyList.h"
- #include "SMDConstructionHeuristic.h"
---- steghide-0.5.1.old/src/wrapper_hash_map.h 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/wrapper_hash_map.h 2008-05-09 19:04:46.000000000 +0200
-@@ -25,17 +25,21 @@
-
- #ifdef __GNUC__
- # if __GNUC__ < 3
- # include <hash_map.h>
- namespace sgi { using ::hash ; using ::hash_map ; } ;
--# else
-+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
- # include <ext/hash_map>
--# if __GNUC_MINOR__ == 0
-+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
- namespace sgi = std ; // GCC 3.0
- # else
- namespace sgi = __gnu_cxx ; // GCC 3.1 and later
- # endif
-+# else
-+# include <unordered_map>
-+# define hash_map unordered_map
-+ namespace sgi = std ;
- # endif
- #else
- namespace sgi = std ;
- #endif
-
---- steghide-0.5.1.old/src/wrapper_hash_set.h 2003-09-28 17:30:30.000000000 +0200
-+++ steghide-0.5.1.new/src/wrapper_hash_set.h 2008-05-09 19:04:46.000000000 +0200
-@@ -26,17 +26,21 @@
-
- #ifdef __GNUC__
- # if __GNUC__ < 3
- # include <hash_set.h>
- namespace sgi { using ::hash ; using ::hash_set ; } ;
--# else
-+# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
- # include <ext/hash_set>
--# if __GNUC_MINOR__ == 0
-+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
- namespace sgi = std ; // GCC 3.0
- # else
- namespace sgi = ::__gnu_cxx ; // GCC 3.1 and later
- # endif
-+# else
-+# include <unordered_set>
-+# define hash_set unordered_set
-+ namespace sgi = std ;
- # endif
- #else
- namespace sgi = std ;
- #endif
-
diff --git a/app-crypt/steghide/metadata.xml b/app-crypt/steghide/metadata.xml
deleted file mode 100644
index 432920121fe0..000000000000
--- a/app-crypt/steghide/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>crypto</herd>
- <maintainer>
- <email>c1pher@gentoo.org</email>
- <name>Dane Smith</name>
- </maintainer>
-</pkgmetadata>
diff --git a/app-crypt/steghide/steghide-0.5.1.ebuild b/app-crypt/steghide/steghide-0.5.1.ebuild
deleted file mode 100644
index 9e4a1c6eb4c6..000000000000
--- a/app-crypt/steghide/steghide-0.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 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.15 2010/11/08 19:40:59 c1pher Exp $
-
-EAPI="3"
-inherit autotools eutils
-
-DESCRIPTION="A steganography program which hides data in various media files"
-HOMEPAGE="http://steghide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="debug"
-
-DEPEND=">=app-crypt/mhash-0.8.18-r1
- >=dev-libs/libmcrypt-2.5.7
- >=sys-libs/zlib-1.1.4-r2
- virtual/jpeg"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
- epatch "${FILESDIR}"/${P}-gcc34.patch \
- "${FILESDIR}"/${P}-gcc4.patch \
- "${FILESDIR}"/${P}-gcc43.patch
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable debug)
-}
-
-src_compile() {
- local libtool
- [[ ${CHOST} == *-darwin* ]] && libtool=$(type -P glibtool) || libtool=$(type -P libtool)
- emake LIBTOOL="${libtool}" || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install || die "emake install failed"
- prepalldocs
-}