[app-admin/tripwire] Cleanup of old versions.

(Portage version: 2.1.11.9/cvs/Linux i686)

11 files changed, 10 insertions, 617 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index 6cacaa337d58..f70163f48238 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.46 2012/08/15 14:12:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.47 2012/09/20 19:31:43 nimiux Exp $
+
+  20 Sep 2012; Chema Alonso <nimiux@gentoo.org>
+  -files/tripwire-2.3.0-50-rfc822.patch, -files/tripwire-2.3.1-2-fhs.patch,
+  -files/tripwire-2.3.1-2-gcc-3.3.patch, -tripwire-2.3.1.2-r1.ebuild,
+  -files/tripwire-2.3.1-gcc3.patch, -tripwire-2.3.1.2-r2.ebuild,
+  -files/tripwire-format-string-email-report.diff,
+  -files/tripwire-friend-classes.patch, -files/tripwire-jbj.patch,
+  -files/tripwire-mkstemp.patch:
+  Cleanup of version 2.3.
 
   15 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
   tripwire-2.4.2.2-r1.ebuild:
diff --git a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch b/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch
deleted file mode 100644
index 7811135a9ffa..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.0-50-rfc822.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur tripwire-2.3.0-50-orig/src/tripwire/mailmessage.cpp tripwire-2.3.0-50/src/tripwire/mailmessage.cpp
---- tripwire-2.3.0-50-orig/src/tripwire/mailmessage.cpp	Sat Oct 28 02:26:18 2000
-+++ tripwire-2.3.0-50/src/tripwire/mailmessage.cpp	Thu Jul  5 05:12:54 2001
-@@ -241,7 +241,7 @@
- 	time_t current_time = time(NULL);
- 	tm = localtime ( &current_time );
- 	
--	const TCHAR* szFormat = _T("%a %d %b %Y %H:%M:%S %z");
-+	const TCHAR* szFormat = _T("%a, %d %b %Y %H:%M:%S %z");
- 	
- 	size_t numChars = _tcsftime( szDate, countof( szDate ), szFormat, tm );
- 	
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch b/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch
deleted file mode 100644
index 0a146ebb6f87..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-2-fhs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-The header defines USES_FHS, while some source files expect USE_FHS, so
-define both to be safe.
-
---- tripwire-2.3.1-2/src/core/platform.h	Fri Aug 10 00:29:29 2001
-+++ tripwire-2.3.1-2/src/core/platform.h	Fri Aug 10 00:29:36 2001
-@@ -291,6 +291,7 @@
- //       where <tw-exe-dir> is the directory the tripwire executable is located in.
- //=============================================================================
- #define USES_FHS 				IS_LINUX
-+#define USE_FHS 				IS_LINUX
- 
- //=============================================================================
- // Miscellaneous
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch b/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch
deleted file mode 100644
index 9d9f30b2a8cd..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-2-gcc-3.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/core/debug.h~	2000-10-28 03:15:19.000000000 +0200
-+++ src/core/debug.h	2003-07-14 06:16:37.000000000 +0200
-@@ -43,7 +43,7 @@
- 
- 
- #include <iostream>
--#include <varargs.h>
-+#include <stdarg.h>
- #include "types.h"
- 
- //
diff --git a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch b/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch
deleted file mode 100644
index 9b2ae7539ce1..000000000000
--- a/app-admin/tripwire/files/tripwire-2.3.1-gcc3.patch
+++ /dev/null
@@ -1,256 +0,0 @@
---- tripwire-2.3.1-2/src/core/stringutil.h.sopwith	Sun Feb  4 00:38:27 2001
-+++ tripwire-2.3.1-2/src/core/stringutil.h	Fri Feb  1 01:11:59 2002
-@@ -64,7 +64,7 @@
-     Convert( std::string& lhs, const std::string& rhs )
-     {
-       lhs = rhs;
--      return lhs.c_str();
-+      return std::string::const_iterator(lhs.c_str());
-     }
- 
-   /// Specialize Everything Else
---- tripwire-2.3.1-2/src/core/charutil.cpp.sopwith	Sat Oct 28 15:22:55 2000
-+++ tripwire-2.3.1-2/src/core/charutil.cpp	Fri Feb  1 01:11:59 2002
-@@ -105,7 +105,7 @@
-     }
- 
-     first = cur;
--    last = tss::strinc( cur );
-+    last = TSTRING::const_iterator(tss::strinc( cur.base() ));
-     return true;
- }
- 
---- tripwire-2.3.1-2/src/core/displayencoder.cpp.sopwith	Fri Oct 27 21:15:20 2000
-+++ tripwire-2.3.1-2/src/core/displayencoder.cpp	Fri Feb  1 01:11:59 2002
-@@ -828,7 +828,8 @@
-             ach[0] = ch;
-             for( sack_type::const_iterator atE = m_encodings.begin(); atE != m_encodings.end(); atE++ )
-             {
--                if( (*atE)->NeedsEncoding( &ach[0], &ach[1] ) )
-+                if( (*atE)->NeedsEncoding( std::string::const_iterator(&ach[0]),
-+					   std::string::const_iterator(&ach[1]) ) )
-                 {
-                     if( fFailedATest )
-                         return false; // each char can only fail one test
---- tripwire-2.3.1-2/src/core/displayutil.cpp.sopwith	Sat Oct 28 15:22:55 2000
-+++ tripwire-2.3.1-2/src/core/displayutil.cpp	Fri Feb  1 01:11:59 2002
-@@ -45,7 +45,7 @@
-     TOSTRINGSTREAM sstr;
-     TSTRING strT;
-     bool fFirstLine = true;
--    for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = tss::strinc( i ) )
-+    for( TSTRING::const_iterator i = str.begin(); i != str.end(); i = TSTRING::const_iterator(tss::strinc( i.base() )) )
-     {
-         // return found -- add line to output string
-         if( _T('\n') == *i )
-@@ -74,7 +74,7 @@
-         else
-         {
-             // add char to string   
--            strT.append( i, (TSTRING::const_iterator)tss::strinc( i ) );
-+            strT.append( i, TSTRING::const_iterator(tss::strinc( i.base() )) );
-         }
-     }    
-                 
---- tripwire-2.3.1-2/src/cryptlib/misc.h.sopwith	Fri Oct 27 20:26:21 2000
-+++ tripwire-2.3.1-2/src/cryptlib/misc.h	Fri Feb  1 01:11:59 2002
-@@ -150,7 +150,7 @@
- 	operator T *()
- 		{return ptr;}
- 
--#if !defined(_MSC_VER) && !defined(_KCC)
-+#if !defined(_MSC_VER) && !defined(_KCC) && 0
-     T *operator +(unsigned int offset)
- 		{return ptr+offset;}
- 	const T *operator +(unsigned int offset) const
---- tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak.sopwith	Fri Feb  1 01:12:57 2002
-+++ tripwire-2.3.1-2/src/cryptlib/i686-pc-linux.mak	Fri Feb  1 01:13:12 2002
-@@ -71,12 +71,12 @@
- # Recusively call make defining the appropriate $(D_FLAGS) var
- 
- debug:
--	gmake -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
--#	gmake -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
-+	$(MAKE) -f $(MAKEFILE) cryptlib_d.a "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
-+#	$(MAKE) -f $(MAKEFILE) cryptest_d "D_FLAGS=$(DEBUG_FLAGS)" "LDFLAGS=DEBUG_LDFLAGS"
- 
- release: 
--	gmake -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
--#	gmake -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
-+	$(MAKE) -f $(MAKEFILE) cryptlib.a "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
-+#	$(MAKE) -f $(MAKEFILE) cryptest "D_FLAGS=$(NDEBUG_FLAGS)" "LDFLAGS=NDEBUG_LDFLAGS"
- 
-  
- ###############################################################################
---- tripwire-2.3.1-2/src/db/hierdatabase.cpp.sopwith	Sun Feb 25 00:41:13 2001
-+++ tripwire-2.3.1-2/src/db/hierdatabase.cpp	Fri Feb  1 01:11:59 2002
-@@ -255,7 +255,8 @@
- 	}
- 	else
- 	{
--		int offset	= rhs.mIter - rhs.mEntries.begin();
-+	        int offset;
-+		offset = -(rhs.mEntries.begin() - rhs.mIter);
- 		mIter		= mEntries.begin() + offset;
- 	}
- 
---- tripwire-2.3.1-2/src/fco/fconame.cpp.sopwith	Fri Oct 27 20:25:41 2000
-+++ tripwire-2.3.1-2/src/fco/fconame.cpp	Fri Feb  1 01:11:59 2002
-@@ -269,7 +269,7 @@
- 	
-     mpPathName->ClearList();
- 	
--	TSTRING::const_iterator at  = ( pszin + 0 );
-+	TSTRING::const_iterator at  = TSTRING::const_iterator( pszin + 0 );
-     TSTRING::const_iterator end = at;
-     while ( *end ) ++end;               // NOTE: Find end
- 
-@@ -277,9 +277,9 @@
- 	while ( at < end )
- 	{
- 		while ( !(*at == mDelimiter) && at < end )
--            at = tss::strinc( at );
-+            at = TSTRING::const_iterator(tss::strinc( at.base() ));
- 
--        if ( at == beg && tss::strinc(at) >= end && at != pszin )
-+        if ( at == beg && TSTRING::const_iterator(tss::strinc(at.base())) >= end && at.base() != pszin )
-             break;
- 
- 		cFCONameTblNode* pNode = 
-@@ -287,7 +287,7 @@
- 
-         mpPathName->mNames.push_back( pNode );
- 		
--        beg = ( at = tss::strinc( at ) );
-+        beg = ( at = TSTRING::const_iterator(tss::strinc( at.base() )) );
- 	}
- }
- 
-Binary files tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith and tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc differ
---- tripwire-2.3.1-2/src/siggen/siggenmain.cpp.sopwith	Fri Oct 27 20:26:25 2000
-+++ tripwire-2.3.1-2/src/siggen/siggenmain.cpp	Fri Feb  1 01:11:59 2002
-@@ -118,11 +118,7 @@
-         // set unexpected and terminate handlers
-         // Note: we do this before Init() in case it attempts to call these handlers
-         // TODO: move this into the Init() routine
--#if IS_GCC
--            #define EXCEPTION_NAMESPACE 
--        #else
--            #define EXCEPTION_NAMESPACE std::
--        #endif
-+#define EXCEPTION_NAMESPACE std::
-         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
-         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/tripwire/mailmessage.cpp.sopwith	Fri Feb  1 01:11:59 2002
-+++ tripwire-2.3.1-2/src/tripwire/mailmessage.cpp	Fri Feb  1 01:11:59 2002
-@@ -509,9 +509,9 @@
-     std::string::size_type stringSize = 0;
-     std::string::const_iterator at;
-     std::string::difference_type charSize;
--    for( at = sIn.begin(), charSize = ( tss::strinc( at ) - at );
-+    for( at = sIn.begin(), charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at );
-          at != sIn.end();
--         at += charSize, charSize = ( tss::strinc( at ) - at ) )
-+         at += charSize, charSize = ( std::string::const_iterator(tss::strinc( at.base() )) - at ) )
-     {
-         ASSERT( charSize > 0 );
- 
---- tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp.sopwith	Sat Feb 24 14:02:12 2001
-+++ tripwire-2.3.1-2/src/tripwire/tripwiremain.cpp	Fri Feb  1 01:11:59 2002
-@@ -122,11 +122,7 @@
-         // set unexpected and terminate handlers
-         // Note: we do this before Init() in case it attempts to call these handlers
-         // TODO: move this into the Init() routine
--#if IS_GCC
--            #define EXCEPTION_NAMESPACE 
--        #else
--            #define EXCEPTION_NAMESPACE std::
--        #endif
-+#define EXCEPTION_NAMESPACE std::
-         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
-         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/twadmin/twadminmain.cpp.sopwith	Fri Oct 27 20:26:22 2000
-+++ tripwire-2.3.1-2/src/twadmin/twadminmain.cpp	Fri Feb  1 01:11:59 2002
-@@ -86,11 +86,7 @@
-         // set unexpected and terminate handlers
-         // Note: we do this before Init() in case it attempts to call these handlers
-         // TODO: move this into the Init() routine
--#if IS_GCC
--            #define EXCEPTION_NAMESPACE 
--        #else
--            #define EXCEPTION_NAMESPACE std::
--        #endif
-+#define EXCEPTION_NAMESPACE std::
-         EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
-         EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/twparser/policyparser.cpp.sopwith	Sat Feb 24 14:02:12 2001
-+++ tripwire-2.3.1-2/src/twparser/policyparser.cpp	Fri Feb  1 01:11:59 2002
-@@ -228,7 +228,7 @@
-          // at gets incremented when used....
-        )
-     {
--        int nBytes = ::mblen( (char*)at, MB_CUR_MAX );
-+        int nBytes = ::mblen( at.base(), MB_CUR_MAX );
-         if ( nBytes == -1 )
-         {
-             d.TraceDebug( "Unrecognized Character: %c\n", *at );
---- tripwire-2.3.1-2/src/twprint/twprintmain.cpp.sopwith	Fri Oct 27 20:26:19 2000
-+++ tripwire-2.3.1-2/src/twprint/twprintmain.cpp	Fri Feb  1 01:11:59 2002
-@@ -98,8 +98,8 @@
- #if IS_GCC
-           #define EXCEPTION_NAMESPACE 
-         #else
--          #define EXCEPTION_NAMESPACE std::
-         #endif
-+#define EXCEPTION_NAMESPACE std::
- 	  EXCEPTION_NAMESPACE set_terminate(tw_terminate_handler);
- 	  EXCEPTION_NAMESPACE set_unexpected(tw_unexpected_handler);
- 
---- tripwire-2.3.1-2/src/Makefile.sopwith	Sat Mar  3 23:03:52 2001
-+++ tripwire-2.3.1-2/src/Makefile	Fri Feb  1 01:11:59 2002
-@@ -93,7 +93,7 @@
- # file to Makefile.linux_intel or something similar.
- 
- MAKEFILE = Makefile
--GMAKE = gmake
-+GMAKE = $(MAKE)
- 
- #-----------------------------------------------------------------------------
- # STLPORT
-@@ -145,7 +145,7 @@
- 
- # It's handy for clean, .PHONY, etc. to have one big list
- #
--targets  = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) STLport_d STLport_r
-+targets  = $(debugbinaries) $(debuglibraries) $(releasebinaries) $(releaselibraries) 
- 
- 
- # Let make know these aren't real file names...
---- tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc.sopwith	Fri Oct 27 20:26:25 2000
-+++ tripwire-2.3.1-2/src/make_include/i686-pc-linux.inc	Fri Feb  1 01:11:59 2002
-@@ -19,11 +19,11 @@
- # General variable definitions
- #
- 
--GMAKE = /usr/bin/gmake
-+GMAKE = $(MAKE)
- CC = g++
- CXX = $(CC)
- AR = ar
--SYSDEF=-D_REDHAT -D_IX86 -D_GCC
-+SYSDEF=-D_REDHAT -D_IX86 -D_GCC $(RPM_OPT_FLAGS)
- STLPORT=../STLport-4.0
- 
- #
-@@ -33,7 +33,7 @@
- CXXFLAGS_R = -I.. -I$(STLPORT)/stlport -ftemplate-depth-32
- DEFINES_R = -DNDEBUG $(SYSDEF)
- LINKFLAGS_R = -static
--LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm -lstlport_gcc
-+LIBRARYFLAGS_R = -L../../lib/$(SYSPRE)_r -lm
- ARFLAGS_R = crv
- 
- #
diff --git a/app-admin/tripwire/files/tripwire-format-string-email-report.diff b/app-admin/tripwire/files/tripwire-format-string-email-report.diff
deleted file mode 100644
index 7e4f2676d4ef..000000000000
--- a/app-admin/tripwire/files/tripwire-format-string-email-report.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r1.1 -r1.2
---- src/tripwire/pipedmailmessage.cpp   21 Jan 2001 00:46:48 -0000      1.1
-+++ src/tripwire/pipedmailmessage.cpp   26 May 2004 20:59:15 -0000      1.2
-@@ -180,7 +180,7 @@
-
- void cPipedMailMessage::SendString( const TSTRING& s )
- {
--    if( _ftprintf( mpFile, s.c_str() ) < 0 )
-+    if( _ftprintf( mpFile, "%s", s.c_str() ) < 0 )
-     {
-         TOSTRINGSTREAM estr;
-         estr << TSS_GetString( cTripwire, tripwire::STR_ERR2_MAIL_MESSAGE_COMMAND
-)
diff --git a/app-admin/tripwire/files/tripwire-friend-classes.patch b/app-admin/tripwire/files/tripwire-friend-classes.patch
deleted file mode 100644
index 4dbcc56bd000..000000000000
--- a/app-admin/tripwire/files/tripwire-friend-classes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nru tripwire-2.3.1-2/src/fco/fconame.h tripwire-2.3.1-2-p1/src/fco/fconame.h
---- tripwire-2.3.1-2/src/fco/fconame.h	2000-10-27 18:25:40.000000000 -0600
-+++ tripwire-2.3.1-2-p1/src/fco/fconame.h	2006-03-08 11:21:03.000000000 -0700
-@@ -49,6 +49,7 @@
- ///////////////////////////////////////////////////////////////////////////////
- class cFCONameTblNode;
- class cFCONameIter;
-+class cFCOName_i;
- 
- class cFCOName : public iTypedSerializable
- {
-diff -Nru tripwire-2.3.1-2/src/fco/fcosetimpl.h tripwire-2.3.1-2-p1/src/fco/fcosetimpl.h
---- tripwire-2.3.1-2/src/fco/fcosetimpl.h	2000-10-27 18:25:39.000000000 -0600
-+++ tripwire-2.3.1-2-p1/src/fco/fcosetimpl.h	2006-03-08 11:07:14.000000000 -0700
-@@ -46,6 +46,8 @@
- #include "fconame.h"
- #endif
- 
-+class cFCOIterImpl;
-+
- class cFCOSetImpl : public iFCOSet
- {
- 	friend class cFCOIterImpl;
-diff -Nru tripwire-2.3.1-2/src/tw/fcoreport.h tripwire-2.3.1-2-p1/src/tw/fcoreport.h
---- tripwire-2.3.1-2/src/tw/fcoreport.h	2000-10-27 18:25:36.000000000 -0600
-+++ tripwire-2.3.1-2-p1/src/tw/fcoreport.h	2006-03-08 11:07:53.000000000 -0700
-@@ -85,6 +85,7 @@
- class cFileHeaderID;
- class cErrorQueue;
- class cFCOReportGenreHeader;
-+class cFCOReportSpecIter; 
- 
- class cFCOReport : public iTypedSerializable
- {
diff --git a/app-admin/tripwire/files/tripwire-jbj.patch b/app-admin/tripwire/files/tripwire-jbj.patch
deleted file mode 100644
index 9906c23a40ec..000000000000
--- a/app-admin/tripwire/files/tripwire-jbj.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- tripwire-2.3.1-2/src/core/resources.h.jbj	2002-11-16 13:08:59.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/resources.h	2002-11-16 14:07:42.000000000 -0500
-@@ -98,7 +98,7 @@
-         typedef Value&              ValueRef;
-         typedef const Value&        ConstValueRef;
-         
--        typedef Table::value_type   Pair;           
-+        typedef typename Table::value_type   Pair;           
- 
-         
- 
---- tripwire-2.3.1-2/src/core/archive.cpp.jbj	2002-11-16 13:42:37.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/archive.cpp	2002-11-16 13:42:51.000000000 -0500
-@@ -45,7 +45,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#include <iostream.h>
-+#include <iostream>
- #include "file.h"
- #include "stringutil.h"
- 
---- tripwire-2.3.1-2/src/core/stringutil.h.jbj	2002-11-16 13:44:39.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/stringutil.h	2002-11-16 13:49:08.000000000 -0500
-@@ -169,7 +169,7 @@
-             //- - - - - - - - - - - - - - - - - - - - - - - - - -
-             // required typedef ( to be a container it must have this... )
-             //- - - - - - - - - - - - - - - - - - - - - - - - - -
--           typedef _ParentT::value_type    value_type;
-+           typedef typename _ParentT::value_type    value_type;
- 
-             //- - - - - - - - - - - - - - - - - - - - - - - - - -
-             // required constructors and assignment operators...
---- tripwire-2.3.1-2/src/tw/twutil.cpp.jbj	2002-11-16 14:34:10.000000000 -0500
-+++ tripwire-2.3.1-2/src/tw/twutil.cpp	2002-11-16 14:37:07.000000000 -0500
-@@ -672,7 +672,7 @@
-         throw eSerializerInputStreamFmt(_T(""), filename, eSerializer::TY_FILE);
-     }
- 
--    d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
-+    // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
- 
-     // check for a mismatched header
-     if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
-@@ -775,7 +775,7 @@
-         throw eSerializerInputStreamFmt(_T(""), filename.c_str(), eSerializer::TY_FILE);
-     }
- 
--    d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
-+    // d.TraceDebug("Found a file header of type %d.\n", fileHeader.GetID());
- 
-     // check for a mismatched header
-     if (fileHeader.GetID() != cConfigFile::GetFileHeaderID())
diff --git a/app-admin/tripwire/files/tripwire-mkstemp.patch b/app-admin/tripwire/files/tripwire-mkstemp.patch
deleted file mode 100644
index daeae8cc33a5..000000000000
--- a/app-admin/tripwire/files/tripwire-mkstemp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- tripwire-2.3.1-2/src/core/unix/unixfsservices.cpp.mkstemp	2001-02-24 14:02:12.000000000 -0500
-+++ tripwire-2.3.1-2/src/core/unix/unixfsservices.cpp	2003-01-04 12:54:33.000000000 -0500
-@@ -243,6 +243,7 @@
- {
-     char* pchTempFileName;
-     char szTemplate[MAXPATHLEN];
-+    int fd;
- 
- #ifdef _UNICODE
-     // convert template from wide character to multi-byte string
-@@ -253,13 +254,12 @@
-     strcpy( szTemplate, strName.c_str() );
- #endif
- 
--    // create temp filename
--    pchTempFileName = mktemp( szTemplate );
--
--    //check to see if mktemp failed
--    if ( pchTempFileName == NULL || strlen(pchTempFileName) == 0) {
--      throw eFSServicesGeneric( strName );
--    }
-+    // create temp filename and check to see if mkstemp failed
-+    if ((fd = mkstemp( szTemplate )) == -1)
-+	throw eFSServicesGeneric( strName );
-+    else
-+	close(fd);
-+    pchTempFileName = szTemplate;
- 
-     // change name so that it has the XXXXXX part filled in
- #ifdef _UNICODE
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
deleted file mode 100644
index 1a22a7876ef3..000000000000
--- a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild,v 1.15 2009/10/11 23:59:13 halcy0n Exp $
-
-inherit eutils flag-o-matic
-
-TW_VER="2.3.1-2"
-DESCRIPTION="Open Source File Integrity Checker and IDS"
-HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	http://non-us.debian.org/debian-non-US/pool/non-US/main/t/tripwire/tripwire_2.3.1.2-6.1.diff.gz
-	mirror://gentoo/twpol.txt.gz
-	mirror://gentoo/tripwire.gif"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-util/patchutils
-	sys-devel/automake
-	dev-libs/openssl"
-RDEPEND="virtual/cron
-	virtual/mta
-	dev-libs/openssl"
-
-S="${WORKDIR}"/tripwire-${TW_VER}
-
-src_unpack() {
-	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz
-	unpack twpol.txt.gz
-	cd "${S}"
-
-	# some patches ive collected/made for tripwire
-	# mostly from mandrake, some from other sources
-	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
-	epatch "${FILESDIR}"/tripwire-2.3.1-2-fhs.patch
-	epatch "${FILESDIR}"/tripwire-2.3.1-2-gcc-3.3.patch
-	epatch "${FILESDIR}"/tripwire-2.3.1-gcc3.patch
-	epatch "${FILESDIR}"/tripwire-jbj.patch
-	epatch "${FILESDIR}"/tripwire-mkstemp.patch
-
-	# pull out the interesting debian patches
-	filterdiff  -i '*/man/man8/twadmin.8' -z  --strip=1	\
-		"${DISTDIR}"/tripwire_2.3.1.2-6.1.diff.gz > "${T}"/debian-patch.diff
-	epatch "${T}"/debian-patch.diff
-
-	# cleanup ready for build
-	rm -rf "${S}"/src/STLport*
-	touch "${S}"/src/STLport_r "${S}"/src/STLport_d
-
-	# security fix, http://www.securityfocus.com/archive/1/365036
-	epatch "${FILESDIR}"/tripwire-format-string-email-report.diff
-}
-
-src_compile() {
-	cd "${S}"/src
-
-	# tripwire can be sensitive to compiler optimisation.
-	# see #32613, #45823, and others.
-	# 	-taviso@gentoo.org
-	strip-flags
-
-	emake -j1 release RPM_OPT_FLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	dosbin "${S}"/bin/*/{tripwire,twadmin,twprint} || die
-
-	for i in {4,5,8}
-	do
-		cd "${S}"/man/man${i}
-		doman *.$i
-		cd "${S}"
-	done
-
-	dodir /etc/tripwire
-	dodir /var/lib/tripwire/report
-
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/tripwire.cron
-
-	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		"${WORKDIR}"/tripwire.gif "${FILESDIR}"/tripwire.txt
-
-	insinto /etc/tripwire
-	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
-
-	exeinto /etc/tripwire
-	doexe "${FILESDIR}"/twinstall.sh
-
-	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
-}
-
-pkg_postinst() {
-	elog "After installing this package, you should run \"/etc/tripwire/twinstall.sh\""
-	elog "to generate cryptographic keys, and \"tripwire --init\" to initialize the"
-	elog "database Tripwire uses."
-	elog
-	elog "A quickstart guide is included with the documentation."
-	elog
-}
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
deleted file mode 100644
index 7aac0c360c1f..000000000000
--- a/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r2.ebuild,v 1.16 2012/04/25 16:07:04 jlec Exp $
-
-inherit eutils flag-o-matic autotools
-
-TW_VER="2.3.1-2"
-DESCRIPTION="Open Source File Integrity Checker and IDS"
-HOMEPAGE="http://www.tripwire.org/"
-SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
-	mirror://gentoo/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	mirror://gentoo/twpol.txt.gz
-	mirror://gentoo/tripwire.gif"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd"
-IUSE="ssl"
-
-DEPEND="sys-devel/automake
-	sys-devel/autoconf
-	dev-util/patchutils
-	ssl? ( dev-libs/openssl )"
-RDEPEND="virtual/cron
-	virtual/mta
-	ssl? ( dev-libs/openssl )"
-
-S="${WORKDIR}"/tripwire-${TW_VER}
-
-src_unpack() {
-	# unpack tripwire source tarball
-	unpack tripwire-${TW_VER}.tar.gz
-	unpack twpol.txt.gz
-	cd "${S}"
-
-	# Paul Herman has been maintaining some updates to tripwire
-	# including autoconf support and portability fixes.
-	# http://www.frenchfries.net/paul/tripwire/
-	export EPATCH_OPTS="-F3 -l"
-	epatch "${FILESDIR}"/tripwire-friend-classes.patch
-	epatch "${DISTDIR}"/tripwire-2.3.1-2-pherman-portability-0.9.diff.bz2
-	epatch "${FILESDIR}"/tripwire-2.3.0-50-rfc822.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	# tripwire can be sensitive to compiler optimisation.
-	# see #32613, #45823, and others.
-	# 	-taviso@gentoo.org
-	strip-flags
-	append-flags -DCONFIG_DIR='"\"/etc/tripwire\""' -fno-strict-aliasing
-
-		ebegin "	Preparing Directory"
-			mkdir "${S}"/lib "${S}"/bin || die
-		eend
-	einfo "Done."
-	chmod +x configure
-	econf `use_enable ssl openssl`
-	emake || die
-}
-
-src_install() {
-	dosbin "${S}"/bin/{siggen,tripwire,twadmin,twprint}
-	doman "${S}"/man/man{4/*.4,5/*.5,8/*.8}
-	dodir /etc/tripwire /var/lib/tripwire{,/report}
-	keepdir /var/lib/tripwire{,/report}
-
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/tripwire.cron
-
-	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
-		"${WORKDIR}"/tripwire.gif "${FILESDIR}"/tripwire.txt
-
-	insinto /etc/tripwire
-	doins "${WORKDIR}"/twpol.txt "${FILESDIR}"/twcfg.txt
-
-	exeinto /etc/tripwire
-	doexe "${FILESDIR}"/twinstall.sh
-
-	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
-}
-
-pkg_postinst() {
-	elog "After installing this package, you should run \"/etc/tripwire/twinstall.sh\""
-	elog "to generate cryptographic keys, and \"tripwire --init\" to initialize the"
-	elog "database Tripwire uses."
-	elog
-	elog "A quickstart guide is included with the documentation."
-	elog
-}