Cleanup for gcc porting.

8 files changed, 0 insertions, 327 deletions

diff --git a/net-fs/fex/ChangeLog b/net-fs/fex/ChangeLog
deleted file mode 100644
index 38505cf70913..000000000000
--- a/net-fs/fex/ChangeLog
+++ /dev/null
@@ -1,37 +0,0 @@
-# ChangeLog for net-fs/fex
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/ChangeLog,v 1.7 2009/02/15 20:49:12 loki_val Exp $
-
-  15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
-  files/fex-0.8.18-gcc4.patch:
-  Update gcc4 patch with fixes for gcc-4.3. Bug 251444. Thanks to Gene Seto
-  <geneseto@hotmail.com> for the patch.
-
-*fex-0.8.18-r1 (29 Dec 2007)
-
-  29 Dec 2007; Ryan Hill <dirtyepic@gentoo.org>
-  +files/fex-0.8.18-configure.patch, +files/fex-0.8.18-gcc4.patch,
-  -fex-0.8.18.ebuild, +fex-0.8.18-r1.ebuild:
-  Revision bump.
-   - fix building with GCC 4 (bug #182009)
-   - fix building against log4cpp-1.0 by linking with -lpthread
-   - added debug USE flag
-   - respect user CFLAGS
-   - ebuild cleanup
-
-  11 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
-  fix spelling of herd in metadata
-
-  06 May 2007; Marius Mauch <genone@gentoo.org> fex-0.8.18.ebuild:
-  Replacing einfo with elog
-
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
-  Transition to Manifest2.
-
-*fex-0.8.18 (20 May 2006)
-
-  20 May 2006; Christian Zoffoli <xmerlin@gentoo.org> +files/fex.conf.d,
-  +files/fex.rc, +fex-0.8.18.ebuild:
-  Initial version. Thanks to Michael Reithinger <mreithinger@web.de> for the
-  initial ebuild. Closing bug #83195.
-
diff --git a/net-fs/fex/Manifest b/net-fs/fex/Manifest
deleted file mode 100644
index 1f17ed73f733..000000000000
--- a/net-fs/fex/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX fex-0.8.18-gcc4.patch 5441 RMD160 7a5b5044a70152c967a613d1cd4be01586c85c10 SHA1 db2fd06561538b47639d6e992245e37b721e59cc SHA256 7bb317a88753bc6343bd00761d36a670288c80f111476d1fbc0eb83cb80f65ef
-AUX fex-0.8.18-lpthread.patch 905 RMD160 1c80277534458384f4e89b658726c7eb6329b415 SHA1 6c78e03828b6ec06ce12868d7c3ae281fdbbfa22 SHA256 0b26c3cce8cd4f1d70d6a9a17015995b274a2418bb1b7dca45848bc275870845
-AUX fex.conf.d 171 RMD160 6b822f8109b2f2f239727745e5d2538f05ab742e SHA1 7ff3ca743fcc657e3ef8a0f5cbcdd8848262eab9 SHA256 dbad1b52ef284baec00223809d4e17818dfe9fc48dc65d185d55b45e8cb3e160
-AUX fex.rc 520 RMD160 635c417b7f89d07f2cb5f998fe3998f169145efa SHA1 7dec8da0d0ce3dc9ea9fa0d85b650f30be962b22 SHA256 83003ef4b5c116c61b40944d0b73081f90cd6c46099fd1b870b81ea98ecd33ad
-DIST fex-0.8.18.tar.gz 388346 RMD160 545830f380616c1d1f8bc1b72f1d83696879bce5 SHA1 2fabf66ebeee42f470a0f531f60379dafd652bbf SHA256 236928fdf3eb80298007c58563c045e138d1f9a91341a62bd4543591f60f78f1
-EBUILD fex-0.8.18-r1.ebuild 1175 RMD160 3a94c40e98cdb187fcb7a18c8ac37ce383c24b99 SHA1 63de52c1804206a78fdcf1a01d53c7e53778ccb6 SHA256 9e0ad745ad5a95c27713e21f0d9a1061efbb6275df4e879e2320bc327962a5ac
-MISC ChangeLog 1323 RMD160 59454868e2e07199311cd74c66869b00f0de2b80 SHA1 1742dd881bb431badfb292782fd58f9677f69bd3 SHA256 9467d5a0b924eb4ed95147da78d0d7fb0d3134876711ad1483c2fd10e06b078d
-MISC metadata.xml 223 RMD160 81ccafc4faf44808e7daaf5e5d17b6e892712c7a SHA1 9ac31475dcab4e5f84dcaedc864f7f881dbb1cc8 SHA256 7c3d91940904fc3736a21cf9fb47bd3c90ad29f0d6a2412800cd05005e9f7a9f
diff --git a/net-fs/fex/fex-0.8.18-r1.ebuild b/net-fs/fex/fex-0.8.18-r1.ebuild
deleted file mode 100644
index 7e4345e56b73..000000000000
--- a/net-fs/fex/fex-0.8.18-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/fex-0.8.18-r1.ebuild,v 1.1 2007/12/29 03:56:06 dirtyepic Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Fex is a replicating filesystem for disconnected computers similar to intermezzo"
-HOMEPAGE="http://www.zahlfee.de/fex/fex.html"
-SRC_URI="http://www.zahlfee.de/fex/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug"
-
-DEPEND="dev-libs/confuse
-	dev-libs/log4cpp
-	net-libs/librsync
-	dev-libs/popt
-	"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-lpthread.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/${PN}.rc ${PN}d || die
-	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}d || die
-}
-
-pkg_postinst() {
-	elog "To enable fex on boot you will have to add it to the"
-	elog "default profile, issue the following command as root to do so."
-	elog "rc-update add fexd default"
-}
diff --git a/net-fs/fex/files/fex-0.8.18-gcc4.patch b/net-fs/fex/files/fex-0.8.18-gcc4.patch
deleted file mode 100644
index 101c78a1a618..000000000000
--- a/net-fs/fex/files/fex-0.8.18-gcc4.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -Naur fex-0.8.18-orig/src/client.cpp fex-0.8.18/src/client.cpp
---- fex-0.8.18-orig/src/client.cpp	2004-12-19 17:49:45.000000000 -0600
-+++ fex-0.8.18/src/client.cpp	2007-12-28 21:03:30.000000000 -0600
-@@ -53,7 +53,7 @@
- {
-   lc.info("start fullsync");
-   parent().write(fex_header(ME_FullSyncStart));
--  parent().wp()->createStateFile((unsigned)this, &_M_ClientFile);
-+  parent().wp()->createStateFile((unsigned long)this, &_M_ClientFile);
- }
-   
- void FullSyncDialog::
-diff -Naur fex-0.8.18-orig/src/dialog.cpp fex-0.8.18/src/dialog.cpp
---- fex-0.8.18-orig/src/dialog.cpp	2005-05-11 10:20:52.000000000 -0600
-+++ fex-0.8.18/src/dialog.cpp	2007-12-28 21:03:58.000000000 -0600
-@@ -224,7 +224,7 @@
-   ModLog::iterator i;
-   for(i = _M_Log.begin(); i != _M_Log.end(); i++) {
-     if (! FileListener::get().lock(parent().wp()->path() + i->first.str(), 
--				   (unsigned int)&parent())) {
-+				   (unsigned long)&parent())) {
-       ModLog::iterator j;
-       for(j = _M_Log.begin(); j != i; j++) {
- 	FileListener::get().unlock(parent().wp(), 
-diff -Naur fex-0.8.18-orig/src/filelistener.cpp fex-0.8.18/src/filelistener.cpp
---- fex-0.8.18-orig/src/filelistener.cpp	2005-06-07 09:49:06.000000000 -0600
-+++ fex-0.8.18/src/filelistener.cpp	2007-12-28 21:04:42.000000000 -0600
-@@ -355,7 +355,7 @@
- 
-   _M_FDBuffer[0].reserve(MinFDBufferSize);
-   _M_FDBuffer[1].reserve(MinFDBufferSize);
--  _S_SignalBuffer = (int)&_M_FDBuffer[0];
-+  _S_SignalBuffer = (long)&_M_FDBuffer[0];
-   _M_ReadBuffer   = &_M_FDBuffer[1];
- 
-   assert(! _S_WakeUpPipe.first);
-@@ -439,7 +439,7 @@
-   typedef FileListener::FileEvent::reqs_m::iterator iterator;
- 
-   _M_ReadBuffer->reserve(_M_Handler->size() + MinFDBufferSize);
--  _S_SignalBuffer = (int)_M_ReadBuffer;
-+  _S_SignalBuffer = (long)_M_ReadBuffer;
-   _M_ReadBuffer   = &_M_FDBuffer[_M_ReadBuffer == &_M_FDBuffer[0] ? 1 : 0];
- 
-   if (_S_RenewAll) {
-diff -Naur fex-0.8.18-orig/src/nmstl/netioevent fex-0.8.18/src/nmstl/netioevent
---- fex-0.8.18-orig/src/nmstl/netioevent	2004-12-12 16:34:50.000000000 -0600
-+++ fex-0.8.18/src/nmstl/netioevent	2007-12-28 21:05:51.000000000 -0600
-@@ -138,7 +138,7 @@
-     io_handler::set_ioh;
- 
- private:
--    inline void tcp_acceptor::ravail() {
-+    inline void ravail() {
-         address a;
-         tcpsocket ioh = sock.accept(a);
-         if (ioh) {
-@@ -168,7 +168,7 @@
-     virtual ~tcp_acceptor() {}
- 
- protected:
--    inline void tcp_acceptor::ravail() {
-+    inline void ravail() {
-         address a;
-         tcpsocket ioh = sock.accept(a);
-         if (ioh) {
-diff -Naur fex-0.8.18-orig/src/server.cpp fex-0.8.18/src/server.cpp
---- fex-0.8.18-orig/src/server.cpp	2004-12-19 17:51:23.000000000 -0600
-+++ fex-0.8.18/src/server.cpp	2007-12-28 21:06:27.000000000 -0600
-@@ -81,7 +81,7 @@
- sendStatFile() 
- {
-   size_t size;
--  size = parent().wp()->createStateFile((unsigned)this, &_M_StateFile);
-+  size = parent().wp()->createStateFile((unsigned long)this, &_M_StateFile);
-   omessage msg;
-   msg << _M_StateFile << size;
-   write(fex_header(ME_FullSyncState), msg);
-diff -Naur fex-0.8.18-orig/src/watchpoint.cpp fex-0.8.18/src/watchpoint.cpp
---- fex-0.8.18-orig/src/watchpoint.cpp	2004-12-27 08:40:40.000000000 -0600
-+++ fex-0.8.18/src/watchpoint.cpp	2007-12-28 21:07:31.000000000 -0600
-@@ -188,7 +188,7 @@
- 	 unsigned int lock_id,
- 	 bool do_sync)
- {
--  if (lock_id == (unsigned int)this)
-+  if (lock_id == (unsigned long)this)
-     return;
- 
-   pair<ModLog::iterator, bool> res = _M_WriteLog->insert(key, state);
-@@ -327,7 +327,7 @@
- save_state()
- {
-   if (_M_Mode >= MO_fullsynched)
--    wp()->createStateFile((unsigned)this, NULL);
-+    wp()->createStateFile((unsigned long)this, NULL);
- }
- 
- 
-diff -rupN fex-0.8.18b/src/modlog.cpp fex-0.8.18/src/modlog.cpp
---- fex-0.8.18b/src/modlog.cpp	2009-01-22 17:00:41.000000000 -0400
-+++ fex-0.8.18/src/modlog.cpp	2009-01-22 17:03:44.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#include <cstdlib>
- extern "C" {
- #include <librsync.h>
- }
-diff -rupN fex-0.8.18b/src/modlog.h fex-0.8.18/src/modlog.h
---- fex-0.8.18b/src/modlog.h	2009-01-22 17:00:41.000000000 -0400
-+++ fex-0.8.18/src/modlog.h	2009-01-22 17:01:44.000000000 -0400
-@@ -22,7 +22,7 @@
- #ifndef MODLOG_H
- #define MODLOG_H
- 
--#include <string>
-+#include <cstring>
- #include <map>
- 
- 
-diff -rupN fex-0.8.18b/src/nmstl/status fex-0.8.18/src/nmstl/status
---- fex-0.8.18b/src/nmstl/status	2009-01-22 17:00:41.000000000 -0400
-+++ fex-0.8.18/src/nmstl/status	2009-01-22 17:02:12.000000000 -0400
-@@ -23,7 +23,7 @@
- #ifndef NMSTL_H_STATUS
- #define NMSTL_H_STATUS
- 
--#include <string>
-+#include <cstring>
- #include <nmstl/internal.h>
- 
- NMSTL_NAMESPACE_BEGIN;
-diff -rupN fex-0.8.18b/src/nmstl_src/debug.cc fex-0.8.18/src/nmstl_src/debug.cc
---- fex-0.8.18b/src/nmstl_src/debug.cc	2009-01-22 17:00:41.000000000 -0400
-+++ fex-0.8.18/src/nmstl_src/debug.cc	2009-01-22 17:04:16.000000000 -0400
-@@ -20,7 +20,8 @@
-  *
-  */
- 
--#include <iostream>
-+#include <cstdlib>
-+#include <cstring>
- 
- #include <nmstl/debug>
- #include <nmstl/thread>
-diff -rupN fex-0.8.18b/src/nmstl_src/internal.cc fex-0.8.18/src/nmstl_src/internal.cc
---- fex-0.8.18b/src/nmstl_src/internal.cc	2009-01-22 17:00:41.000000000 -0400
-+++ fex-0.8.18/src/nmstl_src/internal.cc	2009-01-22 17:04:45.000000000 -0400
-@@ -21,6 +21,7 @@
-  */
- 
- #include <nmstl/internal.h>
-+#include <cstdlib>
- 
- #undef NMSTL_DEBUG_FILE_H
- #define NMSTL_DEBUG_FILE_H "nmstl/internal"
diff --git a/net-fs/fex/files/fex-0.8.18-lpthread.patch b/net-fs/fex/files/fex-0.8.18-lpthread.patch
deleted file mode 100644
index 0539fa9b9a8e..000000000000
--- a/net-fs/fex/files/fex-0.8.18-lpthread.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur fex-0.8.18-orig/configure.ac fex-0.8.18/configure.ac
---- fex-0.8.18-orig/configure.ac	2005-06-07 12:31:43.000000000 -0600
-+++ fex-0.8.18/configure.ac	2007-12-28 21:49:27.000000000 -0600
-@@ -21,9 +21,9 @@
- 	[AS_HELP_STRING([--enable-debug], [build a debug version])])
- 
- if test "$enable_debug" = "yes"; then
--    CXXFLAGS="${CXXFLAGS} -O0 -g3";
-+    CXXFLAGS="${CXXFLAGS}";
- else
--    CXXFLAGS="-O2 -DNDEBUG ${CXXFLAGS}";
-+    CXXFLAGS="-DNDEBUG ${CXXFLAGS}";
- fi
- 
- AC_ARG_ENABLE([slink],
-@@ -68,6 +68,8 @@
- AC_CHECK_HEADERS([ext/malloc_allocator.h])
- AC_CHECK_HEADERS([linux/inotify.h])
- 
-+FEX_LINK="${FEX_LINK} -lpthread"
-+
- AC_CHECK_LIB([rsync],
-   [rs_delta_file],
-   [],
-@@ -89,7 +91,8 @@
- AC_CHECK_LIB([log4cpp],
-   [main],
-   [],
--  [AC_MSG_ERROR([liblog4cpp must be installed])]) 
-+  [AC_MSG_ERROR([liblog4cpp must be installed])],
-+  [-lpthread]) 
- 
- AC_HEADER_STDC
- AC_HEADER_DIRENT
diff --git a/net-fs/fex/files/fex.conf.d b/net-fs/fex/files/fex.conf.d
deleted file mode 100644
index 06d871c1d3f8..000000000000
--- a/net-fs/fex/files/fex.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# Additional options that are passed to the fexd.
-FEXOPTS="-v"
-
-# if fexd  has to work with the dnotify-mechnism, adjust the maximum 
-# of open directories
-#MAX_DIRS=8192
diff --git a/net-fs/fex/files/fex.rc b/net-fs/fex/files/fex.rc
deleted file mode 100644
index c019977c8f4f..000000000000
--- a/net-fs/fex/files/fex.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/files/fex.rc,v 1.2 2006/06/10 16:24:29 swegener Exp $
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-
-	ebegin "Starting fexd"
-	test $MAX_DIRS && ulimit -n $MAX_DIRS
-	start-stop-daemon --start --quiet --exec /usr/sbin/fexd -- $FEXOPTS
-	eend $?
-
-}
-
-stop() {
-
-	ebegin "Stopping fexd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/fexd
-	eend $?
-
-}
diff --git a/net-fs/fex/metadata.xml b/net-fs/fex/metadata.xml
deleted file mode 100644
index e14f775a8f2d..000000000000
--- a/net-fs/fex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>xmerlin@gentoo.org</email>
-</maintainer>
-</pkgmetadata>