python-pygtk2: upgrade to 2.8.6 and remove obsolete versions

diff --git a/packages/python/python-pygtk2_2.4.1.bb b/packages/python/python-pygtk2_2.4.1.bb
deleted file mode 100644 (file)
index 2b589e8..0000000
--- a/packages/python/python-pygtk2_2.4.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Python GTK+ Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "gtk+ libglade"
-SRCNAME = "pygtk"
-LICENSE = "LGPL"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.4/${SRCNAME}-${PV}.tar.bz2 \
-       file://acinclude.m4"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit autotools pkgconfig distutils-base
-
-do_configure_prepend() {
-       install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
-}
-
-do_stage() {
-       autotools_stage_includes
-}
-

diff --git a/packages/python/python-pygtk2_2.6.2.bb b/packages/python/python-pygtk2_2.8.6.bb
similarity index 83%
rename from packages/python/python-pygtk2_2.6.2.bb
rename to packages/python/python-pygtk2_2.8.6.bb
index c9102e6..d91e135 100644 (file)
--- a/packages/python/python-pygtk2_2.6.2.bb
+++ b/packages/python/python-pygtk2_2.8.6.bb
@@ -3,12 +3,12 @@ SECTION = "devel/python"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "gtk+ libglade"
-RDEPENDS += "python-shell"
+RDEPENDS = "python-shell"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${SRCNAME}-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${SRCNAME}-${PV}.tar.bz2 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
@@ -22,4 +22,3 @@ do_stage() {
        autotools_stage_includes
        install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
 }
-

diff --git a/packages/python/python-pygtk_2.2.0.bb b/packages/python/python-pygtk_2.2.0.bb
deleted file mode 100644 (file)
index 16d8676..0000000
--- a/packages/python/python-pygtk_2.2.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Python GTK+ Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "gtk+ libglade"
-RDEPENDS = "python-shell"
-SRCNAME = "pygtk"
-LICENSE = "LGPL"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.2/${SRCNAME}-${PV}.tar.bz2"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit autotools pkgconfig distutils-base
-
-do_stage() {
-       autotools_stage_includes
-}
-

diff --git a/packages/python/python-sip4_4.4.1.bb b/packages/python/python-sip4_4.4.1.bb
index 97f7375..4bdc8ed 100644 (file)
--- a/packages/python/python-sip4_4.4.1.bb
+++ b/packages/python/python-sip4_4.4.1.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/sip-${PV}/siplib"
 
 inherit qmake distutils-base
 
-EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \
+EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
                          CONFIG=console \
                          DESTDIR= \
                          VERSION=1.0.0 \