5 files changed, 8 insertions, 35 deletions
diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc
index 3d46d47bd0..e80da80d87 100644
--- a/packages/python/python-2.5-manifest.inc
+++ b/packages/python/python-2.5-manifest.inc
@@ -50,7 +50,7 @@ FILES_python-datetime="${libdir}/python2.5/_strptime.* ${libdir}/python2.5/calen
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml3"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.5/__future__.* /usr/lib/python2.5/copy.* /usr/lib/python2.5/copy_reg.* /usr/lib/python2.5/ConfigParser.* /usr/lib/python2.5/getopt.* /usr/lib/python2.5/linecache.* /usr/lib/python2.5/new.* /usr/lib/python2.5/os.* /usr/lib/python2.5/posixpath.* /usr/lib/python2.5/warnings.* /usr/lib/python2.5/site.* /usr/lib/python2.5/stat.* /usr/lib/python2.5/UserDict.* /usr/lib/python2.5/UserList.* /usr/lib/python2.5/UserString.* /usr/lib/python2.5/lib-dynload/binascii.so /usr/lib/python2.5/lib-dynload/struct.so /usr/lib/python2.5/lib-dynload/time.so /usr/lib/python2.5/lib-dynload/xreadlines.so /usr/lib/python2.5/types.* /usr/bin/python* "
+FILES_python-core="${libdir}/python2.5/__future__.* ${libdir}/python2.5/copy.* ${libdir}/python2.5/copy_reg.* ${libdir}/python2.5/ConfigParser.* ${libdir}/python2.5/getopt.* ${libdir}/python2.5/linecache.* ${libdir}/python2.5/new.* ${libdir}/python2.5/os.* ${libdir}/python2.5/posixpath.* ${libdir}/python2.5/warnings.* ${libdir}/python2.5/site.* ${libdir}/python2.5/stat.* ${libdir}/python2.5/UserDict.* ${libdir}/python2.5/UserList.* ${libdir}/python2.5/UserString.* ${libdir}/python2.5/lib-dynload/binascii.so ${libdir}/python2.5/lib-dynload/struct.so ${libdir}/python2.5/lib-dynload/time.so ${libdir}/python2.5/lib-dynload/xreadlines.so ${libdir}/python2.5/types.* ${bindir}/python* "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml1"
@@ -95,7 +95,7 @@ FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.*
 DESCRIPTION_python-core-dbg="Python core module debug information"
 PR_python-core-dbg="ml1"
 RDEPENDS_python-core-dbg="python-core"
-FILES_python-core-dbg="/usr/lib/python2.5/lib-dynload/.debug /usr/bin/.debug /usr/lib/.debug "
+FILES_python-core-dbg="${libdir}/python2.5/lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
 PR_python-resource="ml1"
@@ -105,7 +105,7 @@ FILES_python-resource="${libdir}/python2.5/lib-dynload/resource.so "
 DESCRIPTION_python-devel="Python Development Package"
 PR_python-devel="ml1"
 RDEPENDS_python-devel="python-core"
-FILES_python-devel="/usr/include /usr/lib/python2.5/config "
+FILES_python-devel="${includedir} ${libdir}/python2.5/config "
 
 DESCRIPTION_python-math="Python Math Support"
 PR_python-math="ml1"
@@ -165,7 +165,7 @@ FILES_python-curses="${libdir}/python2.5/curses ${libdir}/python2.5/lib-dynload/
 DESCRIPTION_python-smtpd="Python Simple Mail Transport Daemon"
 PR_python-smtpd="ml1"
 RDEPENDS_python-smtpd="python-core python-netserver python-email python-mime"
-FILES_python-smtpd="/usr/bin/smtpd.* "
+FILES_python-smtpd="${bindir}/smtpd.* "
 
 DESCRIPTION_python-html="Python HTML Processing"
 PR_python-html="ml1"
@@ -185,7 +185,7 @@ FILES_python-subprocess="${libdir}/python2.5/subprocess.* "
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml1"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.5/pydoc.* "
+FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.5/pydoc.* "
 
 DESCRIPTION_python-logging="Python Logging Support"
 PR_python-logging="ml1"
@@ -280,7 +280,7 @@ FILES_python-crypt="${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5
 DESCRIPTION_python-idle="Python Integrated Development Environment"
 PR_python-idle="ml1"
 RDEPENDS_python-idle="python-core python-tkinter"
-FILES_python-idle="/usr/bin/idle /usr/lib/python2.5/idlelib "
+FILES_python-idle="${bindir}/idle ${libdir}/python2.5/idlelib "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
 PR_python-lang="ml1"
diff --git a/packages/python/python-pygobject-native_2.12.2.bb b/packages/python/python-pygobject-native_2.12.2.bb
deleted file mode 100644
index c93950b31b..0000000000
--- a/packages/python/python-pygobject-native_2.12.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require python-pygobject_${PV}.bb
-
-DEPENDS = "python-native"
diff --git a/packages/python/python-pygobject-native_2.12.3.bb b/packages/python/python-pygobject-native_2.12.3.bb
index 86d778c5ab..cb879fdeb1 100644
--- a/packages/python/python-pygobject-native_2.12.3.bb
+++ b/packages/python/python-pygobject-native_2.12.3.bb
@@ -1,6 +1,6 @@
 require python-pygobject_${PV}.bb
 
-DEPENDS = "python-native"
+DEPENDS = "python-native glib-2.0-native"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2 "
 
diff --git a/packages/python/python-pygobject_2.12.2.bb b/packages/python/python-pygobject_2.12.2.bb
deleted file mode 100644
index 1604b54715..0000000000
--- a/packages/python/python-pygobject_2.12.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Python GObject bindings"
-SECTION = "devel/python"
-LICENSE = "LGPL"
-DEPENDS = "python-pygobject-native"
-PR = "ml2"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2"
-S = "${WORKDIR}/pygobject-${PV}"
-
-inherit autotools distutils-base pkgconfig
-
-# otherwise the main package keeps snatching the .pc file away
-# and therefore depends on glib-2.0-dev (which only the -dev
-# package should).
-PACKAGES =+ "${PN}-dev"
-
-do_stage() {
-	autotools_stage_all
-	install -d ${STAGING_LIBDIR}/../share/pygobject/
-	cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
-	install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-	cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
-}
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index e1f77984d1..e90b86bf1c 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -5,7 +5,7 @@ DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
 RDEPENDS = "python-shell python-pycairo python-pygobject"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml2"
+PR = "ml3"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
@@ -31,7 +31,6 @@ do_configure_prepend() {
 }
 
 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"