Convert to python-single-r1. Bug #457686.

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

3 files changed, 36 insertions, 32 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index fd44f1d80c9d..49df436eeef2 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,9 @@
 # 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.271 2013/03/02 21:36:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.272 2013/03/10 18:06:53 mgorny Exp $
+
+  10 Mar 2013; Michał Górny <mgorny@gentoo.org> graphviz-2.28.0.ebuild:
+  Convert to python-single-r1. Bug #457686.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> graphviz-2.28.0.ebuild:
   Move Qt dependencies to the new category
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 3968eee28925..70817acc6646 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -10,25 +10,25 @@ 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 7442 SHA256 83762d6c5b4dcb626dafa949d0489b188a08b2d52fff2178a4d4f0fe7ed873b2 SHA512 4e21221859706e216b35f1bcb47ca1d008a1f4082a882d1c92d57d8c2aad588f5a6d904c651dac30886067499850e0a33de3b6ae9350deb350dea673047d0f85 WHIRLPOOL 69dc20a7601d81a34b19fa896a086bd7de81255a8e40d97a9f7d4903c52e7646248314ccf1278ecaee568de72aa9be4090693cb60b75ff9526ab0d4899290cc6
-MISC ChangeLog 40271 SHA256 22a7a697db89e8daf4a9d61fa8a56bcd187b604ed1cb59554f590f259b5af8a9 SHA512 b86a3133e4eb67aba782d0026171c644f8b3611d14b2fd7d60cde2af400e36676d6dd83837c425aec0162c79e0639898776d856b2a879eeafedf865ef2a4e519 WHIRLPOOL c526cce4efdc600130800bc1d6718e7946d86961afc8107ebd36c68e7a442b80e5d2dccd1fccdc384f17fe40a770496400deba533c11c7431a366c48dc15b73e
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMnDRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88YbYP+wRBp089UP7YwagCm3aim89C
-Low4hubly71G0Z4rr0VcrfmU4d6ocr+yOmAmu5ONubyZK+dHQ8FOyWMz93nuZGaU
-0rLOP7SOUmzEOOOBrN+yj8ZslEMdvHZNphtAovWi+5UOGjgA5zH2P8XsfUEYT5AK
-JVn7SElPVy0biYIMMmTZfmxcQEmL8CzAIyOX/YNG05Sp5ox2KRHAZIWGRxwVOcbT
-BMEYLQxP3zTPNV0LdqZLDqeRDWK4CVHX7olk1Ms1X38t9ebibP0IPmb2qof/Rok7
-qpCebVyQanTctX6MhEhmwFXbjG9D9z2Ou+pPUQEUCZnl4Qhu3YJnDlWVkT/Qk5PE
-k8kQ0bCMR1+8lOrLm2As++Ea7YJ/Ao/1wrWktkbwvhXXdq5vLHCb24ibDTMB9fPA
-aUBj9CvzzxxKpKLK09vAh4/nPEEq0yJ9U5lQjlZFL7GaDXGZs1iyTEBihDPCC3D0
-8SiUous5iL57uU+sXDToOUn/K5jVBwodBkJJvgz2N2EatBBjUxYeQ2sItzrzjZFT
-nxalrub8hIl21Q9ZYoWoZo9mncRILgor3ip82FiMIvCPN8Eld/8mDoZHLCJD+duO
-ggmcdlQmVuN9EnrUJrUsA5SpWxGMYZN1t8J9eOQKgx7L7Ta7NCJCWXwgS1Ik7paK
-7OtS0t9OPBFq4o1JVr1o
-=92tf
+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+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index 9ddd4df4ce52..b415ebc7ed11 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.0.ebuild
@@ -1,11 +1,12 @@
 # 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.17 2013/03/02 21:36:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.18 2013/03/10 18:06:53 mgorny Exp $
 
-EAPI=4
-PYTHON_DEPEND="python? 2"
+EAPI=5
 
-inherit eutils autotools multilib python flag-o-matic
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit autotools eutils flag-o-matic multilib python-single-r1
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="http://www.graphviz.org/"
@@ -47,6 +48,7 @@ RDEPEND="
 	gtk?	( x11-libs/gtk+:2 )
 	gts?	( sci-libs/gts )
 	lasi?	( media-libs/lasi )
+	python?	( ${PYTHON_DEPS} )
 	qt4?	(
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
@@ -60,7 +62,10 @@ DEPEND="${RDEPEND}
 	java?	( dev-lang/swig )
 	nls?	( >=sys-devel/gettext-0.14.5 )
 	perl?	( dev-lang/swig )
-	python?	( dev-lang/swig )
+	python?	(
+		dev-lang/swig
+		${PYTHON_DEPS}
+	)
 	ruby?	( dev-lang/swig )
 	tcl?	( dev-lang/swig )"
 REQUIRED_USE="!cairo? ( !X !gtk !postscript !lasi )"
@@ -125,10 +130,7 @@ REQUIRED_USE="!cairo? ( !X !gtk !postscript !lasi )"
 #   with flags enabled at configure time
 
 pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
+	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -237,15 +239,14 @@ src_install() {
 	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 
 	dodoc AUTHORS ChangeLog NEWS README
+
+	use python && python_optimize \
+		"${D}$(python_get_sitedir)" \
+		"${D}/usr/$(get_libdir)/graphviz/python"
 }
 
 pkg_postinst() {
 	# This actually works if --enable-ltdl is passed
 	# to configure
 	dot -c
-	use python && python_mod_optimize gv.py
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup gv.py
 }