Verify and potentially improve Python-related code, #316193

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

6 files changed, 35 insertions, 34 deletions

diff --git a/sci-electronics/kicad/ChangeLog b/sci-electronics/kicad/ChangeLog
index fdea499c216a..7001efa3c134 100644
--- a/sci-electronics/kicad/ChangeLog
+++ b/sci-electronics/kicad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/kicad
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.51 2010/10/01 20:39:57 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/ChangeLog,v 1.52 2010/12/23 08:46:59 jlec Exp $
+
+  23 Dec 2010; Justin Lecher <jlec@gentoo.org> kicad-20090320.1666-r2.ebuild,
+  kicad-20100314_p2456.ebuild, kicad-20100505_p2356.ebuild,
+  kicad-99999999.ebuild:
+  Verify and potentially improve Python-related code, #316193
 
   01 Oct 2010; Rafael G. Martins <rafaelmartins@gentoo.org> metadata.xml:
   Removed myself from metadata.xml
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index f410ed6d8ffb..9ec4d61e2cb2 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -13,20 +13,16 @@ DIST kicad-library-20100505_p2356.tar.xz 11803780 RMD160 5f1dc19432e64d4bbaaa2eb
 DIST kicad-sources-20090320-r1666.tar.lzma 2654855 RMD160 fb72894f36f022e28efc2ee9eaf02a35ab43b392 SHA1 5e603fd46d0080dfc0ee2d9a1b603367ab45fda0 SHA256 9e59c08d93051f57ec10defd7a6c0afa0feeee9d9a47e2aba82ead9dbeca5ad2
 DIST kicad-sources-20100314_p2456.tar.xz 4218420 RMD160 6bf9d81892af0552ba0e0811cd6325134dd74970 SHA1 8d2c901a6c099c9caf264a4d4852923d599e99ce SHA256 2f655dd8f673bc237f695d52b41dbb5a7f4d40d598b9c592d52265cd264b38ab
 DIST kicad-sources-20100505_p2356.tar.xz 4359004 RMD160 c94694a3377d4db71327bbd9ca5975a8baac5d23 SHA1 fb064d211a3fdb1cf983a6b454f4b7bf3da6e3be SHA256 873acb1b73587cddc2ba666aec12328e8710d745680cb6a74bc13c83c978abd2
-EBUILD kicad-20090320.1666-r2.ebuild 2507 RMD160 a94f18e8af103f92e9c40ae4248e2388723a9a6e SHA1 fbbfcb57718e05de1360094f6c170c69c689b3e6 SHA256 b1bcc91823a9789d9c49073d1063ea49785e0e122c6abce0c53206e00882a851
-EBUILD kicad-20100314_p2456.ebuild 3958 RMD160 63cf92b112efc79203be55d5a73addb418fe71ba SHA1 47f4d116ea7c6169184af11a64052db1c6f3d509 SHA256 b415d738d92a8fa7d99130d310fd9ac6801a6f301e705832a794a01de7eb1461
-EBUILD kicad-20100505_p2356.ebuild 3894 RMD160 0c8513f54f4905891232752bea07acc32a9da7ee SHA1 97b2259aaa55e314dc3a9fef3b0e9bfd1858ac42 SHA256 dbea4bc3d80370d518ce36b387599f4c938a414ab4e66a4cdb0a18a75e5e9c00
-EBUILD kicad-99999999.ebuild 3887 RMD160 3578d2f55fa87669919b05c574910d5c255e20bc SHA1 9d68bf4a989fc9097ef309cf957f46e4a32f88ee SHA256 3f8699ad726971807b308645d210ef635fb91a98733ba2e918e95b1807e0b852
-MISC ChangeLog 7870 RMD160 997ea6f98380000fe72072083986ef52929c320b SHA1 2f01666a74b1b0ecb3b67e0dc79db38f108fc168 SHA256 de7f30d0ea3a1e6e6e3cc495c0f02262c002baadb08c6f4532d4cb859f21cbd0
+EBUILD kicad-20090320.1666-r2.ebuild 2484 RMD160 a6cec5cadf8e7c96b569b60df1dd9fa19ef33c09 SHA1 8cfc98055b4d3a6243437a3c70aa26b2fafa4956 SHA256 f0ebe9ec356824476e94c1071ec902e5396a248bfe34b65640cb4d758ff9aa34
+EBUILD kicad-20100314_p2456.ebuild 3937 RMD160 806df3dcb09729832207b955d2aa89a13cf140b2 SHA1 232abdc10a05d99a2181c9af830ab1063880a6e1 SHA256 27309cad451d6e691938718a0375424f28cfe64aa43c62a501e9f2249699adcf
+EBUILD kicad-20100505_p2356.ebuild 3868 RMD160 bd8aa91113d57e1a41e30d0d1a733cb7046ed22c SHA1 75ecafd446f4e76ee015015b6283c3767b3607bd SHA256 50f9c89aa24cdbac34786f2c540f8aeee8df79fc845aa9c849612079efc7a9ad
+EBUILD kicad-99999999.ebuild 3864 RMD160 9e20a5a9fcc0086ca7ea26092f8c6a520f371959 SHA1 2dd4a6257258ebd15f63a63730762af6128d011d SHA256 bbee86caadc88099e6045d7bac17bdd7d2921523ccad588f70f9dc9de3a81690
+MISC ChangeLog 8087 RMD160 bb9a385abc3a006a1fd853971cb57b155f19dfd0 SHA1 c464ff9ac907da126d7d890de01fb2104c19356e SHA256 83007e62aadb6a2687abcdadce5d3342ee5fb831749333096d32a322fd44c814
 MISC metadata.xml 453 RMD160 423fcee9fbe9b007d694450f9c0fa5c16214d9b2 SHA1 802580798f1531bcc97384ca4955a29a4bbd7f4c SHA256 e1eeb975ea33d28547c6f86fafb04dc4925bab409b5a40722df89dc2eb847a1c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMpkbFAAoJEMmH5mwCk1NvXEsIAIS9KnbN9cy0x3t5MCzNh4aJ
-PhM7r0oYSY5EG0DgzQyeS9dHfOyc3QKCtG3bT40S2pSrGyKJkSdyjI3EMdJrv1Ty
-yevJ8VZJ99I+S0fA+7+OaFgoDUpORMXg+lowMYasb39iNgFh+8oZO0ZSaONBKwIT
-hKmbXhXXB2CC7gz+QRi9R4QntT3fbykepgt+IhyRrZs4N3VYfxxxMIKOovNA1IHw
-Ykfn3/HNgiQd/zIagVCJZLWcT8Lo6cINkCXYX9bHDzEmn+0oBc1YPYpARnUXAOoi
-lLBxaL2gpMdGm/ishFNi+bRNB5PcY5EHT+50VUEzghkKQlz1pQuYHYbXbpzz59k=
-=k/te
+iEYEARECAAYFAk0TDI4ACgkQgAnW8HDreRbAoACfTpx2YKouFU9keUEQME3D19O9
+ik8AoKdb6yfwe237r+gCSjBUuL5By0Yb
+=qDsh
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild b/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild
index 45f8da6a03b7..f21189ebf06c 100644
--- a/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild
+++ b/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild,v 1.4 2010/07/10 09:44:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20090320.1666-r2.ebuild,v 1.5 2010/12/23 08:46:59 jlec Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -11,7 +11,8 @@ MY_PV="$(get_major_version)-r$(get_after_major_version)"
 
 DESCRIPTION="Electronic Schematic and PCB design tools."
 HOMEPAGE="http://kicad.sourceforge.net"
-SRC_URI="http://dev.gentoo.org/~calchan/distfiles/${PN}-sources-${MY_PV}.tar.lzma
+SRC_URI="
+	http://dev.gentoo.org/~calchan/distfiles/${PN}-sources-${MY_PV}.tar.lzma
 	!minimal? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-library-${MY_PV}.tar.lzma )
 	doc? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-doc-${MY_PV}.tar.lzma )
 	examples? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-examples-${MY_PV}.tar.lzma )"
@@ -22,12 +23,11 @@ KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc debug examples minimal python"
 
 CDEPEND="x11-libs/wxGTK:2.8[X,opengl]
-	sys-libs/zlib"
+	sys-libs/zlib
+	dev-libs/boost[python?]"
 DEPEND="${CDEPEND}
-	|| ( app-arch/xz-utils app-arch/lzma-utils )
-	dev-libs/boost"
-RDEPEND="${CDEPEND}
-	python? ( dev-lang/python )"
+	|| ( app-arch/xz-utils app-arch/lzma-utils )"
+RDEPEND="${CDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/sci-electronics/kicad/kicad-20100314_p2456.ebuild b/sci-electronics/kicad/kicad-20100314_p2456.ebuild
index 316031f42acd..c7a1c3b3a89f 100644
--- a/sci-electronics/kicad/kicad-20100314_p2456.ebuild
+++ b/sci-electronics/kicad/kicad-20100314_p2456.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20100314_p2456.ebuild,v 1.1 2010/03/20 03:49:44 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20100314_p2456.ebuild,v 1.2 2010/12/23 08:46:59 jlec Exp $
 
 EAPI="3"
 WX_GTK_VER="2.8"
