merge of 67751448562cee294c455a1ca90add74cc339b78

     and ccbb80bf271c9a4cfead703ac33b9b69e95d755e

9 files changed, 138 insertions, 2 deletions

diff --git a/packages/meta/task-python-everything_1.0.0.bb b/packages/meta/task-python-everything_1.0.0.bb
index 46c37676b7..32e36b9f52 100644
--- a/packages/meta/task-python-everything_1.0.0.bb
+++ b/packages/meta/task-python-everything_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml0"
+PR = "ml2"
 
 DEPENDS = "\
 		python-ao 		\
@@ -28,6 +28,7 @@ DEPENDS = "\
 		python-pexpect		\
 		python-pychecker	\
 		python-pycodes		\
+		python-pyflakes		\
 		python-pygame		\
 		python-pygoogle		\
 		python-pygtk		\
@@ -41,6 +42,7 @@ DEPENDS = "\
 		python-pyro		\
 		python-pyserial		\
 		python-pytest		\
+		python-pyvisa		\
 		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
diff --git a/packages/meta/task-python-sharprom_1.0.0.bb b/packages/meta/task-python-sharprom_1.0.0.bb
index 349a40474f..89d155b51d 100644
--- a/packages/meta/task-python-sharprom_1.0.0.bb
+++ b/packages/meta/task-python-sharprom_1.0.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python for SharpROM"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml0"
+PR = "ml2"
 
 NONWORKING = "\
 		python-codes		\
@@ -35,6 +35,7 @@ DEPENDS = "\
 		python-ogg		\
 		python-pexpect		\
 		python-pychecker	\
+		python-pyflakes		\
 		python-pygoogle		\
 		python-pylinda		\
 		python-pylint		\
@@ -42,6 +43,8 @@ DEPENDS = "\
 		python-pyreverse	\
 		python-pyro		\
 		python-pyserial		\
+		python-pyvisa		\
+		python-pyweather	\
 		python-pyxml		\
 		python-pyxmlrpc		\
 		python-quicklauncher    \
diff --git a/packages/python/python-pyflakes_0.2.0.bb b/packages/python/python-pyflakes_0.2.0.bb
new file mode 100644
index 0000000000..77fed35e7a
--- /dev/null
+++ b/packages/python/python-pyflakes_0.2.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "SourceCode Test Utility"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "BSD"
+SRCNAME = "pyflakes"
+
+SRC_URI = "http://www.divmod.org/static/projects/pyflakes/pyflakes-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/python/python-pyvisa_0.9.7.bb b/packages/python/python-pyvisa_0.9.7.bb
new file mode 100644
index 0000000000..54ece76300
--- /dev/null
+++ b/packages/python/python-pyvisa_0.9.7.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A Python package with bindings to the 'Virtual Instrument Software Architecture' \
+(VISA) library, in order to control measurement devices and test equipment via GPIB, RS232, or USB."
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "BSD"
+SRCNAME = "PyVISA"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pyvisa/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/tcltk/.mtn2git_empty b/packages/tcltk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tcltk/.mtn2git_empty
diff --git a/packages/tcltk/files/.mtn2git_empty b/packages/tcltk/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tcltk/files/.mtn2git_empty
diff --git a/packages/tcltk/files/disable-xim.patch b/packages/tcltk/files/disable-xim.patch
new file mode 100644
index 0000000000..bc11d3bbe9
--- /dev/null
+++ b/packages/tcltk/files/disable-xim.patch
@@ -0,0 +1,20 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- ../generic/tk.h~disable-xim
++++ ../generic/tk.h
+@@ -109,9 +109,9 @@
+  * Decide whether or not to use input methods.
+  */
+ 
+-#ifdef XNQueryInputStyle
+-#define TK_USE_INPUT_METHODS
+-#endif
++//#ifdef XNQueryInputStyle
++#undef TK_USE_INPUT_METHODS
++//#endif
+ 
+ /*
+  * Dummy types that are used by clients:
diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb
new file mode 100644
index 0000000000..e56982aac8
--- /dev/null
+++ b/packages/tcltk/tcl_8.4.11.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Tool Command Language"
+LICENSE = "tcl"
+SECTION = "devel/tcltk"
+HOMEPAGE = "http://tcl.sourceforge.net"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz"
+S = "${WORKDIR}/tcl${PV}/unix"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-threads"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_compile_prepend() {
+	echo > ../compat/fixstrtod.c
+}
+
+do_stage() {
+	oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR}
+	oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR}
+	install -m 0755 tclConfig.sh ${STAGING_BINDIR}
+	cd ..
+	for dir in compat generic unix
+	do
+		install -d ${STAGING_INCDIR}/tcl${PV}/$dir
+		install -m 0644 $dir/*.h ${STAGING_INCDIR}/tcl${PV}/$dir/
+	done
+	install -m 0644 generic/tcl.h ${STAGING_INCDIR}
+	install -m 0644 generic/tclDecls.h ${STAGING_INCDIR}
+	install -m 0644 generic/tclPlatDecls.h ${STAGING_INCDIR}
+}
+
+do_install() {
+	autotools_do_install
+	oe_libinstall -so libtcl8.4 ${D}${libdir}
+	ln -sf ./tclsh8.4 ${D}${bindir}/tclsh
+}
+
+FILES_${PN} += "${libdir}/tcl8.4"
diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb
new file mode 100644
index 0000000000..b76d6670f2
--- /dev/null
+++ b/packages/tcltk/tk_8.4.11.bb
@@ -0,0 +1,44 @@
+DESCRIPTION = "Tool Command Language ToolKit Extension"
+LICENSE = "tcl"
+SECTION = "devel/tcltk"
+HOMEPAGE = "http://tcl.sourceforge.net"
+DEPENDS = "tcl x11"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
+           file://disable-xim.patch;patch=1;pnum=0"
+S = "${WORKDIR}/tk${PV}/unix"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-threads --with-tcl=${STAGING_BINDIR} \
+		--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_stage() {
+        oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR}
+        oe_libinstall -so libtk8.4 ${STAGING_LIBDIR}
+        install -m 0755 tkConfig.sh ${STAGING_BINDIR}
+	cd ..
+	#for dir in compat generic unix
+	#do
+	#	install -d ${STAGING_INCDIR}/tk${PV}/$dir
+	#install -m 0644 $dir/*.h ${STAGING_INCDIR}/tk${PV}/$dir/
+	#done
+	install -m 0644 generic/tk.h ${STAGING_INCDIR}
+	install -m 0644 generic/tkDecls.h ${STAGING_INCDIR}
+	install -m 0644 generic/tkPlatDecls.h ${STAGING_INCDIR}
+
+}
+
+do_install() {
+	autotools_do_install
+	oe_libinstall -so libtk8.4 ${D}${libdir}
+	ln -sf ./wish8.4 ${D}${bindir}/wish
+}
+
+FILES_${PN} += "${libdir}/tk8.4"