Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev

3 files changed, 70 insertions, 4 deletions

diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc
new file mode 100644
index 0000000000..18dd39bd04
--- /dev/null
+++ b/recipes/gpe-icons/gpe-icons.inc
@@ -0,0 +1,38 @@
+SECTION = "gpe"
+RDEPENDS += "gdk-pixbuf-loader-png"
+
+INHERIT = "gpe"
+INHERIT_shr = "gpe update-alternatives"
+inherit ${INHERIT}
+
+INC_PR = "r4"
+
+ALTERNATIVE_NAME = "gpe-pixmaps"
+ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps"
+ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst_shr() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+        pixmap_dirs_root="${datadir}/gpe/"
+        cd ${pixmap_dirs_root}
+        for pixmap_dir in pixmaps.*; do
+                if [ "${pixmap_dir}"x == "pixmaps.${PN}"x ] ; then
+                          continue;
+                fi
+                for pixmap in `find ${pixmap_dir}`; do 
+                          pixmap_target=`echo ${pixmap} | sed "s/${pixmap_dir}/pixmaps.${PN}/g"`; 
+                          if [ ! -e ${pixmap_target} ] ; then 
+                                      cp -ra ${pixmap} ${pixmap_target}; 
+                                      echo "${pixmap} merged"; 
+                          fi; 
+                done
+        done
+}
diff --git a/recipes/gpe-icons/gpe-icons_0.25.bb b/recipes/gpe-icons/gpe-icons_0.25.bb
index 6276e9510b..7070e12c2b 100644
--- a/recipes/gpe-icons/gpe-icons_0.25.bb
+++ b/recipes/gpe-icons/gpe-icons_0.25.bb
@@ -4,12 +4,15 @@ SECTION = "gpe"
 
 RDEPENDS = "gdk-pixbuf-loader-png"
 
-
-inherit gpe
-
-PR = "r1"
+PR = "${INC_PR}.0"
 
 #only icons present in the package
 PACKAGE_ARCH = "all"
 FILES_${PN} = "${datadir}/gpe"
 
+#Only SHR is using u-a for gpe-icons
+do_configure_prepend_shr() {
+        sed -i "s| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps/| \$(DESTDIR)\$(PREFIX)/share/gpe/pixmaps.${PN}/|g" Makefile
+}
+
+require gpe-icons.inc
diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb
new file mode 100644
index 0000000000..3f0f7b1c7c
--- /dev/null
+++ b/recipes/gpe-icons/gpe-theme-neo_git.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme"
+SECTION = "gpe"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "gdk-pixbuf-loader-png gpe-filemanager gpe-sketchbook"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PR = "${INC_PR}.0"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/gpe/theme-neo/pixmaps"
+
+require gpe-icons.inc
+
+do_install() {
+        install -d ${D}${datadir}/gpe/
+        install -d ${D}${datadir}/gpe/pixmaps.${PN}/
+        cp -r ${S}/* "${D}${datadir}/gpe/pixmaps.${PN}/"
+}
+
+FILES_${PN} = "${datadir}/gpe/pixmaps.${PN}/"
+