python-pygtk[2]: change naming, python-pygtk is now 2.x, update to 2.10.4

diff --git a/packages/python/python-pygtk_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb
similarity index 90%
rename from packages/python/python-pygtk_0.6.12.bb
rename to packages/python/python-pygtk-1.2_0.6.12.bb
index 20504f1..3b538ef 100644 (file)
--- a/packages/python/python-pygtk_0.6.12.bb
+++ b/packages/python/python-pygtk-1.2_0.6.12.bb
@@ -1,11 +1,11 @@
-DESCRIPTION = "Python GTK+ 1.2 Bindings"
+DESCRIPTION = "Python Bindings for GTK+ 1.2"
 HOMEPAGE = "http://www.gtk.org"
 SECTION = "devel/python"
 LICENSE = "LGPL"
 DEPENDS = "gtk+-1.2"
 RDEPENDS = "python-shell python-re"
 SRCNAME = "pygtk"
-PR = "r0"
+PR = "ml0"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
            file://remove-imlib-et-al;patch=1"

diff --git a/packages/python/python-pygtk2/.mtn2git_empty b/packages/python/python-pygtk/.mtn2git_empty
similarity index 100%
rename from packages/python/python-pygtk2/.mtn2git_empty
rename to packages/python/python-pygtk/.mtn2git_empty

diff --git a/packages/python/python-pygtk2/acinclude.m4 b/packages/python/python-pygtk/acinclude.m4
similarity index 100%
rename from packages/python/python-pygtk2/acinclude.m4
rename to packages/python/python-pygtk/acinclude.m4

diff --git a/packages/python/python-pygtk2/fix-gtkunixprint.patch b/packages/python/python-pygtk/fix-gtkunixprint.patch
similarity index 100%
rename from packages/python/python-pygtk2/fix-gtkunixprint.patch
rename to packages/python/python-pygtk/fix-gtkunixprint.patch

diff --git a/packages/python/python-pygtk2_2.10.3.bb b/packages/python/python-pygtk_2.10.3.bb
similarity index 100%
rename from packages/python/python-pygtk2_2.10.3.bb
rename to packages/python/python-pygtk_2.10.3.bb

diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
new file mode 100644 (file)
index 0000000..c8c45b3
--- /dev/null
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "Python GTK+ 2.10.x Bindings"
+SECTION = "devel/python"
+# needs gtk+ 2.10.x
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+RDEPENDS = "python-shell"
+SRCNAME = "pygtk"
+LICENSE = "LGPL"
+PR = "ml1"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
+           file://fix-gtkunixprint.patch;patch=1 \
+           file://acinclude.m4"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+EXTRA_OECONF = "--disable-docs"
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+inherit autotools pkgconfig distutils-base
+
+do_configure_prepend() {
+    install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+
+PACKAGES =+ "${PN}-dev"
+FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
+
+do_configure_prepend() {
+       install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+require fix-path.inc
+PACKAGES =+ "${PN}-dev"
+FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/*/.debug"
+FILES_${PN}-dbg += "${libdir}/python2.4/site-packages/gtk-2.0/.debug"
+
+do_stage() {
+       autotools_stage_includes
+       sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
+       install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
+       install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
+       install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
+       cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
+       cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
+       cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
+}

diff --git a/packages/python/python-pygtk2_2.6.3.bb b/packages/python/python-pygtk_2.6.3.bb
similarity index 100%
rename from packages/python/python-pygtk2_2.6.3.bb
rename to packages/python/python-pygtk_2.6.3.bb

diff --git a/packages/python/python-pygtk2_2.8.6.bb b/packages/python/python-pygtk_2.8.6.bb
similarity index 100%
rename from packages/python/python-pygtk2_2.8.6.bb
rename to packages/python/python-pygtk_2.8.6.bb