Version bump; closes bugs 75260 and 72021. Also, added support for USE flags doc, unicode, odbc, and smtp. Updated metadata.xml.

6 files changed, 90 insertions, 7 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 80297d0381ab..ad8a5543aa85 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/log4cxx
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.4 2004/07/02 04:51:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.5 2004/12/22 15:17:16 ka0ttic Exp $
+
+*log4cxx-0.9.7 (22 Dec 2004)
+
+  22 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  +files/log4cxx-0.9.7-gentoo.diff, +log4cxx-0.9.7.ebuild:
+  Version bump; closes bugs 75260 and 72021. Also, added support for USE flags
+  doc, unicode, odbc, and smtp. Updated metadata.xml.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> log4cxx-0.9.5.ebuild:
   virtual/glibc -> virtual/libc
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index ae648272cdb0..020c86ea4bd9 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,4 +1,7 @@
 MD5 839e6262a6479c9c33123a3d77a195b7 log4cxx-0.9.5.ebuild 848
-MD5 ad25286cb8d5388cf5ff10ba407d0b60 ChangeLog 624
-MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501
+MD5 94572231c3189b8507e4f4ba2aa2b579 ChangeLog 910
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 c54ea7e86c55e23cc241b7b97b005f05 log4cxx-0.9.7.ebuild 1469
+MD5 50fe13b5c404fa59faeaebe40f36b6be files/log4cxx-0.9.7-gentoo.diff 750
 MD5 1135167eb4745c4a16791f44317ba88b files/digest-log4cxx-0.9.5 65
+MD5 a94dc071335f2e2545d523996053a685 files/digest-log4cxx-0.9.7 65
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7
new file mode 100644
index 000000000000..aaac6045c159
--- /dev/null
+++ b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7
@@ -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
new file mode 100644
index 000000000000..ada50c4f84cd
--- /dev/null
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
@@ -0,0 +1,21 @@
+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-12-22 09:26:21.000000000 -0500
++++ log4cxx-0.9.7/src/smtpappender.cpp	2004-12-22 09:59:25.247244129 -0500
+@@ -134,7 +134,7 @@
+ 	for (i = recipients.begin(); i != recipients.end(); i++)
+ 	{
+ 		if (::libsmtp_add_recipient(LIBSMTP_REC_TO,
+-			(TCHAR *)T2A(i->c_str()),
++			T2A((TCHAR *)i->c_str()),
+ 			(libsmtp_session_struct *)session) != 0)
+ 		{
+ 			LogLog::error(_T("Could not add recipient ")+*i+_T("."));
+@@ -316,6 +316,8 @@
+ */
+ void SMTPAppender::sendBuffer()
+ {
++	USES_CONVERSION;
++
+ 	// Note: this code already owns the monitor for this
+ 	// appender. This frees us from needing to synchronize on 'cb'.
+ 	try
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7.ebuild
new file mode 100644
index 000000000000..947554c8f4a8
--- /dev/null
+++ b/dev-libs/log4cxx/log4cxx-0.9.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2004 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.ebuild,v 1.1 2004/12/22 15:17:16 ka0ttic Exp $
+
+inherit eutils
+
+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)/${PF}\2:" \
+		docs/Makefile.am || die "sed failed"
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
+
+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"
+
+	econf \
+		$(use_enable unicode) \
+		$(use_with odbc ODBC) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/dev-libs/log4cxx/metadata.xml b/dev-libs/log4cxx/metadata.xml
index bcaabdbbd0d3..d31152aca840 100644
--- a/dev-libs/log4cxx/metadata.xml
+++ b/dev-libs/log4cxx/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>apache</herd>
-<longdescription>
-The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-</longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>