Add USE=graph by Bruno (bug #459472).

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

4 files changed, 32 insertions, 27 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 708472756908..92fedecdbcf5 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.243 2013/03/06 04:46:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.244 2013/03/06 16:06:11 jer Exp $
+
+  06 Mar 2013; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.7-r2.ebuild:
+  Add USE=graph by Bruno (bug #459472).
 
 *rrdtool-1.4.7-r2 (06 Mar 2013)
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index dc7baec013af..3cb6448ca58d 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -13,17 +13,13 @@ DIST rrdtool-1.4.7.tar.gz 1349040 SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04
 EBUILD rrdtool-1.4.5-r1.ebuild 3644 SHA256 fcee367f1504f7a4ffaccf700b2d80b050392090d4e4e4b0ff667efd878783b7 SHA512 2fc49d1fd906b89aae97b624ad5720852a718d1c660afaa7eb3b6377ecbbad4fcd2505c636278ec0d9eef34f2e66a2ca41edb7d4d9e657cf615d75ef2f28c8b6 WHIRLPOOL 419db53c8cd9ecc491828195dd6f24160dd968abc94f4c93dc8241872e82a69740e2bfdf75fde0741e86d6ea339fb534b4f4f1a17058389599b7949d3b2a9e48
 EBUILD rrdtool-1.4.5-r2.ebuild 3716 SHA256 1d915c9abdbea167ee6536f6af4b122e91e549822326dcc7daf49bcc5d0c96f7 SHA512 83ae6c4ea7c7e49dbb760bf805bdf93cca2997175c1b205dc93c51d46e1661d7824b11008ced793c7ffdf980b7ac2bbf134bdf3a87e9e489e3ffafffe55b7b7a WHIRLPOOL 1a76003bbdff97f3305b5efe6495119356bcec0213762f4a09b9b9d50e1f563092a74032655f1834463a8c0deefb2f1d83e2de9c618f57d06f437fe38f2b1c29
 EBUILD rrdtool-1.4.7-r1.ebuild 4099 SHA256 b1a16d573962fff1c937c4644c058f22aba1eaf1d185388dd085cc71d0a03735 SHA512 9bfe3692680776f8044facf61befae50ccfca19636de6281bf77256a95f40d0df6c0bff86346b57a2523aac4c881258b9f7fd47c95333619bab13aa5144df870 WHIRLPOOL bbb0a8f808df44d5702417deed622d41a8ae42505564360786e3cf7a926144d7d766763a68e7d98495272de1c49168689b186697fc05252fe16ac5b27bf11442
-EBUILD rrdtool-1.4.7-r2.ebuild 4144 SHA256 c1fc93ce6202fe2ebf828512c0e864ca2d373960ff15d8e829b4bfbbe92c865d SHA512 a1aeafa715b4e5ec919c0bb3a3f669cdd60f322cb0e783f937c98f2991d7906ca99844bab3fadf54d0c8b6a50236b91b522859eae701eb65c3e99bc13cfe0716 WHIRLPOOL 68adf83888b70d5918414763da0da08cf6675c66a25900510fe2eb8d4d36ca6303abfade839840ca157da70c3624dd075a3fcb05033fd6c280f16f0af56d5532
-MISC ChangeLog 36491 SHA256 2f8963a3c711872060fb6ab32a9921c4ba7229643f1b804551ab72d3a52301c7 SHA512 ed92f279b91177acb0f80791fc473864cb8b407226e66cdffe5eec2bc0331a3073cae66fa1480ad5a6b3af1041ee082a5e7ab87496400adb94f02cd469e61278 WHIRLPOOL 86e3657eba97a975277bd52e6bd44fb644036e69118a2cba30d996b10fd4731510942c6e1279b03cca7109d0217c840a2a17dc0c8a6a4c116059c5550c242aee
-MISC metadata.xml 314 SHA256 e08a5acfe66fb546b0ea85e9598baca57ff3979094399e1c60507a718a5151c5 SHA512 2eb70d707167c60e86ff9e13139a57858d0f6382413434d877f11b63c47d1bce38da67165fbb0b9754840e7661d733ef40c7c0112f5b974d245f8c97d5082f0d WHIRLPOOL b026e9b4394948337e3cddb988419df464bae13b8d620b493599f58dca6491eed7e57e3fbc8fdf710847f7d2ecaa6858a2614d4bf1f7839402fe9b13501e57c6
+EBUILD rrdtool-1.4.7-r2.ebuild 4198 SHA256 def0420e8e84ee21ccc91cd3627e263345fc83c9a211ed0e10418a172b0b324b SHA512 b88b278a1eec4aae44a503631037d17e236d527ba384ba999a09d00cd447aec941d2459429f1e88793185bd7b16d3f8ceedba36ce55d56814d4eb112bb98f9c2 WHIRLPOOL e7b4919eae27d2a687e87e941f293e4e636efecb3db5a7f97715f15a0ac4a116c4d593f2db9f781466d08e1ba656df888ab777813a58218d6b2bdcc6e07f43a9
+MISC ChangeLog 36599 SHA256 96b6bb5ee5807655cc1ccdad63c8a96e3a043e7b95a023195bc1da90db688b23 SHA512 6281b0cfe03d27d534ce5c063c8a1a701eb929b06992935c456c1cde7859ab3a63d923cfda8ac9f461d9fc894cac4b0a905428f00d03314d50198d2270476525 WHIRLPOOL 92cfe7379600dc373649083cc0f503b4ca34fbc83046a21ffa0082afe325e65d4970911bf8e7b7883ad83f78dca8d76a127a90a1efad2de497a4beb9bec17582
+MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRNsr1AAoJECo/aRed9267XCIIAMLTUz1Rz+R51sfvUTJYiUHo
-IHkaFkd+igCff6D2SaaDNt+FCWKEnScsEyfKDrtCgmFaNsLk06jcoA12UMBIcyCj
-7RA11+eaXmkr6dbqFXnEKp7AQWoB0h6oQHUjyUJmG8JqxjCMW1vp0BYkkdE2IudD
-PQiMl2Md42cX4Aoq00kGv6B4NhyLqXedEbptaVnGREcii7FdJ1+PvEevuCW7DDb5
-9BE4ZUwJP/hi8Mbz+hJT+0ITN+CaZj1pWo3TKSEnbBxXuB5PQgvMgw0bRPeybBpb
-ebJtX7/T3yWbenxn7d00zdivSR6nbGQLRzuX4lXgTT5uQiEtRMHL11/BWnaixO0=
-=qX6O
+iEYEAREIAAYFAlE3aXUACgkQVWmRsqeSphPRCgCdHeq1yg+XkSyd6Mf7Leljha4g
+edsAnjxv2azkF1GZcVHrRAys9xlG5zqM
+=Zvf6
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index af4202a28de3..36e53733b282 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -5,5 +5,6 @@
   <longdescription>A system to store and display time-series data</longdescription>
   <use>
     <flag name='rrdcgi'>Build rrdcgi support</flag>
+    <flag name='graph'>Enable support for graphing functions</flag>
   </use>
 </pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild
index f66f77396fbe..fd540d010d55 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild,v 1.1 2013/03/06 04:46:44 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild,v 1.2 2013/03/06 16:06:11 jer Exp $
 
 EAPI="5"
 
@@ -15,26 +15,30 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc lua perl python ruby rrdcgi tcl tcpd"
+IUSE="dbi doc +graph lua perl python ruby rrdcgi tcl tcpd"
 
 # This versions are minimal versions upstream tested with.
 RDEPEND="
-	>=media-libs/libpng-1.5.10
-	>=dev-libs/libxml2-2.7.8
-	>=x11-libs/cairo-1.10.2[svg]
 	>=dev-libs/glib-2.28.7
-	>=x11-libs/pango-1.28
+	>=dev-libs/libxml2-2.7.8
+	dbi? ( dev-db/libdbi )
+	graph? (
+		>=media-libs/libpng-1.5.10
+		>=x11-libs/cairo-1.10.2[svg]
+		>=x11-libs/pango-1.28
+	)
 	lua? ( dev-lang/lua[deprecated] )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
 	tcl? ( dev-lang/tcl )
 	tcpd? ( sys-apps/tcp-wrappers )
-	dbi? ( dev-db/libdbi )"
+"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	virtual/awk"
+	virtual/awk
+"
 
 python_compile() {
 	cd bindings/python || die 'can not enter to python bindings directory'
@@ -83,18 +87,19 @@ src_configure() {
 	fi
 
 	econf \
-		--disable-static \
-		$(use_enable rrdcgi) \
-		$(use_enable lua) \
+		$(use_enable graph rrd_graph) \
 		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
+		$(use_enable lua) \
 		$(use_enable perl perl-site-install) \
-		--with-perl-options=INSTALLDIRS=vendor \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable rrdcgi) \
+		$(use_enable ruby ruby-site-install) \
+		$(use_enable ruby) \
 		$(use_enable tcl) \
 		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python) \
+		--disable-static \
+		--with-perl-options=INSTALLDIRS=vendor \
 		${myconf[@]}
 }