1 |
On 09/11/2010 01:02 AM, Arfrever Frehtes Taifersar Arahesis (arfrever) |
2 |
wrote: |
3 |
> arfrever 10/09/10 22:02:28 |
4 |
> |
5 |
> Modified: PyQt4-4.7.6.ebuild ChangeLog |
6 |
> Log: |
7 |
> Update EAPI. Fix dependencies. |
8 |
> |
9 |
|
10 |
This message does not tell why the EPREFIX stuff was removed. |
11 |
|
12 |
> (Portage version: 2.2_rc79_p5/cvs/Linux x86_64) |
13 |
> |
14 |
> Revision Changes Path |
15 |
> 1.2 dev-python/PyQt4/PyQt4-4.7.6.ebuild |
16 |
> |
17 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.6.ebuild?rev=1.2&view=markup |
18 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.6.ebuild?rev=1.2&content-type=text/plain |
19 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.6.ebuild?r1=1.1&r2=1.2 |
20 |
> |
21 |
> Index: PyQt4-4.7.6.ebuild |
22 |
> =================================================================== |
23 |
> RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.6.ebuild,v |
24 |
> retrieving revision 1.1 |
25 |
> retrieving revision 1.2 |
26 |
> diff -u -r1.1 -r1.2 |
27 |
> --- PyQt4-4.7.6.ebuild 8 Sep 2010 23:30:31 -0000 1.1 |
28 |
> +++ PyQt4-4.7.6.ebuild 10 Sep 2010 22:02:27 -0000 1.2 |
29 |
> @@ -1,8 +1,9 @@ |
30 |
> # Copyright 1999-2010 Gentoo Foundation |
31 |
> # Distributed under the terms of the GNU General Public License v2 |
32 |
> -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.6.ebuild,v 1.1 2010/09/08 23:30:31 hwoarang Exp $ |
33 |
> +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.6.ebuild,v 1.2 2010/09/10 22:02:27 arfrever Exp $ |
34 |
> |
35 |
> -EAPI="2" |
36 |
> +EAPI="3" |
37 |
> +PYTHON_DEPEND="*" |
38 |
> PYTHON_EXPORT_PHASE_FUNCTIONS="1" |
39 |
> SUPPORT_PYTHON_ABIS="1" |
40 |
> |
41 |
> @@ -50,8 +51,6 @@ |
42 |
> ) |
43 |
> |
44 |
> src_prepare() { |
45 |
> - use prefix || EPREFIX= |
46 |
> - |
47 |
> if ! use dbus; then |
48 |
> sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \ |
49 |
> "${S}"/configure.py || die |
50 |
> @@ -70,7 +69,7 @@ |
51 |
> python_copy_sources |
52 |
> |
53 |
> preparation() { |
54 |
> - if [[ "${PYTHON_ABI:0:1}" == "3" ]]; then |
55 |
> + if [[ "$(python_get_version --major)" == "3" ]]; then |
56 |
> rm -fr pyuic/uic/port_v2 |
57 |
> else |
58 |
> rm -fr pyuic/uic/port_v3 |
59 |
> @@ -84,8 +83,6 @@ |
60 |
> } |
61 |
> |
62 |
> src_configure() { |
63 |
> - use prefix || EPREFIX= |
64 |
> - |
65 |
> configuration() { |
66 |
> local myconf="$(PYTHON) configure.py |
67 |
> --confirm-license |
68 |
> |
69 |
> |
70 |
> |