merge of 'b34f7bef0e6b11e4d57624cc0e7afecfde12f0bc'

     and 'c0ff5cfb65ff533ba57e89d6af3dc28effc19792'

35 files changed, 46 insertions, 148 deletions

diff --git a/packages/libxfce4mcs/.mtn2git_empty b/packages/ecj/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfce4mcs/.mtn2git_empty
+++ b/packages/ecj/.mtn2git_empty
diff --git a/packages/ecj/ecj-native_3.2.2.bb b/packages/ecj/ecj-native_3.2.2.bb
new file mode 100644
index 0000000000..8afa2653ca
--- /dev/null
+++ b/packages/ecj/ecj-native_3.2.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "JDT Core Batch Compiler"
+HOMEPAGE = "http://www.eclipse.org/"
+PRIORITY = "optional"
+SECTION = "devel"
+LICENSE = "EPL"
+PR = "r0"
+
+inherit native
+
+SRC_URI = "http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.2.2-200702121330/ecj.jar \
+	   file://ecj.sh"
+
+do_stage() {
+        install -d ${STAGING_BINDIR_NATIVE}
+        install -m 755 ${S}/../ecj.jar ${STAGING_BINDIR_NATIVE}
+	install -m 755 ${S}/../ecj.sh ${STAGING_BINDIR_NATIVE}/ecj
+}
diff --git a/packages/libxfce4util/.mtn2git_empty b/packages/ecj/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/libxfce4util/.mtn2git_empty
+++ b/packages/ecj/files/.mtn2git_empty
diff --git a/packages/ecj/files/ecj.sh b/packages/ecj/files/ecj.sh
new file mode 100644
index 0000000000..75aa2c2287
--- /dev/null
+++ b/packages/ecj/files/ecj.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Xmx512m -jar $0.jar "$@"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index ceca03c0a8..5e34bb3014 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -13,6 +13,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
 SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
            file://fix-configure.patch;patch=1 \
+	   file://pagesize.patch;patch=1 \
            ${E_CVS};module=e17/libs/evas/m4;date=20060101"
 
 S = "${WORKDIR}/evas-${PV}"
