Fixed bug #84909. Added USE-flags 'doc' and 'threads' together with correct dependencies.

Package-Manager: portage-2.1.2_pre3-r3

4 files changed, 51 insertions, 31 deletions

diff --git a/dev-libs/log4cpp/ChangeLog b/dev-libs/log4cpp/ChangeLog
index 673fecb714b7..b6c12eb3623a 100644
--- a/dev-libs/log4cpp/ChangeLog
+++ b/dev-libs/log4cpp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/log4cpp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.10 2005/09/19 22:30:08 halcy0n Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/ChangeLog,v 1.11 2006/10/18 16:29:48 dev-zero Exp $
+
+  18 Oct 2006; Tiziano Müller <dev-zero@gentoo.org> ChangeLog:
+  Fixed bug #84909. Added USE-flags 'doc' and 'threads' together with correct dependencies.
 
   19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> +metadata.xml:
   Adding to cpp herd
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest
index ec0bb1169e21..10c99d532fbe 100644
--- a/dev-libs/log4cpp/Manifest
+++ b/dev-libs/log4cpp/Manifest
@@ -1,14 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 da8ac717bca84569e13d06cc5ad04d6b ChangeLog 1320
-MD5 da7879a2c696d63812dd19f55f129319 log4cpp-0.3.4b.ebuild 864
+DIST log4cpp-0.3.4b.tar.gz 323195 RMD160 da4f5a40c1c7023349e19bad8353ff286d3c28dc SHA1 60f1bf4eaf60a0ca45339b0b2a93abb9139a1fd8 SHA256 030f7cb38e0fe2c6cea8983bddba8d47c13a76c96c1327f394254dcbfd47efd5
+EBUILD log4cpp-0.3.4b.ebuild 1136 RMD160 038b87160dd2dba930351ce0dd74bb1eedf948e2 SHA1 afaad24db2cb7a51b362f5c274260cd66ecaa185 SHA256 e90598a0bda680b3d7771a63134e5caca37cb308ce01c9adbe737ea16cd5221c
+MD5 2b5f41842a01ab3df9a741922785c4ba log4cpp-0.3.4b.ebuild 1136
+RMD160 038b87160dd2dba930351ce0dd74bb1eedf948e2 log4cpp-0.3.4b.ebuild 1136
+SHA256 e90598a0bda680b3d7771a63134e5caca37cb308ce01c9adbe737ea16cd5221c log4cpp-0.3.4b.ebuild 1136
+MISC ChangeLog 1478 RMD160 71439c61a32fc910f7aab85e5a06857fc1d30b64 SHA1 3ecf4a85e1f94d9e7def3bebb28362464b634b97 SHA256 c9b6137e27d3be14449c6272339a03027901681008c722043023a51687cfd401
+MD5 bc96239e255027633b584fffe19afdb9 ChangeLog 1478
+RMD160 71439c61a32fc910f7aab85e5a06857fc1d30b64 ChangeLog 1478
+SHA256 c9b6137e27d3be14449c6272339a03027901681008c722043023a51687cfd401 ChangeLog 1478
+MISC metadata.xml 156 RMD160 537178ef5a820896e97475fb9aded47d50474bef SHA1 2a4ef4879b918a28132d21cd6d1bbaa2a30dccde SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f
 MD5 41d7ac32dc54956e937401bb5a2c3810 metadata.xml 156
-MD5 6eae2b4ee80979173d9b91a5cb223cd1 files/digest-log4cpp-0.3.4b 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLzv7CRZPokWLroQRAtbRAJ9M1ueUtdKW1mG4wluouTqXlmOmKgCg20U3
-UNdKu17slsQDmIzA66kTRo4=
-=LKJW
------END PGP SIGNATURE-----
+RMD160 537178ef5a820896e97475fb9aded47d50474bef metadata.xml 156
+SHA256 0e8490f9c62cb74e5894b52f643a02de0024d97dbfebad43082dce6bcb39555f metadata.xml 156
+MD5 0bd10169acc785cff80a70697acfc329 files/digest-log4cpp-0.3.4b 244
+RMD160 103d36d3eac9ab5b388d7e88bdcb1df43978a6ea files/digest-log4cpp-0.3.4b 244
+SHA256 5fd166acc462d9833bbe9aaf95a0fa19f572327c73e69c05c84b463c29a448f8 files/digest-log4cpp-0.3.4b 244
diff --git a/dev-libs/log4cpp/files/digest-log4cpp-0.3.4b b/dev-libs/log4cpp/files/digest-log4cpp-0.3.4b
index 84ecb22c0a22..70e06738ab22 100644
--- a/dev-libs/log4cpp/files/digest-log4cpp-0.3.4b
+++ b/dev-libs/log4cpp/files/digest-log4cpp-0.3.4b
@@ -1 +1,3 @@
 MD5 8051f012fcc58173e8015710d449457a log4cpp-0.3.4b.tar.gz 323195
+RMD160 da4f5a40c1c7023349e19bad8353ff286d3c28dc log4cpp-0.3.4b.tar.gz 323195
+SHA256 030f7cb38e0fe2c6cea8983bddba8d47c13a76c96c1327f394254dcbfd47efd5 log4cpp-0.3.4b.tar.gz 323195
diff --git a/dev-libs/log4cpp/log4cpp-0.3.4b.ebuild b/dev-libs/log4cpp/log4cpp-0.3.4b.ebuild
index 36de5ce03d0c..9db6a4f96047 100644
--- a/dev-libs/log4cpp/log4cpp-0.3.4b.ebuild
+++ b/dev-libs/log4cpp/log4cpp-0.3.4b.ebuild
@@ -1,29 +1,42 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/log4cpp-0.3.4b.ebuild,v 1.13 2005/03/11 20:59:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cpp/log4cpp-0.3.4b.ebuild,v 1.14 2006/10/18 16:29:48 dev-zero Exp $
+
+KEYWORDS="x86 ppc amd64 s390"
 
 DESCRIPTION="library of C++ classes for flexible logging to files, syslog, IDSA and other destinations"
 HOMEPAGE="http://log4cpp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/log4cpp/${PN}-0.3.4b.tar.gz"
-
+SRC_URI="mirror://sourceforge/${PN}/${PN}-0.3.4b.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ppc amd64 s390"
-IUSE=""
+IUSE="doc threads"
 
-DEPEND="virtual/libc"
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	# We have to fix it directly in Makefile.in to avoid
+	# loosing configuration-options
+	cd "${S}/doc"
+	sed -i \
+		-e 's#$(man3dir)#$(DESTDIR)/$(man3dir)#' \
+		-e 's#$(docdir)#$(DESTDIR)/$(docdir)#' \
+		Makefile.in || die "sed failed"
+}
 
 src_compile() {
-	econf || die "./configure failed"
-	emake || die
+	econf \
+		--without-omnithreads \
+		--without-idsa \
+		$(use_with threads pthreads) \
+		$(use_enable doc doxygen) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install () {
-#	make DESTDIR=${D} install || die
-	make prefix=${D}/usr \
-		datadir=${D}/usr/share \
-		mandir=${D}/usr/share/man \
-		docdir=${D}/usr/share/doc/${PF}/html \
-		sysconfdir=${D}/etc install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }