illume-keyboards-shr_git.bb: new recipe

This folds the various illume-keyboard-* that were in the efl1
folder into one recipe in the correct place (e17).

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

16 files changed, 81 insertions, 205 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 73cbd7f688..94fe83459f 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -107,18 +107,7 @@ SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
-SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-intone ?= "66"
diff --git a/recipes/e17/illume-keyboards-shr_git.bb b/recipes/e17/illume-keyboards-shr_git.bb
new file mode 100644
index 0000000000..109dc51a54
--- /dev/null
+++ b/recipes/e17/illume-keyboards-shr_git.bb
@@ -0,0 +1,78 @@
+SECTION = "x11/data"
+
+SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+PV = "0.0+gitr${SRCPV}"
+PE = "1"
+PR = "r1"
+
+
+PACKAGES = "\
+illume-keyboard-arabic \
+illume-keyboard-browse \
+illume-keyboard-danish \
+illume-keyboard-default-alt \
+illume-keyboard-dutch \
+illume-keyboard-dvorak \
+illume-keyboard-french \
+illume-keyboard-german \
+illume-keyboard-hebrew \
+illume-keyboard-numeric-alt \
+illume-keyboard-russian \
+illume-keyboard-russian-terminal \
+"
+
+PACKAGE_ARCH = "all"
+
+AUTHOR_illume-keyboard-arabic = "Mohammad Fahmi / Tom Hacohen"
+DESCRIPTION_illume-keyboard-arabic = "Illume keyboard with arabic layout"
+FILES_illume-keyboard-arabic = "${libdir}/enlightenment/modules/illume/keyboards/arabic"
+
+AUTHOR_illume-keyboard-browse = "Pander"
+DESCRIPTION_illume-keyboard-browse = "Illume keyboard with a layout optimized for browsing"
+FILES_illume-keyboard-browse = "${libdir}/enlightenment/modules/illume/keyboards/browse"
+
+AUTHOR_illume-keyboard-danish = "Esben Damgaard"
+DESCRIPTION_illume-keyboard-danish = "Illume keyboard with danish layout"
+FILES_illume-keyboard-danish = "${libdir}/enlightenment/modules/illume/keyboards/danish"
+
+AUTHOR_illume-keyboard-default-alt = "Pander"
+DESCRIPTION_illume-keyboard-default-alt = "Illume keyboard with an alternative default layout"
+FILES_illume-keyboard-default-alt = "${libdir}/enlightenment/modules/illume/keyboards/default-alt"
+
+AUTHOR_illume-keyboard-dutch = "Pander"
+DESCRIPTION_illume-keyboard-dutch = "Illume keyboard with dutch layout"
+FILES_illume-keyboard-dutch = "${libdir}/enlightenment/modules/illume/keyboards/dutch"
+
+AUTHOR_illume-keyboard-dvorak = "Gabor Adam TOTH"
+DESCRIPTION_illume-keyboard-dvorak = "Illume keyboard with dvorak layout"
+FILES_illume-keyboard-dvorak = "${libdir}/enlightenment/modules/illume/keyboards/dvorak"
+
+DESCRIPTION_illume-keyboard-french = "Illume keyboard with french layout"
+FILES_illume-keyboard-french = "${libdir}/enlightenment/modules/illume/keyboards/french"
+
+AUTHOR_illume-keyboard-german = "Florian Hackenberger"
+DESCRIPTION_illume-keyboard-german = "Illume keyboard with german layout"
+FILES_illume-keyboard-german = "${libdir}/enlightenment/modules/illume/keyboards/german"
+
+AUTHOR_illume-keyboard-hebrew = "Tom Hacohen"
+DESCRIPTION_illume-keyboard-hebrew = "Illume keyboard with hebrew layout"
+FILES_illume-keyboard-hebrew = "${libdir}/enlightenment/modules/illume/keyboards/hebrew"
+
+AUTHOR_illume-keyboard-numeric-alt = "Pander"
+DESCRIPTION_illume-keyboard-numeric-alt = "Illume keyboard with an alternative numeric layout"
+FILES_illume-keyboard-numeric-alt = "${libdir}/enlightenment/modules/illume/keyboards/numeric-alt"
+
+AUTHOR_illume-keyboard-russian = "lucky"
+DESCRIPTION_illume-keyboard-russian = "Illume keyboard with russian layout"
+FILES_illume-keyboard-russian = "${libdir}/enlightenment/modules/illume/keyboards/russian"
+
+AUTHOR_illume-keyboard-russian-terminal = "lucky"
+DESCRIPTION_illume-keyboard-russian-terminal = "Illume keyboard with russian layout for the Terminal"
+FILES_illume-keyboard-russian-terminal = "${libdir}/enlightenment/modules/illume/keyboards/russian-terminal"
+
+do_install() {
+	make DESTDIR=${D} install
+}
+
diff --git a/recipes/efl1/illume-keyboard-arabic_git.bb b/recipes/efl1/illume-keyboard-arabic_git.bb
deleted file mode 100644
index fcc01c905a..0000000000
--- a/recipes/efl1/illume-keyboard-arabic_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "Mohammad Fahmi / Tom Hacohen"
-DESCRIPTION = "Illume keyboard with arabic layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "arabic"
-INSTFILES = "Arabic.kbd Arabic.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-browse_git.bb b/recipes/efl1/illume-keyboard-browse_git.bb
deleted file mode 100644
index b9f5e750d1..0000000000
--- a/recipes/efl1/illume-keyboard-browse_git.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-AUTHOR = "Pander"
-DESCRIPTION = "Illume keyboard with a layout optimized for browsing"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "browse"
-INSTFILES = "\
-Browse.kbd \
-end-browse.png \
-pagedown-browse.png \
-browse.png \
-home-browse.png \
-pageup-browse.png \
-space-browse.png \
-"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-danish_git.bb b/recipes/efl1/illume-keyboard-danish_git.bb
deleted file mode 100644
index b824a9e9d9..0000000000
--- a/recipes/efl1/illume-keyboard-danish_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "Esben Damgaard"
-DESCRIPTION = "Illume keyboard with danish layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "danish"
-INSTFILES = "Danish.kbd danish.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-default-alt_git.bb b/recipes/efl1/illume-keyboard-default-alt_git.bb
deleted file mode 100644
index 4ceca530ae..0000000000
--- a/recipes/efl1/illume-keyboard-default-alt_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "Pander"
-DESCRIPTION = "Illume keyboard with an alternative default layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "default-alt"
-INSTFILES = "Default-alt.kbd"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-dutch_git.bb b/recipes/efl1/illume-keyboard-dutch_git.bb
deleted file mode 100644
index 15d0022de8..0000000000
--- a/recipes/efl1/illume-keyboard-dutch_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTHOR = "Pander"
-DESCRIPTION = "Illume keyboard with dutch layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "dutch"
-INSTFILES = "\
-capslock-negative.png \
-end.png \
-pagedown.png \
-qwerty-dutch-nl.png \
-Terminal-dutch-nl.kbd \
-capslock.png \
-home.png \
-pageup.png \
-space.png \
-"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-dvorak_git.bb b/recipes/efl1/illume-keyboard-dvorak_git.bb
deleted file mode 100644
index 61c58b406b..0000000000
--- a/recipes/efl1/illume-keyboard-dvorak_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "Gabor Adam TOTH"
-DESCRIPTION = "Illume keyboard with dvorak layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "dvorak"
-INSTFILES = "Dvorak.kbd dvorak.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-french_git.bb b/recipes/efl1/illume-keyboard-french_git.bb
deleted file mode 100644
index 5e957e98e1..0000000000
--- a/recipes/efl1/illume-keyboard-french_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Illume keyboard with french layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "french"
-INSTFILES = "Azerty.kbd Azerty.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-german_git.bb b/recipes/efl1/illume-keyboard-german_git.bb
deleted file mode 100644
index 7120dea750..0000000000
--- a/recipes/efl1/illume-keyboard-german_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "Florian Hackenberger"
-DESCRIPTION = "Illume keyboard with german layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "german"
-INSTFILES = "German.kbd German.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-hebrew_git.bb b/recipes/efl1/illume-keyboard-hebrew_git.bb
deleted file mode 100644
index cbd47eaad3..0000000000
--- a/recipes/efl1/illume-keyboard-hebrew_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "Tom Hacohen"
-DESCRIPTION = "Illume keyboard with hebrew layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "hebrew"
-INSTFILES = "Hebrew.kbd Alpha-hebrew-il.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-numeric-alt_git.bb b/recipes/efl1/illume-keyboard-numeric-alt_git.bb
deleted file mode 100644
index 8abfb8f020..0000000000
--- a/recipes/efl1/illume-keyboard-numeric-alt_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTHOR = "Pander"
-DESCRIPTION = "Illume keyboard with an alternative numeric layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "numeric-alt"
-INSTFILES = "\
-end-alt.png \
-home-alt.png \
-Numbers-alt.kbd \
-numeric-alt.png \
-pagedown-alt.png \
-pageup-alt.png \
-"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard-russian-terminal_git.bb b/recipes/efl1/illume-keyboard-russian-terminal_git.bb
deleted file mode 100644
index b625e937c2..0000000000
--- a/recipes/efl1/illume-keyboard-russian-terminal_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTHOR = "lucky"
-DESCRIPTION = "Illume keyboard with russian layout for the Terminal"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "russian-terminal"
-INSTFILES = "Terminal_Russian.kbd Terminal-russian-ru.png"
-
-require illume-keyboard.inc
diff --git a/recipes/efl1/illume-keyboard-russian_git.bb b/recipes/efl1/illume-keyboard-russian_git.bb
deleted file mode 100644
index ed0644ee58..0000000000
--- a/recipes/efl1/illume-keyboard-russian_git.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTHOR = "lucky"
-DESCRIPTION = "Illume keyboard with russian layout"
-PV = "0.0+gitr${SRCREV}"
-PE = "1"
-PR = "r0"
-
-BASEDIR = "russian"
-INSTFILES = "X8_Russian.kbd X8-russian-ru.png"
-
-require illume-keyboard.inc
-
-
diff --git a/recipes/efl1/illume-keyboard.inc b/recipes/efl1/illume-keyboard.inc
deleted file mode 100644
index 4003352cc1..0000000000
--- a/recipes/efl1/illume-keyboard.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "x11/data"
-
-SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master"
-S = "${WORKDIR}/git"
-
-FILES_${PN} = "${libdir}/enlightenment/modules/illume/keyboards/*"
-PACKAGE_ARCH = "all"
-
-do_install() {
-	install -d ${D}${libdir}/enlightenment/modules/illume/keyboards
-	for f in ${INSTFILES}; do
-		install -m 0644 ${S}/${BASEDIR}/${f} ${D}${libdir}/enlightenment/modules/illume/keyboards/
-	done
-}
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 4ec77cdc97..17766635ec 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r26"
+PR = "r27"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -211,18 +211,7 @@ RDEPENDS_${PN} += "\
 		elmdentica \
 		shr-installer \
 		eject \
-		illume-keyboard-german \
-		illume-keyboard-arabic \
-		illume-keyboard-browse \
-		illume-keyboard-danish \
-		illume-keyboard-default-alt \
-		illume-keyboard-dutch \
-		illume-keyboard-dvorak \
-		illume-keyboard-french \
-		illume-keyboard-hebrew \
-		illume-keyboard-numeric-alt \
-		illume-keyboard-russian-terminal \
-		illume-keyboard-russian \
+		illume-keyboards-shr \
 		python-xlib \
 		xcompmgr \
 		man \