Add missing pkgconfig dep per bug #227487. Clean up bit the ebuild.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 32 insertions, 23 deletions

diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index 679354c095e1..f55b8d09981f 100644
--- a/dev-db/hk_classes/ChangeLog
+++ b/dev-db/hk_classes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/hk_classes
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.61 2009/03/23 02:20:14 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.62 2009/06/14 09:57:55 scarabeus Exp $
+
+  14 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  hk_classes-0.8.3.ebuild:
+  Add missing pkgconfig dep per bug #227487. Clean up bit the ebuild.
 
   23 Mar 2009; Friedrich Oslage <bluebird@gentoo.org>
   hk_classes-0.8.3.ebuild:
diff --git a/dev-db/hk_classes/Manifest b/dev-db/hk_classes/Manifest
index 78873f1ea3cb..09ccf3709d12 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -17,6 +17,6 @@ EBUILD hk_classes-0.7.4a.ebuild 1977 RMD160 30c6b680ea0ff0ecb2e43ee67aac1bf54cbd
 EBUILD hk_classes-0.8.1.ebuild 1717 RMD160 c405541394960609d6fcd79f7ea7d1143000be77 SHA1 2e6fb0220582af8f1b480ad2911e1261385776e7 SHA256 4e95c8bd20ca6110972260fbbe6980deed7d8debcad69340879a5baf9870cec4
 EBUILD hk_classes-0.8.1_alpha3.ebuild 2057 RMD160 fd715916ea5d601ce9aa81f979c0911877684547 SHA1 d3db35b367544eec45f0870aacf33c7034993d15 SHA256 f4f8d3dd314565ecfbccf13751f86673a253e189bfcf72c3b5d16d936f6a6504
 EBUILD hk_classes-0.8.2_alpha3.ebuild 2057 RMD160 8eb7f43cac9ca1ecdbc98e21043689c22a4fea03 SHA1 c4fc5e27ff6b7552258424fce75eaeb29afb863a SHA256 e494eb2682b0ce4e7eb3e65e95700cbfd912b73ca8cca8e5a872e3d76dde55fd
-EBUILD hk_classes-0.8.3.ebuild 1891 RMD160 e9ef80cf7fe2e75484576a1638e5b8cf7b0f8a57 SHA1 417336c5f035c8539f394401cc5db4f244c4ae9d SHA256 47b9e4c37849df6346ca8144751e9c75fa55ebac0ae30bc7fa75c1519e524cb4
-MISC ChangeLog 9600 RMD160 034534fd354c6ccb4e5cfdefb9880fa91217dbc1 SHA1 63a439938af3c4d4d7eda1646951d6056fc5a6f1 SHA256 14206f2ef46a7e644db36a7f562e5abc6f1e6e151f6ce4e5f5511f7cbd109e86
+EBUILD hk_classes-0.8.3.ebuild 1859 RMD160 f854b51203c9d05d2028ead86767a3abb22fb334 SHA1 7dfcaca731a41c7459e9022098ca02689de7c51f SHA256 66a30b92a15ee499de45036eb8aef656f642614529392b04b7eedbe63e0f704d
+MISC ChangeLog 9754 RMD160 aeffbab044ce272537bbc379d98efd241d8d4b19 SHA1 35fa582b6b4eea98e4423df1ba3fa1f2bcfa2320 SHA256 a33dc4ee158b2fdce91c926b711ab12a4d7e60b7683c07e96b2cc2d97e01882c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-db/hk_classes/hk_classes-0.8.3.ebuild b/dev-db/hk_classes/hk_classes-0.8.3.ebuild
index 47c2dcfc3183..e70f54b7f626 100644
--- a/dev-db/hk_classes/hk_classes-0.8.3.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.3.ebuild,v 1.8 2009/03/23 02:20:14 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.8.3.ebuild,v 1.9 2009/06/14 09:57:55 scarabeus Exp $
 
 inherit autotools eutils python
 
@@ -23,11 +23,14 @@ LICENSE="LGPL-2"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="doc firebird mysql odbc postgres"
 
