Add forgotten PYTHON_DEPS, bug #493802 by Maxim Kammerer

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 12 insertions, 83 deletions

diff --git a/dev-libs/gobject-introspection/ChangeLog b/dev-libs/gobject-introspection/ChangeLog
index fec12c18b3d7..524bcb7e8b4b 100644
--- a/dev-libs/gobject-introspection/ChangeLog
+++ b/dev-libs/gobject-introspection/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/gobject-introspection
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.100 2013/12/08 17:59:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/ChangeLog,v 1.101 2013/12/10 21:30:13 pacho Exp $
+
+  10 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  -gobject-introspection-1.36.0.ebuild, gobject-introspection-1.36.0-r1.ebuild:
+  Add forgotten PYTHON_DEPS, bug #493802 by Maxim Kammerer
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   gobject-introspection-1.36.0-r1.ebuild:
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 40ea396f3e0f..0a1dc657e347 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -8,14 +8,13 @@ DIST gobject-introspection-1.34.2.tar.xz 1088768 SHA256 bc7948a35ce2218922dfb080
 DIST gobject-introspection-1.36.0.tar.xz 1201108 SHA256 e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383 SHA512 5c6d17851ac7d1372abdc6a9ced44d1c2313b098e6fdfbe7cba78bff66032923fccddb58913753f46e1d7fea09536bb057ea2ff7203d5f4f7540badd830eaa83 WHIRLPOOL 1f31a314a9056f2f452e59808ba143f5e387f1c7c82ddb0e3f20295592850995f602a2a82b36602b7089cddb192896d918db02190e411710d8806dbdebc77f4c
 EBUILD gobject-introspection-1.32.1.ebuild 3098 SHA256 d78ff5d29e8f980ae289d059c31a10e25e920c31ec4d4b3716eac4d03269b95b SHA512 0d5aeec20f0988f88aeca439ac6557bb7afa6fa482edf09dae4509e42048b6c1027d380a48f05620d8ea54a382ae41e38f7384874e61de26e151767e0886f022 WHIRLPOOL 517e67a21896915481e814e2afd6138619b92e3ab02408de68aaea833b2543b940e43de1e5dd2d647d4fd2c3f10a63533e8a8f07020bef78d8f5833472323349
 EBUILD gobject-introspection-1.34.2-r1.ebuild 2700 SHA256 1bb99ae5a68f48a79366dbd09fcd272c747916f4ad8cbcd1f5612f868cdcbc30 SHA512 75b5aa0898ecf3ab9de12800093044f4e1fb00233e2e9a6fc4da9385080713d89216aa5270929c28cfd10d95f6f6147fbd8fbd4f5b70be5404dfc146cc6c4185 WHIRLPOOL 08ae09d49007907a182c4bf851411a4183dd2afef2934d6d5555d1e6d122ede7796ca16d5097ecea41eb26a1e08e73c17daa755298a06adb689ce8f81ed131ad
