merge of 'a1b53f4890a543077cd9692d6f36d55601cf5cba'

     and 'e7f793242547302eb26367c08896596376eba484'

16 files changed, 16 insertions, 52 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} \
diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb
index 3e8cdcf5be..e2ded16111 100644
--- a/packages/efl1/ecore_cvs.bb
+++ b/packages/efl1/ecore_cvs.bb
@@ -1,5 +1,5 @@
 require ecore.inc
-PR = "r1"
+PR = "r0"
 
 EXTRA_OECONF = "\
         --x-includes=${STAGING_INCDIR}/X11 \
diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb
index 8ad9c361a0..8b3731412f 100644
--- a/packages/efl1/edb_cvs.bb
+++ b/packages/efl1/edb_cvs.bb
@@ -2,5 +2,6 @@ DESCRIPTION = "Edb is the Enlightenment database library"
 LICENSE = "MIT BSD"
 DEPENDS = "zlib"
 PV = "1.0.5.042+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb
index 0a4e04e558..c6ff68b8bf 100644
--- a/packages/efl1/edbus_cvs.bb
+++ b/packages/efl1/edbus_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
 DEPENDS = "dbus ecore efreet ewl"
 LICENSE = "MIT BSD"
 PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r3"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb
index d0a1848c93..5e78575efa 100644
--- a/packages/efl1/edje_cvs.bb
+++ b/packages/efl1/edje_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library"
 DEPENDS = "eet evas ecore embryo edje-native"
 LICENSE = "MIT BSD"
 PV = "0.5.0.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb
index 6befb0c065..f6ae8abe71 100644
--- a/packages/efl1/embryo_cvs.bb
+++ b/packages/efl1/embryo_cvs.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Enlightenment C-like scripting language for Edje"
 LICENSE = "MIT BSD"
 PV = "0.9.1.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb
index 0c12621d33..e5e422a887 100644
--- a/packages/efl1/epsilon_cvs.bb
+++ b/packages/efl1/epsilon_cvs.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT BSD"
 # can also depend on xine for movie thumbnails
 DEPENDS = "imlib2 epeg libpng evas ecore edje perl-native"
 PV = "0.3.0.012+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
 
 inherit efl
 
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index 8c36f7edff..d5260848ad 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -2,12 +2,10 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
 PV = "0.1.0.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
 
 inherit efl
 
-SRC_URI += "file://etk_scrolled_view_dragable_combined_bouncy.patch;patch=1"
-
 RRECOMMENDS_${PN} = "\
   etk-engines-software-x11 \
   etk-engines-evas \
diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb
index 02706eb978..3a0cf28d4a 100644
--- a/packages/efl1/evolve_cvs.bb
+++ b/packages/efl1/evolve_cvs.bb
@@ -2,5 +2,6 @@ DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language"
 LICENSE = "MIT"
 DEPENDS = "etk evolve-native"
 PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl
diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb
index d63fa056bb..5a017569b7 100644
--- a/packages/efl1/exml_cvs.bb
+++ b/packages/efl1/exml_cvs.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Exml is a generic XML parser wrapper."
 LICENSE = "MIT"
 DEPENDS = "libxml2 libxslt ecore"
 PV = "0.1.1+cvs${SRCDATE}"
+PR = "r0"
 
 inherit efl