Added patch to fix compilation problems for projects depending on log4cxx (bug #162523, thanks to Pedro). Dropped old versions.

(Portage version: 2.1.2.2)

8 files changed, 66 insertions, 84 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 12a8d8dfecf9..b664e3c04fed 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/log4cxx
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.20 2007/02/22 01:05:20 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.21 2007/03/15 22:48:29 dev-zero Exp $
+
+*log4cxx-0.9.7-r4 (15 Mar 2007)
+
+  15 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -files/log4cxx-0.9.5-fix-errno.diff, +files/log4cxx-0.9.7-tchar.patch,
+  -log4cxx-0.9.5.ebuild, -log4cxx-0.9.7-r2.ebuild, +log4cxx-0.9.7-r4.ebuild:
+  Added patch to fix compilation problems for projects depending on log4cxx
+  (bug #162523, thanks to Pedro). Dropped old versions.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.5 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.5
deleted file mode 100644
index 6e042c691004..000000000000
--- a/dev-libs/log4cxx/files/digest-log4cxx-0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dd1cc7a974d27620a7f2a1e886bf1757 log4cxx-0.9.5.tar.gz 232685
-RMD160 8c41aa584be1c019c71a8be8a14624cbc149409a log4cxx-0.9.5.tar.gz 232685
-SHA256 8485ec4423e24641334df3cf45e8cb5bf55fe05d3423ecb83991f404432c2db5 log4cxx-0.9.5.tar.gz 232685
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r4
index 4f09145279a2..4f09145279a2 100644
--- a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
+++ b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r4
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff b/dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff
deleted file mode 100644
index d157ae369747..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.5-fix-errno.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/filewatchdog.cpp.orig	2004-08-07 21:36:34.987676584 -0500
-+++ src/filewatchdog.cpp	2004-08-07 21:36:41.562677032 -0500
-@@ -17,10 +17,7 @@
- #include <log4cxx/helpers/filewatchdog.h>
- #include <log4cxx/helpers/loglog.h>
- #include <sys/stat.h>
--
--#ifdef WIN32
--#include <errno.h>
-+#include <cerrno>
--#endif
- 
- using namespace log4cxx;
- using namespace log4cxx::helpers;
---- src/socketimpl.cpp.orig	2004-08-07 22:01:02.577569008 -0500
-+++ src/socketimpl.cpp	2004-08-07 22:01:23.868332320 -0500
-@@ -15,6 +15,7 @@
-  ***************************************************************************/
- 
- #include <log4cxx/config.h>
-+#include <cerrno>
- 
- #ifdef WIN32
- #include <windows.h>
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
new file mode 100644
index 000000000000..a3ba40fc864a
--- /dev/null
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
@@ -0,0 +1,12 @@
+--- log4cxx-0.9.7.orig/include/log4cxx/helpers/tchar.h	2004-05-10 14:54:50.000000000 +0200
++++ log4cxx-0.9.7/include/log4cxx/helpers/tchar.h	2007-01-17 12:46:44.000000000 +0100
+@@ -142,7 +142,9 @@
+ 	#define _T(x) x
+ #endif
+ 
++#ifndef TCHAR
+ 	typedef char TCHAR;
++#endif
+ 	#define totupper toupper
+ 	#define totlower tolower
+ 	#define tcout std::cout
diff --git a/dev-libs/log4cxx/log4cxx-0.9.5.ebuild b/dev-libs/log4cxx/log4cxx-0.9.5.ebuild
deleted file mode 100644
index 419fb4fa1c21..000000000000
--- a/dev-libs/log4cxx/log4cxx-0.9.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.5.ebuild,v 1.7 2005/01/12 12:06:08 ka0ttic Exp $
-
-inherit eutils
-
-DESCRIPTION="Library of C++ classes for flexible logging to files, syslog and other destinations"
-HOMEPAGE="http://log4cxx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/log4cxx/${P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/libc
-		dev-libs/libxml2"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-errno.diff
-}
-
-src_compile() {
-	./autogen.sh || die "autogen.sh failed"
-	econf || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO
-}
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
index 9418f6afe5f5..3c88328a12b2 100644
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild,v 1.3 2006/10/28 08:06:39 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild,v 1.4 2007/03/15 22:48:29 dev-zero Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
index 3e41d08784fb..97010ced943d 100644
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
@@ -1,49 +1,71 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild,v 1.3 2005/06/28 08:24:37 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild,v 1.1 2007/03/15 22:48:29 dev-zero Exp $
 
-inherit eutils flag-o-matic
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="latest"
+
+inherit autotools eutils flag-o-matic
+
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="Library of C++ classes for flexible logging to files, syslog and other destinations"
 HOMEPAGE="http://logging.apache.org/log4cxx/"
 SRC_URI="http://www.apache.org/dist/logging/${PN}/${P}.tar.gz"
-
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc unicode odbc smtp"
+IUSE="doc iodbc unicode odbc smtp threads"
 
-DEPEND="virtual/libc
+RDEPEND="dev-libs/boost
 		dev-libs/libxml2
-		doc? ( app-doc/doxygen media-gfx/graphviz )
-		odbc? ( dev-db/unixODBC )
+		odbc? (
+			iodbc? ( >=dev-db/libiodbc-3.52.4 )
+			!iodbc? ( dev-db/unixODBC ) )
 		smtp? ( dev-libs/libsmtp )"
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen media-gfx/graphviz )"
+
+pkg_setup() {
+	if use iodbc && ! use odbc ; then
+		elog "Please enable the odbc USE-flag as well if you want odbc-support through iodbc."
+	fi
+}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i "s:\(htmldir = \).*\(/html\):\1\$(datadir)/doc/${PF}\2:" \
+	cd "${S}"
+	sed -i \
+		-e "s:\(htmldir = \).*\(/html\):\1\$(datadir)/doc/${PF}\2:" \
 		docs/Makefile.am || die "sed failed"
 
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch "${FILESDIR}/${P}-gentoo.diff"
 
 	if use unicode && use odbc ; then
