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
Package-Manager: portage-2.1.4_rc11

6 files changed, 195 insertions, 18 deletions

diff --git a/net-fs/fex/ChangeLog b/net-fs/fex/ChangeLog
index fcc18502dec2..ae8103f67547 100644
--- a/net-fs/fex/ChangeLog
+++ b/net-fs/fex/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-fs/fex
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/ChangeLog,v 1.4 2007/05/11 01:14:32 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/fex/ChangeLog,v 1.5 2007/12/29 03:56:06 dirtyepic Exp $
+
+*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
diff --git a/net-fs/fex/Manifest b/net-fs/fex/Manifest
index 6b0116b26253..008cd74d7c62 100644
--- a/net-fs/fex/Manifest
+++ b/net-fs/fex/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fex-0.8.18-gcc4.patch 3668 RMD160 5029e9d71b7a3191ec5d765cead3094e6f3f5c34 SHA1 785b01172473ae43881a258037462c56dbf2895d SHA256 2c2a1f16c83858c14a9f5f342425b6056710a186091d3d91d1a4dbf2a662dcda
+MD5 96f76f6c83971effc81df3c6ed314862 files/fex-0.8.18-gcc4.patch 3668
+RMD160 5029e9d71b7a3191ec5d765cead3094e6f3f5c34 files/fex-0.8.18-gcc4.patch 3668
+SHA256 2c2a1f16c83858c14a9f5f342425b6056710a186091d3d91d1a4dbf2a662dcda files/fex-0.8.18-gcc4.patch 3668
+AUX fex-0.8.18-lpthread.patch 905 RMD160 1c80277534458384f4e89b658726c7eb6329b415 SHA1 6c78e03828b6ec06ce12868d7c3ae281fdbbfa22 SHA256 0b26c3cce8cd4f1d70d6a9a17015995b274a2418bb1b7dca45848bc275870845
+MD5 3cb6970a1a556dfe4d727d71f42547e4 files/fex-0.8.18-lpthread.patch 905
+RMD160 1c80277534458384f4e89b658726c7eb6329b415 files/fex-0.8.18-lpthread.patch 905
+SHA256 0b26c3cce8cd4f1d70d6a9a17015995b274a2418bb1b7dca45848bc275870845 files/fex-0.8.18-lpthread.patch 905
 AUX fex.conf.d 171 RMD160 6b822f8109b2f2f239727745e5d2538f05ab742e SHA1 7ff3ca743fcc657e3ef8a0f5cbcdd8848262eab9 SHA256 dbad1b52ef284baec00223809d4e17818dfe9fc48dc65d185d55b45e8cb3e160
 MD5 f2d94dd415f28efa8a1e9f1ad4a338d3 files/fex.conf.d 171
 RMD160 6b822f8109b2f2f239727745e5d2538f05ab742e files/fex.conf.d 171
@@ -7,18 +18,25 @@ MD5 564be45ee3b4467d4f183c94030d8eb3 files/fex.rc 520
 RMD160 635c417b7f89d07f2cb5f998fe3998f169145efa files/fex.rc 520
 SHA256 83003ef4b5c116c61b40944d0b73081f90cd6c46099fd1b870b81ea98ecd33ad files/fex.rc 520
 DIST fex-0.8.18.tar.gz 388346 RMD160 545830f380616c1d1f8bc1b72f1d83696879bce5 SHA1 2fabf66ebeee42f470a0f531f60379dafd652bbf SHA256 236928fdf3eb80298007c58563c045e138d1f9a91341a62bd4543591f60f78f1
