| 1 |
arfrever 10/12/30 01:05:25 |
| 2 |
|
| 3 |
Modified: eric-5.0.4.ebuild eric-4.4.10.ebuild |
| 4 |
Log: |
| 5 |
Use python_merge_intermediate_installation_images(). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha10_p17/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-util/eric/eric-5.0.4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/eric/eric-5.0.4.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/eric/eric-5.0.4.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/eric/eric-5.0.4.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: eric-5.0.4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.0.4.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- eric-5.0.4.ebuild 6 Dec 2010 19:09:36 -0000 1.1 |
| 23 |
+++ eric-5.0.4.ebuild 30 Dec 2010 01:05:25 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.0.4.ebuild,v 1.1 2010/12/06 19:09:36 arfrever Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.0.4.ebuild,v 1.2 2010/12/30 01:05:25 arfrever Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
PYTHON_DEPEND="3" |
| 32 |
@@ -41,6 +41,8 @@ |
| 33 |
|
| 34 |
S="${WORKDIR}/${MY_P}" |
| 35 |
|
| 36 |
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*") |
| 37 |
+ |
| 38 |
src_prepare() { |
| 39 |
epatch "${FILESDIR}/${PN}-5.0.2-remove_coverage.patch" |
| 40 |
|
| 41 |
@@ -62,11 +64,12 @@ |
| 42 |
"$(PYTHON)" install.py \ |
| 43 |
-z \ |
| 44 |
-b "${EPREFIX}/usr/bin" \ |
| 45 |
- -i "${D}" \ |
| 46 |
+ -i "${T}/images/${PYTHON_ABI}" \ |
| 47 |
-d "${EPREFIX}$(python_get_sitedir)" \ |
| 48 |
-c |
| 49 |
} |
| 50 |
python_execute_function installation |
| 51 |
+ python_merge_intermediate_installation_images "${T}/images" |
| 52 |
|
| 53 |
doicon eric/icons/default/${MY_PN}.png || die "doicon failed" |
| 54 |
} |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.2 dev-util/eric/eric-4.4.10.ebuild |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/eric/eric-4.4.10.ebuild?rev=1.2&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/eric/eric-4.4.10.ebuild?rev=1.2&content-type=text/plain |
| 62 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/eric/eric-4.4.10.ebuild?r1=1.1&r2=1.2 |
| 63 |
|
| 64 |
Index: eric-4.4.10.ebuild |
| 65 |
=================================================================== |
| 66 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.10.ebuild,v |
| 67 |
retrieving revision 1.1 |
| 68 |
retrieving revision 1.2 |
| 69 |
diff -u -r1.1 -r1.2 |
| 70 |
--- eric-4.4.10.ebuild 6 Dec 2010 18:43:06 -0000 1.1 |
| 71 |
+++ eric-4.4.10.ebuild 30 Dec 2010 01:05:25 -0000 1.2 |
| 72 |
@@ -1,6 +1,6 @@ |
| 73 |
# Copyright 1999-2010 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.10.ebuild,v 1.1 2010/12/06 18:43:06 arfrever Exp $ |
| 76 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.10.ebuild,v 1.2 2010/12/30 01:05:25 arfrever Exp $ |
| 77 |
|
| 78 |
EAPI="3" |
| 79 |
PYTHON_DEPEND="2:2.6" |
| 80 |
@@ -43,6 +43,8 @@ |
| 81 |
|
| 82 |
S="${WORKDIR}/${MY_P}" |
| 83 |
|
| 84 |
+PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*") |
| 85 |
+ |
| 86 |
src_prepare() { |
| 87 |
epatch "${FILESDIR}/eric-4.4-no-interactive.patch" |
| 88 |
epatch "${FILESDIR}/remove_coverage.patch" |
| 89 |
@@ -58,11 +60,12 @@ |
| 90 |
"$(PYTHON)" install.py \ |
| 91 |
-z \ |
| 92 |
-b "${EPREFIX}/usr/bin" \ |
| 93 |
- -i "${D}" \ |
| 94 |
+ -i "${T}/images/${PYTHON_ABI}" \ |
| 95 |
-d "${EPREFIX}$(python_get_sitedir)" \ |
| 96 |
-c |
| 97 |
} |
| 98 |
python_execute_function installation |
| 99 |
+ python_merge_intermediate_installation_images "${T}/images" |
| 100 |
|
| 101 |
doicon eric/icons/default/eric.png || die "doicon failed" |
| 102 |
make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt" |
Archives