diff --git a/packages/efl/evas/pagesize.patch b/packages/efl/evas/pagesize.patch
new file mode 100644
index 0000000000..5efd16a96e
--- /dev/null
+++ b/packages/efl/evas/pagesize.patch
@@ -0,0 +1,13 @@
+diff --git a/src/modules/engines/fb/evas_fb_main.c b/src/modules/engines/fb/evas_fb_main.c
+index e26c171..75e0743 100644
+--- a/src/modules/engines/fb/evas_fb_main.c
++++ b/src/modules/engines/fb/evas_fb_main.c
+@@ -530,7 +530,7 @@ fb_postinit(FB_Mode *mode)
+       fb_cleanup();
+       exit(1);
+     }
+-  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (~PAGE_MASK);
++  mode->mem_offset = (unsigned)(fb_fix.smem_start) & (getpagesize()-1);
+   mode->mem = (unsigned char *)mmap(NULL, fb_fix.smem_len + mode->mem_offset,
+ 				 PROT_WRITE | PROT_READ, MAP_SHARED, fb, 0);
+   if ((int)mode->mem == -1)
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
deleted file mode 100644
index 07d7a95ae1..0000000000
--- a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfce4mcs OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/libxfce4util/libxfce4util_4.3.99.2.bb b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
deleted file mode 100644
index d1c29197d6..0000000000
--- a/packages/libxfce4util/libxfce4util_4.3.99.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-require ${PN}.inc
-
-SRC_URI += "\
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-depends.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-features.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-python.m4 \
-http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-xfce.m4"
-
-
-MACROS="m4/xdt*.m4"
-
-XFCE_HEADERS="debug.h utf8.h xfce-generics.h   xfce-resource.h \
-              i18n.h util.h xfce-kiosk.h libxfce4util-config.h  \
-              xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \
-              xfce-fileutils.h xfce-rc.h xfce-utf8.h \
-              xfce-license.h xfce-i18n.h libxfce4util-enum-types.h"
-
-do_configure_prepend() {
-    install -m 0755 -d ${S}/m4/
-    install -m 0644 ${WORKDIR}/xdt-*.m4 ${S}/m4/
-}
diff --git a/packages/libxfcegui4/.mtn2git_empty b/packages/libxfcegui4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/libxfcegui4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/libxfcegui4/libxfcegui4_4.2.2.bb b/packages/libxfcegui4/libxfcegui4_4.2.2.bb
deleted file mode 100644
index 2def53685a..0000000000
--- a/packages/libxfcegui4/libxfcegui4_4.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
deleted file mode 100644
index 2def53685a..0000000000
--- a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/perl/liburi-perl-native_1.35.bb b/packages/perl/liburi-perl-native_1.35.bb
new file mode 100644
index 0000000000..3cb7197d97
--- /dev/null
+++ b/packages/perl/liburi-perl-native_1.35.bb
@@ -0,0 +1,2 @@
+inherit native
+require liburi-perl_${PV}.bb
diff --git a/packages/perl/liburi-perl_1.35.bb b/packages/perl/liburi-perl_1.35.bb
new file mode 100644
index 0000000000..c62de2c0fa
--- /dev/null
+++ b/packages/perl/liburi-perl_1.35.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Manipulates and accesses URI strings"
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+#RDEPENDS += " libmime-base64-perl libnet-perl"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-${PV}.tar.gz"
+
+S = "${WORKDIR}/URI-${PV}"
+
+inherit cpan
diff --git a/packages/xfce-mcs-manager/.mtn2git_empty b/packages/xfce-mcs-manager/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce-mcs-manager/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb
deleted file mode 100644
index de5cf2b012..0000000000
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-manager OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
deleted file mode 100644
index de5cf2b012..0000000000
--- a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-manager OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-mcs-plugins/.mtn2git_empty b/packages/xfce-mcs-plugins/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce-mcs-plugins/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb
deleted file mode 100644
index 02ad97e860..0000000000
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.2.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
deleted file mode 100644
index 02ad97e860..0000000000
--- a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfce-utils/.mtn2git_empty b/packages/xfce-utils/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce-utils/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb
deleted file mode 100644
index 472ba68a14..0000000000
--- a/packages/xfce-utils/xfce-utils_4.3.99.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfce-utils OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR = "r2"
-require ${PN}.inc
diff --git a/packages/xfce4-goodies/.mtn2git_empty b/packages/xfce4-goodies/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce4-goodies/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce4-panel/.mtn2git_empty b/packages/xfce4-panel/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfce4-panel/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
deleted file mode 100644
index 18dce6fa3c..0000000000
--- a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfce4-panel OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR="r1"
-require ${PN}.inc
diff --git a/packages/xfdesktop/.mtn2git_empty b/packages/xfdesktop/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfdesktop/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfdesktop/xfdesktop_4.2.0.bb b/packages/xfdesktop/xfdesktop_4.2.0.bb
deleted file mode 100644
index 7a90487cc8..0000000000
--- a/packages/xfdesktop/xfdesktop_4.2.0.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="xfce4 Desktop Background Manager"
-SECTION = "x11/base"
-DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2"
-
-inherit xfce
-PACKAGES += "xfdesktop-backdrops"
-
-FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*"
diff --git a/packages/xfdesktop/xfdesktop_4.3.99.2.bb b/packages/xfdesktop/xfdesktop_4.3.99.2.bb
deleted file mode 100644
index d7af836791..0000000000
--- a/packages/xfdesktop/xfdesktop_4.3.99.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR = "r1"
-require ${PN}.inc
diff --git a/packages/xfwm4-themes/.mtn2git_empty b/packages/xfwm4-themes/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfwm4-themes/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb b/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
deleted file mode 100644
index f133e9524c..0000000000
--- a/packages/xfwm4-themes/xfwm4-themes_4.2.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="XFCE4 Window Manager Themes"
-SECTION = "x11/wm"
-
-inherit xfce
-
-# No ${PN} for this one
-PACKAGES=""
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
diff --git a/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb b/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb
deleted file mode 100644
index 9f67ad2ed9..0000000000
--- a/packages/xfwm4-themes/xfwm4-themes_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfwm4/.mtn2git_empty b/packages/xfwm4/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/xfwm4/.mtn2git_empty
+++ /dev/null
diff --git a/packages/xfwm4/xfwm4_4.2.0.bb b/packages/xfwm4/xfwm4_4.2.0.bb
deleted file mode 100644
index e6fbd22b59..0000000000
--- a/packages/xfwm4/xfwm4_4.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="XFCE4 Window Manager"
-SECTION = "x11/wm"
-inherit xfce
-
-
-FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-
-DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
-
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
diff --git a/packages/xfwm4/xfwm4_4.2.2.bb b/packages/xfwm4/xfwm4_4.2.2.bb
deleted file mode 100644
index 2fc47e641e..0000000000
--- a/packages/xfwm4/xfwm4_4.2.2.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-PR="r1"
-require ${PN}.inc
diff --git a/packages/xfwm4/xfwm4_4.2.3.2.bb b/packages/xfwm4/xfwm4_4.2.3.2.bb
deleted file mode 100644
index e1feff01f1..0000000000
--- a/packages/xfwm4/xfwm4_4.2.3.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc
diff --git a/packages/xfwm4/xfwm4_4.3.99.2.bb b/packages/xfwm4/xfwm4_4.3.99.2.bb
deleted file mode 100644
index e1feff01f1..0000000000
--- a/packages/xfwm4/xfwm4_4.3.99.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require ${PN}.inc