From 78711962558d481026c9ea2d728a93d780bfa6bd Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 26 Apr 2006 21:39:39 +0000
Subject: task-python-everything, python-pygtk: cosmetic changes

---
 packages/python/python-egenix-mx-base_2.0.6.bb |  4 +++-
 packages/python/python-pygtk-0_0.6.12.bb       | 30 --------------------------
 packages/python/python-pygtk_0.6.12.bb         | 26 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 31 deletions(-)
 delete mode 100644 packages/python/python-pygtk-0_0.6.12.bb
 create mode 100644 packages/python/python-pygtk_0.6.12.bb

(limited to 'packages/python')

diff --git a/packages/python/python-egenix-mx-base_2.0.6.bb b/packages/python/python-egenix-mx-base_2.0.6.bb
index 84bf7e2e3c..49a61c97b0 100644
--- a/packages/python/python-egenix-mx-base_2.0.6.bb
+++ b/packages/python/python-egenix-mx-base_2.0.6.bb
@@ -6,8 +6,10 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "EGENIX"
 SRCNAME = "egenix-mx-base"
+PR = "r1"
 
-SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz"
+SRC_URI = "http://www.egenix.com/files/python/egenix-mx-base-${PV}.tar.gz \
+           file://gcc4.patch;patch=1"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 inherit distutils
diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk-0_0.6.12.bb
deleted file mode 100644
index 3c9dc3a895..0000000000
--- a/packages/python/python-pygtk-0_0.6.12.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "Python GTK+ 1.2 Bindings"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
-DEPENDS = "gtk+-1.2 python"
-RDEPENDS = "python-core python-shell python-re"
-SRCNAME = "pygtk"
-PR = "r4"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/python-pygtk-${PV}"
-
-
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
-           file://remove-imlib-et-al;patch=1"
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit autotools pkgconfig distutils-base
-
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
-
-do_configure_prepend() {
-	echo ${LDFLAGS} > /tmp/ldflags
-	rm -f aclocal.m4
-}
-
-do_stage() {
-	autotools_stage_includes
-}
-
diff --git a/packages/python/python-pygtk_0.6.12.bb b/packages/python/python-pygtk_0.6.12.bb
new file mode 100644
index 0000000000..d01918bf05
--- /dev/null
+++ b/packages/python/python-pygtk_0.6.12.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Python GTK+ 1.2 Bindings"
+HOMEPAGE = "http://www.gtk.org"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+MAINTAINER = "Rob Taylor <robtaylor@fastmail.fm>"
+DEPENDS = "gtk+-1.2"
+RDEPENDS = "python-shell python-re"
+SRCNAME = "pygtk"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
+           file://remove-imlib-et-al;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig distutils-base
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
+
+do_configure_prepend() {
+	echo ${LDFLAGS} > /tmp/ldflags
+	rm -f aclocal.m4
+}
+
+do_stage() {
+	autotools_stage_includes
+}
-- 
cgit v1.2.3