media-gfx/graphviz: Fix usage of python-r1.eclass

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 27 insertions, 33 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 49df436eeef2..71f1d754f3cb 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.272 2013/03/10 18:06:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.273 2013/06/30 15:35:56 jlec Exp $
+
+  30 Jun 2013; Justin Lecher <jlec@gentoo.org> graphviz-2.28.0.ebuild,
+  metadata.xml:
+  Fix usage of python-r1.eclass
 
   10 Mar 2013; Michał Górny <mgorny@gentoo.org> graphviz-2.28.0.ebuild:
   Convert to python-single-r1. Bug #457686.
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 70817acc6646..c99f194f833b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3 SHA512 c3e3c155a36b3cd2910efe2fa9c69f51561a32686b51b0ce746fbebaadd044ce924e0c3c7909809b7383392c2601940f7a995064861d8f9af3875fa3e9f3b728 WHIRLPOOL 618ea0569731e1b89c0fca533c0c1ece8d79550dec9522efe86425e607bafa58bc52e4c5dadf5bb270bb0c9c16088b43924ff425453c6849030342d5d0c725fa
 AUX graphviz-2.26.3-libtool.patch 557 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46 SHA512 89f94085fde3d496b64f903c2c1bc70b8714a89142a7ae4135aed25545e1a7cb3189617ca38606034bfa3946b089baf2917b08aed5a383e1ab62d75749a9f0c9 WHIRLPOOL 5987a50101800cc0c5db1e074628211f3ba94c220f0d457193b37c410615aa3d2ead98053435a000927bc5c90e3d7e1edda0f3b42e14abad3b102ec94f92c2f4
@@ -10,25 +10,13 @@ DIST graphviz-2.26.3.tar.gz 17092429 SHA256 f410996e69b1095237c2128deae5fc7b6ce9
 DIST graphviz-2.28.0.tar.gz 19620087 SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 SHA512 d6dbcd99487e382f9ca83ef63a3ff3fbe9208f6d3969cf03d15b8944dfb58c7fefe1bf96939e3e69019ae9a562619c6d64ad24e390c408b7271caade443233e0 WHIRLPOOL f0274567661f16993a107f45685f0716e64ea493e064efd2e72a4680120cbee8989fb0eab6429d432d18106d42bfc37d4113816efb14e7888d00014b83dea72a
 EBUILD graphviz-2.26.3-r3.ebuild 6138 SHA256 7d4e109b7396d65b077cea80f620e3e1c7c30ce2562e016ad8e38dcba6679df6 SHA512 76b4197f5060fdd82a978bda50b8bafe1c979e17a70ab09ad115edf13cc91525d3067cfab10bfc65bab1fcd5a66fc52559b647301a68acd106c2d4bed7a18ffc WHIRLPOOL 95c95c225d647c7f4da7df2ff5a101591e64babb52ba291dc4a21520dcfe3064975f5d3e07cb9ec14c4fe3800c6ad47e5cbe6ab5808fc63dc6ff7fd2b3ce9b39
 EBUILD graphviz-2.26.3-r4.ebuild 6364 SHA256 2a66f61cb6e04ba701e8968c53e7ecab12f84746548c3847859e183b013ce229 SHA512 64d3c7aee8401c00d49bc905acf78f8072c6ed139fd93d8f99ba72976cd4cc5807a8b8ee8a0540772af971d6048972f8557e7ad6465bf5cb033da03861f6d752 WHIRLPOOL 8aa92086f0f851a5bf560855a36745e2a03281b3b559352d3de389fd1b1708b530bb67e907161c1d88cc9653d7e542d8bd3a9094609608b945bec79144f5ef4b
