Fix some USE=graph issues.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 18 insertions, 9 deletions

diff --git a/dev-ruby/rrdtool-bindings/ChangeLog b/dev-ruby/rrdtool-bindings/ChangeLog
index 8a64378f7d8a..c1dc01505a59 100644
--- a/dev-ruby/rrdtool-bindings/ChangeLog
+++ b/dev-ruby/rrdtool-bindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rrdtool-bindings
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/ChangeLog,v 1.15 2015/01/19 15:13:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/ChangeLog,v 1.16 2015/01/19 15:24:46 jer Exp $
+
+  19 Jan 2015; Jeroen Roovers <jer@gentoo.org>
+  rrdtool-bindings-1.5.0_rc1.ebuild:
+  Fix some USE=graph issues.
 
 *rrdtool-bindings-1.5.0_rc1 (19 Jan 2015)
 
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 4510c8acfa46..9ef8191458ba 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -8,13 +8,13 @@ DIST rrdtool-1.5.0-rc1.tar.gz 2007685 SHA256 c20cdf1e0d61d5852e3b18cb21f329c9943
 EBUILD rrdtool-bindings-1.4.8-r2.ebuild 1329 SHA256 485caa23af4a9048b85eba2986f0125bc4dfd9c9d9004e89980c97182812f32f SHA512 3efb5627d7aef9e91e3c6ad13e9399988256be14f514a092fa477f955c9dc0974c435dc0dfe8d98599add8c7ccd93315e5d20317356c3ab325f6ca8aa0c7dc4b WHIRLPOOL fee2943986b75e74193e53f7f42c685b5205936585da0abda9333974065106034b2ed46064ab98c18e20f1b959eaf7c9ff132dce2c3ec9fb7fda134e7467a6fc
 EBUILD rrdtool-bindings-1.4.8.ebuild 1166 SHA256 ac05ebf46a77901f2f38767c3b51951b24283b59c482f95480a93aa04a9268c1 SHA512 66983204076502b5e0e925665c44191d68a51ac0e03cded40d96fcd4b8ef70b03b9367160f893b1e778b936aeae3003088c6e1a69ef113eb13f6c24a47ddc445 WHIRLPOOL 7e8e76b98280e4ee372d962da069ab7774b899154a977a0dd2507cf1dcdb5fd94ab962cb7f85f4c56017b8c35fd72838eefa4cd14b9d9e00f42cc5e573871e41
 EBUILD rrdtool-bindings-1.4.9.ebuild 1333 SHA256 33a2db2e858d7541267330f7c6cf995dc2a16ca609512fa997eb2df016c56034 SHA512 f1a449c4f875be47d5315db5df9bfb9055c02b3767a6ea1072a7515e458cba2bb3e006baf883c5d8d2190770ed4cee449810b4c0a39bdad263d63eebb63b73cd WHIRLPOOL eed2bc6dcc84e24c94172fc30a2f67ff3a7d8908ce33de5d4b2a13be5e2354cc2d239c0dec38f07196ac2100c5402c93c0e60563f86f1ffa92651798bedf7730
-EBUILD rrdtool-bindings-1.5.0_rc1.ebuild 1384 SHA256 81b810519b1d7b0bc73039b6b60150393c45fcb05503d9450cfc223666eedc02 SHA512 0653c46da5a2a5e851a1fc9b5d5dc5bd0e5a40ae52e6c7cd4add8a9a898446387078fa006059c71411ae4c51522c950bc6921c0417d1cc6bb40e670f09d982e6 WHIRLPOOL 99a110391a82504dd897296b0b8818c58bfb1550c08cc7a4cc948c3eb4af22a0440a13ded031f6cdb028487cdb6694fbe963b6f1f3fe8c4d1e5aeb9378b06cea
-MISC ChangeLog 2507 SHA256 292985f6901dc35cd497dbbef37fb1958cd9856d0d5dfb6b5b8111899936713f SHA512 1c0a4b4a9b4884d9dea516e2f83d19f3f982388d7668ecaf71f64e985bb969c2ea793620c04f0d868ac5464313e63dc38edbbcf1af39c4884494627b1317e393 WHIRLPOOL 206747df3a3c1c2080faf66749e2641a791565c3e8c472f50e7be2ce2f44430ca4da0e390249469944e9f7152fb4d166354a3905e4116fb0f6019a4914ac9f2c
+EBUILD rrdtool-bindings-1.5.0_rc1.ebuild 1495 SHA256 c0b64f2d3c69ae806b68f41e3657468cca4af643aa5fed644837e5b52077c9d0 SHA512 73e45fe80fb8bd47423deb89f304761bc9e4a17c955eef81d1d27bc87c8e183f56c14aef5e40886afeebf5c409e9b4a776022783e388150dfaa00870627afbf8 WHIRLPOOL d23ca3158dee7719dd82f892a9cb1be2fa4239cb709a498e4a6cdea672c2007fffe98173dc957210887ebabf7469440c429186c5fe2e27b099b1390476ab1384
+MISC ChangeLog 2621 SHA256 d28a4d96b2d7693131e72081f6dee2797c4aa46785aa664b540634d022ec9429 SHA512 90e8b7926a92bf6491226f7552464d67aa1ea3b5ec2edf2050aedd908e6952114be9706d71eeae50501f3a1ca1c388c90f28bccaf6a522199fd97618dfedbbe3 WHIRLPOOL 70e4bed7b3814727f4b8b442cf320daf4876bd22ac6cba71bba43ee74545afc9db8e4e7cbe5b519677080d18100281413ed923023a5a012cdf5bf307e46296c5
 MISC metadata.xml 258 SHA256 52120853b9e41a94acc81ee215cba8b7abf5d602f6265f3913029e61b45ae5ed SHA512 77925fd954f148b0005992969b844e5b77738314a73c972698575e4f1629703a5ece9024d0a88b639d31ed230ab6b85ebcc7a60d0aacbdc60e4ba8eb125179ce WHIRLPOOL 3677e82b1a16724747827bfb9362ca501ffd980e8136de9f229baa96dc34ae417dc460657c1c1cf4e9340d9c4a66e028ac6cc0f76bd501f219afb018a77c20ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS9HzQACgkQVWmRsqeSphPSZACfek8Idl8cKpcJiDc6OicRnCPM
-Z74An1wSZgUJJrz9TcwoJCaEKoQDN6ny
-=2uN5
+iEYEAREIAAYFAlS9IcAACgkQVWmRsqeSphMfPACbB/TdfEPXzjgfSm6xevb0UuGR
+40YAnR4oh3f9Ib2Ue4LLp4wYIprWbK0+
+=s15G
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild
index 402d40d2905c..4a63c98cb5bc 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild,v 1.1 2015/01/19 15:13:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.5.0_rc1.ebuild,v 1.2 2015/01/19 15:24:46 jer Exp $
 
 EAPI="5"
 
@@ -38,8 +38,11 @@ RUBY_PATCHES=(
 )
 
 each_ruby_configure() {
+	rm ../../src/rrd_config.h || die
+	touch ../../src/rrd_config.h || die
+
 	${RUBY} extconf.rb \
-		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH '')" || die
+		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
 }
 
 each_ruby_compile() {
@@ -47,7 +50,9 @@ each_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -I. test.rb || die
+	if use graph; then
+		${RUBY} -I. test.rb || die
+	fi
 }
 
 all_ruby_install() {