Added gcc-4* patch, thanks to Mike Auty, fixes bug #145244. Added 'iodbc' USE-flag. Misc dependency fixes, bug #142718.

(Portage version: 2.1.2_pre3-r3)

5 files changed, 105 insertions, 2 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 26a8d255472c..e8eed28fe03a 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/log4cxx
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.15 2005/09/19 22:30:31 halcy0n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.16 2006/10/22 20:42:42 dev-zero Exp $
+
+  22 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Added gcc-4* patch, thanks to Mike Auty, fixes bug #145244. Added 'iodbc'
+  USE-flag. Misc dependency fixes, bug #142718.
 
   19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
   Adding to cpp herd
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
index aaac6045c159..4f09145279a2 100644
--- a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
+++ b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
@@ -1 +1,3 @@
 MD5 fd09abc90b8c0c8af1d5146a75590792 log4cxx-0.9.7.tar.gz 256449
+RMD160 e8bcb2b188615b4edb09b807cb763535432586e7 log4cxx-0.9.7.tar.gz 256449
+SHA256 5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6 log4cxx-0.9.7.tar.gz 256449
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r3 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r3
new file mode 100644
index 000000000000..4f09145279a2
--- /dev/null
+++ b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r3
@@ -0,0 +1,3 @@
+MD5 fd09abc90b8c0c8af1d5146a75590792 log4cxx-0.9.7.tar.gz 256449
+RMD160 e8bcb2b188615b4edb09b807cb763535432586e7 log4cxx-0.9.7.tar.gz 256449
+SHA256 5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6 log4cxx-0.9.7.tar.gz 256449
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
new file mode 100644
index 000000000000..8b1305c44165
--- /dev/null
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
@@ -0,0 +1,12 @@
+diff -uNr log4cxx-0.9.7.orig/include/log4cxx/xml/domconfigurator.h log4cxx-0.9.7/include/log4cxx/xml/domconfigurator.h
+--- log4cxx-0.9.7.orig/include/log4cxx/xml/domconfigurator.h	2004-05-10 13:42:04.000000000 +0100
++++ log4cxx-0.9.7/include/log4cxx/xml/domconfigurator.h	2006-03-19 13:15:30.000000000 +0000
+@@ -208,7 +208,7 @@
+ 				spi::LoggerRepositoryPtr& repository);
+ 
+ 		protected:
+-			String DOMConfigurator::subst(const String& value);
++			String subst(const String& value);
+ 
+ 		protected:
+ 			void * appenderBag;
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
new file mode 100644
index 000000000000..3917e7af7290
--- /dev/null
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 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.1 2006/10/22 20:42:42 dev-zero Exp $
+
+inherit 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"
+IUSE="doc iodbc unicode odbc smtp threads"
+
+RDEPEND="dev-libs/boost
+		dev-libs/libxml2
+		odbc? (
+			iodbc? ( dev-db/libiodbc )
+			!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 \
+		-e "s:\(htmldir = \).*\(/html\):\1\$(datadir)/doc/${PF}\2:" \
+		docs/Makefile.am || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+
+	if use unicode && use odbc ; then
+		epatch "${FILESDIR}/${P}-use-SQLWCHAR.diff"
+	fi
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
+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" || \
+		myconf="${myconf} --disable-doxygen --disable-dot --disable-html-docs"
+	use smtp && myconf="${myconf} --with-SMTP=libsmtp"
+	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
+		# instead of wchar_t
+		append-flags -DSQL_WCHART_CONVERT
+	fi
+
+	econf \
+		--with-XML=libxml2 \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}