Fixed ebuild with doc use flag and gcc-3.4 support

7 files changed, 43 insertions, 60 deletions

diff --git a/dev-libs/log4c/ChangeLog b/dev-libs/log4c/ChangeLog
index 181abc90c858..2b2c0150d26e 100644
--- a/dev-libs/log4c/ChangeLog
+++ b/dev-libs/log4c/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/log4c
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/ChangeLog,v 1.22 2004/12/04 04:00:18 dragonheart Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/ChangeLog,v 1.23 2005/01/02 02:52:22 dragonheart Exp $
+
+  02 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  files/log4c-1.0.10-nodocs.patch, log4c-1.0.10-r1.ebuild:
+  Fixed ebuild with no doc use flag as per patch from Lee Thompson
+  <bm55b@yahoo.com> in bug #70529.
 
   04 Dec 2004; Daniel Black <dragonheart@gentoo.org> log4c-1.0.10-r1.ebuild,
   log4c-1.0.11:
diff --git a/dev-libs/log4c/Manifest b/dev-libs/log4c/Manifest
index a6a75991a98d..d8f180eeec38 100644
--- a/dev-libs/log4c/Manifest
+++ b/dev-libs/log4c/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0c4f4fee04c7b183ed4a4b5f7e7cde64 ChangeLog 3666
-MD5 6346dcad6ef8b4d29ffa7b5284b6cca7 log4c-1.0.11.ebuild 1531
-MD5 938777a64cf7065ccd8484c7a92d6eac log4c-1.0.12.ebuild 1174
-MD5 b18c56863e452cbe463de8ee6b53dcc5 log4c-1.0.6-r1.ebuild 1011
+MD5 6090f72c62f70248845bead49bb2cda2 ChangeLog 3881
+MD5 b1af999e208375af1e247ab5fe4a25a1 log4c-1.0.11.ebuild 1531
+MD5 124411a387a7f0b5c34502c9b3eade40 log4c-1.0.12.ebuild 1174
+MD5 3f17053384003899188fbb9824120573 log4c-1.0.6-r1.ebuild 1011
 MD5 4eafc1e08f52712fd036e73730b0a172 metadata.xml 435
-MD5 b8b6eb37c8b270c9192bd7bb5ac38708 log4c-1.0.10-r1.ebuild 1771
+MD5 fd2e38fa22f2a775cd4382045cd29fbf log4c-1.0.10-r1.ebuild 1773
 MD5 37d8d5f4cc1cf6074bcd576c3c294b99 files/configure.in.patch 854
 MD5 1f0fac7267c1cff0be0ee973376e272e files/digest-log4c-1.0.11 64
 MD5 fef7d3e32cce5efd15a56a6dcff9c4d1 files/digest-log4c-1.0.12 64
@@ -15,13 +12,6 @@ MD5 81e6117c525d7118531b1868a13738fc files/log4c_1.0.11_test.patch 464
 MD5 1902a2badd2a965f9e4072f4b6e7adfe files/makefile.doc.am.patch 350
 MD5 028648da7dc4850b5dbc3ec0469eba94 files/makefile.doc.in.patch 352
 MD5 a9fba68dfd5dea143cfe49ccb0662fc1 files/digest-log4c-1.0.10-r1 64
-MD5 29ae48e8f7698e738fd6e7c18a17b5c7 files/log4c-1.0.10-nodocs.patch 1425
 MD5 80234f09351af06e9eda20bf7dd1c2bd files/log4c-1.0.12-function.patch 998
 MD5 80234f09351af06e9eda20bf7dd1c2bd files/log4c-1.0.11-function.patch 998
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBsTZYmdTrptrqvGERAiRYAKCG07NONTavcY7PrwLZuyQxRlSyfwCeKH7i
-umhWyKXx9NmDiuVuVfvvtA8=
-=dNk7
------END PGP SIGNATURE-----
+MD5 2debb494dcd9f4261f707e22e453f391 files/log4c-1.0.10-nodocs.patch 838
diff --git a/dev-libs/log4c/files/log4c-1.0.10-nodocs.patch b/dev-libs/log4c/files/log4c-1.0.10-nodocs.patch
index 0759afbf99b5..278367faf80f 100644
--- a/dev-libs/log4c/files/log4c-1.0.10-nodocs.patch
+++ b/dev-libs/log4c/files/log4c-1.0.10-nodocs.patch
@@ -1,6 +1,6 @@
 diff -Nru log4c-1.0.10.orig/configure log4c-1.0.10/configure
---- log4c-1.0.10.orig/configure	2002-11-22 08:44:32.000000000 -0600
-+++ log4c-1.0.10/configure	2004-11-16 10:32:32.303881856 -0600
+--- log4c-1.0.10.orig/configure	2004-11-08 18:01:19.789622792 -0600
++++ log4c-1.0.10/configure	2004-11-08 18:07:41.406608192 -0600
 @@ -9522,6 +9522,7 @@
  else
  	enable_doc=yes
@@ -18,21 +18,3 @@ diff -Nru log4c-1.0.10.orig/configure log4c-1.0.10/configure
  
  ac_config_commands="$ac_config_commands default"
  
