python-pygtk 2.10.4: fix dependencies and packaging. closes #2905

diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 0584d11..4471cf5 100644 (file)
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "Python GTK+ 2.10.x Bindings"
 SECTION = "devel/python"
 # needs gtk+ 2.10.x
-DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+DEPENDS = "gtk+ libglade"
 RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml3"
+PR = "ml4"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
@@ -19,16 +19,24 @@ EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 inherit autotools pkgconfig distutils-base
 
 do_configure_prepend() {
-    install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+       install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
 }
 
-do_configure_prepend() {
-       install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+# dirty fix #1: remove dependency on python-pygobject-dev
+do_install_append() {
+       find ${D} -name "*.la"|xargs rm -f
+       rm -f ${D}/${bindir}/pygtk-codegen-2.0
+       rm -rf ${D}/${libdir}/pkgconfig
 }
 
+# dirty fix #2: fix build system paths leaking in
 require fix-path.inc
 
-FILES_${PN}-dev += "${libdir}/pygtk/2.0 ${bindir}/pygtk-*"
+# todo: revamp packaging, package demo seperatly
+FILES_${PN}-dev += "\
+  ${libdir}/pygtk/2.0 \
+  ${bindir}/pygtk-* \
+  ${datadir}/pygtk/2.0"
 
 do_stage() {
        autotools_stage_includes