[oe-commits] org.oe.dev python-pyqt: promote qt4 to being the default, rename other packages accordingly

[mickeyl commit]

python-pyqt: promote qt4 to being the default, rename other packages accordingly

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 7b07ebfd38ce840f19984f46c32c16060a959504
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7b07ebfd38ce840f19984f46c32c16060a959504
Files:
1
packages/python/python-pyqt-3.13
packages/python/python24-pyqt2
packages/python/python-pyqt4
packages/python/python-pyqt
packages/python/python-pyqt4_4.2.bb
packages/python/python-pyqt_4.2.bb
packages/python/python-pyqt_3.13.bb
packages/python/python24-pyqt2_3.13.bb
packages/python/python-pyqwt-3.10
packages/python/python24-pyqwt2
packages/python/python-pyqwt_3.10.bb
packages/python/python24-pyqwt2_3.10.bb
packages/python/python-sip4_4.4.5.bb
packages/python/python-sip_4.7.bb
packages/python/python-sip_4.1.1.bb
packages/python/python24-sip_4.1.1.bb
Diffs:

#
# mt diff -r22a64554be1b1714f2038ee65f7de97471b24136 -r7b07ebfd38ce840f19984f46c32c16060a959504
#
# 
# 
# rename "packages/python/python-pyqt-3.13"
#     to "packages/python/python24-pyqt2"
# 
# rename "packages/python/python-pyqt4"
#     to "packages/python/python-pyqt"
# 
# rename "packages/python/python-pyqt4_4.2.bb"
#     to "packages/python/python-pyqt_4.2.bb"
# 
# rename "packages/python/python-pyqt_3.13.bb"
#     to "packages/python/python24-pyqt2_3.13.bb"
# 
# rename "packages/python/python-pyqwt-3.10"
#     to "packages/python/python24-pyqwt2"
# 
# rename "packages/python/python-pyqwt_3.10.bb"
#     to "packages/python/python24-pyqwt2_3.10.bb"
# 
# rename "packages/python/python-sip4_4.4.5.bb"
#     to "packages/python/python-sip_4.7.bb"
# 
# rename "packages/python/python-sip_4.1.1.bb"
#     to "packages/python/python24-sip_4.1.1.bb"
# 
# patch "packages/python/python-sip_4.7.bb"
#  from [fa03ba711423830b8844288f45ce258c039fd200]
#    to [ce53a5841077caeebe24c0d99c56790cc0c14733]
# 
# patch "packages/python/python24-pyqt2_3.13.bb"
#  from [8787f426c79cec01ecba1e959e0d1ea4325012f6]
#    to [8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e]
# 
============================================================
--- packages/python/python-sip4_4.4.5.bb	fa03ba711423830b8844288f45ce258c039fd200
+++ packages/python/python-sip_4.7.bb	ce53a5841077caeebe24c0d99c56790cc0c14733
@@ -1,3 +1,5 @@
+BROKEN = "1"
+
 DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
 SECTION = "devel/python"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
@@ -10,7 +12,7 @@ S = "${WORKDIR}/sip-${PV}/siplib"
 SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
 S = "${WORKDIR}/sip-${PV}/siplib"
 
-inherit qmake distutils-base
+inherit qmake2 distutils-base
 
 EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
                          CONFIG=console \
============================================================
--- packages/python/python-pyqt_3.13.bb	8787f426c79cec01ecba1e959e0d1ea4325012f6
+++ packages/python/python24-pyqt2_3.13.bb	8e509b0c5adf0ed85de6da3e6f2caf1b87e86b6e
@@ -5,7 +5,7 @@ DEPENDS = "virtual/libqte2 virtual/libqp
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libqte2 virtual/libqpe1"
-RDEPENDS = "python-core python-sip"
+RDEPENDS = "python-core python24-sip"
 SRCNAME = "pyqt"
 PR = "ml5"