-diff -Nru log4c-1.0.10.orig/tests/log4c/test_category.c log4c-1.0.10/tests/log4c/test_category.c
---- log4c-1.0.10.orig/tests/log4c/test_category.c	2002-11-20 09:38:34.000000000 -0600
-+++ log4c-1.0.10/tests/log4c/test_category.c	2004-11-16 11:53:53.436836856 -0600
-@@ -111,11 +111,11 @@
- {   
-     log4c_category_set_priority(root, LOG4C_PRIORITY_TRACE);
- 
--    foo(root, trace);
-+    foo(root, info);
-     foo(root, warn);
--    foo(sub1, trace);
-+    foo(sub1, info);
-     foo(sub1, warn);
--    foo(sun1sub2, trace);
-+    foo(sun1sub2, info);
-     foo(sun1sub2, warn);
-     return 1;
- }
diff --git a/dev-libs/log4c/log4c-1.0.10-r1.ebuild b/dev-libs/log4c/log4c-1.0.10-r1.ebuild
index b2f4e2a2b94d..4e86d2d012b7 100644
--- a/dev-libs/log4c/log4c-1.0.10-r1.ebuild
+++ b/dev-libs/log4c/log4c-1.0.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.10-r1.ebuild,v 1.3 2004/12/04 04:00:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.10-r1.ebuild,v 1.4 2005/01/02 02:52:22 dragonheart Exp $
 
 inherit eutils
 
@@ -10,40 +10,46 @@ HOMEPAGE="http://log4c.sourceforge.net"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="x86 ~sparc ppc ~amd64"
+KEYWORDS="x86 ~sparc ~ppc amd64"
 IUSE="doc"
 
-# This is the last version of log4c that uses 'expat' and the last one I could
-# get working with a gcc 3.3.4 gentoo box.  Later version work okay on 
-# redhat boxes, but the ones I had around we're gcc 3.2.  The virtual/logger
+# The virtual/logger
 # could probably be deleted, but it just doesn't seem right to have log4c
 # without a logger underneath it.
 
 DEPEND=">=dev-libs/expat-1.95.2
-	>=media-gfx/graphviz-1.7.15-r2"
-
-RDEPEND="virtual/logger
-	>=dev-libs/expat-1.95.2
-	>=media-gfx/graphviz-1.7.15-r2"
+	>=media-gfx/graphviz-1.7.15-r2
+	virtual/logger
+	doc? ( >=app-doc/doxygen-1.2.15 )"
 
+DEPEND=">=dev-libs/expat-1.95.2
+	>=media-gfx/graphviz-1.7.15-r2
+	virtual/logger"
 
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	### comment out the docs with this patch to minimize depenencies
-	useq doc || epatch ${FILESDIR}/${P}-nodocs.patch
-	epatch ${FILESDIR}/log4c-1.0.11-function.patch  || die "failed to patch"
+	if use doc;
+	then
+		epatch ${FILESDIR}/makefile.doc.in.patch ||  die "patch failed"
+		epatch ${FILESDIR}/makefile.doc.am.patch ||  die "patch failed"
+	else
+		### comment out the docs with this patch to minimize depenencies
+		epatch ${FILESDIR}/${P}-nodocs.patch || die "patch failed"
+	fi
+	# fixes gcc-3.4 problems
+	epatch ${FILESDIR}/log4c-1.0.11-function.patch || die "patch failed"
+	epatch ${FILESDIR}/log4c_1.0.11_test.patch || die "patch failed"
 }
 
 src_compile() {
-
 	econf --enable-test || die
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL README
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
 	# Currently with this ebuild you have to have a /etc/log4crc file and
 	# have LOG4C_RCPATH defined or log4c quitely does nothing
 	cp ${D}/etc/log4crc.sample ${D}/etc/log4crc
diff --git a/dev-libs/log4c/log4c-1.0.11.ebuild b/dev-libs/log4c/log4c-1.0.11.ebuild
index 09c3c091aa82..da85ff660cf3 100644
--- a/dev-libs/log4c/log4c-1.0.11.ebuild
+++ b/dev-libs/log4c/log4c-1.0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.11.ebuild,v 1.7 2004/12/04 04:00:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.11.ebuild,v 1.8 2005/01/02 02:52:22 dragonheart Exp $
 
 inherit eutils
 
diff --git a/dev-libs/log4c/log4c-1.0.12.ebuild b/dev-libs/log4c/log4c-1.0.12.ebuild
index 510f5dd9c6de..e5ac6ffe3561 100644
--- a/dev-libs/log4c/log4c-1.0.12.ebuild
+++ b/dev-libs/log4c/log4c-1.0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.12.ebuild,v 1.3 2004/11/21 08:58:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.12.ebuild,v 1.4 2005/01/02 02:52:22 dragonheart Exp $
 
 inherit eutils
 
diff --git a/dev-libs/log4c/log4c-1.0.6-r1.ebuild b/dev-libs/log4c/log4c-1.0.6-r1.ebuild
index 9493bc9c74ce..5b4aebd0ed30 100644
--- a/dev-libs/log4c/log4c-1.0.6-r1.ebuild
+++ b/dev-libs/log4c/log4c-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.6-r1.ebuild,v 1.17 2004/09/07 06:52:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.6-r1.ebuild,v 1.18 2005/01/02 02:52:22 dragonheart Exp $
 
 DESCRIPTION="Log4c is a library of C for flexible logging to files, syslog and other destinations. It is modeled after the Log for Java library (http://jakarta.apache.org/log4j/), staying as close to their API as is reasonable."
 SRC_URI="mirror://sourceforge/log4c/${P}.tar.gz"