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

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

8 files changed, 11 insertions, 204 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/Manifest b/dev-libs/log4cxx/Manifest
index d8db86e1079d..600c98280a24 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,13 +1,7 @@
 AUX 0.10.0-missing_includes.patch 1554 RMD160 442e71ef3584b16dbe924fa9eccb38dccb1d2162 SHA1 ad67024a329223c815d3f6d14115ed2e00d2061f SHA256 7b78a7fe46ba1481af80fbf8e2a1c82bde00ce956a6ebe007a8f0b47f56cd735
 AUX log4cxx-0.10.0-gcc44.patch 357 RMD160 b2a1e74e66d6102c04be8f42905e76946b9dc405 SHA1 62116e694561012a7cc81eafdce8e7b2ba5e0e60 SHA256 397c5420076b7fe2379b1f03b260cc5353a5bc9448ac388aac6e1fb964a7b185
 AUX log4cxx-0.10.0-unixODBC.patch 2989 RMD160 e300c120eb4c8a1691a73cad5c33f2b16d8c9c98 SHA1 2bb5dcbfb181ad346ebe3633abb8369f3ecc5bbf SHA256 f9fd19383c1b3fa4579e7063d36096c30e3b29a6b756d64d74a32fd088c04ca1
-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 1572 RMD160 21f6664451102c08cda78a3fb914c76b4df34aa7 SHA1 8313440e625b79069e57054cf835d1237ee09901 SHA256 0ccdc37c32889798224786713bb35d42f8bfab02ee62ac5a7454bf6fb68c4b23
-EBUILD log4cxx-0.9.7-r4.ebuild 2386 RMD160 e2044c0266c183aad7f60050ce77c8a5cffc3a76 SHA1 2a15071ae8f99399f533dfc023f5838a8fec67d4 SHA256 4b658c9eaec6a91e9a28f189ce823fe8f4393674657a26cb22d7414c4e6ba193
-MISC ChangeLog 4829 RMD160 8279ec8a7d7f425c7d69d02ab6d792d04eaff7cd SHA1 f73300918171ed2b25fb0427fc4216ca3d81c771 SHA256 77d8da30f6d8bf706d7726e6219f477c1f7291c03e37b6157db97e42dc514a4e
+EBUILD log4cxx-0.10.0.ebuild 1569 RMD160 e4034a9760da9b475f82887c680f738901e6c4d5 SHA1 b32de23bc5ab7eb6425b52bfda513203e702b324 SHA256 a1038270ee1f50519506d1a93b55ae564d23412c5de2cd750b85a762770d827f
+MISC ChangeLog 5137 RMD160 5b7a2411a1d6651e7241add855975ad4d92fe3fb SHA1 e9f87a825bbc4eade727df9c07d1dae902f36a9a SHA256 c16846f73f6f0e1839b3dbb6db6be3a64d272c9ab7f1f53a94028efd379d598b
 MISC metadata.xml 367 RMD160 c0e5c79d5c0bf196d945dc117b75b6adf4a3e980 SHA1 4b108cd4a2bf0fcb7469c89693315c19b2363209 SHA256 198d92b692ab95eb4fe72d88dac8b8daf126da23e84304443fa5f69e37883ffc
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
-}