-DEPEND=">=media-libs/fontconfig-2.5.0-r1
+RDEPEND=">=media-libs/fontconfig-2.5.0-r1
 	firebird? ( dev-db/firebird )
 	mysql? ( >=dev-db/mysql-3.23.54a )
 	postgres? ( >=virtual/postgresql-server-7.3 )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+"
 
 src_unpack() {
 	unpack ${A}
@@ -43,23 +46,25 @@ src_compile() {
 	python_version
 	export LIBPYTHON="-lpython${PYVER} -lz"
 
-	myconf="--with-pythondir=/usr/$(get_libdir)/python${PYVER}/\
+	econf \
+		--with-pythondir=/usr/$(get_libdir)/python${PYVER}/ \
 		$(use_with mysql) \
 		$(use_with firebird) \
 		$(use_with odbc) \
-		$(use_with postgres)"
+		$(use_with postgres)
 
-	econf ${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	use doc && dohtml -r "${WORKDIR}"/${MY_P}/documentation/api
-	use doc && dohtml -r "${WORKDIR}"/hk_classestutorial
-	use doc && dohtml -r "${WORKDIR}"/hk_kdeclssestutorial
-	use doc && dohtml -r "${WORKDIR}"/knodascriptingtutorial
-	use doc && dohtml -r "${WORKDIR}"/knodatutorial
-	use doc && dohtml -r "${WORKDIR}"/pythonreference
+	if use doc; then
+		dohtml -r "${WORKDIR}"/${MY_P}/documentation/api
+		dohtml -r "${WORKDIR}"/hk_classestutorial
+		dohtml -r "${WORKDIR}"/hk_kdeclssestutorial
+		dohtml -r "${WORKDIR}"/knodascriptingtutorial
+		dohtml -r "${WORKDIR}"/knodatutorial
+		dohtml -r "${WORKDIR}"/pythonreference
+	fi
 
 	emake DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/dev-db/knoda/Manifest b/dev-db/knoda/Manifest
index 010b3c059e2e..9765a2547dc3 100644
--- a/dev-db/knoda/Manifest
+++ b/dev-db/knoda/Manifest
@@ -6,12 +6,12 @@ DIST knoda-0.8.1-test3.tar.bz2 4433946 RMD160 64ffd34efd88bc6723225d651b52c2b184
 DIST knoda-0.8.1.tar.bz2 4463670 RMD160 0d1213ed3ccb82fdd85740e9844de0e00913efeb SHA1 3108bec74697a2abf90098c8c368ecfef595786f SHA256 8855374cede5fa5ca6321c80f200f62577efe4f9b0ef416541d8e05292ea3993
 DIST knoda-0.8.2-test3.tar.bz2 4493840 RMD160 c3195bca372672aa93dc3eecb75939fa78d77793 SHA1 231854494f4766a4ff7c85a529cf7609e5810ade SHA256 57a4360b5229bf981dcb716294013334bf5ac18d4f52d71dec20f27e6bdc4598
 DIST knoda-0.8.3.tar.bz2 4619446 RMD160 1a4169128acbbc7624932df181ab167d8ed8cce2 SHA1 a61810a568f619291fade5586165dbec0460532a SHA256 0ec5eb90c0efd6c76f3b0e86e1a9af4dd4800dcaff170ad35d86025d8d13eeb4
-EBUILD knoda-0.7.1.ebuild 593 RMD160 bed52b0cfcb5bc1b75ade3f54d6862413c07fbd3 SHA1 6383d1cddcec532acf32ca71f0129cc3714835e2 SHA256 a7a6ffc8e0f39df1747188eafef472e36b8b3a52442eff43bd69a8c30921b238
-EBUILD knoda-0.7.4-r1.ebuild 671 RMD160 b932981b5269786732eec59e38665640c1ec56f8 SHA1 07a33cb3321914652dc927b8294eaef2b63a9640 SHA256 180b87cf681fc65ec8f4c9769c65e302a207f610bf32931c7927c82f95bdcb5d
-EBUILD knoda-0.7.4.ebuild 554 RMD160 e94b58f1e236096935f467e87e1facac64074f8d SHA1 a8d847c0bd286f2ac8d09711a62642a1d839d204 SHA256 3be002324d4262f76425f9b5e254b13fd2f332600ad361096aedcbe508e7c500
-EBUILD knoda-0.8.1.ebuild 554 RMD160 19ca2ae37022b5f03ffb0a1261587ecfaa1df8c9 SHA1 24b2cbc7332b7a591ba013f98cc6a23233715522 SHA256 d7122c97765b5bf59bc2e0945f11f23a993d17631f87c0b0d6f3fdccb3d1ee8b
-EBUILD knoda-0.8.1_alpha3.ebuild 565 RMD160 0b21e62b6dd4b64a1a13677f941c92d13edbf284 SHA1 1d09746eb77480ed3ced745a0d936d81dc8473fd SHA256 eac028a222745d1a9485c3c00176f99481c4e06bd5c3f0a694c720ac79b36a55
-EBUILD knoda-0.8.2_alpha3.ebuild 565 RMD160 8bf2739948ce50d189dcca159526b6affad91d34 SHA1 6b5fdd7239c44a39af24d2ec9d56f9c85cc9aaad SHA256 3760fa5cc83e5e5867326f6751ae0d55a978acba9c02eda2ddf37cc55889142d
-EBUILD knoda-0.8.3.ebuild 553 RMD160 636e7109250b5cef83fd3b5c4742fecd5420d615 SHA1 9237c4709d10eb26d65e8a6ab301419987393366 SHA256 5d643e51505ef035f68e2cbe6c8b685256a48ca5acb4d0bdf259dbc64383df2b
-MISC ChangeLog 6143 RMD160 8f9d502b1ad2435e711725b7a4c39966ef00a93a SHA1 542b979969811d1b3144c54e0febebb8eb3d5c04 SHA256 e4cd2ff8344c8a5a6f137c1ef58c045cde8eeb8506e110a34e1e2a732641aca0
+EBUILD knoda-0.7.1.ebuild 596 RMD160 dfabe9fef569f9f80a9073bb214f1aa00926a253 SHA1 b55639386f3bbe211f5efa160eea2c891288b618 SHA256 1692a78a20670fc57915445adb16452b71d5d8ee7a3fd99a7898ed7533ab071c
+EBUILD knoda-0.7.4-r1.ebuild 673 RMD160 26fbf24fc0d7412c7c7f268f0776e00f1e2e4565 SHA1 ead05b4756f6f97a7999f19f7a6f5a8e009a638c SHA256 66f228d70bd4f2da5dd48ff8b6ff3aa43c1ae0ae9f75103268e2bb7da70faf21
+EBUILD knoda-0.7.4.ebuild 560 RMD160 d0c39f1da040b39af01b30fb1e7d77e3437d6ead SHA1 57dd29260f2c303b5a3d2af2ae5fa5af4ae4a602 SHA256 dd1160f43d6f12615a8e63d1b3b3ce00da21ff93a8e2164b924429f1da876b52
+EBUILD knoda-0.8.1.ebuild 556 RMD160 6627f769bf7a53e64d90fc04d8f33ff7aa0b5ed4 SHA1 04e750ac5fac9319e5c3742346b6c4a19865d7e9 SHA256 c9d9dbe6eb77b4ab3822fc1aa588920b699b9121429a301f633c51f368f96f14
+EBUILD knoda-0.8.1_alpha3.ebuild 567 RMD160 522c5f4477f4ff024a2d5e5189f8f7a78e6d3dbc SHA1 23392cbd61d7af274f3d2ff18dcd7e4540fc50ee SHA256 7e2b219edee8404e3047110d8a4c57a7c78ceab4a1aba21295eb6d7e21d00717
+EBUILD knoda-0.8.2_alpha3.ebuild 567 RMD160 d65e4a203a7d022f32938810854dce6aa05a420e SHA1 1ee94dc41a70992d54cdc5956740f8823f0a1dce SHA256 9a96e0415e09f4584c54f18f86f59d88667c427de9b7a5237266f03e5b3f571b
+EBUILD knoda-0.8.3.ebuild 556 RMD160 25bd7ebf3313860ea697d43bc9488192f8970d99 SHA1 c6ad3d1e070bf63fffddc44285fd9337099107c5 SHA256 0b51214605f7a1267de776dcb8a016cd36719dc958146809c8632cdc13d72995
+MISC ChangeLog 6373 RMD160 b0ccea97dfca6d43e45eef5c8b4ccb0a9a4dfb9b SHA1 311c0c93b8501e361a850aab3b2f4d9fe9e883c1 SHA256 6d107b19fea91aaff658668560c1968a0c4819fc229f576460757dca837cbc45
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a