-EBUILD gobject-introspection-1.36.0-r1.ebuild 2395 SHA256 5be23214f8326efa9ae4a4f95e2c5b191efa48d770a9b547b0c87ae725313adc SHA512 5e28504fa7218fe71eb8b5583604bae7309e4ec7ed740b3cf4022d53f404ebde9646c1908bd4a908a970f47824df9c6175222cc202067626fae6bf8c4834eb80 WHIRLPOOL b05ce1090a3f2f6acf635e5f345bbe5156dfcee6b917c3fa8680062937d136dea64924b8ee9606fbacacdc521cc78aa77054c474027811de3b692dbee7fded16
-EBUILD gobject-introspection-1.36.0.ebuild 2240 SHA256 4ddd061a7679dafee6da1fbe725ddb86b54d3beb065f5cd6354012f664625506 SHA512 9be10ce058ff3b08a4c17835425b305d479d4bddeba43a8ff31920e7483c9eaed034be8800047c8c81f96b9d1ea59be0fc77e4a65b3df25342951ded9431f89b WHIRLPOOL cf669f5290f5b9a84d25ab703e59d3da13b75388204cb807af145f35fc82cf0ab1f3fb40864783a9ed786dc62abb38ae2256ad96dcc146edd94c8f75463c5dad
-MISC ChangeLog 18194 SHA256 44f38414c9383fb36e3aefd460c8c03f9b22bbeaaf0d445144a333ffea6ccb16 SHA512 e5175a5946416f2529f84d5fea5153fc817a8f43e0e0633aa1a04ccb5d4266e6af433bbe3c1c654331e12b79e94439d5a65c42dd8c3416fd95f0ef723807d332 WHIRLPOOL 7cc7aa0d631ce0801cf74e5c56d374440db11e3edc4b795dac91410904b354ff35f7e05253ac42049f542ed328a54d894d848b64d7c6bab6f342e7b058bdf5e0
+EBUILD gobject-introspection-1.36.0-r1.ebuild 2411 SHA256 fb0eb4c39857179c255dc41df503dabb8ecc316fa5e327026a65d0e072fb9dad SHA512 914e614a869dc53492ac8b17485d30c115e9f63dd50707d4d8b89ac7c42569e87f4008e2a321d264fb63eafbf5904acfec9c438cdf9374b4f7ef194b4c43bd05 WHIRLPOOL 97d6d9c29a00b81edee9adeb58afb28cc37ad2091d9b005b077a7630e6c16f8172481201a3916d42518a04053215b2c76d6d05b317ef3bef8bf96b44a30d4684
+MISC ChangeLog 18380 SHA256 fe5a681c806c3b29b26885c57de33583c025433bc1f088b5a1ec1b0e19962842 SHA512 1f183fbc32e40bb49f2e09f7f22f12cad1630d32678f371ea4fb1e97c5b89112977e9b50fefcf49a2bb3246d248102712a3d104391c4607b3790af80cd76e2e3 WHIRLPOOL 42f8e18b75005d7654cf812e9552891ce00d43df2396c95138e2391caeb86d1bdc4a47f32a7450f33028351a2b3df7d6e8f38c8e93bc4b24b5d6269b39f4c1ed
 MISC metadata.xml 276 SHA256 64896ff5d165a9a750f5e13dfb6ae8ab203c9c5ecf1fe95f5828dca418652cb3 SHA512 69c30c46828ec7f02fde73973d64e48042242a42f7c354fe37297df0653552eed04fac21cabbe385efa9e0d348f70e718afdf328ebdcd203a109761b4b89f99e WHIRLPOOL c527df37fc6657961892dd27b52b8597a54f11f9da01e3acbe7cad6ebaaa6d41364e49bb1635ab5c5e354a8a56e11eae49eff1f394be934cda9322204de4e282
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKks5sACgkQCaWpQKGI+9RuYACfX36XbRW8RQRC1iHuoqSk+6t6
-rD8Anj004mQoj56TuPMR4YyyzBLWUxKe
-=tnEZ
+iEYEAREIAAYFAlKnh+YACgkQCaWpQKGI+9RUKQCfUKKp+Qyssp6zFPMgW7juU8hu
+T4UAn1lkKfavumc2XV8GIS2KbJJCIaTt
+=taKK
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild
index 96202ba3ef67..18f7b10ab64b 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.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/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild,v 1.3 2013/12/08 17:59:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0-r1.ebuild,v 1.4 2013/12/10 21:30:13 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -28,6 +28,7 @@ RDEPEND="
 	doctool? ( dev-python/mako )
 	virtual/libffi:=
 	!<dev-lang/vala-0.20.0
+	${PYTHON_DEPS}
 "
 # Wants real bison, not virtual/yacc
 DEPEND="${RDEPEND}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild
deleted file mode 100644
index 98a73b90af6f..000000000000
--- a/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.5 2013/07/27 17:12:33 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="Introspection infrastructure for generating gobject library bindings for various languages"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="LGPL-2+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="cairo doctool test"
-REQUIRED_USE="test? ( cairo )"
-
-RDEPEND="
-	>=dev-libs/gobject-introspection-common-${PV}
-	>=dev-libs/glib-2.36:2
-	doctool? ( dev-python/mako )
-	virtual/libffi:=
-	!<dev-lang/vala-0.20.0
-"
-# Wants real bison, not virtual/yacc
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-# PDEPEND to avoid circular dependencies, bug #391213
-PDEPEND="cairo? ( x11-libs/cairo[glib] )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# To prevent crosscompiling problems, bug #414105
-	CC=$(tc-getCC)
-
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog NEWS README TODO"
-	gnome2_src_prepare
-
-	# avoid GNU-isms
-	sed -i -e 's/\(if test .* \)==/\1=/' configure || die
-
-	if ! has_version "x11-libs/cairo[glib]"; then
-		# Bug #391213: enable cairo-gobject support even if it's not installed
-		# We only PDEPEND on cairo to avoid circular dependencies
-		export CAIRO_LIBS="-lcairo -lcairo-gobject"
-		export CAIRO_CFLAGS="-I${EPREFIX}/usr/include/cairo"
-	fi
-}
-src_configure(){
-	gnome2_src_configure \
-		--disable-static \
-		YACC=$(type -p yacc) \
-		$(use_with cairo) \
-		$(use_enable doctool)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Prevent collision with gobject-introspection-common
-	rm -v "${ED}"usr/share/aclocal/introspection.m4 \
-		"${ED}"usr/share/gobject-introspection-1.0/Makefile.introspection || die
-	rmdir "${ED}"usr/share/aclocal || die
-}