-		epatch ${FILESDIR}/${P}-use-SQLWCHAR.diff
+		epatch "${FILESDIR}/${P}-use-SQLWCHAR.diff"
 	fi
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-tchar.patch"
+	eautoreconf
 }
 
 src_compile() {
-	${S}/autogen.sh || die "autogen.sh failed"
-
 	# has cppunit support, but make check builds nothing...
 	local myconf="--disable-cppunit"
 	use doc && myconf="${myconf} --enable-doxygen --enable-dot
-		--enable-html-docs --enable-latex-docs" || \
+		--enable-html-docs" || \
 		myconf="${myconf} --disable-doxygen --disable-dot --disable-html-docs"
 	use smtp && myconf="${myconf} --with-SMTP=libsmtp"
-	use odbc && myconf="${myconf} --with-ODBC=unixODBC"
+	if use odbc ; then
+		if use iodbc ; then
+			myconf="${myconf} --with-ODBC=iODBC"
+		else
+			myconf="${myconf} --with-ODBC=unixODBC"
+		fi
+	fi
 	# it's broken, so we must do this rather than use_enable
 	use unicode && myconf="${myconf} --enable-unicode"
+	use threads && myconf="${myconf} --with-thread=pthread"
 
 	if use unicode && use odbc ; then
 		# fix some warnings as w/o it TCHAR gets typedef'd to signed short
@@ -51,11 +73,13 @@ src_compile() {
 		append-flags -DSQL_WCHART_CONVERT
 	fi
 
-	econf ${myconf} || die "econf failed"
+	econf \
+		--with-XML=libxml2 \
+		${myconf} || die "econf failed"
 	emake -j1 || die "emake failed"
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog README
 }