merge of '3f551b06dbb61a62224fe6d9f3affb063932e0f1'

     and 'b06c292fe0a6222355b7b5337759a187eafa372b'

6 files changed, 38 insertions, 37 deletions

diff --git a/packages/ecj/ecj-initial_3.3.2.bb b/packages/ecj/ecj-initial_3.3.2.bb
index 22cced959d..60bbc5546c 100644
--- a/packages/ecj/ecj-initial_3.3.2.bb
+++ b/packages/ecj/ecj-initial_3.3.2.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
 HOMEPAGE = "http://www.eclipse.org/"
 LICENSE = "EPL"
 
-DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+DEPENDS = "fastjar-native unzip-native jikes-initial virtual/java-initial"
 
 SRC_URI = "\
     http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \
diff --git a/packages/ecj/ecj-initial_3.3.bb b/packages/ecj/ecj-initial_3.3.bb
index 7b65daef99..884d98f30b 100644
--- a/packages/ecj/ecj-initial_3.3.bb
+++ b/packages/ecj/ecj-initial_3.3.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
 HOMEPAGE = "http://www.eclipse.org/"
 LICENSE = "EPL"
 
-DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+DEPENDS = "fastjar-native unzip-native jikes-initial virtual/java-initial"
 
 SRC_URI = "\
     http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
diff --git a/packages/ecj/ecj-initial_3.4.bb b/packages/ecj/ecj-initial_3.4.bb
index a0cacffebb..dcc08139c1 100644
--- a/packages/ecj/ecj-initial_3.4.bb
+++ b/packages/ecj/ecj-initial_3.4.bb
@@ -7,7 +7,7 @@ DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
 HOMEPAGE = "http://www.eclipse.org/"
 LICENSE = "EPL"
 
-DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+DEPENDS = "fastjar-native unzip-native jikes-initial virtual/java-initial"
 
 SRC_URI = "\
     http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip \
diff --git a/packages/qtnx/qtnx-qte_0.9.bb b/packages/qtnx/qtnx-qte_0.9.bb
new file mode 100644
index 0000000000..998666b276
--- /dev/null
+++ b/packages/qtnx/qtnx-qte_0.9.bb
@@ -0,0 +1,2 @@
+require qtnx.inc
+inherit qtopia4core
diff --git a/packages/qtnx/qtnx.inc b/packages/qtnx/qtnx.inc
new file mode 100644
index 0000000000..b20339001e
--- /dev/null
+++ b/packages/qtnx/qtnx.inc
@@ -0,0 +1,31 @@
+DESCRIPTION = "This a the freesource nx client, build with qt"
+HOMEPAGE = "http://freenx.berlios.de/"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r1"
+
+DEPENDS = "libnxcl"
+
+SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \
+	   file://pro.patch;patch=1 \
+	   file://id-path.patch;patch=1 \
+	   file://scroll.patch;patch=1 \
+	  "
+
+S = "${WORKDIR}/freenx-client-${PV}/qtnx"
+
+FILES_${PN} += ${datadir}/id.key
+
+do_configure_prepend () {
+
+	rm ${S}/qtnxwin32.pro
+
+}
+
+do_install () {
+       install -d ${D}${bindir}/
+       install -s -m 0755 qtnx ${D}${bindir}/
+       install -d ${D}${datadir}/
+       install -m 0644 id.key ${D}${datadir}/ 
+}
+
diff --git a/packages/qtnx/qtnx_0.9.bb b/packages/qtnx/qtnx_0.9.bb
index d0ed565b36..f4e045d60d 100644
--- a/packages/qtnx/qtnx_0.9.bb
+++ b/packages/qtnx/qtnx_0.9.bb
@@ -1,34 +1,2 @@
-DESCRIPTION = "This a the freesource nx client, build with qt"
-HOMEPAGE = "http://freenx.berlios.de/"
-SECTION = "libs"
-LICENSE = "GPL"
-PR = "r0"
-
-DEPENDS = "libnxcl"
-
-SRC_URI = "http://download.berlios.de/freenx/freenx-client-${PV}.tar.bz2 \
-	   file://pro.patch;patch=1 \
-	   file://id-path.patch;patch=1 \
-	   file://scroll.patch;patch=1 \
-	  "
-
-S = "${WORKDIR}/freenx-client-${PV}/qtnx"
-
-inherit qtopia4core
-
-
-FILES_${PN} += ${datadir}/id.key
-
-do_configure_prepend () {
-
-	rm ${S}/qtnxwin32.pro
-
-}
-
-do_install () {
-       install -d ${D}${bindir}/
-       install -s -m 0755 qtnx ${D}${bindir}/
-       install -d ${D}${datadir}/
-       install -m 0644 id.key ${D}${datadir}/ 
-}
-
+require qtnx.inc
+inherit qt4x11