Version bumpg (bug #220203). Dropped old version.

(Portage version: 2.1.5_rc6)

4 files changed, 112 insertions, 87 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 00b97b96ad08..eaaea9179cbb 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.23 2007/06/23 19:21:09 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.24 2008/05/06 08:06:58 dev-zero Exp $
+
+*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
diff --git a/dev-libs/log4cxx/files/0.10.0-missing_includes.patch b/dev-libs/log4cxx/files/0.10.0-missing_includes.patch
new file mode 100644
index 000000000000..78a57916bde0
--- /dev/null
+++ b/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;
+ 
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
new file mode 100644
index 000000000000..b5877aa6861f
--- /dev/null
+++ b/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
@@ -0,0 +1,66 @@
+# 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.1 2008/05/06 08:06:58 dev-zero 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 ~x86"
+IUSE="doc iodbc unicode odbc smtp"
+
+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 )"
+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() {
+	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"
+
+	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
+}
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
deleted file mode 100644
index 3c88328a12b2..000000000000
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.4 2007/03/15 22:48:29 dev-zero Exp $
-
-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"
-IUSE="doc iodbc unicode odbc smtp threads"
-
-RDEPEND="dev-libs/boost
-		dev-libs/libxml2
-		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 \
-		-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"
-
-	eautoreconf
-}
-
-src_compile() {
-	# 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
-}