QA fixes + graphviz is only a RDEPEND - bug #142719

(Portage version: 2.1.1_pre4-r1)

8 files changed, 46 insertions, 35 deletions

diff --git a/dev-libs/log4c/ChangeLog b/dev-libs/log4c/ChangeLog
index 16d6ad781524..51806fd2f90e 100644
--- a/dev-libs/log4c/ChangeLog
+++ b/dev-libs/log4c/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/log4c
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/ChangeLog,v 1.26 2005/07/29 23:30:05 dragonheart Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/ChangeLog,v 1.27 2006/08/04 02:57:58 dragonheart Exp $
+
+  04 Aug 2006; Daniel Black <dragonheart@gentoo.org> log4c-1.0.10-r1.ebuild,
+  log4c-1.0.11.ebuild, log4c-1.0.12.ebuild:
+  QA fixes + graphviz is only a RDEPEND - bug #142719 thanks Carsten Lohrke
 
   29 Jul 2005; Daniel Black <dragonheart@gentoo.org> log4c-1.0.10-r1.ebuild,
   log4c-1.0.11.ebuild, log4c-1.0.12.ebuild:
diff --git a/dev-libs/log4c/files/digest-log4c-1.0.10-r1 b/dev-libs/log4c/files/digest-log4c-1.0.10-r1
index 9d6da5d875b7..c09acd9503bc 100644
--- a/dev-libs/log4c/files/digest-log4c-1.0.10-r1
+++ b/dev-libs/log4c/files/digest-log4c-1.0.10-r1
@@ -1 +1,3 @@
 MD5 db901a69a6da4f1974bf47105a9aac8a log4c-1.0.10.tar.gz 242286
+RMD160 da71bca3a59018e4ac2c4245e8c38094bcd9c7e5 log4c-1.0.10.tar.gz 242286
+SHA256 247e260a972929eaadedeb974c4cbb78d5784c7f4400ac17be3227ab89113233 log4c-1.0.10.tar.gz 242286
diff --git a/dev-libs/log4c/files/digest-log4c-1.0.11 b/dev-libs/log4c/files/digest-log4c-1.0.11
index 96888f33a687..73a7e3bc7143 100644
--- a/dev-libs/log4c/files/digest-log4c-1.0.11
+++ b/dev-libs/log4c/files/digest-log4c-1.0.11
@@ -1 +1,3 @@
 MD5 bbb0bb81840470743432b09911dd11a5 log4c-1.0.11.tar.gz 291738
+RMD160 4f19370c1316e19a6ae34e93a09620198b684489 log4c-1.0.11.tar.gz 291738
+SHA256 36a08a844e3c44501df7906739b8748c427d2b57a6297c6a076e580425b8da2a log4c-1.0.11.tar.gz 291738
diff --git a/dev-libs/log4c/files/digest-log4c-1.0.12 b/dev-libs/log4c/files/digest-log4c-1.0.12
index 0ea3a2519249..75d9b8d2b7c2 100644
--- a/dev-libs/log4c/files/digest-log4c-1.0.12
+++ b/dev-libs/log4c/files/digest-log4c-1.0.12
@@ -1 +1,3 @@
 MD5 334d38ed163b26b1be48364b445ad170 log4c-1.0.12.tar.gz 298286
+RMD160 30f3349b3d2d7f211e7a9f292628edecb9fa7e65 log4c-1.0.12.tar.gz 298286
+SHA256 4e9b28e511107c89d33d36a28a5caf26a3d4367c9b6f1d7f97b58ab484c1c0a2 log4c-1.0.12.tar.gz 298286
diff --git a/dev-libs/log4c/log4c-1.0.10-r1.ebuild b/dev-libs/log4c/log4c-1.0.10-r1.ebuild
index f299e3c51951..3efe59f3871b 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-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/log4c/log4c-1.0.10-r1.ebuild,v 1.8 2005/07/29 23:30:05 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.10-r1.ebuild,v 1.9 2006/08/04 02:57:58 dragonheart Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/expat-1.95.2
 	>=media-gfx/graphviz-1.7.15-r2
 	virtual/logger"
 
