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

diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 1957500a0247633a83e05d887241de8412b6bb8c..48828ea688aa88aa7220e886863c2bea584d2e99 100644 (file)
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCDATE = "20080409"
+EFL_SRCDATE = "20080411"
 SRCDATE_edb-native ?= "${EFL_SRCDATE}"
 SRCDATE_edb ?= "${EFL_SRCDATE}"
 SRCDATE_eet-native ?= "${EFL_SRCDATE}"

diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb
index 8ffd96992ae2d310186ba0dfddf0f7c604833a9a..df023ad0aa0f32032a5afeb5082f1aa8e6c94491 100644 (file)
--- 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 (file)
index 40904e1..0000000
--- 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 4f50b118f362574e8d85c9c5c54584be8c1842d3..f87f08d06e1ec4283d6eb3dd217c06025ab95b4d 100644 (file)
--- 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 (file)
index f0a7335..0000000
--- 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 38e062ffa93b0b8a4a446dbc1b92bd6978ab525f..c8b06de346267360957646617a989e6960a4baa0 100644 (file)
--- 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 7fdd7449d66af1c91b5030ea4133859e4189c167..2c32fc12d6528f6b07a25ff2935a778dbc910c7d 100644 (file)
--- 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 11d4e503cb535d81afd0537e737379b004c5af02..df34529df6b51feae1d11e499638266365b61f38 100644 (file)
--- 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 3e8cdcf5bec47bac480dc9ddc06226b92aa14df6..e2ded16111b5b924a007de9638e0c2f7774ad262 100644 (file)
--- 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 8ad9c361a059e80771432d2a9cf6e19680913609..8b3731412fae350816f71adb1bfb217cbc24ac86 100644 (file)
--- 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 0a4e04e5582918175e093513c9f701051bce2e21..c6ff68b8bf7b2d41fcdc490c1bf77340c8e64694 100644 (file)
--- 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 d0a1848c9316125f2cff0cde4a828533b2fe9a4a..5e78575efac7c7afa18c1353426dcec702b163fe 100644 (file)
--- 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 6befb0c065fc931c226d9dbaceddfd30fcf090d4..f6ae8abe716b9e5249ec4c7b2c872c15f5acf21d 100644 (file)
--- 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 0c12621d33b15b772e6ac9442f9aff4384e7c760..e5e422a887c6d3e988acf2a4f55b1d72a336b91b 100644 (file)
--- 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 8c36f7edffb1dae6bc6b99e69fb41f891fc954ff..d5260848ad325cd271b4f0cf73045e751bb036a5 100644 (file)
--- 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 02706eb9782c6a3567d1821d4d553f54c4ec49ea..3a0cf28d4a87d6af0efbd7d6465f69f5c7e480e4 100644 (file)
--- 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 d63fa056bb244709d487661a6f4a921e6ca1bba1..5a017569b7e872512bec5f70e322d418a6855e91 100644 (file)
--- 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