@@ -9,7 +9,8 @@ inherit cmake-utils wxwidgets fdo-mime gnome2-utils
 
 DESCRIPTION="Electronic Schematic and PCB design tools."
 HOMEPAGE="http://kicad.sourceforge.net"
-SRC_URI="http://dev.gentoo.org/~calchan/distfiles/${PN}-sources-${PV}.tar.xz
+SRC_URI="
+	http://dev.gentoo.org/~calchan/distfiles/${PN}-sources-${PV}.tar.xz
 	!minimal? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-library-${PV}.tar.xz )
 	doc? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-doc-${PV}.tar.xz )
 	examples? ( http://dev.gentoo.org/~calchan/distfiles/${PN}-examples-${PV}.tar.xz )"
@@ -22,13 +23,12 @@ IUSE="dev-doc doc debug examples minimal python"
 CDEPEND="x11-libs/wxGTK:2.8[X,opengl]"
 DEPEND="${CDEPEND}
 	>=dev-util/cmake-2.6.0
-	>=dev-libs/boost-1.40
+	>=dev-libs/boost-1.40[python?]
 	app-arch/xz-utils
 	dev-doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}
 	sys-libs/zlib
-	sci-electronics/electronics-menu
-	python? ( dev-lang/python )"
+	sci-electronics/electronics-menu"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/sci-electronics/kicad/kicad-20100505_p2356.ebuild b/sci-electronics/kicad/kicad-20100505_p2356.ebuild
index 77170b3c40fd..ea6ab6a5027c 100644
--- a/sci-electronics/kicad/kicad-20100505_p2356.ebuild
+++ b/sci-electronics/kicad/kicad-20100505_p2356.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20100505_p2356.ebuild,v 1.1 2010/10/01 17:02:43 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-20100505_p2356.ebuild,v 1.2 2010/12/23 08:46:59 jlec Exp $
 
 EAPI="3"
+
 WX_GTK_VER="2.8"
 
 inherit cmake-utils wxwidgets fdo-mime gnome2-utils
 
 DESCRIPTION="Electronic Schematic and PCB design tools."
 HOMEPAGE="http://kicad.sourceforge.net"
-SRC_URI="http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-sources-${PV}.tar.xz
+SRC_URI="
+	http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-sources-${PV}.tar.xz
 	!minimal? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-library-${PV}.tar.xz )
 	doc? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-doc-${PV}.tar.xz )
 	examples? ( http://dev.gentoo.org/~rafaelmartins/distfiles/${PN}-examples-${PV}.tar.xz )"
@@ -22,13 +24,12 @@ IUSE="dev-doc debug doc examples minimal python"
 CDEPEND="x11-libs/wxGTK:2.8[X,opengl]"
 DEPEND="${CDEPEND}
 	>=dev-util/cmake-2.6.0
-	>=dev-libs/boost-1.40
+	>=dev-libs/boost-1.40[python?]
 	app-arch/xz-utils
 	dev-doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}
 	sys-libs/zlib
-	sci-electronics/electronics-menu
-	python? ( dev-lang/python )"
+	sci-electronics/electronics-menu"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/sci-electronics/kicad/kicad-99999999.ebuild b/sci-electronics/kicad/kicad-99999999.ebuild
index 59ea93cf3417..5d82b5866fe8 100644
--- a/sci-electronics/kicad/kicad-99999999.ebuild
+++ b/sci-electronics/kicad/kicad-99999999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-99999999.ebuild,v 1.3 2010/03/20 03:49:44 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/kicad/kicad-99999999.ebuild,v 1.4 2010/12/23 08:46:59 jlec Exp $
 
 EAPI="2"
 WX_GTK_VER="2.8"
@@ -18,12 +18,11 @@ IUSE="dev-doc doc debug examples minimal python"
 CDEPEND="x11-libs/wxGTK:2.8[X,opengl]"
 DEPEND="${CDEPEND}
 	>=dev-util/cmake-2.6.0
-	>=dev-libs/boost-1.39
+	>=dev-libs/boost-1.39[python?]
 	dev-doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}
 	sys-libs/zlib
-	sci-electronics/electronics-menu
-	python? ( dev-lang/python )"
+	sci-electronics/electronics-menu"
 
 src_unpack() {
 	local svn_uri_base="https://kicad.svn.sourceforge.net/svnroot/kicad/trunk"