-DEPEND="${RDEPEND}
+DEPEND=">=dev-libs/expat-1.95.2
 	doc? ( >=app-doc/doxygen-1.2.15 )"
 
 src_unpack() {
diff --git a/dev-libs/log4c/log4c-1.0.11.ebuild b/dev-libs/log4c/log4c-1.0.11.ebuild
index 43c5613242c0..ef37608f1313 100644
--- a/dev-libs/log4c/log4c-1.0.11.ebuild
+++ b/dev-libs/log4c/log4c-1.0.11.ebuild
@@ -1,8 +1,8 @@
-# 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/log4c/log4c-1.0.11.ebuild,v 1.10 2005/07/29 23:31:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.11.ebuild,v 1.11 2006/08/04 02:57:58 dragonheart Exp $
 
-inherit eutils
+inherit eutils autotools
 
 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"
@@ -15,18 +15,18 @@ IUSE="doc"
 
 DEPEND="doc? ( >=app-doc/doxygen-1.2.15
 		virtual/tetex
-		virtual/ghostscript )
-	sys-devel/autoconf
-	>=media-gfx/graphviz-1.7.15-r2"
+		virtual/ghostscript )"
+RDEPEND=">=media-gfx/graphviz-1.7.15-r2"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/makefile.doc.am.patch
-	epatch ${FILESDIR}/makefile.doc.in.patch
-	epatch ${FILESDIR}/configure.in.patch
-	epatch ${FILESDIR}/log4c_1.0.11_test.patch
-	epatch ${FILESDIR}/${P}-function.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/makefile.doc.am.patch
+	epatch "${FILESDIR}"/makefile.doc.in.patch
+	epatch "${FILESDIR}"/configure.in.patch
+	epatch "${FILESDIR}"/log4c_1.0.11_test.patch
+	epatch "${FILESDIR}"/${P}-function.patch
+	eautoreconf
 }
 
 src_compile() {
@@ -38,17 +38,16 @@ src_compile() {
 	#	myconf="${myconf} --enable-test"
 	#fi
 
-	autoconf
-	econf --enable-test `use_enable doc` || die
+	econf --enable-test $(use_enable doc) || die
 	use doc && addwrite "${ROOT}/var/cache/fonts"
 	emake || die
 }
 
 src_test() {
-	${S}/tests/log4c/test_category || die "test_rc failed"
+	"${S}"/tests/log4c/test_category || die "test_rc failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
-	prepalldocs.new || prepalldocs
+	emake DESTDIR="${D}" install || die
+	prepalldocs
 }
diff --git a/dev-libs/log4c/log4c-1.0.12.ebuild b/dev-libs/log4c/log4c-1.0.12.ebuild
index 4d8243b41e65..3f382b2ebe03 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-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/log4c/log4c-1.0.12.ebuild,v 1.5 2005/07/29 23:30:05 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.12.ebuild,v 1.6 2006/08/04 02:57:58 dragonheart Exp $
 
 inherit eutils
 
@@ -15,18 +15,18 @@ IUSE="doc"
 
 DEPEND="doc? ( >=app-doc/doxygen-1.2.15
 		virtual/tetex
-		virtual/ghostscript )
-	>=media-gfx/graphviz-1.7.15-r2"
+		virtual/ghostscript )"
+RDEPEND=">=media-gfx/graphviz-1.7.15-r2"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-function.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-function.patch
 }
 
 src_compile() {
 
-	econf --enable-test `use_enable doc` || die
+	econf --enable-test $(use_enable doc) || die
 	use doc && addwrite "${ROOT}/var/cache/fonts"
 	emake || die
 }
@@ -34,10 +34,10 @@ src_compile() {
 src_test() {
 	# test case broken
 	#${S}/tests/log4c/test_rc || die "test_rc failed"
-	${S}/tests/log4c/test_category || die "test_rc failed"
+	"${S}"/tests/log4c/test_category || die "test_rc failed"
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
-	prepalldocs.new || prepalldocs
+	emake DESTDIR="${D}" install || die
+	prepalldocs
 }
diff --git a/dev-libs/log4c/log4c-1.0.6-r1.ebuild b/dev-libs/log4c/log4c-1.0.6-r1.ebuild
index 5b4aebd0ed30..de0a106377c6 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-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.18 2005/01/02 02:52:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4c/log4c-1.0.6-r1.ebuild,v 1.19 2006/08/04 02:57:58 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"
@@ -11,11 +11,13 @@ LICENSE="LGPL-2.1"
 KEYWORDS="x86 sparc ppc"
 IUSE=""
 
-DEPEND=">=dev-libs/expat-1.95.2
+DEPEND="
 	>=app-doc/doxygen-1.2.15
-	>=media-gfx/graphviz-1.7.15-r2
 	virtual/tetex"
 
+RDEPEND=">=dev-libs/expat-1.95.2
+		>=media-gfx/graphviz-1.7.15-r2"
+
 src_compile() {
 
 	econf || die