Boost is only a dependency for running tests (bug #167016), added them and made them work.

Package-Manager: portage-2.1.3_rc5

3 files changed, 33 insertions, 34 deletions

diff --git a/dev-libs/log4cxx/ChangeLog b/dev-libs/log4cxx/ChangeLog
index b664e3c04fed..150eac145ad3 100644
--- a/dev-libs/log4cxx/ChangeLog
+++ b/dev-libs/log4cxx/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2007/03/15 22:48:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.22 2007/06/23 15:46:44 dev-zero Exp $
+
+  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)
 
diff --git a/dev-libs/log4cxx/Manifest b/dev-libs/log4cxx/Manifest
index 6f0ef67fb87a..4810cbee34c7 100644
--- a/dev-libs/log4cxx/Manifest
+++ b/dev-libs/log4cxx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX log4cxx-0.9.7-gcc41.patch 523 RMD160 4b066a4844a06e73f59e87c9410dc26159fa869e SHA1 7f55bf31bb2225cbdd43ca41be47b921c2d795b6 SHA256 de55161e96e70a48eb0408d3096c831bf30d7985bb19e2f285389476035c9ec4
 MD5 cffaee6c7b2319f836c036461d488568 files/log4cxx-0.9.7-gcc41.patch 523
 RMD160 4b066a4844a06e73f59e87c9410dc26159fa869e files/log4cxx-0.9.7-gcc41.patch 523
@@ -22,14 +19,14 @@ EBUILD log4cxx-0.9.7-r3.ebuild 2322 RMD160 6128a52efece89499623525c92267819d26bf
 MD5 2a932779629c83c929fd236a42bf8a78 log4cxx-0.9.7-r3.ebuild 2322
 RMD160 6128a52efece89499623525c92267819d26bff51 log4cxx-0.9.7-r3.ebuild 2322
 SHA256 2e527380c60ae48f9157f8db4787c6bec496957edab53f21d9dfa34ba3d61614 log4cxx-0.9.7-r3.ebuild 2322
-EBUILD log4cxx-0.9.7-r4.ebuild 2361 RMD160 c77b5e3dee92fbb0f366a982cb31c79b39f97202 SHA1 6e4b78d9d51244bafeb80166433d329aa1be8444 SHA256 58fe4e1866bb0d2eb433bb5cd833a2ffbee5eada3738a69e708090e0e3f724ba
-MD5 7b16ced22e1d156745bdc8be145fc7b8 log4cxx-0.9.7-r4.ebuild 2361
-RMD160 c77b5e3dee92fbb0f366a982cb31c79b39f97202 log4cxx-0.9.7-r4.ebuild 2361
-SHA256 58fe4e1866bb0d2eb433bb5cd833a2ffbee5eada3738a69e708090e0e3f724ba log4cxx-0.9.7-r4.ebuild 2361
-MISC ChangeLog 3411 RMD160 9502fbc1fc06103c8ebda58b489a9a81d1a55f34 SHA1 b45039e7de9ad01b61910b3317aff7ea5594e445 SHA256 9fc057cce2b0f1a5d191dc7aedda1e7850ed014f3a0cd1f77563ac8fc45fbedc
-MD5 dcfd8a8244dee921ae2a91023efe2d9e ChangeLog 3411
-RMD160 9502fbc1fc06103c8ebda58b489a9a81d1a55f34 ChangeLog 3411
-SHA256 9fc057cce2b0f1a5d191dc7aedda1e7850ed014f3a0cd1f77563ac8fc45fbedc ChangeLog 3411
+EBUILD log4cxx-0.9.7-r4.ebuild 2388 RMD160 f45428238f252d1024dad198af0a228ccacf02b4 SHA1 e070d76aeeb7552075be57c350e8b257363eba70 SHA256 3b4565bdbaff5d95e222af557d9f32b1ac8afc571d43b320f45ca900ad4e23bb
+MD5 8b8a602de789eaa35cac41a9ebc9f111 log4cxx-0.9.7-r4.ebuild 2388
+RMD160 f45428238f252d1024dad198af0a228ccacf02b4 log4cxx-0.9.7-r4.ebuild 2388
+SHA256 3b4565bdbaff5d95e222af557d9f32b1ac8afc571d43b320f45ca900ad4e23bb log4cxx-0.9.7-r4.ebuild 2388
+MISC ChangeLog 3587 RMD160 67865f79d7cc04ec8357701bbf0a1e1a49c9c6c5 SHA1 4e6f11d591b489be744a5b7c26f1d995f85fac54 SHA256 18967af63509192424c9b82010aba57e67a6e5f9606c0a4433966ed64deffcde
+MD5 e618a2ba8199f765992cf22733484ff3 ChangeLog 3587
+RMD160 67865f79d7cc04ec8357701bbf0a1e1a49c9c6c5 ChangeLog 3587
+SHA256 18967af63509192424c9b82010aba57e67a6e5f9606c0a4433966ed64deffcde ChangeLog 3587
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
 MD5 694f01269d0e6ca70d0d588a68181808 metadata.xml 157
 RMD160 1a16d7c8813911ff609857e1d437b678c924114c metadata.xml 157
@@ -40,10 +37,3 @@ SHA256 a8e1d5d020ae8322758615db044ea3ece82f9ac64e23fc878689d71d7794bf7f files/di
 MD5 b1a6f35db3f3a221b7e25eec70528d62 files/digest-log4cxx-0.9.7-r4 241
 RMD160 001203f955281bb98db260bc181d31d48b56806d files/digest-log4cxx-0.9.7-r4 241
 SHA256 a8e1d5d020ae8322758615db044ea3ece82f9ac64e23fc878689d71d7794bf7f files/digest-log4cxx-0.9.7-r4 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF+c1MGwVqY66cHjARAkivAJ495G2fsK7AFSimvjZTShCB6eIRxACeMs//
-Gsj9abDKLc0e27XZnK4pVs4=
-=Pnmm
------END PGP SIGNATURE-----
diff --git a/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
index 97010ced943d..903a0b3424a8 100644
--- a/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
+++ b/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2007/03/15 22:48:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.9.7-r4.ebuild,v 1.2 2007/06/23 15:46:44 dev-zero Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -14,16 +14,16 @@ 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 )"
+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 )"
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-libs/boost dev-util/cppunit )"
 
 pkg_setup() {
 	if use iodbc && ! use odbc ; then
@@ -46,15 +46,15 @@ src_unpack() {
 
 	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() {
-	# 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
@@ -65,6 +65,7 @@ src_compile() {
 	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
@@ -75,6 +76,9 @@ src_compile() {
 
 	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"
 }