From 038f68a6b713e8e19780e06856af02da38485e9f Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 8 Mar 2010 16:54:09 +0100
Subject: shr: move etk-themes to obsolete, remove etk-theme-neo from RSUGGESTS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/obsolete/shr/etk-theme-neo_git.bb | 13 ++++++++++++
 recipes/obsolete/shr/etk-theme-shr_git.bb |  9 ++++++++
 recipes/obsolete/shr/etk-theme.inc        | 34 +++++++++++++++++++++++++++++++
 recipes/shr/e-wm-theme-illume-neo_git.bb  |  4 ++--
 recipes/shr/elementary-theme-neo_git.bb   |  4 ++--
 recipes/shr/etk-theme-neo_git.bb          | 13 ------------
 recipes/shr/etk-theme-shr_git.bb          |  8 --------
 recipes/shr/etk-theme.inc                 | 34 -------------------------------
 recipes/shr/gtk-theme-neo_git.bb          |  4 ++--
 recipes/shr/icon-theme-neo_git.bb         |  4 ++--
 10 files changed, 64 insertions(+), 63 deletions(-)
 create mode 100644 recipes/obsolete/shr/etk-theme-neo_git.bb
 create mode 100644 recipes/obsolete/shr/etk-theme-shr_git.bb
 create mode 100644 recipes/obsolete/shr/etk-theme.inc
 delete mode 100644 recipes/shr/etk-theme-neo_git.bb
 delete mode 100644 recipes/shr/etk-theme-shr_git.bb
 delete mode 100644 recipes/shr/etk-theme.inc

(limited to 'recipes')

diff --git a/recipes/obsolete/shr/etk-theme-neo_git.bb b/recipes/obsolete/shr/etk-theme-neo_git.bb
new file mode 100644
index 0000000000..ab028b1228
--- /dev/null
+++ b/recipes/obsolete/shr/etk-theme-neo_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "nEo etk theme - a very fast, high contrast etk theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
+PR = "r4"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+require etk-theme.inc
diff --git a/recipes/obsolete/shr/etk-theme-shr_git.bb b/recipes/obsolete/shr/etk-theme-shr_git.bb
new file mode 100644
index 0000000000..764955e48f
--- /dev/null
+++ b/recipes/obsolete/shr/etk-theme-shr_git.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "etk SHR theme"
+LICENSE = "MIT BSD"
+PV = "1.1.1-${EFL_SRCREV}+gitr${SRCREV}"
+PR = "r2"
+
+SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+require etk-theme.inc
diff --git a/recipes/obsolete/shr/etk-theme.inc b/recipes/obsolete/shr/etk-theme.inc
new file mode 100644
index 0000000000..6e8b33db27
--- /dev/null
+++ b/recipes/obsolete/shr/etk-theme.inc
@@ -0,0 +1,34 @@
+SECTION = "e/utils"
+DEPENDS = "edje-native"
+RDEPENDS = "etk"
+
+S = "${WORKDIR}/git/etk/${PN}/"
+
+do_compile() {
+        ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/etk/themes.${PN}/
+        install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes.${PN}/
+}
+
+FILES_${PN} = "${datadir}/etk/themes.${PN}"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "etk-theme"
+ALTERNATIVE_LINK = "${datadir}/etk/themes"
+ALTERNATIVE_PATH = "${datadir}/etk/themes.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst() {
+        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
+}
diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb
index 0d1859902f..ca1b3ab3ce 100644
--- a/recipes/shr/e-wm-theme-illume-neo_git.bb
+++ b/recipes/shr/e-wm-theme-illume-neo_git.bb
@@ -4,12 +4,12 @@ HOMEPAGE = "http://jmccloud.jm.funpic.de"
 AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
 DEPENDS = "edje-native"
 RDEPENDS = "e-wm"
-RSUGGESTS = "elementary-theme-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+RSUGGESTS = "elementary-theme-neo gtk-theme-neo gpe-theme-neo icon-theme-neo"
 LICENCE = "unknown"
 
 SRCREV = "820f4d41531ad6f790615b6a7312a60e30e99fdc"
 PV = "0.1-${EFL_SRCREV}+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 
diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb
index bc01e23922..ff310445c8 100644
--- a/recipes/shr/elementary-theme-neo_git.bb
+++ b/recipes/shr/elementary-theme-neo_git.bb
@@ -3,12 +3,12 @@ SECTION = "e/utils"
 HOMEPAGE = "http://jmccloud.jm.funpic.de"
 AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
 DEPENDS = "edje-native"
-RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo"
 LICENSE = "unknown"
 
 SRCREV = "fb377425e69ce1fc13f5094801b96836203e8154"
 PV = "0.5-${EFL_SRCREV}+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
           "
diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb
deleted file mode 100644
index ab028b1228..0000000000
--- a/recipes/shr/etk-theme-neo_git.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "nEo etk theme - a very fast, high contrast etk theme"
-HOMEPAGE = "http://jmccloud.jm.funpic.de"
-AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
-RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo icon-theme-neo"
-LICENSE = "unknown"
-
-SRCREV = "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
-PR = "r4"
-
-SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
-
-require etk-theme.inc
diff --git a/recipes/shr/etk-theme-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb
deleted file mode 100644
index e05fa56ee4..0000000000
--- a/recipes/shr/etk-theme-shr_git.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "etk SHR theme"
-LICENSE = "MIT BSD"
-PV = "1.1.1-${EFL_SRCREV}+gitr${SRCREV}"
-PR = "r2"
-
-SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
-
-require etk-theme.inc
diff --git a/recipes/shr/etk-theme.inc b/recipes/shr/etk-theme.inc
deleted file mode 100644
index 6e8b33db27..0000000000
--- a/recipes/shr/etk-theme.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-SECTION = "e/utils"
-DEPENDS = "edje-native"
-RDEPENDS = "etk"
-
-S = "${WORKDIR}/git/etk/${PN}/"
-
-do_compile() {
-        ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj
-}
-
-do_install() {
-        install -d ${D}${datadir}/etk/themes.${PN}/
-        install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes.${PN}/
-}
-
-FILES_${PN} = "${datadir}/etk/themes.${PN}"
-
-inherit update-alternatives
-
-ALTERNATIVE_NAME = "etk-theme"
-ALTERNATIVE_LINK = "${datadir}/etk/themes"
-ALTERNATIVE_PATH = "${datadir}/etk/themes.${PN}"
-ALTERNATIVE_PRIORITY ?= 1
-
-pkg_postinst() {
-        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
-}
diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb
index bfa635bfbe..94f9b9f992 100644
--- a/recipes/shr/gtk-theme-neo_git.bb
+++ b/recipes/shr/gtk-theme-neo_git.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "nEo GTK theme - a very fast, high contrast GTK theme"
 HOMEPAGE = "http://jmccloud.jm.funpic.de"
 AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
 RDEPENDS += "icon-theme-neo"
-RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gpe-theme-neo icon-theme-neo"
 LICENSE = "unknown"
 
 SRCREV = "f847105c5ef5d488a4bce0c0a85d572c3509d56f"
 PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 
diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb
index 641f091f75..b9894722ed 100644
--- a/recipes/shr/icon-theme-neo_git.bb
+++ b/recipes/shr/icon-theme-neo_git.bb
@@ -3,12 +3,12 @@ SECTION = "e/utils"
 HOMEPAGE = "http://jmccloud.jm.funpic.de"
 AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
 RDEPENDS = "e-wm"
-RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo"
+RSUGGESTS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo gpe-theme-neo"
 LICENSE = "unknown"
 
 SRCREV = "f847105c5ef5d488a4bce0c0a85d572c3509d56f"
 PV = "0.2-${EFL_SRCREV}+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
 
-- 
cgit v1.2.3