Fixes thanks to Aaron Walker <ka0ttic@butsugenjitemple.org> in bug #60047

4 files changed, 29 insertions, 12 deletions

diff --git a/dev-libs/log4c/ChangeLog b/dev-libs/log4c/ChangeLog
index 2d375b70de8b..663f52f50c44 100644
--- a/dev-libs/log4c/ChangeLog
+++ b/dev-libs/log4c/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2004/08/11 09:28:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/ChangeLog,v 1.13 2004/08/11 13:50:18 dragonheart Exp $
+
+  11 Aug 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/makefile.doc.in.patch, log4c-1.0.11.ebuild:
+  Fixes thank to Aaron Walker <ka0ttic@butsugenjitemple.org> in bug #60047
 
 *log4c-1.0.11 (11 Aug 2004)
 
diff --git a/dev-libs/log4c/Manifest b/dev-libs/log4c/Manifest
index 9b8ec95f9aae..cfb1ee398d57 100644
--- a/dev-libs/log4c/Manifest
+++ b/dev-libs/log4c/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4c510c58045f50459b2a79cfb695464b ChangeLog 1565
+MD5 f4c276fd0ae1b375ebc4912a7cc972dc ChangeLog 1747
 MD5 947886de3129e5cdef1c72ab2b2e2e8e log4c-1.0.6-r1.ebuild 1018
 MD5 ef3ee7cb4b111c01065c297b1a00dc5a log4c-1.0.6.ebuild 1027
-MD5 bcbfeaef129ce947c59bc0d7a75abeee log4c-1.0.11.ebuild 1258
+MD5 de7f54099f7dd003d0e6809116db2e31 log4c-1.0.11.ebuild 1330
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 fcc031971422d4234f3de52e34fcf256 files/digest-log4c-1.0.6 63
 MD5 fcc031971422d4234f3de52e34fcf256 files/digest-log4c-1.0.6-r1 63
 MD5 1f0fac7267c1cff0be0ee973376e272e files/digest-log4c-1.0.11 64
 MD5 37d8d5f4cc1cf6074bcd576c3c294b99 files/configure.in.patch 854
+MD5 89a726a759f8fef50c60987274892c0a files/makefile.doc.in.patch 378
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBGeTLmdTrptrqvGERAhP7AJ4h5H84CdjwroHcYdR4ZtI7cLepmACbBB2N
-1AC5z/BObQBiCcE84x75Kmg=
-=vVMz
+iD8DBQFBGiG3mdTrptrqvGERAv+fAJ452uqjF1LF1/BxmfEqasxKKa29PQCfTKcD
+JO9W+vaII+ITCoCul9XCOdk=
+=XdrF
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/log4c/files/makefile.doc.in.patch b/dev-libs/log4c/files/makefile.doc.in.patch
new file mode 100644
index 000000000000..fd65f46e5984
--- /dev/null
+++ b/dev-libs/log4c/files/makefile.doc.in.patch
@@ -0,0 +1,11 @@
+--- log4c-1.0.11/doc/Makefile.in.orig	2004-08-11 22:24:32.497489472 +0930
++++ log4c-1.0.11/doc/Makefile.in	2004-08-11 22:24:59.267419824 +0930
+@@ -254,7 +254,7 @@
+ 		echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
+ 		$(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
+ 	done
+-	cp -r html $(docdir)
++	cp -r html $(DESTDIR)$(docdir)
+ 
+ uninstall-local:
+ 	@for i in ./man/man3/*.3; do \
diff --git a/dev-libs/log4c/log4c-1.0.11.ebuild b/dev-libs/log4c/log4c-1.0.11.ebuild
index 34814abbd38f..f197792f7546 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
 # 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.1 2004/08/11 09:28:43 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.11.ebuild,v 1.2 2004/08/11 13:50:18 dragonheart Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ DEPEND="doc? ( >=app-doc/doxygen-1.2.15
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/makefile.doc.in.patch || die "failed to patch"
 	cd ${S}
 	epatch ${FILESDIR}/configure.in.patch || die "failed to patch"
 }
@@ -28,11 +29,11 @@ src_unpack() {
 src_compile() {
 
 
-	local myconf
-	if has maketest ${FEATURES} || use maketest;
-	then
-		myconf="${myconf} --enable-test"
-	fi
+	#local myconf
+	#if has maketest ${FEATURES} || use maketest;
+	#then
+	#	myconf="${myconf} --enable-test"
+	#fi
 
 	autoconf
 	econf --enable-test `use_enable doc` || die