-EBUILD fex-0.8.18.ebuild 947 RMD160 419dcfca062e2649529fc59ca1526d0436b7f504 SHA1 2b4c5a1fd58213cec069db6bde4feaa44cf3a609 SHA256 4b9f4ae4405f87394921e5c78ea8921e77521bedca03adac33939dc6ed6e8923
-MD5 876176175bd93a63596b30bc7c7392f9 fex-0.8.18.ebuild 947
-RMD160 419dcfca062e2649529fc59ca1526d0436b7f504 fex-0.8.18.ebuild 947
-SHA256 4b9f4ae4405f87394921e5c78ea8921e77521bedca03adac33939dc6ed6e8923 fex-0.8.18.ebuild 947
-MISC ChangeLog 735 RMD160 94e8d69c2ffe41d8e5f5d840f3e3db5697f398dc SHA1 d465f2918a39e752ff007b6f527627ac3ea58da8 SHA256 db7ca3b514bbae5ddd6445fdc725224b35be28ed8568d494a44acbfdd70060b9
-MD5 a03bd2af6b3b88a3bae480e375a2b6f0 ChangeLog 735
-RMD160 94e8d69c2ffe41d8e5f5d840f3e3db5697f398dc ChangeLog 735
-SHA256 db7ca3b514bbae5ddd6445fdc725224b35be28ed8568d494a44acbfdd70060b9 ChangeLog 735
+EBUILD fex-0.8.18-r1.ebuild 1175 RMD160 3a94c40e98cdb187fcb7a18c8ac37ce383c24b99 SHA1 63de52c1804206a78fdcf1a01d53c7e53778ccb6 SHA256 9e0ad745ad5a95c27713e21f0d9a1061efbb6275df4e879e2320bc327962a5ac
+MD5 1124c1ebad2ac1696fd9aa2792841b8e fex-0.8.18-r1.ebuild 1175
+RMD160 3a94c40e98cdb187fcb7a18c8ac37ce383c24b99 fex-0.8.18-r1.ebuild 1175
+SHA256 9e0ad745ad5a95c27713e21f0d9a1061efbb6275df4e879e2320bc327962a5ac fex-0.8.18-r1.ebuild 1175
+MISC ChangeLog 1123 RMD160 6b73d380e1c33764f8c7b500cf91bbdc0ff728d1 SHA1 37797f72d699062ea08b93774e1dce97216fe1b3 SHA256 312640287c516a6c795f83d8b68e2e0fd6ee72011436fba065fd5ff857381825
+MD5 20baf67cc14050c05bc52aee135e6eda ChangeLog 1123
+RMD160 6b73d380e1c33764f8c7b500cf91bbdc0ff728d1 ChangeLog 1123
+SHA256 312640287c516a6c795f83d8b68e2e0fd6ee72011436fba065fd5ff857381825 ChangeLog 1123
 MISC metadata.xml 223 RMD160 81ccafc4faf44808e7daaf5e5d17b6e892712c7a SHA1 9ac31475dcab4e5f84dcaedc864f7f881dbb1cc8 SHA256 7c3d91940904fc3736a21cf9fb47bd3c90ad29f0d6a2412800cd05005e9f7a9f
 MD5 47c9a55d8a3c7e36cd9f8a5a90a7ced6 metadata.xml 223
 RMD160 81ccafc4faf44808e7daaf5e5d17b6e892712c7a metadata.xml 223
 SHA256 7c3d91940904fc3736a21cf9fb47bd3c90ad29f0d6a2412800cd05005e9f7a9f metadata.xml 223
-MD5 4e25b9d52f4f692d30559e8da4144083 files/digest-fex-0.8.18 232
-RMD160 48051effa8fcd2db8b66929500ea5cb8e0e1ded1 files/digest-fex-0.8.18 232
-SHA256 a48b5d89a5a70d4ae8ec6a325a81f9f25a463d9ca996638654857af3601cfb34 files/digest-fex-0.8.18 232
+MD5 4e25b9d52f4f692d30559e8da4144083 files/digest-fex-0.8.18-r1 232
+RMD160 48051effa8fcd2db8b66929500ea5cb8e0e1ded1 files/digest-fex-0.8.18-r1 232
+SHA256 a48b5d89a5a70d4ae8ec6a325a81f9f25a463d9ca996638654857af3601cfb34 files/digest-fex-0.8.18-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd1xWMACgkQiqiDRvmkBmKdAACeLom5/Ei898GxrjmTfbcSnDNd
+M6gAoND/1CmoQ+Y7EzoOACZeZeaS2sNe
+=QIJO
+-----END PGP SIGNATURE-----
diff --git a/net-fs/fex/fex-0.8.18.ebuild b/net-fs/fex/fex-0.8.18-r1.ebuild
index 11a455d60ad4..7e4345e56b73 100644
--- a/net-fs/fex/fex-0.8.18.ebuild
+++ b/net-fs/fex/fex-0.8.18-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.ebuild,v 1.2 2007/05/06 10:15:50 genone Exp $
+# $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"
@@ -9,7 +11,7 @@ SRC_URI="http://www.zahlfee.de/fex/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE=""
+IUSE="debug"
 
 DEPEND="dev-libs/confuse
 	dev-libs/log4cpp
@@ -17,16 +19,28 @@ DEPEND="dev-libs/confuse
 	dev-libs/popt
 	"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-lpthread.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+
+	eautoreconf
+}
+
 src_compile() {
-	econf || die "econf failed"
+	econf \
+		$(use_enable debug) || die "econf failed"
+
 	emake || die "emake failed"
 }
 
 src_install() {
-	einstall || die "install problem"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd ${FILESDIR}/${PN}.rc ${PN}d || die
-	newconfd ${FILESDIR}/${PN}.conf.d ${PN}d || die
+	newinitd "${FILESDIR}"/${PN}.rc ${PN}d || die
+	newconfd "${FILESDIR}"/${PN}.conf.d ${PN}d || die
 }
 
 pkg_postinst() {
diff --git a/net-fs/fex/files/digest-fex-0.8.18 b/net-fs/fex/files/digest-fex-0.8.18-r1
index 9e02e72f4ddd..9e02e72f4ddd 100644
--- a/net-fs/fex/files/digest-fex-0.8.18
+++ b/net-fs/fex/files/digest-fex-0.8.18-r1
diff --git a/net-fs/fex/files/fex-0.8.18-gcc4.patch b/net-fs/fex/files/fex-0.8.18-gcc4.patch
new file mode 100644
index 000000000000..00147faaea6f
--- /dev/null
+++ b/net-fs/fex/files/fex-0.8.18-gcc4.patch
@@ -0,0 +1,99 @@
+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 --git a/net-fs/fex/files/fex-0.8.18-lpthread.patch b/net-fs/fex/files/fex-0.8.18-lpthread.patch
new file mode 100644
index 000000000000..0539fa9b9a8e
--- /dev/null
+++ b/net-fs/fex/files/fex-0.8.18-lpthread.patch
@@ -0,0 +1,34 @@
+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