diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-05-22 08:10:00 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-05-22 08:10:00 +0000 |
| commit | 38a6138625901875833e75ea7861cdb880030bbb (patch) | |
| tree | 9531aafb302c99140e6a61779f5c28a13409d24e /dev-util/eric | |
| parent | Version bump. (diff) | |
| download | gentoo-2-38a6138625901875833e75ea7861cdb880030bbb.tar.gz gentoo-2-38a6138625901875833e75ea7861cdb880030bbb.tar.bz2 gentoo-2-38a6138625901875833e75ea7861cdb880030bbb.zip | |
Use updated patch by Alejandro Dubrovsky <alito@organicrobot.com> to solve bug #470656 (patch fails to apply).
(Portage version: 2.1.12.1/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'dev-util/eric')
| -rw-r--r-- | dev-util/eric/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/eric/eric-4.5.10.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/eric/files/eric-4.5-no-interactive.patch | 15 |
3 files changed, 23 insertions, 3 deletions
diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog index 5b9f0e64b82b..2df39932b70f 100644 --- a/dev-util/eric/ChangeLog +++ b/dev-util/eric/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/eric # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.194 2013/04/07 23:49:00 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.195 2013/05/22 08:10:00 kensington Exp $ + + 22 May 2013; Michael Palimaka <kensington@gentoo.org> + +files/eric-4.5-no-interactive.patch, eric-4.5.10.ebuild: + Use updated patch by Alejandro Dubrovsky <alito@organicrobot.com> to solve bug + #470656 (patch fails to apply). *eric-5.3.2 (07 Apr 2013) *eric-4.5.10 (07 Apr 2013) diff --git a/dev-util/eric/eric-4.5.10.ebuild b/dev-util/eric/eric-4.5.10.ebuild index 4d8e76ec0627..0e75e6e476c4 100644 --- a/dev-util/eric/eric-4.5.10.ebuild +++ b/dev-util/eric/eric-4.5.10.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-util/eric/eric-4.5.10.ebuild,v 1.1 2013/04/07 23:49:00 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.10.ebuild,v 1.2 2013/05/22 08:10:00 kensington Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -51,7 +51,7 @@ S=${WORKDIR}/${MY_P} PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*") src_prepare() { - epatch "${FILESDIR}/eric-4.4-no-interactive.patch" + epatch "${FILESDIR}/eric-4.5-no-interactive.patch" use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch" # Delete internal copies of dev-python/chardet, dev-python/coverage, diff --git a/dev-util/eric/files/eric-4.5-no-interactive.patch b/dev-util/eric/files/eric-4.5-no-interactive.patch new file mode 100644 index 000000000000..37e57748e487 --- /dev/null +++ b/dev-util/eric/files/eric-4.5-no-interactive.patch @@ -0,0 +1,15 @@ +--- eric4-4.5.10/install.py ++++ eric4-4.5.10/install.py +@@ -1053,12 +1053,6 @@ + (v[0], v[1], v[2]) + print " with foreign characters. Please see 'README-PyXML.txt' for" + print " details." +- try: +- res = raw_input(" Shall pyXML be patched now (y/n)? ") +- if res in ["Y", "y"]: +- patchPyXML() +- except EOFError: +- pass + except ImportError: + pass + |