Verify and potentially improve Python-related code, #316193

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

5 files changed, 27 insertions, 22 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/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"