| 1 |
arfrever 09/06/20 14:22:51 |
| 2 |
|
| 3 |
Modified: ChangeLog PyQt4-4.5.1.ebuild |
| 4 |
Log: |
| 5 |
Don't install modules specific for other versions of Python (bug #274499). |
| 6 |
(Portage version: 13655-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.66 dev-python/PyQt4/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.66&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.66&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.65&r2=1.66 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v |
| 18 |
retrieving revision 1.65 |
| 19 |
retrieving revision 1.66 |
| 20 |
diff -u -r1.65 -r1.66 |
| 21 |
--- ChangeLog 16 Jun 2009 17:52:24 -0000 1.65 |
| 22 |
+++ ChangeLog 20 Jun 2009 14:22:51 -0000 1.66 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-python/PyQt4 |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.65 2009/06/16 17:52:24 hwoarang Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.66 2009/06/20 14:22:51 arfrever Exp $ |
| 28 |
+ |
| 29 |
+ 20 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 30 |
+ PyQt4-4.5.1.ebuild: |
| 31 |
+ Don't install modules specific for other versions of Python (bug #274499). |
| 32 |
|
| 33 |
16 Jun 2009; Markos Chandras <hwoarang@g.o> PyQt4-4.5.1.ebuild: |
| 34 |
Raise sip dependency to 4.8.1 |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.3 dev-python/PyQt4/PyQt4-4.5.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.1.ebuild?rev=1.3&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.1.ebuild?rev=1.3&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.1.ebuild?r1=1.2&r2=1.3 |
| 43 |
|
| 44 |
Index: PyQt4-4.5.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.1.ebuild,v |
| 47 |
retrieving revision 1.2 |
| 48 |
retrieving revision 1.3 |
| 49 |
diff -u -r1.2 -r1.3 |
| 50 |
--- PyQt4-4.5.1.ebuild 16 Jun 2009 17:52:24 -0000 1.2 |
| 51 |
+++ PyQt4-4.5.1.ebuild 20 Jun 2009 14:22:51 -0000 1.3 |
| 52 |
@@ -1,10 +1,10 @@ |
| 53 |
# Copyright 1999-2009 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.1.ebuild,v 1.2 2009/06/16 17:52:24 hwoarang Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.1.ebuild,v 1.3 2009/06/20 14:22:51 arfrever Exp $ |
| 57 |
|
| 58 |
EAPI="2" |
| 59 |
|
| 60 |
-inherit distutils qt4 |
| 61 |
+inherit distutils python qt4 |
| 62 |
|
| 63 |
MY_P=PyQt-x11-gpl-${PV} |
| 64 |
QTVER="4.5.1" |
| 65 |
@@ -56,6 +56,14 @@ |
| 66 |
"${S}"/configure.py || die |
| 67 |
fi |
| 68 |
qt4_src_prepare |
| 69 |
+ |
| 70 |
+ # Remove this code after removing Python 2 from the tree. |
| 71 |
+ python_version |
| 72 |
+ if [[ "${PYVER:0:1}" == "3" ]]; then |
| 73 |
+ rm -fr pyuic/uic/port_v2 |
| 74 |
+ else |
| 75 |
+ rm -fr pyuic/uic/port_v3 |
| 76 |
+ fi |
| 77 |
} |
| 78 |
|
| 79 |
src_configure() { |
Archives