merge of '6bfc098b36170550230dc57120c75b31480dc6b3'

     and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'

9 files changed, 49 insertions, 102 deletions

diff --git a/packages/gnome/gnome-desktop.inc b/packages/gnome/gnome-desktop.inc
new file mode 100644
index 0000000000..aeabf4f41e
--- /dev/null
+++ b/packages/gnome/gnome-desktop.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "GNOME library for reading .desktop files"
+SECTION = "x11/gnome"
+LICENSE = "GPL"
+DEPENDS = "gnome-common libgnomeui"
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_configure_prepend () {
+	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+do_stage () {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gnome-about"
diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb
index b8e098f40c..2bf249ddb6 100644
--- a/packages/gnome/gnome-desktop_2.10.2.bb
+++ b/packages/gnome/gnome-desktop_2.10.2.bb
@@ -1,17 +1,5 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r1"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome pkgconfig
-
-DEPENDS = "gnome-common libgnomeui"
+require gnome-desktop.inc
 
-EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
+PR = "r1"
 
-do_stage () {
-autotools_stage_all
-}
+inherit gnome pkgconfig
diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb
index 69de709350..fb45b134ae 100644
--- a/packages/gnome/gnome-desktop_2.16.1.bb
+++ b/packages/gnome/gnome-desktop_2.16.1.bb
@@ -1,25 +1,9 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r2"
-DESCRIPTION = "GNOME library for reading .desktop files"
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils libgnomeui"
+DEPENDS += "gnome-doc-utils"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-FILES_${PN} += "${datadir}/gnome-about"
-
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gnome/gnome-desktop_2.18.3.bb b/packages/gnome/gnome-desktop_2.18.3.bb
index c2888bf2a4..7b9a5932e1 100644
--- a/packages/gnome/gnome-desktop_2.18.3.bb
+++ b/packages/gnome/gnome-desktop_2.18.3.bb
@@ -1,23 +1,10 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r2"
-DESCRIPTION = "GNOME library for reading .desktop files"
+
 inherit gnome pkgconfig
 
-DEPENDS = "gnome-common gnome-doc-utils gnome-vfs libgnomeui"
+DEPENDS += "gnome-doc-utils gnome-vfs"
 
 SRC_URI += "file://scrollkeeper.patch;patch=1 \
             file://no-desktop-docs.patch;patch=1;pnum=0"
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-FILES_${PN} += "${datadir}/gnome-about"
-
-
-do_stage () {
-	autotools_stage_all
-}
diff --git a/packages/gnome/gnome-desktop_2.7.90.bb b/packages/gnome/gnome-desktop_2.7.90.bb
index c7fd61470d..53b70245ca 100644
--- a/packages/gnome/gnome-desktop_2.7.90.bb
+++ b/packages/gnome/gnome-desktop_2.7.90.bb
@@ -1,17 +1,12 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
+require gnome-desktop.inc
+
 PR = "r0"
-DESCRIPTION = "GNOME library for reading .desktop files"
-inherit gnome
 
-DEPENDS = "gnome-common libgnomeui"
+inherit gnome
 
+EXTRA_OECONF = ""
 EXTRA_AUTORECONF = "-I ${STAGING_DATADIR}/aclocal/gnome2-macros"
 
-do_configure_prepend () {
-	cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
 do_stage () {
 	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnome/
 #	install -d ${STAGING_INCDIR}/gnome-desktop-2.0/libgnomeui/
diff --git a/packages/gnome/gnome-doc-utils.inc b/packages/gnome/gnome-doc-utils.inc
new file mode 100644
index 0000000000..ff62257aa8
--- /dev/null
+++ b/packages/gnome/gnome-doc-utils.inc
@@ -0,0 +1,16 @@
+LICENSE = "GPL LGPL"
+DEPENDS = "libxml2 libxslt libxslt-native"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_stage() {
+	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
+	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xml*"
diff --git a/packages/gnome/gnome-doc-utils_0.10.3.bb b/packages/gnome/gnome-doc-utils_0.10.3.bb
index 315cdbd160..cfb4788076 100644
--- a/packages/gnome/gnome-doc-utils_0.10.3.bb
+++ b/packages/gnome/gnome-doc-utils_0.10.3.bb
@@ -1,16 +1,3 @@
-LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt"
+require gnome-doc-utils.inc
 
 PR = "r0"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-FILES_${PN} += "${datadir}/xml*"
-
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
-}
diff --git a/packages/gnome/gnome-doc-utils_0.12.0.bb b/packages/gnome/gnome-doc-utils_0.12.0.bb
index f190a5ae13..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ b/packages/gnome/gnome-doc-utils_0.12.0.bb
@@ -1,16 +1,3 @@
-LICENSE = "GPL/LGPL"
-DEPENDS = "libxml2 libxslt"
+require gnome-doc-utils.inc
 
 PR = "r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-FILES_${PN} += "${datadir}/xml*"
-
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
-}
diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb
index 86a36c4bd7..2499ac36e4 100644
--- a/packages/gnome/gnome-doc-utils_0.7.1.bb
+++ b/packages/gnome/gnome-doc-utils_0.7.1.bb
@@ -1,16 +1,3 @@
-LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt"
+require gnome-doc-utils.inc
 
 PR = "r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-FILES_${PN} += "${datadir}/xml*"
-
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
-}