add mozldap support

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@629 6952d904-891a-0410-993b-d76249ca496b

dev-libs/log4cxx/ChangeLog

@@ -0,0 +1,112 @@
+# ChangeLog for dev-libs/log4cxx
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.26 2008/11/02 07:30:45 vapier Exp $
+
+  02 Nov 2008; Mike Frysinger <vapier@gentoo.org> log4cxx-0.10.0.ebuild:
+  Add ppc/ppc64 love for KDE 4.
+
+  06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
+  Add USE flag description to metadata wrt GLEP 56.
+
+*log4cxx-0.10.0 (06 May 2008)
+
+  06 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/0.10.0-missing_includes.patch, -log4cxx-0.9.7-r3.ebuild,
+  +log4cxx-0.10.0.ebuild:
+  Version bumpg (bug #220203). Dropped old version.
+
+  23 Jun 2007; Raúl Porcel <armin76@gentoo.org> log4cxx-0.9.7-r4.ebuild:
+  x86 stable
+
+  23 Jun 2007; Tiziano Müller <dev-zero@gentoo.org>
+  log4cxx-0.9.7-r4.ebuild:
+  Boost is only a dependency for running tests (bug #167016), added them and
+  made them work.
+
+*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.
+
+  29 Nov 2006; Tiziano Müller <dev-zero@gentoo.org> metadata.xml:
+  Set herd as maintainer
+
+  28 Oct 2006; Christian Faulhammer <opfer@gentoo.org>
+  log4cxx-0.9.7-r3.ebuild:
+  x86 stable wrt bug #145244
+
+  23 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Fixed possible automake/autoconf dependency bug. Corrected libiodbc dependency.
+
+  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
+
+  28 Jun 2005; Simon Stelling <blubb@gentoo.org> log4cxx-0.9.7-r2.ebuild:
+  added ~amd64 keyword
+
+  23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> -log4cxx-0.9.7-r1.ebuild,
+  log4cxx-0.9.7-r2.ebuild:
+  Marked stable on x86.
+
+*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.
+
+  12 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> log4cxx-0.9.5.ebuild:
+  Marked stable on x86.
+
+  07 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/log4cxx-0.9.7-gentoo.diff, +files/log4cxx-0.9.7-use-SQLWCHAR.diff,
+  log4cxx-0.9.7-r1.ebuild:
+  Fixed ./configire --with-ODBC invocation (bug 76532) in addition to the
+  compilation failures that ensued.
+
+  06 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/log4cxx-0.9.5-fix-errno.diff, log4cxx-0.9.5.ebuild:
+  Fix compilation failure - bug 59743.
+
+*log4cxx-0.9.7-r1 (28 Dec 2004)
+
+  28 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> +log4cxx-0.9.7-r1.ebuild,
+  -log4cxx-0.9.7.ebuild:
+  Revbump; install html docs in correct location.
+
+  23 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> log4cxx-0.9.7.ebuild:
+  Don't use use_enable for unicode, as the configure.in doesn't respect
+  --disable-unicode; fixes bug 75448.
+
+*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
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> log4cxx-0.9.5.ebuild:
+  Correct HOMEPAGE.
+
+*log4cxx-0.9.5 (03 Jun 2004)
+
+  03 Jun 2004; Chuck Short <zul@gentoo.org> log4cxx-0.9.5.ebuild,
+  metadata.xml:
+  Initial verison, ebuild originally written by Aaron Jackson < ajackson @
+  pobox.com> Closes #49114.
+

dev-libs/log4cxx/Manifest

@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 0.10.0-missing_includes.patch 1554 RMD160 442e71ef3584b16dbe924fa9eccb38dccb1d2162 SHA1 ad67024a329223c815d3f6d14115ed2e00d2061f SHA256 7b78a7fe46ba1481af80fbf8e2a1c82bde00ce956a6ebe007a8f0b47f56cd735
+AUX log4cxx-0.9.7-gcc41.patch 523 RMD160 4b066a4844a06e73f59e87c9410dc26159fa869e SHA1 7f55bf31bb2225cbdd43ca41be47b921c2d795b6 SHA256 de55161e96e70a48eb0408d3096c831bf30d7985bb19e2f285389476035c9ec4
+AUX log4cxx-0.9.7-gentoo.diff 1989 RMD160 9f4cc34f71119b8e318db5315cf2807d6ef1c788 SHA1 b8f6c3c2b86aecb08fc0ed867ca986db85d1e133 SHA256 ed1e5ec3192f61ff6731816ea45dee35e2d257b4d3f01b7e2fcf6e64febc0807
+AUX log4cxx-0.9.7-tchar.patch 350 RMD160 aa4d404e36fe3765fc020c7bc5538458d846622c SHA1 a5cf4faefadc06b5f7560d1ea9aba2606fff085a SHA256 654b9c7e1d10d8d3ce7396ceb7588b270a73643aa81890748b6da18fc6409397
+AUX log4cxx-0.9.7-use-SQLWCHAR.diff 967 RMD160 a2972e6c6b4c840f14082a0ef8d29d6bf03ab961 SHA1 2f340f656e33b297cdd205d69e8fb60e397b978e SHA256 4831659f137cdbb9c188d64f00c4b20d69082044d3705d8c6409ea5ab218b212
+DIST apache-log4cxx-0.10.0.tar.gz 1667425 RMD160 6df384e5c746c3c6903efae6c9f0d64e4f07a5ad SHA1 d79c053e8ac90f66c5e873b712bb359fd42b648d SHA256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
+DIST log4cxx-0.9.7.tar.gz 256449 RMD160 e8bcb2b188615b4edb09b807cb763535432586e7 SHA1 a1e156f24530fea72fb2c4b11ae137eddda6fd5a SHA256 5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6
+EBUILD log4cxx-0.10.0.ebuild 1591 RMD160 158b24063c037e6b9f5151af054f9ff84866a03b SHA1 aa8460a1210fed69a074ecfb4d78bd3fbe5dfe1f SHA256 53c7378670a9174ffea7dc04d403e0e3d13a1438b180100bfed3f6c91ff9b810
+EBUILD log4cxx-0.9.7-r4.ebuild 2386 RMD160 e2044c0266c183aad7f60050ce77c8a5cffc3a76 SHA1 2a15071ae8f99399f533dfc023f5838a8fec67d4 SHA256 4b658c9eaec6a91e9a28f189ce823fe8f4393674657a26cb22d7414c4e6ba193
+MISC ChangeLog 4122 RMD160 be487eeb2849a6893755d15b16400bf33b4c6a52 SHA1 c70fc9f230b6a01fc2c5ecc3776ccbad911a5109 SHA256 6dfcf89d48993c52acfb55efa1c877326d2b2a3e18ba86c581841ef27247360a
+MISC metadata.xml 367 RMD160 c0e5c79d5c0bf196d945dc117b75b6adf4a3e980 SHA1 4b108cd4a2bf0fcb7469c89693315c19b2363209 SHA256 198d92b692ab95eb4fe72d88dac8b8daf126da23e84304443fa5f69e37883ffc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkNVy0ACgkQ67wieSYcaxfnPACeN3ozLMvV5lPQRtjuLWL2/1Rz
+cRMAoLfcgAQPUaT287DtAUeOCGcNutJ/
+=tOj0
+-----END PGP SIGNATURE-----

dev-libs/log4cxx/files/0.10.0-missing_includes.patch

@@ -0,0 +1,37 @@
+diff -Naur apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp apache-log4cxx-0.10.0/src/examples/cpp/console.cpp
+--- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp	2008-05-06 05:40:52.000000000 +0200
+@@ -15,7 +15,8 @@
+  * limitations under the License.
+  */
+ 
+-#include <stdlib.h>
++#include <cstdlib>
++#include <cstring>
+ #include <log4cxx/logger.h>
+ #include <log4cxx/consoleappender.h>
+ #include <log4cxx/simplelayout.h>
+diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp	2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp	2008-05-06 05:32:31.000000000 +0200
+@@ -21,6 +21,8 @@
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
+ 
++#include <cstring>
++
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+ 
+diff -Naur apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp	2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp	2008-05-06 05:35:55.000000000 +0200
+@@ -20,6 +20,8 @@
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
+ 
++#include <cstring>
++
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
+ 

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;

dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff

@@ -0,0 +1,55 @@
+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 @@
+ 	}
+ }
+ 
+-#endif
+\ No newline at end of file
++#endif
++
+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++)
+ 	{
+ 		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 --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

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

dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff

@@ -0,0 +1,25 @@
+diff -urN log4cxx-0.9.7.post-gentoo-diff/src/odbcappender.cpp log4cxx-0.9.7/src/odbcappender.cpp
+--- log4cxx-0.9.7.post-gentoo-diff/src/odbcappender.cpp	2005-01-07 01:30:56.466447632 -0500
++++ log4cxx-0.9.7/src/odbcappender.cpp	2005-01-07 01:31:29.045494864 -0500
+@@ -111,7 +111,7 @@
+ 		ret = SQLExecDirect(stmt, (SQLTCHAR *)sql.c_str(), SQL_NTS);
+ #else
+ 		USES_CONVERSION;
+-		ret = SQLExecDirect(stmt, (SQLCHAR *)T2A(sql.c_str()), SQL_NTS);
++		ret = SQLExecDirect(stmt, (SQLWCHAR *)T2A(sql.c_str()), SQL_NTS);
+ #endif
+ 		if (ret < 0)
+ 		{
+@@ -182,9 +182,9 @@
+ 		std::string user = T2A(databaseUser.c_str());
+ 		std::string password = T2A(databasePassword.c_str());
+ 		ret = SQLConnect(connection,
+-			(SQLCHAR *)URL.c_str(), SQL_NTS,
+-			(SQLCHAR *)user.c_str(), SQL_NTS,
+-			(SQLCHAR *)password.c_str(), SQL_NTS);
++			(SQLWCHAR *)URL.c_str(), SQL_NTS,
++			(SQLWCHAR *)user.c_str(), SQL_NTS,
++			(SQLWCHAR *)password.c_str(), SQL_NTS);
+ #endif
+ 		if (ret < 0)
+ 		{

dev-libs/log4cxx/log4cxx-0.10.0-r100.ebuild

@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.2 2008/11/02 07:30:45 vapier Exp $
+
+EAPI="1"
+
+inherit eutils
+
+MY_P="apache-${P}"
+
+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}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc iodbc unicode odbc smtp mozldap"
+
+RDEPEND="dev-libs/apr:1
+	dev-libs/apr-util:1
+	odbc? (
+		iodbc? ( >=dev-db/libiodbc-3.52.4 )
+		!iodbc? ( dev-db/unixODBC ) )
+	smtp? ( net-libs/libesmtp )
+	mozldap? ( dev-libs/mozldap )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+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}"
+
+	epatch "${FILESDIR}/${PV}-missing_includes.patch"
+}
+
+src_compile() {
+	local myconf
+	use smtp && myconf="${myconf} --with-SMTP=libesmtp"
+	if use odbc ; then
+		if use iodbc ; then
+			myconf="${myconf} --with-ODBC=iODBC"
+		else
+			myconf="${myconf} --with-ODBC=unixODBC"
+		fi
+	fi
+	use unicode && myconf="${myconf} --with-charset=utf-8"
+
+	use mozldap && LDFLAGS=/usr/$(get_libdir)/mozldap \
+	econf \
+		--disable-doxygen \
+		--disable-html-docs \
+		${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dohtml -r site/*
+
+	insinto /usr/share/doc/${PF}/examples
+	doins src/examples/cpp/*.cpp
+}

dev-libs/log4cxx/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>cpp</herd>
+<use>
+  <flag name='smtp' restrict='&lt;0.10'>Offer SMTP support via
+    <pkg>net-libs/libsmtp</pkg></flag>
+  <flag name='smtp' restrict='*'>Offer SMTP support via
+    <pkg>net-libs/libesmtp</pkg></flag>
+</use>
+</pkgmetadata>