5 files changed, 9 insertions, 79 deletions
diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index 1fdb9dbe62fa..454cc43b2f9f 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/log4cxx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.12 2005/03/16 11:12:41 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.13 2005/04/23 12:16:10 ka0ttic Exp $
+
+  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)
 
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index c2e27016275a..12843950c2de 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 93dfb35d63fa946198b90458415a4fed log4cxx-0.9.7-r1.ebuild 1847
 MD5 acdf5c918d02c97d984332414891678e log4cxx-0.9.5.ebuild 881
-MD5 7d3b6a3ca080b7f2cbee893f38112f70 ChangeLog 2099
+MD5 42d4131edc65904fa2be3e9af3740aa3 ChangeLog 2226
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 c9d8af5130ddcb98bd87388e7f573a29 log4cxx-0.9.7-r2.ebuild 1848
+MD5 f34ec3a932b844847aa4f384ab660fa6 log4cxx-0.9.7-r2.ebuild 1847
 MD5 f1b5b29185d699bc52fd6f9d23af3588 files/log4cxx-0.9.7-gentoo.diff 1989
 MD5 b11a3e797b67c6aea1bb82f6473890df files/log4cxx-0.9.7-use-SQLWCHAR.diff 967
-MD5 a94dc071335f2e2545d523996053a685 files/digest-log4cxx-0.9.7-r1 65
 MD5 a94dc071335f2e2545d523996053a685 files/digest-log4cxx-0.9.7-r2 65
 MD5 f9e8c2a552b387262cde2f04b5dc9605 files/log4cxx-0.9.5-fix-errno.diff 683
 MD5 1135167eb4745c4a16791f44317ba88b files/digest-log4cxx-0.9.5 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCOBS/EZCkKN40op4RAu1pAKCBynJBUL6slY0jDhfOgGd8fsfumwCcDrY2
-B4KyuL7WIrmbwwYFy44ggDc=
-=L89u
------END PGP SIGNATURE-----
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r1 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r1
deleted file mode 100644
index aaac6045c159..000000000000
--- a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd09abc90b8c0c8af1d5146a75590792 log4cxx-0.9.7.tar.gz 256449
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild
deleted file mode 100644
index fbcc158940e4..000000000000
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 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-r1.ebuild,v 1.4 2005/01/31 11:02:42 ka0ttic Exp $
-
-inherit eutils flag-o-matic
-
-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)/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
-}
-
-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"
-	use odbc && myconf="${myconf} --with-ODBC=unixODBC"
-	# it's broken, so we must do this rather than use_enable
-	use unicode && myconf="${myconf} --enable-unicode"
-
-	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 ${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/log4cxx-0.9.7-r2.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild
index 6be266b6ffc6..9f28e4707306 100644
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/03/16 11:12:41 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r2.ebuild,v 1.2 2005/04/23 12:16:10 ka0ttic Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.apache.org/dist/logging/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc unicode odbc smtp"
 
 DEPEND="virtual/libc