-EBUILD graphviz-2.28.0.ebuild 7489 SHA256 2004551268e5db6467ef9a5e0c7dcf62dc7d82c3cd2e75014742c5990cfbff55 SHA512 93c259e1214736b29dc17f302b11e50f343e1ee688aee377f96200f29bbd3a376dd2aa96b26c6ef8e43ec439aaa3ceda8f6c4aaeccc3f764048ba0f237566d33 WHIRLPOOL 69f225a6c6ba3d9bf194e333244fb08288becda75caa76f94f76a0f0a68253d857d8905d9054c7438a48e38aa5b2fa35caafe418bde7d3f50f9e0a9cd273dc5d
-MISC ChangeLog 40388 SHA256 9ca36bdba4adafa9fbf9fbf26497773145d2b828f8f89c6a11fab1e61fc86921 SHA512 096aa1b1999b13dbf58e611dd1f1c44f6d47ea4a35cf156a77172ead647ddb583fdc6b446a8dcbba704d1a324416222b91b253f7b86ae36826101917ee85e793 WHIRLPOOL 6485aae06f97ab3e04e2dcf3f4cb81b45877ed2e06db7e1d51542160da9b5c1f7dab58d7c2379b5e9a366fbbe65c834a5394004dba283790f087a19fae462852
-MISC metadata.xml 2063 SHA256 5cd524c8d90855401461ca66c7624ba2f42e02dd74efb9d8c89a1504ba87d46e SHA512 b84707f180ecfab4a976509c7f15edb8016d3149cd3b50c6b5465d576515c463e05feda616ddd860e47bb78f9024c9eb9f5ddc21c375a0598eb2e379e7149db5 WHIRLPOOL afdfd7a8851296eb9b8f51987c7ed43f604d8876be97df27fc569ce1ad55fef52b643b599a0ca49a0b5abc16afc0cca654ed8a39702b88fcfa6ecca7e6fa851e
+EBUILD graphviz-2.28.0.ebuild 7525 SHA256 9343bf254b4c481f844f2c4eea2c94e486d914bc4de1b88e951e204e20816926 SHA512 3a3e3d295d896fcf8988ffa367634fd7c4a1f6e4957fd18372934adf90497364b81d057b6c47ac0530ddb7c3780c24ca8548ce558b07da4c53ae4754580c3549 WHIRLPOOL a731911ac7e2c42b30b48f263c3442732a97266d83d8d52d084e314be2296cd81c09881fabdbe09eaad2a25f73bf1089e2cd9999e8a0cacad4ebe9c4f1135c96
+MISC ChangeLog 40506 SHA256 a56bb47024fbc824826fb8ba447fcdfa48fd38564486b701d16b1c15f0b1314d SHA512 db3dd0ee215af53c22066a81abca2c5339d12ff600f9073d4ea17840acb16d4db814eb44e0077a97830bbea5ba2f0851f9654fc573e61cb60fd5fdf1f3845371 WHIRLPOOL f7cfa0edbd22470704c106f1396b62faefecb3fe2398f8e47c4f2e47a023336bd88fe4d4919721781ae7d326fc545d696a50f62bbe0981a0caa37f927f706c45
+MISC metadata.xml 2079 SHA256 b8725c6d6323293e6f09b217ebfaa23f040b427ee619451599afa96d49a5c975 SHA512 543648db8af3a129c8efc22c3e9caddde3c26210f032afae5743071b63356d32bb11e6509e5440cca241c99463b2055609385ac1159f456b5276c68a538b6ed9 WHIRLPOOL 08989446195807c0b69d07ea722ed2c7683d61995a7130bd7a79772f2addecada36c6bdbcea3f68c1cd8843b50596a4a8a09dfba3e1ac40d1b49226f28ff8a0b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRPMvlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDBxQQAImCu5NpvkX/HJGnIRmzDbPo
-pgpEl1h0lIRKlxL199H6PT6hE/So1scMkGle3vtXLDDiCfCBTug5marx9hUsV1z2
-glRxp1wmVvXdZfqk3Psnmmomkes/mGQGIxuUBDs65bBDlXyKx1xNhoe4PUSNQFmA
-NUWLpf5MogTAu7DDOQ7++zZdKdJ8LiCY+NT3EP1+o7HNwXdQPKrQwCUwMuQ0MghB
-6D7XsiCTZn2bwH6L2QoRdVTHXZIqjqQV000kdKkBv3AzsST/V8+gOCFL/7/AwRjC
-u6ZUo+nHHSBVDMtXId9akPYMCKKsvvODFe+ZUEGElK/yb7Bf225AAE5bTZw6upf9
-5uGSaHCbDq++goTT4/hvs7VnfYqcKNWZoUZ9nF3xXpAqUgIiBWtSE2aCblX1W0sR
-d1hVTbmQ4uVlDkmGJFfbwnpFCqIlnQzlmNbeZCQsP0KoleYB69omUd5MTwLMYA5/
-DEdFX6x1586GiOPUKzn6pumXt5VYZHTCC3CVTmfaCbsF3aETM41rD9sOXfC2BkZM
-mgUXaOmjeD2k0q7897MUfeBTUHAmlqbPKuqGIxGxbEOKzYgHP7RXzTHDjPezSMew
-DvBxEbw+Qwe/qweQGTG9QcaTeKAY0eGWck/HyBhcXju7rn0Owjap4MEtfY2tPc93
-D6mUTjCZD+MsBUZVPjz2
-=mC8+
+iEYEAREKAAYFAlHQUF0ACgkQgAnW8HDreRbZAwCdHvCaBROm/DFw2CfJwReAcjBw
+EMUAniuw2oTAS1s9ojnMMrIBrbEzgPbk
+=H28a
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index b415ebc7ed11..418f6b27ea42 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.0.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/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.18 2013/03/10 18:06:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.19 2013/06/30 15:35:56 jlec Exp $
 
 EAPI=5
 
@@ -68,7 +68,9 @@ DEPEND="${RDEPEND}
 	)
 	ruby?	( dev-lang/swig )
 	tcl?	( dev-lang/swig )"
-REQUIRED_USE="!cairo? ( !X !gtk !postscript !lasi )"
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Dependency description / Maintainer-Info:
 
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 2befaca62e84..b7ac441985d6 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
-	<longdescription>
+  <herd>graphics</herd>
+  <longdescription>
 graphviz  is a set of graph drawing tools for Unix or MS-Windows 
 (win32), including a web service interface (webdot). Source code and 
 binary executables for common platforms are available. Graph drawing 
@@ -28,18 +28,18 @@ documents
     * you would like to discover patterns and communities of interest in 
 a database of telephone calls or e-mail messages
 </longdescription>
-	<use>
-		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
-		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
-		<flag name="gts">Enables support for gts</flag>
-		<flag name="lasi">
+  <use>
+    <flag name="devil">Enables DevIL output plugin -Tdevil</flag>
+    <flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
+    <flag name="gts">Enables support for gts</flag>
+    <flag name="lasi">
 		Enables PostScript output via <pkg>media-libs/lasi</pkg>, for 
 		plugin -Tlasi (needs cairo)
 	</flag>
-		<flag name="qt4">Builds gvedit front-end</flag>
-		<flag name="X">
+    <flag name="qt4">Builds gvedit front-end</flag>
+    <flag name="X">
 		Builds lefty front-end, builds plugin -Txlib, and enables support
 		for x11 in various other modules (needs cairo)
 	</flag>
-	</use>
+  </use>
 </pkgmetadata>