From: Tiziano Müller <dev-zero@gentoo.org>
Date: Sat, 30 Dec 2006 00:19:42 +0000 (+0000)
Subject: Added qscintilla dependency (bug #117945)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cd4c1a9e81711d001311429398ce5b0064a2723;p=gentoo.git

Added qscintilla dependency (bug #117945)
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index ca99f7696bc8..ef876722b271 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.39 2006/12/26 22:36:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.40 2006/12/30 00:19:42 dev-zero Exp $
+
+  30 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> eric-3.7.2-r1.ebuild,
+  eric-3.9.3.ebuild:
+  Added qscintilla dependency (bug #117945)
 
 *eric-3.9.3 (26 Dec 2006)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 482bc78b86c6..0afe95b3a1f9 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -6,18 +6,18 @@ DIST eric-i18n-fr-3.7.2.tar.gz 212608
 DIST eric-i18n-fr-3.9.3.tar.gz 243243 RMD160 b39cf34e1b2931314c4e11c7f95882d2293a27a5 SHA1 6607a2940a7f2a7bbecff6d3c76399bc3983ffc0 SHA256 249b68bb81008964b9a9fa598024b80cf07849828f41427ee706a070f3f75ec7
 DIST eric-i18n-ru-3.7.2.tar.gz 221137
 DIST eric-i18n-ru-3.9.3.tar.gz 251499 RMD160 df66844bf486052e6cfe02c7186e414d0ac9835c SHA1 6e46a7bd7c0adbc6d02f7f66270b80346db234cf SHA256 a28886d784c0f0d0a816e1bc82887bfc816a439a27754020e2fd8de94f5592d1
-EBUILD eric-3.7.2-r1.ebuild 1926 RMD160 ba0f54fb663935d7b4e2f673b91f82a723d4d344 SHA1 e23de75298efc729f2047a07ae3cf6a4c87b3500 SHA256 231e0faf9e8c93338f325d75f3a32ef2bf5152ec2a00443f522f0cc6ff7591c0
-MD5 e7e7f89a23d445a78c62fbb2f58a83b6 eric-3.7.2-r1.ebuild 1926
-RMD160 ba0f54fb663935d7b4e2f673b91f82a723d4d344 eric-3.7.2-r1.ebuild 1926
-SHA256 231e0faf9e8c93338f325d75f3a32ef2bf5152ec2a00443f522f0cc6ff7591c0 eric-3.7.2-r1.ebuild 1926
-EBUILD eric-3.9.3.ebuild 1487 RMD160 cdfccc3902bd40e9b5375699845a37d2400aa184 SHA1 b1fe0de62d971f7993481b17c8e446aaedde3af8 SHA256 cc202728696aedb7e3891d0d4b3f8ae65162dcc7f0fbb65ef1821c5bcd771438
-MD5 ff928335e5c445692e56881a15893cef eric-3.9.3.ebuild 1487
-RMD160 cdfccc3902bd40e9b5375699845a37d2400aa184 eric-3.9.3.ebuild 1487
-SHA256 cc202728696aedb7e3891d0d4b3f8ae65162dcc7f0fbb65ef1821c5bcd771438 eric-3.9.3.ebuild 1487
-MISC ChangeLog 4649 RMD160 85cdf3b3a377b3d1b065e54a06e0eb89c6f9599c SHA1 487981ebe2c8d8db36bbb83ce2c9378ff88e08e3 SHA256 f3b7cc807978cde8c606886b394791d3c87d097ede639cd7ee0de61f9e1b6ac6
-MD5 46ebadc3c0e389d2e2bfd6094fd811ec ChangeLog 4649
-RMD160 85cdf3b3a377b3d1b065e54a06e0eb89c6f9599c ChangeLog 4649
-SHA256 f3b7cc807978cde8c606886b394791d3c87d097ede639cd7ee0de61f9e1b6ac6 ChangeLog 4649
+EBUILD eric-3.7.2-r1.ebuild 1956 RMD160 5f3b1b946a16b9296fac9dc9d9f14184bfa91853 SHA1 2f5fd18b89d1ffc8c4e9a492d2e6337208ef40a7 SHA256 6931ae9add6a835c6f21671adc38790b938fca2fdb6437e0d7d1bd0ab8b9b6b9
+MD5 468617becc38106d25f025a37cba7516 eric-3.7.2-r1.ebuild 1956
+RMD160 5f3b1b946a16b9296fac9dc9d9f14184bfa91853 eric-3.7.2-r1.ebuild 1956
+SHA256 6931ae9add6a835c6f21671adc38790b938fca2fdb6437e0d7d1bd0ab8b9b6b9 eric-3.7.2-r1.ebuild 1956
+EBUILD eric-3.9.3.ebuild 1546 RMD160 b05a8abac3ce9f66a5eca2524e76c4202c51705d SHA1 9147e26d3f51cb9709e3ec5fa35c3b77503ffdaf SHA256 b02ee351e360557771d96ca1f130fd72face826f4a7445d065627ae7b9fa1802
+MD5 b5c9d277f74cef52365b00e95cfdabdc eric-3.9.3.ebuild 1546
+RMD160 b05a8abac3ce9f66a5eca2524e76c4202c51705d eric-3.9.3.ebuild 1546
+SHA256 b02ee351e360557771d96ca1f130fd72face826f4a7445d065627ae7b9fa1802 eric-3.9.3.ebuild 1546
+MISC ChangeLog 4790 RMD160 541ddf54966ba7e6f95584a2cda95cdbbf581550 SHA1 948f989c254fcd836876464b8fd4f9393ca139af SHA256 eadb70f69f1d735447cfc4bacbbd27921e6896e08f973c6d33534d5b7eee1017
+MD5 dc86c3a3dd83220e9192311c49ba4d3f ChangeLog 4790
+RMD160 541ddf54966ba7e6f95584a2cda95cdbbf581550 ChangeLog 4790
+SHA256 eadb70f69f1d735447cfc4bacbbd27921e6896e08f973c6d33534d5b7eee1017 ChangeLog 4790
 MISC metadata.xml 175 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 SHA1 a17b5760bd5ecd4be11ca0a15698fc6d3f3cc76e SHA256 815ada75b169c0b450bdb3429137e6edd42429656bb6369d42e89fd652bdf7c2
 MD5 56ad59727dbcdbf30e7ed8282d3913e5 metadata.xml 175
 RMD160 220bb3f470a506fe50312f4b69c2e5df90b7c282 metadata.xml 175
diff --git a/dev-util/eric/eric-3.7.2-r1.ebuild b/dev-util/eric/eric-3.7.2-r1.ebuild
index 66465c6c3b6a..d6fbc98dbcdf 100644
--- a/dev-util/eric/eric-3.7.2-r1.ebuild
+++ b/dev-util/eric/eric-3.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.7.2-r1.ebuild,v 1.5 2006/01/24 19:37:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.7.2-r1.ebuild,v 1.6 2006/12/30 00:19:42 dev-zero Exp $
 
 inherit python eutils
 
@@ -24,7 +24,8 @@ KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="idl"
 
 DEPEND=">=dev-python/PyQt-3.13
-	>=dev-python/pyxml-0.8.4"
+	>=dev-python/pyxml-0.8.4
+	>=dev-python/qscintilla-1.0"
 
 RDEPEND=">=dev-python/PyQt-3.13
 	>=dev-python/pyxml-0.8.4
diff --git a/dev-util/eric/eric-3.9.3.ebuild b/dev-util/eric/eric-3.9.3.ebuild
index 2c7187c05521..b8630324c381 100644
--- a/dev-util/eric/eric-3.9.3.ebuild
+++ b/dev-util/eric/eric-3.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.3.ebuild,v 1.1 2006/12/26 22:36:13 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.3.ebuild,v 1.2 2006/12/30 00:19:42 dev-zero Exp $
 
 inherit python eutils
 
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="idl"
 
 DEPEND=">=dev-python/PyQt-3.13
-	>=dev-python/pyxml-0.8.4"
-
+	>=dev-python/pyxml-0.8.4
+	>=dev-python/qscintilla-1.0"
 RDEPEND=">=dev-python/PyQt-3.13
 	>=dev-python/pyxml-0.8.4
 	idl? ( !sparc? ( >=net-misc/omniORB-4.0.3 ) )"
@@ -28,11 +28,11 @@ LANGS="de fr ru"
 python_version
 
 src_install() {
-	${python} install.py \
+	python install.py \
 		-b "${ROOT}usr/bin" \
 		-i "${D}" \
 		-d "${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages" \
-		-c
+		-c || die "python install.py failed"
 
 	dodoc HISTORY THANKS eric/README*
 	make_desktop_entry "eric3 --nosplash" \