Remove old blocker on ruby-rrd. Add dependency on pkgconfig (bug #385017 by Nikoli).

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

4 files changed, 23 insertions, 17 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 5f2d0cf1c03a..79b5e55b28de 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.211 2011/10/01 06:55:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.212 2011/10/01 06:59:07 radhermit Exp $
+
+  01 Oct 2011; Tim Harder <radhermit@gentoo.org> rrdtool-1.3.8.ebuild,
+  rrdtool-1.4.5-r1.ebuild:
+  Remove old blocker on ruby-rrd. Add dependency on pkgconfig (bug #385017 by
+  Nikoli).
 
   01 Oct 2011; Tim Harder <radhermit@gentoo.org> -rrdtool-1.0.50.ebuild,
   -files/rrdtool-1.2.15-newstyle-resize.patch, -rrdtool-1.2.29.ebuild,
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index d6941c3063d5..57220bd278c2 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -6,18 +6,18 @@ AUX rrdtool-1.4.3-ruby-ldflags.patch 614 RMD160 dc43e0e459709323ab191005dcfb31b7
 AUX rrdtool-1.4.4-dont-link-system-lib.patch 801 RMD160 ae423617f43efbffe00f84e5ad8c9e1c49ee896f SHA1 d4accd6c75027554e729633f296d7c2ddb506132 SHA256 7a726fe8534a9e56d7074af827ef88e96d5176d4f68983ff5514fb137c1f12eb
 DIST rrdtool-1.3.8.tar.gz 1021427 RMD160 e05cada9d1df11ed474536c1f6e11d7cc4c08077 SHA1 1fe71706442ddd78ec8cdbaadd8ce16bb1326b05 SHA256 a7084e07a8c78e91ca7af211af11f777c7a040b93ce21ab1144dd00079da0f38
 DIST rrdtool-1.4.5.tar.gz 1348713 RMD160 9c45c3be7bcb8e17260055a33e936f307884914f SHA1 56638e8aedd5d5522152e86746e382b75dc48c35 SHA256 1267af420533d846432e55352db89b0f2507c711f80c65e016f7484f3cb0cf1d
-EBUILD rrdtool-1.3.8.ebuild 2674 RMD160 32ab770c5cb9f8caabf7129765527e5c03851fd2 SHA1 d4118a2d8d1390200e6de6f8166b394da037fb27 SHA256 4e87abbe91e3850e7ce1eddd241c2fc1ebe4b7fe128710e5df0a98a120288413
-EBUILD rrdtool-1.4.5-r1.ebuild 3155 RMD160 adc9352a01c80b71cb572ec35b9e78a46eb8ba5a SHA1 a909569809597b007aec42136d8969fc2f3bf130 SHA256 663746906cd300571c46fe6bcdd5a70e9d5a26a112d6b6511a773250b6822a69
-MISC ChangeLog 32230 RMD160 02e89944df7d18dfc544cbd1058291d8e55588dc SHA1 6f2c806ffff815e6723c793a72fa393b67313967 SHA256 e6362eb762fa0281092cf6efda441d1066a83c2cbe6f2720e488bd48827e6c79
+EBUILD rrdtool-1.3.8.ebuild 2675 RMD160 3c3f86284ec51257d8c0ababc429223a5be454d8 SHA1 c2ee49578fbd4ba40e7ed20479c23d0533cf1ee6 SHA256 b487a17f6fee97af87d53d496e59d64df86af93abe4feba0337846b352b80829
+EBUILD rrdtool-1.4.5-r1.ebuild 3156 RMD160 c51e670a585b9b629521888305cbfc83c4e0dd31 SHA1 bdd00375b8e400ad9cb6e8d96c3103e446cecc65 SHA256 476d31eb4d463bb455a8cdc2d35112d546a7777ea66f155649f63d961db99633
+MISC ChangeLog 32418 RMD160 281680a2d06c43a5459e0fac3f1215666a384c8d SHA1 743523ade3b1df0f230265df96642940f77bdb76 SHA256 3cbc039c6e03e43214f36b2a0d1fdd9b64830b0f35a822541834242c61fe254c
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOhrlcAAoJEEqz6FtPBkyjwV4H/1wR0obud6IuAGgrdKF7RWvB
-3pTFw5wJFcyDNsPuFmqKa44yeavN2k1px8Qh9eDkOO1GRZh/ZeqaVSAHlvMJrQrk
-uf27Q3f/kVeqPak5luUZBHmmJDSCkipxlb/xQvPIn6RBluCcYdgQ//hifuUAgfog
-G4mg41bC5MpIiEgfpXNfcVmUjRV9MnWKsCU2na3el/UT3RVkQGyjM9C5bPlwf9+D
-UJUEbOpK6FMHZD3dp9VW+8AnqwIwju3lvVAKL7X5dQBotwUDT9PgXHphmySv+m1H
-EYZ8Hm6cQbNK39tFbjXxIfi8oZCCTstChFjyb7WAq+VKMm9EsWxqNZ+qV3sd3NE=
-=93YI
+iQEcBAEBCgAGBQJOhrpBAAoJEEqz6FtPBkyjlccH/1lQpQuiaDuFck2X1YqoUn8H
+H4uU/XEr6mB9lct6vis03fkKgtiqjfubRxPSuA+b3nI6YfKbpXZRcEzgQK8Fqnkd
+pww8qpIC+7GBukjteokM+/OPVOH2DZC9TYgnVA08MHBs1umJIvSXKSTSwqoBs+7j
+loP5gkH+cAYWDb0J2OTH9gqIzE3UNh5XKpEfTrbRAfIiR7enF2csAZNln14kXfu2
+ee1O8Sm4wh2wiVUutnzkiZhtZRPZJIFPtc9LTXbMtmdwyCxWidwR5MyoNDUzmx8P
+NKRNBIrWBfhTrj8hUovnkHIixeMCGswiqZp6sxGmG7/Bd7nRx/sc7nzUECd662I=
+=z5sY
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/rrdtool-1.3.8.ebuild b/net-analyzer/rrdtool/rrdtool-1.3.8.ebuild
index 1ff58f3b029a..1b3cfbe41540 100644
--- a/net-analyzer/rrdtool/rrdtool-1.3.8.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.8.ebuild,v 1.13 2010/10/16 13:52:19 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.3.8.ebuild,v 1.14 2011/10/01 06:59:07 radhermit Exp $
 
 EAPI="2"
 
@@ -25,12 +25,12 @@ RDEPEND="
 	tcl? ( dev-lang/tcl )
 	perl? ( dev-lang/perl )
 	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
-			!dev-ruby/ruby-rrd )"
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )"
 
 DEPEND="${RDEPEND}
 	nls? ( >=dev-util/intltool-0.35
 		sys-devel/gettext )
+	dev-util/pkgconfig
 	sys-apps/gawk"
 
 pkg_setup() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
index fb8de1fa8f73..aa454ddb9db0 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v 1.1 2011/08/07 08:13:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v 1.2 2011/10/01 06:59:07 radhermit Exp $
 
 EAPI="3"
 
@@ -26,10 +26,11 @@ RDEPEND="
 	lua? ( dev-lang/lua )
 	perl? ( dev-lang/perl )
 	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 !dev-ruby/ruby-rrd )
+	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
 	tcl? ( dev-lang/tcl )"
 
 DEPEND="${RDEPEND}
+	dev-util/pkgconfig
 	sys-apps/gawk"
 
 src_prepare() {