From 97d951baea0b7278634118ac3db1a2584820b5f3 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 25 Apr 2006 18:35:14 +0000
Subject: python-pygtk2: upgrade to 2.8.6 and remove obsolete versions

---
 packages/python/python-pygtk2_2.4.1.bb | 23 -----------------------
 packages/python/python-pygtk2_2.6.2.bb | 25 -------------------------
 packages/python/python-pygtk2_2.8.6.bb | 24 ++++++++++++++++++++++++
 packages/python/python-pygtk_2.2.0.bb  | 19 -------------------
 packages/python/python-sip4_4.4.1.bb   |  2 +-
 5 files changed, 25 insertions(+), 68 deletions(-)
 delete mode 100644 packages/python/python-pygtk2_2.4.1.bb
 delete mode 100644 packages/python/python-pygtk2_2.6.2.bb
 create mode 100644 packages/python/python-pygtk2_2.8.6.bb
 delete mode 100644 packages/python/python-pygtk_2.2.0.bb

diff --git a/packages/python/python-pygtk2_2.4.1.bb b/packages/python/python-pygtk2_2.4.1.bb
deleted file mode 100644
index 2b589e8d8a..0000000000
--- 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.6.2.bb
deleted file mode 100644
index c9102e6347..0000000000
--- a/packages/python/python-pygtk2_2.6.2.bb
+++ /dev/null
@@ -1,25 +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 = "r2"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/${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
-	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR}/
-}
-
diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk2_2.8.6.bb
new file mode 100644
index 0000000000..d91e13532c
--- /dev/null
+++ b/packages/python/python-pygtk2_2.8.6.bb
@@ -0,0 +1,24 @@
+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 = "r0"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.8/${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
+	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
index 16d8676282..0000000000
--- 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 97f7375056..4bdc8ed769 100644
--- 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 \
-- 
cgit v1.2.3