Revision bump; updated patch with fixes from Juraj Hercek in bug 81247.

(Portage version: 2.0.51.19)

5 files changed, 102 insertions, 19 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index aea2217390f3..1fdb9dbe62fa 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2005/01/31 11:02:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.12 2005/03/16 11:12:41 ka0ttic Exp $
+
+*log4cxx-0.9.7-r2 (16 Mar 2005)
+
+  16 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/log4cxx-0.9.7-gentoo.diff, +log4cxx-0.9.7-r2.ebuild:
+  Revision bump; updated patch with fixes from Juraj Hercek in bug 81247.
 
   31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> log4cxx-0.9.7-r1.ebuild:
   Marked stable on x86.
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 2eafd5d12162..7c31861f65d0 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 93dfb35d63fa946198b90458415a4fed log4cxx-0.9.7-r1.ebuild 1847
 MD5 acdf5c918d02c97d984332414891678e log4cxx-0.9.5.ebuild 881
-MD5 bc0c7bef82bbb084b36d572f57274e60 ChangeLog 1881
+MD5 7dd653e6dacd09afb9a80a08a7a6e3ef ChangeLog 2099
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 58ee85872eea9711c59ddaeeb2f09568 files/log4cxx-0.9.7-gentoo.diff 1037
+MD5 d37881938f3e20f067c71ac77100a37a log4cxx-0.9.7-r2.ebuild 1848
+MD5 f1b5b29185d699bc52fd6f9d23af3588 files/log4cxx-0.9.7-gentoo.diff 1989
 MD5 b11a3e797b67c6aea1bb82f6473890df files/log4cxx-0.9.7-use-SQLWCHAR.diff 967
 MD5 a94dc071335f2e2545d523996053a685 files/digest-log4cxx-0.9.7-r1 65
+MD5 a94dc071335f2e2545d523996053a685 files/digest-log4cxx-0.9.7-r2 65
 MD5 f9e8c2a552b387262cde2f04b5dc9605 files/log4cxx-0.9.5-fix-errno.diff 683
 MD5 1135167eb4745c4a16791f44317ba88b files/digest-log4cxx-0.9.5 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB/hC/EZCkKN40op4RAnzxAJ93wvwGFg4/WCUyWl/O/d2aC6x2FgCeI31h
-OS6UlDvIJDT9GIfpXBerbe8=
-=dPds
------END PGP SIGNATURE-----
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
new file mode 100644
index 000000000000..aaac6045c159
--- /dev/null
+++ b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
@@ -0,0 +1 @@
+MD5 fd09abc90b8c0c8af1d5146a75590792 log4cxx-0.9.7.tar.gz 256449
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
index 50ba4dd14aac..c169bd1c07e0 100644
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
@@ -1,6 +1,17 @@
-diff -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
---- log4cxx-0.9.7.orig/src/msxml.cpp	2004-05-10 08:37:45.000000000 -0400
-+++ log4cxx-0.9.7/src/msxml.cpp	2005-01-07 01:29:54.013941856 -0500
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/include/log4cxx/helpers/class.h log4cxx-0.9.7/include/log4cxx/helpers/class.h
+--- log4cxx-0.9.7.orig/include/log4cxx/helpers/class.h	2005-03-16 02:27:08.783682464 -0500
++++ log4cxx-0.9.7/include/log4cxx/helpers/class.h	2005-03-16 02:27:26.479992216 -0500
+@@ -53,6 +53,7 @@
+ 		{
+ 		public:
+ 			Class(const String& name);
++			virtual ~Class() {};
+ 			virtual ObjectPtr newInstance() const;
+ 			const String& toString() const;
+ 			const String& getName() const;
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
+--- log4cxx-0.9.7.orig/src/msxml.cpp	2005-03-16 02:27:08.733690064 -0500
++++ log4cxx-0.9.7/src/msxml.cpp	2005-03-16 02:27:38.852111368 -0500
 @@ -289,4 +289,5 @@
  	}
  }
@@ -9,9 +20,9 @@ diff -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
 \ No newline at end of file
 +#endif
 +
-diff -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender.cpp
---- log4cxx-0.9.7.orig/src/smtpappender.cpp	2004-05-10 08:38:01.000000000 -0400
-+++ log4cxx-0.9.7/src/smtpappender.cpp	2005-01-07 01:29:33.730025480 -0500
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender.cpp
+--- log4cxx-0.9.7.orig/src/smtpappender.cpp	2005-03-16 02:27:08.725691280 -0500
++++ log4cxx-0.9.7/src/smtpappender.cpp	2005-03-16 02:27:38.853111216 -0500
 @@ -134,7 +134,7 @@
  	for (i = recipients.begin(); i != recipients.end(); i++)
  	{
@@ -30,3 +41,15 @@ diff -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender
  	// Note: this code already owns the monitor for this
  	// appender. This frees us from needing to synchronize on 'cb'.
  	try
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/stringtokenizer.cpp log4cxx-0.9.7/src/stringtokenizer.cpp
+--- log4cxx-0.9.7.orig/src/stringtokenizer.cpp	2005-03-16 02:27:08.727690976 -0500
++++ log4cxx-0.9.7/src/stringtokenizer.cpp	2005-03-16 02:27:26.480992064 -0500
+@@ -39,7 +39,7 @@
+ 
+ StringTokenizer::~StringTokenizer()
+ {
+-	delete this->str;
++	delete[] this->str;
+ }
+ 
+ bool StringTokenizer::hasMoreTokens() const
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild
new file mode 100644
index 000000000000..6be266b6ffc6
--- /dev/null
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild
@@ -0,0 +1,61 @@
+# 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.7-r2.ebuild,v 1.1 2005/03/16 11:12:41 ka0ttic Exp $
+
+inherit eutils flag-o-matic
+
+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="~x86"
+IUSE="doc unicode odbc smtp"
+
+DEPEND="virtual/libc
+		dev-libs/libxml2
+		doc? ( app-doc/doxygen media-gfx/graphviz )
+		odbc? ( dev-db/unixODBC )
+		smtp? ( dev-libs/libsmtp )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i "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
+}
+
+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" || \
+		myconf="${myconf} --disable-doxygen --disable-dot --disable-html-docs"
+	use smtp && myconf="${myconf} --with-SMTP=libsmtp"
+	use odbc && myconf="${myconf} --with-ODBC=unixODBC"
+	# it's broken, so we must do this rather than use_enable
+	use unicode && myconf="${myconf} --enable-unicode"
+
+	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 ${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}