Remove old wrt #302501. Remove unused USE flag "doc".

(Portage version: 2.2_rc63/cvs/Linux x86_64)

7 files changed, 9 insertions, 196 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index bed531084aae..b1507f628885 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/log4cxx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.31 2010/02/24 12:49:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.32 2010/02/25 09:53:49 ssuominen Exp $
+
+  25 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  -log4cxx-0.9.7-r4.ebuild, -files/log4cxx-0.9.7-gcc41.patch,
+  -files/log4cxx-0.9.7-gentoo.diff, -files/log4cxx-0.9.7-tchar.patch,
+  -files/log4cxx-0.9.7-use-SQLWCHAR.diff, log4cxx-0.10.0.ebuild:
+  Remove old wrt #302501. Remove unused USE flag "doc".
 
   24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> log4cxx-0.10.0.ebuild,
   +files/log4cxx-0.10.0-unixODBC.patch:
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
deleted file mode 100644
index 8b1305c44165..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/files/log4cxx-0.9.7-gentoo.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
deleted file mode 100644
index c169bd1c07e0..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-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
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
deleted file mode 100644
index a3ba40fc864a..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
deleted file mode 100644
index 0456e57594a2..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-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)
- 		{
diff --git a/dev-libs/log4cxx/log4cxx-0.10.0.ebuild b/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
index b2b346f661b5..1179587a9418 100644
--- a/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.9 2010/02/24 12:55:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.10 2010/02/25 09:53:49 ssuominen Exp $
 
 EAPI=2
 inherit eutils
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos"
-IUSE="doc iodbc unicode odbc smtp"
+IUSE="iodbc unicode odbc smtp"
 
 DEPEND="dev-libs/apr:1
 	dev-libs/apr-util:1
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
deleted file mode 100644
index 04a62d08234a..000000000000
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
+++ /dev/null
@@ -1,89 +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-r4.ebuild,v 1.3 2007/06/23 19:21:09 armin76 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 test threads"
-
-RDEPEND="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 )
-	test? ( dev-libs/boost dev-util/cppunit )"
-
-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"
-	epatch "${FILESDIR}/${P}-tchar.patch"
-
-	# Fix a bug in the tests
-	sed -i -e 's/regex.hpp/cregex.hpp/' \
-		tests/src/util/filter.cpp || die "sed failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	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 test && myconf="${myconf} --enable-cppunit"
-	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 \
-		$(use_enable doc doxygen) \
-		$(use_enable doc dot) \
-		$(use_enable doc html-docs) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-}