merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'

     and 'f556521018478109967b108bb830f8109aefbb0e'

110 files changed, 442 insertions, 94541 deletions

diff --git a/packages/cmake/cmake-native_2.4.7.bb b/packages/cmake/cmake-native_2.4.7.bb
new file mode 100644
index 0000000000..fcfdda1c1a
--- /dev/null
+++ b/packages/cmake/cmake-native_2.4.7.bb
@@ -0,0 +1,3 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
+inherit native
diff --git a/packages/cmake/cmake-native_2.2.3.bb b/packages/cmake/cmake.inc
index b4e84cc093..83475bb5eb 100644
--- a/packages/cmake/cmake-native_2.2.3.bb
+++ b/packages/cmake/cmake.inc
@@ -7,14 +7,12 @@ HOMEPAGE = "http://www.cmake.org/"
 LICENSE = "Berkely-style license"
 SECTION = "console/utils"
 
-SRC_URI = "http://www.cmake.org/files/v2.2/cmake-${PV}.tar.gz"
+SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
 
 inherit autotools
 
 S = "${WORKDIR}/cmake-${PV}"
 
-inherit native
-
 do_configure () {
 	./configure --prefix=${base_prefix} || die "./bootstrap failed"
 }
diff --git a/packages/cmake/cmake_2.4.7.bb b/packages/cmake/cmake_2.4.7.bb
new file mode 100644
index 0000000000..619aea9701
--- /dev/null
+++ b/packages/cmake/cmake_2.4.7.bb
@@ -0,0 +1,2 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
diff --git a/packages/distcc/distcc_2.18.3.bb b/packages/distcc/distcc_2.18.3.bb
index 506618d359..ebf02e17ee 100644
--- a/packages/distcc/distcc_2.18.3.bb
+++ b/packages/distcc/distcc_2.18.3.bb
@@ -2,14 +2,15 @@ DESCRIPTION = "distcc is a parallel build system that distributes \
 compilation of C/C++/ObjC code across machines on a network."
 SECTION = "devel"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "avahi gtk+"
 RRECOMMENDS = "avahi-daemon"
 
 SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \
 	   file://distcc-avahi.patch;patch=1 \
-	   file://default \
+	   file://no-man.patch;patch=1 \
+           file://default \
 	   file://distcc"
 
 inherit autotools pkgconfig update-rc.d
@@ -21,8 +22,10 @@ EXTRA_OECONF = " --with-gtk "
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d/
     install -d ${D}${sysconfdir}/default
+    install -d ${D}${sysconfdir}/distcc
     install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+    echo "+zeroconf" > ${D}${sysconfdir}/distcc/hosts
 }
 
 PACKAGES += "distcc-distmon-gnome"
@@ -31,5 +34,11 @@ FILES_${PN} = " ${sysconfdir} \
 		${bindir}/distcc \
 		${bindir}/distccd \
 		${bindir}/distccmon-text"
+
+CONFFILES_${PN} += "${sysconfdir}/default/distcc \
+                    ${sysconfdir}/distcc/hosts \
+                    ${sysconfdir}/init.d/distcc \
+                   " 
+
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
 				${datadir}/distcc"
diff --git a/packages/distcc/files/no-man.patch b/packages/distcc/files/no-man.patch
new file mode 100644
index 0000000000..ac1c18ac96
--- /dev/null
+++ b/packages/distcc/files/no-man.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.in	2008-01-06 16:44:45.696595605 +0100
++++ distcc-2.18.3/Makefile.in	2008-01-06 16:44:56.879181132 +0100
+@@ -556,7 +556,7 @@
+ # install-sh can't handle multiple arguments, but we don't need any
+ # tricky features so mkinstalldirs and cp will do
+ 
+-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@
++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@
+ 
+ install-programs: $(bin_PROGRAMS)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff --git a/packages/docbook-utils/docbook-utils-native_0.6.13.bb b/packages/docbook-utils/docbook-utils-native_0.6.13.bb
index ec0449e858..19aa327107 100644
--- a/packages/docbook-utils/docbook-utils-native_0.6.13.bb
+++ b/packages/docbook-utils/docbook-utils-native_0.6.13.bb
@@ -1,6 +1,6 @@
 SECTION = "console/utils"
 LICENSE = "GPL"
-DEPENDS = "openjade-native docbook-sgml-dtd-native docbook-dsssl-stylesheets-native"
+DEPENDS = "openjade-native docbook-sgml-dtd-3.1-native docbook-dsssl-stylesheets-native"
 
 SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook