efl|e17: update SRCDATE, remove entice (dead upstream), remove some redundancies in recipes

7 files changed, 7 insertions, 44 deletions

diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
index 8ffd96992a..df023ad0aa 100644
--- a/packages/e17/edje-viewer_cvs.bb
+++ b/packages/e17/edje-viewer_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje_Viewer is just that."
 DEPENDS = "etk"
 LICENSE = "MIT BSD"
 PV = "0.0.0+cvs${SRCDATE}"
-PR = "r3"
+PR = "r0"
 
 inherit e
 
diff --git a/packages/e17/enna/locale-is-broken.patch b/packages/e17/enna/locale-is-broken.patch
deleted file mode 100644
index 40904e14dd..0000000000
--- a/packages/e17/enna/locale-is-broken.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: enna/Makefile.am
-===================================================================
---- enna.orig/Makefile.am
-+++ enna/Makefile.am
-@@ -1,7 +1,7 @@
- ## Process this file with automake to produce Makefile.in
- ## Created by Anjuta
- 
--SUBDIRS = src po data
-+SUBDIRS = src data
- 
- EXTRA_DIST = config.rpath  $(ennadoc_DATA)
- 
diff --git a/packages/e17/enna_cvs.bb b/packages/e17/enna_cvs.bb
index 4f50b118f3..f87f08d06e 100644
--- a/packages/e17/enna_cvs.bb
+++ b/packages/e17/enna_cvs.bb
@@ -4,13 +4,13 @@ DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
 DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
 SECTION = "x11/multimedia"
 PV = "0.2.0+cvs${SRCDATE}"
+PR = "r0"
 
 inherit e
 
-SRC_URI = "${E_CVS};module=misc/enna \
-           file://locale-is-broken.patch;patch=1"
+SRC_URI = "${E_CVS};module=misc/enna"
 S = "${WORKDIR}/enna"
 
 do_configure_prepend() {
-	touch po/Makefile.in.in
+    autopoint
 }
diff --git a/packages/e17/entice_cvs.bb b/packages/e17/entice_cvs.bb
deleted file mode 100644
index f0a7335d6c..0000000000
--- a/packages/e17/entice_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Entice is the E17 picture viewer"
-# can also depend on GIMP for editing
-LICENSE = "MIT BSD"
-DEPENDS = "edb evas ecore edje epsilon esmart"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r0"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/entice"
-S = "${WORKDIR}/entice"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/examine_cvs.bb b/packages/e17/examine_cvs.bb
index 38e062ffa9..c8b06de346 100644
--- a/packages/e17/examine_cvs.bb
+++ b/packages/e17/examine_cvs.bb
@@ -1,14 +1,11 @@
 DESCRIPTION = "Examine, the program configurator"
 DEPENDS = "ewl"
 LICENSE = "MIT BSD"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.0.1+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
 
-SRC_URI = "${E_CVS};module=e17/apps/examine"
-S = "${WORKDIR}/examine"
-
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb
index 7fdd7449d6..2c32fc12d6 100644
--- a/packages/e17/exhibit_cvs.bb
+++ b/packages/e17/exhibit_cvs.bb
@@ -1,10 +1,7 @@
 DESCRIPTION = "Exhibit is the ETK picture viewer"
 DEPENDS = "evas ecore epsilon edje eet etk efreet"
 LICENSE = "MIT BSD"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.1.1+cvs${SRCDATE}"
 PR = "r0"
 
 inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/exhibit"
-S = "${WORKDIR}/${PN}"
diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb
index 11d4e503cb..df34529df6 100644
--- a/packages/e17/expedite_cvs.bb
+++ b/packages/e17/expedite_cvs.bb
@@ -3,13 +3,10 @@ DEPENDS = "eet evas"
 RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
 LICENSE = "MIT BSD"
 PV = "0.6.0+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
 
 inherit autotools
 
-SRC_URI = "${E_CVS};module=e17/apps/expedite"
-S = "${WORKDIR}/${PN}"
-
 EXTRA_OECONF = "\
   --x-includes=${STAGING_INCDIR}/X11 \
   --x-libraries=${STAGING_LIBDIR} \