merge of 1ef2ba501604b3eb3973e0bd43a66f784236b00e

     and b7ea8a0106e07a1fdbbbfabfa918c24d0dd19d2f

26 files changed, 42 insertions, 367 deletions

diff --git a/packages/gnome/goffice_0.0.1.bb b/packages/gnome/goffice_0.0.1.bb
deleted file mode 100644
index eabe184e36..0000000000
--- a/packages/gnome/goffice_0.0.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r1"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
-
diff --git a/packages/gnome/goffice_0.0.2.bb b/packages/gnome/goffice_0.0.2.bb
deleted file mode 100644
index 59372fa5ec..0000000000
--- a/packages/gnome/goffice_0.0.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r0"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnome/goffice_0.0.3.bb b/packages/gnome/goffice_0.0.3.bb
deleted file mode 100644
index 59372fa5ec..0000000000
--- a/packages/gnome/goffice_0.0.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r0"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnome/goffice_0.0.4.bb b/packages/gnome/goffice_0.0.4.bb
deleted file mode 100644
index 59372fa5ec..0000000000
--- a/packages/gnome/goffice_0.0.4.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r0"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnome/goffice_0.1.0.bb b/packages/gnome/goffice_0.1.0.bb
deleted file mode 100644
index 59372fa5ec..0000000000
--- a/packages/gnome/goffice_0.1.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r0"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnome/goffice_0.1.2.bb b/packages/gnome/goffice_0.1.2.bb
deleted file mode 100644
index 59372fa5ec..0000000000
--- a/packages/gnome/goffice_0.1.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r0"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnome/goffice_0.2.0.bb b/packages/gnome/goffice_0.2.0.bb
deleted file mode 100644
index 59372fa5ec..0000000000
--- a/packages/gnome/goffice_0.2.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Gnome Office Library"
-LICENSE="GPLv2"
-PR="r0"
-
-DEPENDS="glib-2.0 gtk+ pango libgnomeprint libgsf libglade libxml2 libart-lgpl"
-
-inherit gnome pkgconfig
-
-do_stage() {
-        gnome_stage_includes
-	oe_libinstall -so -C goffice libgoffice-1 ${STAGING_LIBDIR}
-}
-
-PACKAGES_DYNAMIC = "goffice-plugin-*"
-
-python populate_packages_prepend () {
-        goffice_libdir = bb.data.expand('${libdir}/goffice/${PV}/plugins', d)
-
-        do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True)
-}
-
diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty b/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnumeric/gnumeric-1.3.1.cvs/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch
deleted file mode 100644
index fe06e2bae3..0000000000
--- a/packages/gnumeric/gnumeric-1.3.1.cvs/Makefile.am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-+++ Makefile.am	2004-04-07 15:47:04.000000000 +0100
---- Makefile.am.orig	2004-07-23 18:03:34.000000000 +0100
-@@ -44,7 +44,7 @@
- 	intltool-extract.in	\
- 	intltool-merge.in	\
- 	intltool-update.in	\
-+#	xmldocs.make 		\
--	xmldocs.make 		\
- 	omf.make		\
- 	$(server_in_files) $(server_DATA)
- 
diff --git a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch b/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch
deleted file mode 100644
index 08ce8e1ee2..0000000000
--- a/packages/gnumeric/gnumeric-1.3.1.cvs/gnumeric-doc.make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-+++ gnumeric-doc.make	2004-03-31 02:32:25.000000000 +0100
---- gnumeric-doc.make.orig	2004-07-26 15:51:43.000000000 +0100
-@@ -24,7 +24,7 @@
- include $(top_srcdir)/xmldocs.make
- 
- # include generated files to simplify installation
--EXTRA_DIST +=		\
-+EXTRA_DIST =		\
- 	func.defs	\
- 	functions.xml	\
- 	func-header.xml func-footer.xml
diff --git a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty b/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnumeric/gnumeric-1.3.1/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch b/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch
deleted file mode 100644
index 2fbd71ceaf..0000000000
--- a/packages/gnumeric/gnumeric-1.3.1/workbook-control-gui-priv.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnumeric/src/workbook-control-gui-priv.h.orig	2004-07-19 07:06:18.000000000 +0100
-+++ gnumeric/src/workbook-control-gui-priv.h	2004-07-28 00:15:46.000000000 +0100
-@@ -111,7 +111,7 @@
- void	 wbcg_insert_sheet	      (GtkWidget *ignored, WorkbookControlGUI *wbcg);
- void	 wbcg_append_sheet	      (GtkWidget *ignored, WorkbookControlGUI *wbcg);
- void	 wbcg_set_selection_halign    (WorkbookControlGUI *wbcg, StyleHAlignFlags halign);
--void	 wbcg_set_selection_valign    (WorkbookControlGUI *wbcg, StyleHAlignFlags halign);
-+void	 wbcg_set_selection_valign    (WorkbookControlGUI *wbcg, StyleVAlignFlags halign);
- 
- enum {
- 	WBCG_MARKUP_CHANGED,
diff --git a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnumeric/gnumeric-1.5.3/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch
deleted file mode 100644
index 4a9108bd4e..0000000000
--- a/packages/gnumeric/gnumeric-1.5.3/remove-docs.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- gnumeric-1.5.2/Makefile.am.orig	2005-08-01 11:32:36.119921544 +0000
-+++ gnumeric-1.5.2/Makefile.am	2005-08-01 11:32:44.689618752 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = . po po-functions src plugins icons templates doc schemas
-+SUBDIRS = . po po-functions src plugins icons templates schemas
- if WITH_WIN32
-   SUBDIRS += tools
- endif
diff --git a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty b/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnumeric/gnumeric-1.5.5/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch b/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch
deleted file mode 100644
index 4a9108bd4e..0000000000
--- a/packages/gnumeric/gnumeric-1.5.5/remove-docs.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- gnumeric-1.5.2/Makefile.am.orig	2005-08-01 11:32:36.119921544 +0000
-+++ gnumeric-1.5.2/Makefile.am	2005-08-01 11:32:44.689618752 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = . po po-functions src plugins icons templates doc schemas
-+SUBDIRS = . po po-functions src plugins icons templates schemas
- if WITH_WIN32
-   SUBDIRS += tools
- endif
diff --git a/packages/gnumeric/gnumeric_1.3.1.bb b/packages/gnumeric/gnumeric_1.3.1.bb
deleted file mode 100644
index 299c36cbb2..0000000000
--- a/packages/gnumeric/gnumeric_1.3.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r3"
-S = "${WORKDIR}/gnumeric-${PV}"
-DEPENDS = "libgsf gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += 'file://workbook-control-gui-priv.h.patch;patch=1'
-
-EXTRA_OEMAKE_prepend = ' ORBIT_IDL=`which orbit-idl-2` '
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.3.1.cvs.bb b/packages/gnumeric/gnumeric_1.3.1.cvs.bb
deleted file mode 100644
index 6bbbf645c4..0000000000
--- a/packages/gnumeric/gnumeric_1.3.1.cvs.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-#SRCDATE="20040719"
-CVSTAG="GNUMERIC_1_3_1"
-
-DEFAULT_PREFERENCE = "-1"
-
-S = "${WORKDIR}/gnumeric"
-
-
-PR = "r1"
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gnumeric;tag=${CVSTAG} \
-           file://gnumeric-doc.make.patch;patch=1 \
-           file://Makefile.am.patch;patch=1"
-	   
-DEPENDS = "libgsf1 gtk+ libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui" 
-
-
-EXTRA_OECONF = "--without-gnome"
-
-do_configure_prepend() {
-	touch xmldocs.make
-	intltoolize --automake --debug
-#	# aclocal seems to insist on looking in here.  Make sure it exists.
-#	mkdir -p ${S}/m4
-#	# work around automake lossage with AC_CONFIG_AUX_DIR
-#	( cd libmutt; libtoolize --force ; cp ../ltmain.sh . )
-}
-
-inherit autotools
diff --git a/packages/gnumeric/gnumeric_1.5.3.bb b/packages/gnumeric/gnumeric_1.5.3.bb
deleted file mode 100644
index c3a594a391..0000000000
--- a/packages/gnumeric/gnumeric_1.5.3.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-S = "${WORKDIR}/gnumeric-${PV}"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += "file://remove-docs.patch;patch=1"
-
-EXTRA_OECONF=" --without-perl "
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.5.5.bb b/packages/gnumeric/gnumeric_1.5.5.bb
deleted file mode 100644
index c3a594a391..0000000000
--- a/packages/gnumeric/gnumeric_1.5.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-PR = "r0"
-S = "${WORKDIR}/gnumeric-${PV}"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += "file://remove-docs.patch;patch=1"
-
-EXTRA_OECONF=" --without-perl "
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.5.90.bb b/packages/gnumeric/gnumeric_1.5.90.bb
deleted file mode 100644
index 18ab5472a4..0000000000
--- a/packages/gnumeric/gnumeric_1.5.90.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-S = "${WORKDIR}/gnumeric-${PV}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += "file://remove-docs.patch;patch=1"
-
-EXTRA_OECONF=" --without-perl "
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.6.0.bb b/packages/gnumeric/gnumeric_1.6.0.bb
deleted file mode 100644
index 18ab5472a4..0000000000
--- a/packages/gnumeric/gnumeric_1.6.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-S = "${WORKDIR}/gnumeric-${PV}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += "file://remove-docs.patch;patch=1"
-
-EXTRA_OECONF=" --without-perl "
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.6.1.bb b/packages/gnumeric/gnumeric_1.6.1.bb
deleted file mode 100644
index 18ab5472a4..0000000000
--- a/packages/gnumeric/gnumeric_1.6.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-S = "${WORKDIR}/gnumeric-${PV}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += "file://remove-docs.patch;patch=1"
-
-EXTRA_OECONF=" --without-perl "
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/gnumeric/gnumeric_1.6.2.bb b/packages/gnumeric/gnumeric_1.6.2.bb
deleted file mode 100644
index 18ab5472a4..0000000000
--- a/packages/gnumeric/gnumeric_1.6.2.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-LICENSE = "GPL"
-SECTION = "x11/utils"
-S = "${WORKDIR}/gnumeric-${PV}"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
-DEPENDS = "libgsf gtk+ libxml2 goffice libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libgnomeprintui libbonoboui"
-DESCRIPTION = "Gnumeric spreadsheet for GNOME"
-
-inherit gnome flow-lossage
-
-SRC_URI += "file://remove-docs.patch;patch=1"
-
-EXTRA_OECONF=" --without-perl "
-
-PACKAGES_DYNAMIC = "gnumeric-plugin-*"
-
-python populate_packages_prepend () {
-	gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d)
-
-	do_split_packages(d, gnumeric_libdir, '(.*)', 'gnumeric-plugin-%s', 'Gnumeric plugin for %s', allow_dirs=True)
-}
diff --git a/packages/qemu/files/trunk_nodocs.patch b/packages/qemu/files/trunk_nodocs.patch
new file mode 100644
index 0000000000..36977ca0e7
--- /dev/null
+++ b/packages/qemu/files/trunk_nodocs.patch
@@ -0,0 +1,40 @@
+diff -Naur trunk_orig/Makefile trunk/Makefile
+--- trunk_orig/Makefile	2006-04-01 11:01:54.000000000 +0200
++++ trunk/Makefile	2006-04-01 12:40:45.000000000 +0200
+@@ -12,7 +12,7 @@
+ ifdef CONFIG_STATIC
+ LDFLAGS+=-static
+ endif
+-DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1
++DOCS=
+ 
+ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
+ 	for d in $(TARGET_DIRS); do \
+@@ -54,10 +54,10 @@
+                        pc-bios/proll.elf \
+                        pc-bios/linux_boot.bin "$(datadir)"
+ 	mkdir -p "$(docdir)"
+-	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
++#	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
+ ifndef CONFIG_WIN32
+ 	mkdir -p "$(mandir)/man1"
+-	install qemu.1 qemu-img.1 "$(mandir)/man1"
++#	install qemu.1 qemu-img.1 "$(mandir)/man1"
+ 	mkdir -p "$(datadir)/keymaps"
+ 	install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps"
+ endif
+@@ -122,10 +122,10 @@
+ 	$(datadir)/ppc_rom.bin \
+ 	$(datadir)/video.x \
+ 	$(datadir)/proll.elf \
+-	$(datadir)/linux_boot.bin \
+-	$(docdir)/qemu-doc.html \
+-	$(docdir)/qemu-tech.html \
+-	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
++	$(datadir)/linux_boot.bin
++#	$(docdir)/qemu-doc.html \
++#	$(docdir)/qemu-tech.html \
++#	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-img.1 )
+ 
+ ifneq ($(wildcard .depend),)
+ include .depend
diff --git a/packages/qemu/qemu-qop-nogfx-native_svn.bb b/packages/qemu/qemu-qop-nogfx-native_svn.bb
index cfe57653a2..58c65b606b 100644
--- a/packages/qemu/qemu-qop-nogfx-native_svn.bb
+++ b/packages/qemu/qemu-qop-nogfx-native_svn.bb
@@ -3,7 +3,8 @@ PV = "0.8.0+svn${SRCDATE}"
 PROVIDES = "qemu-native"
 
 SRC_URI = "svn://nowt.dyndns.org/svn/qemu;module=trunk;proto=https \
-           file://configure.patch;patch=1"
+           file://configure.patch;patch=1 \
+           file://trunk_nodocs.patch;patch=1"
            
 S = "${WORKDIR}/trunk"