4 files changed, 350 insertions, 92 deletions

diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index ce14dfedeeac..87f3e55a82b7 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	efl
-PORTVERSION=	1.13.2
+PORTVERSION=	1.15.0
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	enlightenment@FreeBSD.org
 COMMENT=	Enlightenment Foundation Libraries
 
 LICENSE=	BSD2CLAUSE LGPL21
@@ -108,12 +108,7 @@ PLIST_SUB+=			AUDIO="@comment "
 
 .if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=			yes
-. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1001000
-EXTRA_PATCHES+=			${FILESDIR}/extra-patch-configure.ac
-CONFIGURE_ENV+=			ECORE_CON_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" ECORE_CON_LIBS="-lssl"
-. else
 WITH_OPENSSL_PORT=		yes
-. endif
 .else
 CONFIGURE_ARGS+=		--with-crypto=none
 .endif
diff --git a/devel/efl/distinfo b/devel/efl/distinfo
index 9acb52e5d726..a07b89e776e6 100644
--- a/devel/efl/distinfo
+++ b/devel/efl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (enlightenment/efl-1.13.2.tar.xz) = 18ef8ce8586e909b562f4e0ea5abbc63efab7cd15958b2aa9d365c292499d983
-SIZE (enlightenment/efl-1.13.2.tar.xz) = 40332272
+SHA256 (enlightenment/efl-1.15.0.tar.xz) = 5d9580e9ba961fc64222d54a73849c730477c209dde89cc123dde14f22d532bc
+SIZE (enlightenment/efl-1.15.0.tar.xz) = 43130156
diff --git a/devel/efl/files/patch-configure.ac b/devel/efl/files/patch-configure.ac
index efbb95b16383..74a679beb15f 100644
--- a/devel/efl/files/patch-configure.ac
+++ b/devel/efl/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2014-11-10 12:02:43.000000000 +0100
-+++ configure.ac	2014-11-20 23:35:26.000000000 +0100
-@@ -407,14 +407,15 @@
+--- configure.ac.orig	2015-06-12 05:40:48.754367679 -0700
++++ configure.ac	2015-06-12 05:45:05.521352761 -0700
+@@ -414,12 +414,12 @@
  execinfo.h \
  mcheck.h \
  sys/epoll.h \
@@ -13,6 +13,11 @@
 +netinet/tcp.h \
  ])
  
+ EFL_CHECK_PATH_MAX
+@@ -3995,6 +3995,7 @@
+ ### Checks for linker characteristics
+ 
+ ### Checks for library functions
 +ac_cv_header_sys_inotify_h="no"
  have_inotify="${ac_cv_header_sys_inotify_h}"
  AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
diff --git a/devel/efl/pkg-plist b/devel/efl/pkg-plist
index 07d16bd496ec..0a9341785abd 100644
--- a/devel/efl/pkg-plist
+++ b/devel/efl/pkg-plist
@@ -10,8 +10,12 @@ bin/edje_player
 bin/edje_recc
 bin/edje_watch
 bin/eet
+bin/eetpack
+bin/efl_debug
+bin/efl_debugd
 bin/efreetd
 bin/eina-bench-cmp
+bin/eina_btlog
 bin/eldbus-codegen
 %%ELUA%%bin/elua
 bin/embryo_cc
@@ -54,23 +58,32 @@ include/ecore-1/ecore_timer.eo.legacy.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_obj_in_sndfile.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_obj_in_tone.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_obj_out.h
+%%PULSEAUDIO%%include/ecore-audio-1/ecore_audio_obj_out_pulse.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_obj_out_sndfile.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_out.eo.h
 %%PULSEAUDIO%%include/ecore-audio-1/ecore_audio_out_pulse.eo.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_out_sndfile.eo.h
 %%AUDIO%%include/ecore-audio-1/ecore_audio_protected.h
-%%PULSEAUDIO%%include/ecore-audio-1/ecore_audio_obj_out_pulse.h
 %%AUDIO%%include/ecore-audio-cxx-1/Ecore_Audio.hh
 %%AUDIO%%include/ecore-audio-cxx-1/ecore_audio.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio.eo.impl.hh
 %%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in.eo.impl.hh
 %%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in_sndfile.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in_sndfile.eo.impl.hh
 %%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in_tone.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in_tone.eo.impl.hh
 %%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_out.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_out.eo.impl.hh
 %%PULSEAUDIO%%include/ecore-audio-cxx-1/ecore_audio_out_pulse.eo.hh
+%%PULSEAUDIO%%include/ecore-audio-cxx-1/ecore_audio_out_pulse.eo.impl.hh
 %%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_out_sndfile.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_out_sndfile.eo.impl.hh
 include/ecore-avahi-1/Ecore_Avahi.h
 include/ecore-con-1/Ecore_Con.h
 include/ecore-con-1/Ecore_Con_Eet.h
+include/ecore-con-1/Ecore_Con_Eet_Eo.h
+include/ecore-con-1/Ecore_Con_Eet_Legacy.h
 include/ecore-con-1/Ecore_Con_Eo.h
 include/ecore-con-1/Ecore_Con_Legacy.h
 include/ecore-con-1/ecore_con_base.eo.h
@@ -79,18 +92,38 @@ include/ecore-con-1/ecore_con_client.eo.h
 include/ecore-con-1/ecore_con_client.eo.legacy.h
 include/ecore-con-1/ecore_con_connector.eo.h
 include/ecore-con-1/ecore_con_connector.eo.legacy.h
+include/ecore-con-1/ecore_con_eet_base.eo.h
+include/ecore-con-1/ecore_con_eet_base.eo.legacy.h
+include/ecore-con-1/ecore_con_eet_client_obj.eo.h
+include/ecore-con-1/ecore_con_eet_client_obj.eo.legacy.h
+include/ecore-con-1/ecore_con_eet_server_obj.eo.h
+include/ecore-con-1/ecore_con_eet_server_obj.eo.legacy.h
 include/ecore-con-1/ecore_con_server.eo.h
 include/ecore-con-1/ecore_con_server.eo.legacy.h
-include/ecore-con-1/ecore_con_url.eo.h
-include/ecore-con-1/ecore_con_url.eo.legacy.h
+include/ecore-con-1/efl_network_url.eo.h
+include/ecore-con-1/efl_network_url.eo.legacy.h
 include/ecore-cxx-1/Ecore.eo.hh
 include/ecore-cxx-1/Ecore.hh
 include/ecore-cxx-1/ecore_animator.eo.hh
+include/ecore-cxx-1/ecore_animator.eo.impl.hh
+include/ecore-cxx-1/ecore_exe.eo.hh
+include/ecore-cxx-1/ecore_exe.eo.impl.hh
+include/ecore-cxx-1/ecore_idle_enterer.eo.hh
+include/ecore-cxx-1/ecore_idle_enterer.eo.impl.hh
 include/ecore-cxx-1/ecore_idle_exiter.eo.hh
+include/ecore-cxx-1/ecore_idle_exiter.eo.impl.hh
 include/ecore-cxx-1/ecore_idler.eo.hh
+include/ecore-cxx-1/ecore_idler.eo.impl.hh
 include/ecore-cxx-1/ecore_job.eo.hh
+include/ecore-cxx-1/ecore_job.eo.impl.hh
+include/ecore-cxx-1/ecore_mainloop.eo.hh
+include/ecore-cxx-1/ecore_mainloop.eo.impl.hh
 include/ecore-cxx-1/ecore_parent.eo.hh
+include/ecore-cxx-1/ecore_parent.eo.impl.hh
 include/ecore-cxx-1/ecore_poller.eo.hh
+include/ecore-cxx-1/ecore_poller.eo.impl.hh
+include/ecore-cxx-1/ecore_timer.eo.hh
+include/ecore-cxx-1/ecore_timer.eo.impl.hh
 include/ecore-evas-1/Ecore_Evas.h
 include/ecore-evas-1/Ecore_Evas_Types.h
 include/ecore-file-1/Ecore_File.h
@@ -99,11 +132,33 @@ include/ecore-imf-evas-1/Ecore_IMF_Evas.h
 include/ecore-input-1/Ecore_Input.h
 include/ecore-input-evas-1/Ecore_Input_Evas.h
 include/ecore-ipc-1/Ecore_Ipc.h
+%%SDL%%include/ecore-sdl-1/Ecore_Sdl.h
 include/ecore-x-1/Ecore_X.h
 include/ecore-x-1/Ecore_X_Atoms.h
 include/ecore-x-1/Ecore_X_Cursor.h
 include/ecore-x-1/ecore_x_version.h
-%%SDL%%include/ecore-sdl-1/Ecore_Sdl.h
+include/ector-1/Ector.h
+include/ector-1/Ector_Cairo.h
+include/ector-1/Ector_Software.h
+include/ector-1/cairo/ector_cairo_surface.eo.h
+include/ector-1/cairo/ector_renderer_cairo_base.eo.h
+include/ector-1/cairo/ector_renderer_cairo_gradient_linear.eo.h
+include/ector-1/cairo/ector_renderer_cairo_gradient_radial.eo.h
+include/ector-1/cairo/ector_renderer_cairo_shape.eo.h
+include/ector-1/ector_renderer.h
+include/ector-1/ector_surface.h
+include/ector-1/ector_util.h
+include/ector-1/generic/ector_generic_surface.eo.h
+include/ector-1/generic/ector_renderer_generic_base.eo.h
+include/ector-1/generic/ector_renderer_generic_gradient.eo.h
+include/ector-1/generic/ector_renderer_generic_gradient_linear.eo.h
+include/ector-1/generic/ector_renderer_generic_gradient_radial.eo.h
+include/ector-1/generic/ector_renderer_generic_shape.eo.h
+include/ector-1/software/ector_renderer_software_base.eo.h
+include/ector-1/software/ector_renderer_software_gradient_linear.eo.h
+include/ector-1/software/ector_renderer_software_gradient_radial.eo.h
+include/ector-1/software/ector_renderer_software_shape.eo.h
+include/ector-1/software/ector_software_surface.eo.h
 include/edje-1/Edje.h
 include/edje-1/Edje_Common.h
 include/edje-1/Edje_Edit.h
@@ -113,9 +168,12 @@ include/edje-1/edje_edit.eo.h
 include/edje-1/edje_edit.eo.legacy.h
 include/edje-1/edje_object.eo.h
 include/edje-1/edje_object.eo.legacy.h
+include/edje-1/edje_types.eot.h
 include/edje-cxx-1/Edje.hh
 include/edje-cxx-1/edje_edit.eo.hh
+include/edje-cxx-1/edje_edit.eo.impl.hh
 include/edje-cxx-1/edje_object.eo.hh
+include/edje-cxx-1/edje_object.eo.impl.hh
 include/eet-1/Eet.h
 include/eet-cxx-1/Eet.hh
 include/eet-cxx-1/eet-cxx/eet_composite.hh
@@ -123,19 +181,56 @@ include/eet-cxx-1/eet-cxx/eet_register.hh
 include/eet-cxx-1/eet-cxx/eet_type.hh
 include/efl-1/Efl.h
 include/efl-1/Efl_Config.h
+include/efl-1/Efl_Model_Common.h
 include/efl-1/interfaces/efl_control.eo.h
 include/efl-1/interfaces/efl_file.eo.h
+include/efl-1/interfaces/efl_gfx_base.eo.h
+include/efl-1/interfaces/efl_gfx_fill.eo.h
+include/efl-1/interfaces/efl_gfx_filter.eo.h
+include/efl-1/interfaces/efl_gfx_gradient_base.eo.h
+include/efl-1/interfaces/efl_gfx_gradient_linear.eo.h
+include/efl-1/interfaces/efl_gfx_gradient_radial.eo.h
+include/efl-1/interfaces/efl_gfx_shape.eo.h
+include/efl-1/interfaces/efl_gfx_stack.eo.h
+include/efl-1/interfaces/efl_gfx_view.eo.h
 include/efl-1/interfaces/efl_image.eo.h
+include/efl-1/interfaces/efl_model_base.eo.h
 include/efl-1/interfaces/efl_player.eo.h
 include/efl-1/interfaces/efl_text.eo.h
 include/efl-1/interfaces/efl_text_properties.eo.h
 include/efl-cxx-1/Efl.hh
 include/efl-cxx-1/efl_control.eo.hh
+include/efl-cxx-1/efl_control.eo.impl.hh
 include/efl-cxx-1/efl_file.eo.hh
+include/efl-cxx-1/efl_file.eo.impl.hh
+include/efl-cxx-1/efl_gfx_base.eo.hh
+include/efl-cxx-1/efl_gfx_base.eo.impl.hh
+include/efl-cxx-1/efl_gfx_fill.eo.hh
+include/efl-cxx-1/efl_gfx_fill.eo.impl.hh
+include/efl-cxx-1/efl_gfx_filter.eo.hh
+include/efl-cxx-1/efl_gfx_filter.eo.impl.hh
+include/efl-cxx-1/efl_gfx_gradient_base.eo.hh
+include/efl-cxx-1/efl_gfx_gradient_base.eo.impl.hh
+include/efl-cxx-1/efl_gfx_gradient_linear.eo.hh
+include/efl-cxx-1/efl_gfx_gradient_linear.eo.impl.hh
+include/efl-cxx-1/efl_gfx_gradient_radial.eo.hh
+include/efl-cxx-1/efl_gfx_gradient_radial.eo.impl.hh
+include/efl-cxx-1/efl_gfx_shape.eo.hh
+include/efl-cxx-1/efl_gfx_shape.eo.impl.hh
+include/efl-cxx-1/efl_gfx_stack.eo.hh
+include/efl-cxx-1/efl_gfx_stack.eo.impl.hh
+include/efl-cxx-1/efl_gfx_view.eo.hh
+include/efl-cxx-1/efl_gfx_view.eo.impl.hh
 include/efl-cxx-1/efl_image.eo.hh
+include/efl-cxx-1/efl_image.eo.impl.hh
+include/efl-cxx-1/efl_model_base.eo.hh
+include/efl-cxx-1/efl_model_base.eo.impl.hh
 include/efl-cxx-1/efl_player.eo.hh
+include/efl-cxx-1/efl_player.eo.impl.hh
 include/efl-cxx-1/efl_text.eo.hh
+include/efl-cxx-1/efl_text.eo.impl.hh
 include/efl-cxx-1/efl_text_properties.eo.hh
+include/efl-cxx-1/efl_text_properties.eo.impl.hh
 include/efreet-1/Efreet.h
 include/efreet-1/Efreet_Mime.h
 include/efreet-1/Efreet_Trash.h
@@ -158,7 +253,9 @@ include/eina-1/eina/eina_convert.h
 include/eina-1/eina/eina_counter.h
 include/eina-1/eina/eina_cow.h
 include/eina-1/eina/eina_cpu.h
+include/eina-1/eina/eina_crc.h
 include/eina-1/eina/eina_error.h
+include/eina-1/eina/eina_evlog.h
 include/eina-1/eina/eina_file.h
 include/eina-1/eina/eina_fp.h
 include/eina-1/eina/eina_hamster.h
@@ -167,6 +264,7 @@ include/eina-1/eina/eina_inarray.h
 include/eina-1/eina/eina_inline_array.x
 include/eina-1/eina/eina_inline_clist.x
 include/eina-1/eina/eina_inline_cpu.x
+include/eina-1/eina/eina_inline_crc.x
 include/eina-1/eina/eina_inline_f16p16.x
 include/eina-1/eina/eina_inline_f32p32.x
 include/eina-1/eina/eina_inline_f8p24.x
@@ -196,12 +294,15 @@ include/eina-1/eina/eina_lock.h
 include/eina-1/eina/eina_log.h
 include/eina-1/eina/eina_magic.h
 include/eina-1/eina/eina_main.h
+include/eina-1/eina/eina_matrix.h
 include/eina-1/eina/eina_matrixsparse.h
 include/eina-1/eina/eina_mempool.h
 include/eina-1/eina/eina_mmap.h
 include/eina-1/eina/eina_module.h
 include/eina-1/eina/eina_prefix.h
+include/eina-1/eina/eina_quad.h
 include/eina-1/eina/eina_quadtree.h
+include/eina-1/eina/eina_quaternion.h
 include/eina-1/eina/eina_rbtree.h
 include/eina-1/eina/eina_rectangle.h
 include/eina-1/eina/eina_refcount.h
@@ -220,6 +321,7 @@ include/eina-1/eina/eina_types.h
 include/eina-1/eina/eina_unicode.h
 include/eina-1/eina/eina_ustrbuf.h
 include/eina-1/eina/eina_ustringshare.h
+include/eina-1/eina/eina_util.h
 include/eina-1/eina/eina_value.h
 include/eina-1/eina/eina_value_util.h
 include/eina-1/eina/eina_xattr.h
@@ -243,6 +345,7 @@ include/eina-cxx-1/eina-cxx/eina_ptrarray.hh
 include/eina-cxx-1/eina-cxx/eina_ptrlist.hh
 include/eina-cxx-1/eina-cxx/eina_range_types.hh
 include/eina-cxx-1/eina-cxx/eina_ref.hh
+include/eina-cxx-1/eina-cxx/eina_string_view.hh
 include/eina-cxx-1/eina-cxx/eina_stringshare.hh
 include/eina-cxx-1/eina-cxx/eina_thread.hh
 include/eina-cxx-1/eina-cxx/eina_throw.hh
@@ -252,6 +355,10 @@ include/eina-cxx-1/eina-cxx/eina_type_traits.hh
 include/eina-cxx-1/eina-cxx/eina_value.hh
 include/eio-1/Eio.h
 include/eio-1/eio_inline_helper.x
+include/eio-1/eio_model.eo.h
+include/eio-cxx-1/Eio.hh
+include/eio-cxx-1/eio_model.eo.hh
+include/eio-cxx-1/eio_model.eo.impl.hh
 include/eldbus-1/Eldbus.h
 include/eldbus-1/eldbus_connection.h
 include/eldbus-1/eldbus_freedesktop.h
@@ -282,6 +389,10 @@ include/elocation-1/eldbus_utils.h
 include/elocation-1/elocation_private.h
 %%ELUA%%include/elua-1/Elua.h
 include/embryo-1/Embryo.h
+include/emile-1/Emile.h
+include/emile-1/emile_cipher.h
+include/emile-1/emile_compress.h
+include/emile-1/emile_image.h
 include/emotion-1/Emotion.h
 include/emotion-1/Emotion_Eo.h
 include/emotion-1/Emotion_Generic_Plugin.h
@@ -293,7 +404,9 @@ include/eo-1/eo_abstract_class.eo.h
 include/eo-1/eo_base.eo.h
 include/eo-cxx-1/Eo.hh
 include/eo-cxx-1/eo_abstract_class.eo.hh
+include/eo-cxx-1/eo_abstract_class.eo.impl.hh
 include/eo-cxx-1/eo_base.eo.hh
+include/eo-cxx-1/eo_base.eo.impl.hh
 include/eo-cxx-1/eo_concrete.hh
 include/eo-cxx-1/eo_cxx_interop.hh
 include/eo-cxx-1/eo_event.hh
@@ -313,6 +426,7 @@ include/eolian-cxx-1/grammar/eo_class_constructors_generator.hh
 include/eolian-cxx-1/grammar/eo_class_events_generator.hh
 include/eolian-cxx-1/grammar/eo_class_functions_generator.hh
 include/eolian-cxx-1/grammar/eo_class_generator.hh
+include/eolian-cxx-1/grammar/eo_class_scope_guard_generator.hh
 include/eolian-cxx-1/grammar/eo_header_generator.hh
 include/eolian-cxx-1/grammar/inheritance_base_generator.hh
 include/eolian-cxx-1/grammar/namespace_generator.hh
@@ -325,39 +439,56 @@ include/ethumb-client-1/Ethumb_Client.h
 include/evas-1/Evas.h
 include/evas-1/Evas_Common.h
 include/evas-1/Evas_Engine_Buffer.h
+%%OPENGL%%include/evas-1/Evas_Engine_GL_X11.h
 include/evas-1/Evas_Engine_Software_X11.h
 include/evas-1/Evas_Eo.h
 include/evas-1/Evas_GL.h
 include/evas-1/Evas_Legacy.h
 include/evas-1/Evas_Loader.h
-%%OPENGL%%include/evas-1/Evas_Engine_GL_X11.h
-%%OPENGL%%%%SDL%%include/evas-1/Evas_Engine_GL_SDL.h
-include/evas-1/canvas/evas_canvas.eo.h
-include/evas-1/canvas/evas_canvas.eo.legacy.h
-include/evas-1/canvas/evas_3d_camera.eo.h
-include/evas-1/canvas/evas_3d_camera.eo.legacy.h
-include/evas-1/canvas/evas_3d_light.eo.h
-include/evas-1/canvas/evas_3d_light.eo.legacy.h
-include/evas-1/canvas/evas_3d_material.eo.h
-include/evas-1/canvas/evas_3d_material.eo.legacy.h
-include/evas-1/canvas/evas_3d_mesh.eo.h
-include/evas-1/canvas/evas_3d_mesh.eo.legacy.h
-include/evas-1/canvas/evas_3d_node.eo.h
-include/evas-1/canvas/evas_3d_node.eo.legacy.h
-include/evas-1/canvas/evas_3d_object.eo.h
-include/evas-1/canvas/evas_3d_object.eo.legacy.h
-include/evas-1/canvas/evas_3d_scene.eo.h
-include/evas-1/canvas/evas_3d_scene.eo.legacy.h
-include/evas-1/canvas/evas_3d_texture.eo.h
-include/evas-1/canvas/evas_3d_texture.eo.legacy.h
+include/evas-1/canvas/efl_vg_base.eo.h
+include/evas-1/canvas/efl_vg_base.eo.legacy.h
+include/evas-1/canvas/efl_vg_container.eo.h
+include/evas-1/canvas/efl_vg_container.eo.legacy.h
+include/evas-1/canvas/efl_vg_gradient.eo.h
+include/evas-1/canvas/efl_vg_gradient.eo.legacy.h
+include/evas-1/canvas/efl_vg_gradient_linear.eo.h
+include/evas-1/canvas/efl_vg_gradient_linear.eo.legacy.h
+include/evas-1/canvas/efl_vg_gradient_radial.eo.h
+include/evas-1/canvas/efl_vg_gradient_radial.eo.legacy.h
+include/evas-1/canvas/efl_vg_root_node.eo.h
+include/evas-1/canvas/efl_vg_root_node.eo.legacy.h
+include/evas-1/canvas/efl_vg_shape.eo.h
+include/evas-1/canvas/efl_vg_shape.eo.legacy.h
 include/evas-1/canvas/evas_box.eo.h
 include/evas-1/canvas/evas_box.eo.legacy.h
+include/evas-1/canvas/evas_canvas.eo.h
+include/evas-1/canvas/evas_canvas.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_camera.eo.h
+include/evas-1/canvas/evas_canvas3d_camera.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_light.eo.h
+include/evas-1/canvas/evas_canvas3d_light.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_material.eo.h
+include/evas-1/canvas/evas_canvas3d_material.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_mesh.eo.h
+include/evas-1/canvas/evas_canvas3d_mesh.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_node.eo.h
+include/evas-1/canvas/evas_canvas3d_node.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_object.eo.h
+include/evas-1/canvas/evas_canvas3d_object.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_primitive.eo.h
+include/evas-1/canvas/evas_canvas3d_primitive.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_scene.eo.h
+include/evas-1/canvas/evas_canvas3d_scene.eo.legacy.h
+include/evas-1/canvas/evas_canvas3d_texture.eo.h
+include/evas-1/canvas/evas_canvas3d_texture.eo.legacy.h
 include/evas-1/canvas/evas_clickable_interface.eo.h
 include/evas-1/canvas/evas_clickable_interface.eo.legacy.h
 include/evas-1/canvas/evas_common_interface.eo.h
 include/evas-1/canvas/evas_common_interface.eo.legacy.h
 include/evas-1/canvas/evas_draggable_interface.eo.h
 include/evas-1/canvas/evas_draggable_interface.eo.legacy.h
+include/evas-1/canvas/evas_filter.eo.h
+include/evas-1/canvas/evas_filter.eo.legacy.h
 include/evas-1/canvas/evas_grid.eo.h
 include/evas-1/canvas/evas_grid.eo.legacy.h
 include/evas-1/canvas/evas_image.eo.h
@@ -366,6 +497,8 @@ include/evas-1/canvas/evas_line.eo.h
 include/evas-1/canvas/evas_line.eo.legacy.h
 include/evas-1/canvas/evas_object.eo.h
 include/evas-1/canvas/evas_object.eo.legacy.h
+include/evas-1/canvas/evas_object_smart.eo.h
+include/evas-1/canvas/evas_object_smart.eo.legacy.h
 include/evas-1/canvas/evas_out.eo.h
 include/evas-1/canvas/evas_out.eo.legacy.h
 include/evas-1/canvas/evas_polygon.eo.h
@@ -378,8 +511,6 @@ include/evas-1/canvas/evas_selectable_interface.eo.h
 include/evas-1/canvas/evas_selectable_interface.eo.legacy.h
 include/evas-1/canvas/evas_signal_interface.eo.h
 include/evas-1/canvas/evas_signal_interface.eo.legacy.h
-include/evas-1/canvas/evas_object_smart.eo.h
-include/evas-1/canvas/evas_object_smart.eo.legacy.h
 include/evas-1/canvas/evas_smart_clipped.eo.h
 include/evas-1/canvas/evas_smart_clipped.eo.legacy.h
 include/evas-1/canvas/evas_table.eo.h
@@ -390,39 +521,93 @@ include/evas-1/canvas/evas_textblock.eo.h
 include/evas-1/canvas/evas_textblock.eo.legacy.h
 include/evas-1/canvas/evas_textgrid.eo.h
 include/evas-1/canvas/evas_textgrid.eo.legacy.h
+include/evas-1/canvas/evas_types.eot.h
+include/evas-1/canvas/evas_vg.eo.h
+include/evas-1/canvas/evas_vg.eo.legacy.h
 include/evas-1/canvas/evas_zoomable_interface.eo.h
 include/evas-1/canvas/evas_zoomable_interface.eo.legacy.h
 include/evas-cxx-1/Evas.hh
-include/evas-cxx-1/canvas/evas_3d_camera.eo.hh
-include/evas-cxx-1/canvas/evas_3d_light.eo.hh
-include/evas-cxx-1/canvas/evas_3d_material.eo.hh
-include/evas-cxx-1/canvas/evas_3d_mesh.eo.hh
-include/evas-cxx-1/canvas/evas_3d_node.eo.hh
-include/evas-cxx-1/canvas/evas_3d_object.eo.hh
-include/evas-cxx-1/canvas/evas_3d_scene.eo.hh
-include/evas-cxx-1/canvas/evas_3d_texture.eo.hh
+include/evas-cxx-1/canvas/Evas.hh
+include/evas-cxx-1/canvas/efl_vg_base.eo.hh
+include/evas-cxx-1/canvas/efl_vg_base.eo.impl.hh
+include/evas-cxx-1/canvas/efl_vg_container.eo.hh
+include/evas-cxx-1/canvas/efl_vg_container.eo.impl.hh
+include/evas-cxx-1/canvas/efl_vg_gradient.eo.hh
+include/evas-cxx-1/canvas/efl_vg_gradient.eo.impl.hh
+include/evas-cxx-1/canvas/efl_vg_gradient_linear.eo.hh
+include/evas-cxx-1/canvas/efl_vg_gradient_linear.eo.impl.hh
+include/evas-cxx-1/canvas/efl_vg_gradient_radial.eo.hh
+include/evas-cxx-1/canvas/efl_vg_gradient_radial.eo.impl.hh
+include/evas-cxx-1/canvas/efl_vg_root_node.eo.hh
+include/evas-cxx-1/canvas/efl_vg_root_node.eo.impl.hh
+include/evas-cxx-1/canvas/efl_vg_shape.eo.hh
+include/evas-cxx-1/canvas/efl_vg_shape.eo.impl.hh
 include/evas-cxx-1/canvas/evas_box.eo.hh
+include/evas-cxx-1/canvas/evas_box.eo.impl.hh
 include/evas-cxx-1/canvas/evas_canvas.eo.hh
+include/evas-cxx-1/canvas/evas_canvas.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_camera.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_camera.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_light.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_light.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_material.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_material.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_mesh.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_mesh.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_node.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_node.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_object.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_object.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_primitive.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_primitive.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_scene.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_scene.eo.impl.hh
+include/evas-cxx-1/canvas/evas_canvas3d_texture.eo.hh
+include/evas-cxx-1/canvas/evas_canvas3d_texture.eo.impl.hh
 include/evas-cxx-1/canvas/evas_clickable_interface.eo.hh
+include/evas-cxx-1/canvas/evas_clickable_interface.eo.impl.hh
 include/evas-cxx-1/canvas/evas_common_interface.eo.hh
+include/evas-cxx-1/canvas/evas_common_interface.eo.impl.hh
 include/evas-cxx-1/canvas/evas_draggable_interface.eo.hh
+include/evas-cxx-1/canvas/evas_draggable_interface.eo.impl.hh
+include/evas-cxx-1/canvas/evas_filter.eo.hh
+include/evas-cxx-1/canvas/evas_filter.eo.impl.hh
 include/evas-cxx-1/canvas/evas_grid.eo.hh
+include/evas-cxx-1/canvas/evas_grid.eo.impl.hh
 include/evas-cxx-1/canvas/evas_image.eo.hh
+include/evas-cxx-1/canvas/evas_image.eo.impl.hh
 include/evas-cxx-1/canvas/evas_line.eo.hh
+include/evas-cxx-1/canvas/evas_line.eo.impl.hh
 include/evas-cxx-1/canvas/evas_object.eo.hh
+include/evas-cxx-1/canvas/evas_object.eo.impl.hh
 include/evas-cxx-1/canvas/evas_object_smart.eo.hh
+include/evas-cxx-1/canvas/evas_object_smart.eo.impl.hh
 include/evas-cxx-1/canvas/evas_out.eo.hh
+include/evas-cxx-1/canvas/evas_out.eo.impl.hh
 include/evas-cxx-1/canvas/evas_polygon.eo.hh
+include/evas-cxx-1/canvas/evas_polygon.eo.impl.hh
 include/evas-cxx-1/canvas/evas_rectangle.eo.hh
+include/evas-cxx-1/canvas/evas_rectangle.eo.impl.hh
 include/evas-cxx-1/canvas/evas_scrollable_interface.eo.hh
+include/evas-cxx-1/canvas/evas_scrollable_interface.eo.impl.hh
 include/evas-cxx-1/canvas/evas_selectable_interface.eo.hh
+include/evas-cxx-1/canvas/evas_selectable_interface.eo.impl.hh
 include/evas-cxx-1/canvas/evas_signal_interface.eo.hh
+include/evas-cxx-1/canvas/evas_signal_interface.eo.impl.hh
 include/evas-cxx-1/canvas/evas_smart_clipped.eo.hh
+include/evas-cxx-1/canvas/evas_smart_clipped.eo.impl.hh
 include/evas-cxx-1/canvas/evas_table.eo.hh
+include/evas-cxx-1/canvas/evas_table.eo.impl.hh
 include/evas-cxx-1/canvas/evas_text.eo.hh
+include/evas-cxx-1/canvas/evas_text.eo.impl.hh
 include/evas-cxx-1/canvas/evas_textblock.eo.hh
+include/evas-cxx-1/canvas/evas_textblock.eo.impl.hh
 include/evas-cxx-1/canvas/evas_textgrid.eo.hh
+include/evas-cxx-1/canvas/evas_textgrid.eo.impl.hh
+include/evas-cxx-1/canvas/evas_vg.eo.hh
+include/evas-cxx-1/canvas/evas_vg.eo.impl.hh
 include/evas-cxx-1/canvas/evas_zoomable_interface.eo.hh
+include/evas-cxx-1/canvas/evas_zoomable_interface.eo.impl.hh
 lib/cmake/Ecore/EcoreConfig.cmake
 lib/cmake/Ecore/EcoreConfigVersion.cmake
 lib/cmake/EcoreCxx/EcoreCxxConfig.cmake
@@ -443,10 +628,14 @@ lib/cmake/Eina/EinaConfig.cmake
 lib/cmake/Eina/EinaConfigVersion.cmake
 lib/cmake/EinaCxx/EinaCxxConfig.cmake
 lib/cmake/EinaCxx/EinaCxxConfigVersion.cmake
+lib/cmake/Eio/EioConfig.cmake
+lib/cmake/Eio/EioConfigVersion.cmake
 lib/cmake/Eldbus/EldbusConfig.cmake
 lib/cmake/Eldbus/EldbusConfigVersion.cmake
 %%ELUA%%lib/cmake/Elua/EluaConfig.cmake
 %%ELUA%%lib/cmake/Elua/EluaConfigVersion.cmake
+lib/cmake/Emile/EmileConfig.cmake
+lib/cmake/Emile/EmileConfigVersion.cmake
 lib/cmake/Emotion/EmotionConfig.cmake
 lib/cmake/Emotion/EmotionConfigVersion.cmake
 lib/cmake/Eo/EoConfig.cmake
@@ -467,11 +656,11 @@ lib/cmake/EvasCxx/EvasCxxConfig.cmake
 lib/cmake/EvasCxx/EvasCxxConfigVersion.cmake
 lib/ecore/system/upower/v-%%BRANCHVERSION%%/module.so
 lib/ecore_evas/engines/extn/v-%%BRANCHVERSION%%/module.so
-lib/ecore_evas/engines/x/v-%%BRANCHVERSION%%/module.so
 %%SDL%%lib/ecore_evas/engines/sdl/v-%%BRANCHVERSION%%/module.so
-lib/ecore_imf/modules/xim/v-%%BRANCHVERSION%%/module.so
+lib/ecore_evas/engines/x/v-%%BRANCHVERSION%%/module.so
 %%IBUS%%lib/ecore_imf/modules/ibus/v-%%BRANCHVERSION%%/module.so
 %%SCIM%%lib/ecore_imf/modules/scim/v-%%BRANCHVERSION%%/module.so
+lib/ecore_imf/modules/xim/v-%%BRANCHVERSION%%/module.so
 lib/ecore_x/bin/v-%%BRANCHVERSION%%/ecore_x_vsync
 lib/edje/modules/emotion/v-%%BRANCHVERSION%%/module.so
 lib/edje/utils/v-%%BRANCHVERSION%%/epp
@@ -483,14 +672,13 @@ lib/ethumb/modules/emotion/v-%%BRANCHVERSION%%/module.so
 lib/ethumb/modules/emotion/v-%%BRANCHVERSION%%/template.edj
 lib/ethumb_client/utils/v-%%BRANCHVERSION%%/ethumbd_slave
 %%OPENGL%%lib/evas/modules/engines/gl_generic/v-%%BRANCHVERSION%%/module.so
-lib/evas/modules/engines/software_x11/v-%%BRANCHVERSION%%/module.so
 %%OPENGL%%lib/evas/modules/engines/gl_x11/v-%%BRANCHVERSION%%/module.so
-%%OPENGL%%%%SDL%%lib/evas/modules/engines/gl_sdl/v-%%BRANCHVERSION%%/module.so
+lib/evas/modules/engines/software_x11/v-%%BRANCHVERSION%%/module.so
 lib/evas/modules/image_loaders/gif/v-%%BRANCHVERSION%%/module.so
 %%OPENJPEG%%lib/evas/modules/image_loaders/jp2k/v-%%BRANCHVERSION%%/module.so
 lib/evas/modules/image_loaders/tiff/v-%%BRANCHVERSION%%/module.so
-lib/evas/modules/image_savers/tiff/v-%%BRANCHVERSION%%/module.so
 %%WEBP%%lib/evas/modules/image_loaders/webp/v-%%BRANCHVERSION%%/module.so
+lib/evas/modules/image_savers/tiff/v-%%BRANCHVERSION%%/module.so
 %%WEBP%%lib/evas/modules/image_savers/webp/v-%%BRANCHVERSION%%/module.so
 lib/libecore.so
 lib/libecore.so.1
@@ -525,12 +713,15 @@ lib/libecore_input_evas.so.%%PORTVERSION%%
 lib/libecore_ipc.so
 lib/libecore_ipc.so.1
 lib/libecore_ipc.so.%%PORTVERSION%%
-lib/libecore_x.so
-lib/libecore_x.so.1
-lib/libecore_x.so.%%PORTVERSION%%
 %%SDL%%lib/libecore_sdl.so
 %%SDL%%lib/libecore_sdl.so.1
 %%SDL%%lib/libecore_sdl.so.%%PORTVERSION%%
+lib/libecore_x.so
+lib/libecore_x.so.1
+lib/libecore_x.so.%%PORTVERSION%%
+lib/libector.so
+lib/libector.so.1
+lib/libector.so.%%PORTVERSION%%
 lib/libedje.so
 lib/libedje.so.1
 lib/libedje.so.%%PORTVERSION%%
@@ -567,6 +758,9 @@ lib/libelocation.so.%%PORTVERSION%%
 lib/libembryo.so
 lib/libembryo.so.1
 lib/libembryo.so.%%PORTVERSION%%
+lib/libemile.so
+lib/libemile.so.1
+lib/libemile.so.%%PORTVERSION%%
 lib/libemotion.so
 lib/libemotion.so.1
 lib/libemotion.so.%%PORTVERSION%%
@@ -588,9 +782,11 @@ lib/libethumb_client.so.%%PORTVERSION%%
 lib/libevas.so
 lib/libevas.so.1
 lib/libevas.so.%%PORTVERSION%%
+%%AUDIO%%libdata/pkgconfig/ecore-audio-cxx.pc
 %%AUDIO%%libdata/pkgconfig/ecore-audio.pc
 libdata/pkgconfig/ecore-avahi.pc
 libdata/pkgconfig/ecore-con.pc
+libdata/pkgconfig/ecore-cxx.pc
 libdata/pkgconfig/ecore-evas.pc
 libdata/pkgconfig/ecore-file.pc
 libdata/pkgconfig/ecore-imf-evas.pc
@@ -598,42 +794,41 @@ libdata/pkgconfig/ecore-imf.pc
 libdata/pkgconfig/ecore-input-evas.pc
 libdata/pkgconfig/ecore-input.pc
 libdata/pkgconfig/ecore-ipc.pc
-libdata/pkgconfig/ecore-x.pc
 %%SDL%%libdata/pkgconfig/ecore-sdl.pc
+libdata/pkgconfig/ecore-x.pc
 libdata/pkgconfig/ecore.pc
-%%AUDIO%%libdata/pkgconfig/ecore-audio-cxx.pc
-libdata/pkgconfig/ecore-cxx.pc
-libdata/pkgconfig/edje.pc
+libdata/pkgconfig/ector.pc
 libdata/pkgconfig/edje-cxx.pc
-libdata/pkgconfig/eet.pc
+libdata/pkgconfig/edje.pc
 libdata/pkgconfig/eet-cxx.pc
-libdata/pkgconfig/efl.pc
+libdata/pkgconfig/eet.pc
 libdata/pkgconfig/efl-cxx.pc
-libdata/pkgconfig/efreet.pc
+libdata/pkgconfig/efl.pc
 libdata/pkgconfig/efreet-mime.pc
 libdata/pkgconfig/efreet-trash.pc
-libdata/pkgconfig/eina.pc
+libdata/pkgconfig/efreet.pc
 libdata/pkgconfig/eina-cxx.pc
+libdata/pkgconfig/eina.pc
+libdata/pkgconfig/eio-cxx.pc
 libdata/pkgconfig/eio.pc
 libdata/pkgconfig/eldbus.pc
 libdata/pkgconfig/elocation.pc
 libdata/pkgconfig/elua.pc
 libdata/pkgconfig/embryo.pc
+libdata/pkgconfig/emile.pc
 libdata/pkgconfig/emotion.pc
-libdata/pkgconfig/eo.pc
 libdata/pkgconfig/eo-cxx.pc
-libdata/pkgconfig/eolian.pc
+libdata/pkgconfig/eo.pc
 libdata/pkgconfig/eolian-cxx.pc
+libdata/pkgconfig/eolian.pc
 %%PHYSICS%%libdata/pkgconfig/ephysics.pc
 libdata/pkgconfig/ethumb.pc
 libdata/pkgconfig/ethumb_client.pc
 libdata/pkgconfig/evas-cxx.pc
+%%OPENGL%%libdata/pkgconfig/evas-opengl-x11.pc
 libdata/pkgconfig/evas-software-buffer.pc
 libdata/pkgconfig/evas-software-x11.pc
-%%OPENGL%%libdata/pkgconfig/evas-opengl-x11.pc
-%%OPENGL%%%%SDL%%libdata/pkgconfig/evas-opengl-sdl.pc
 libdata/pkgconfig/evas.pc
-share/dbus-1/services/org.enlightenment.Efreet.service
 share/dbus-1/services/org.enlightenment.Ethumb.service
 share/ecore/checkme
 share/ecore_imf/checkme
@@ -641,9 +836,8 @@ share/ecore_x/checkme
 share/edje/include/edje.inc
 share/eeze/checkme
 share/efreet/checkme
-%%ELUA%%share/elua/checkme
 %%ELUA%%share/elua/apps/lualian.lua
-%%ELUA%%share/elua/apps/xgettext.lua
+%%ELUA%%share/elua/checkme
 %%ELUA%%share/elua/core/gettext.lua
 %%ELUA%%share/elua/core/module.lua
 %%ELUA%%share/elua/core/util.lua
@@ -668,13 +862,26 @@ share/efreet/checkme
 %%ELUA%%share/elua/modules/ecore_con/ecore_con_base.eo.lua
 %%ELUA%%share/elua/modules/ecore_con/ecore_con_client.eo.lua
 %%ELUA%%share/elua/modules/ecore_con/ecore_con_connector.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_eet_base.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_eet_client_obj.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/ecore_con_eet_server_obj.eo.lua
 %%ELUA%%share/elua/modules/ecore_con/ecore_con_server.eo.lua
-%%ELUA%%share/elua/modules/ecore_con/ecore_con_url.eo.lua
+%%ELUA%%share/elua/modules/ecore_con/efl_network_url.eo.lua
 %%ELUA%%share/elua/modules/edje/edje_edit.eo.lua
 %%ELUA%%share/elua/modules/edje/edje_object.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_control.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_file.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_base.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_fill.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_filter.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_gradient_base.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_gradient_linear.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_gradient_radial.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_shape.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_stack.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_gfx_view.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_image.eo.lua
+%%ELUA%%share/elua/modules/efl/efl_model_base.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_player.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_text.eo.lua
 %%ELUA%%share/elua/modules/efl/efl_text_properties.eo.lua
@@ -691,19 +898,28 @@ share/efreet/checkme
 %%ELUA%%share/elua/modules/emotion/emotion_object.eo.lua
 %%ELUA%%share/elua/modules/eo.lua
 %%ELUA%%share/elua/modules/eolian.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_camera.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_light.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_material.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_mesh.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_node.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_object.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_scene.eo.lua
-%%ELUA%%share/elua/modules/evas/evas_3d_texture.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_base.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_container.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_gradient.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_gradient_linear.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_gradient_radial.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_root_node.eo.lua
+%%ELUA%%share/elua/modules/evas/efl_vg_shape.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_box.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_canvas.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_camera.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_light.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_material.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_mesh.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_node.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_object.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_primitive.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_scene.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_canvas3d_texture.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_clickable_interface.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_common_interface.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_draggable_interface.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_filter.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_grid.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_image.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_line.eo.lua
@@ -720,12 +936,10 @@ share/efreet/checkme
 %%ELUA%%share/elua/modules/evas/evas_text.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_textblock.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_textgrid.eo.lua
+%%ELUA%%share/elua/modules/evas/evas_vg.eo.lua
 %%ELUA%%share/elua/modules/evas/evas_zoomable_interface.eo.lua
 %%ELUA%%share/elua/modules/getopt.lua
 %%ELUA%%share/elua/modules/lualian.lua
-%%ELUA%%share/elua/modules/xgettext/generator.lua
-%%ELUA%%share/elua/modules/xgettext/lexer.lua
-%%ELUA%%share/elua/modules/xgettext/parser.lua
 share/embryo/include/default.inc
 share/emotion/checkme
 share/eo/gdb/eo_gdb.py
@@ -740,8 +954,10 @@ share/eolian/include/ecore-1/ecore_animator.eo
 share/eolian/include/ecore-1/ecore_con_base.eo
 share/eolian/include/ecore-1/ecore_con_client.eo
 share/eolian/include/ecore-1/ecore_con_connector.eo
+share/eolian/include/ecore-1/ecore_con_eet_base.eo
+share/eolian/include/ecore-1/ecore_con_eet_client_obj.eo
+share/eolian/include/ecore-1/ecore_con_eet_server_obj.eo
 share/eolian/include/ecore-1/ecore_con_server.eo
-share/eolian/include/ecore-1/ecore_con_url.eo
 share/eolian/include/ecore-1/ecore_exe.eo
 share/eolian/include/ecore-1/ecore_idle_enterer.eo
 share/eolian/include/ecore-1/ecore_idle_exiter.eo
@@ -751,30 +967,69 @@ share/eolian/include/ecore-1/ecore_mainloop.eo
 share/eolian/include/ecore-1/ecore_parent.eo
 share/eolian/include/ecore-1/ecore_poller.eo
 share/eolian/include/ecore-1/ecore_timer.eo
-share/eolian/include/edje-1/edje_object.eo
+share/eolian/include/ecore-1/efl_network_url.eo
+share/eolian/include/ector-1/ector_cairo_surface.eo
+share/eolian/include/ector-1/ector_generic_surface.eo
+share/eolian/include/ector-1/ector_renderer_cairo_base.eo
+share/eolian/include/ector-1/ector_renderer_cairo_gradient_linear.eo
+share/eolian/include/ector-1/ector_renderer_cairo_gradient_radial.eo
+share/eolian/include/ector-1/ector_renderer_cairo_shape.eo
+share/eolian/include/ector-1/ector_renderer_generic_base.eo
+share/eolian/include/ector-1/ector_renderer_generic_gradient.eo
+share/eolian/include/ector-1/ector_renderer_generic_gradient_linear.eo
+share/eolian/include/ector-1/ector_renderer_generic_gradient_radial.eo
+share/eolian/include/ector-1/ector_renderer_generic_shape.eo
+share/eolian/include/ector-1/ector_renderer_software_base.eo
+share/eolian/include/ector-1/ector_renderer_software_gradient_linear.eo
+share/eolian/include/ector-1/ector_renderer_software_gradient_radial.eo
+share/eolian/include/ector-1/ector_renderer_software_shape.eo
+share/eolian/include/ector-1/ector_software_surface.eo
 share/eolian/include/edje-1/edje_edit.eo
+share/eolian/include/edje-1/edje_object.eo
+share/eolian/include/edje-1/edje_types.eot
 share/eolian/include/efl-1/efl_control.eo
 share/eolian/include/efl-1/efl_file.eo
+share/eolian/include/efl-1/efl_gfx_base.eo
+share/eolian/include/efl-1/efl_gfx_fill.eo
+share/eolian/include/efl-1/efl_gfx_filter.eo
+share/eolian/include/efl-1/efl_gfx_gradient_base.eo
+share/eolian/include/efl-1/efl_gfx_gradient_linear.eo
+share/eolian/include/efl-1/efl_gfx_gradient_radial.eo
+share/eolian/include/efl-1/efl_gfx_shape.eo
+share/eolian/include/efl-1/efl_gfx_stack.eo
+share/eolian/include/efl-1/efl_gfx_view.eo
 share/eolian/include/efl-1/efl_image.eo
+share/eolian/include/efl-1/efl_model_base.eo
 share/eolian/include/efl-1/efl_player.eo
 share/eolian/include/efl-1/efl_text.eo
 share/eolian/include/efl-1/efl_text_properties.eo
+share/eolian/include/eio-1/eio_model.eo
 share/eolian/include/emotion-1/emotion_object.eo
+share/eolian/include/eo-1/eina_types.eot
 share/eolian/include/eo-1/eo_abstract_class.eo
 share/eolian/include/eo-1/eo_base.eo
-share/eolian/include/evas-1/evas_3d_camera.eo
-share/eolian/include/evas-1/evas_3d_light.eo
-share/eolian/include/evas-1/evas_3d_material.eo
-share/eolian/include/evas-1/evas_3d_mesh.eo
-share/eolian/include/evas-1/evas_3d_node.eo
-share/eolian/include/evas-1/evas_3d_object.eo
-share/eolian/include/evas-1/evas_3d_scene.eo
-share/eolian/include/evas-1/evas_3d_texture.eo
+share/eolian/include/evas-1/efl_vg_base.eo
+share/eolian/include/evas-1/efl_vg_container.eo
+share/eolian/include/evas-1/efl_vg_gradient.eo
+share/eolian/include/evas-1/efl_vg_gradient_linear.eo
+share/eolian/include/evas-1/efl_vg_gradient_radial.eo
+share/eolian/include/evas-1/efl_vg_root_node.eo
+share/eolian/include/evas-1/efl_vg_shape.eo
 share/eolian/include/evas-1/evas_box.eo
 share/eolian/include/evas-1/evas_canvas.eo
+share/eolian/include/evas-1/evas_canvas3d_camera.eo
+share/eolian/include/evas-1/evas_canvas3d_light.eo
+share/eolian/include/evas-1/evas_canvas3d_material.eo
+share/eolian/include/evas-1/evas_canvas3d_mesh.eo
+share/eolian/include/evas-1/evas_canvas3d_node.eo
+share/eolian/include/evas-1/evas_canvas3d_object.eo
+share/eolian/include/evas-1/evas_canvas3d_primitive.eo
+share/eolian/include/evas-1/evas_canvas3d_scene.eo
+share/eolian/include/evas-1/evas_canvas3d_texture.eo
 share/eolian/include/evas-1/evas_clickable_interface.eo
 share/eolian/include/evas-1/evas_common_interface.eo
 share/eolian/include/evas-1/evas_draggable_interface.eo
+share/eolian/include/evas-1/evas_filter.eo
 share/eolian/include/evas-1/evas_grid.eo
 share/eolian/include/evas-1/evas_image.eo
 share/eolian/include/evas-1/evas_line.eo
@@ -791,11 +1046,14 @@ share/eolian/include/evas-1/evas_table.eo
 share/eolian/include/evas-1/evas_text.eo
 share/eolian/include/evas-1/evas_textblock.eo
 share/eolian/include/evas-1/evas_textgrid.eo
+share/eolian/include/evas-1/evas_types.eot
+share/eolian/include/evas-1/evas_vg.eo
 share/eolian/include/evas-1/evas_zoomable_interface.eo
 share/ethumb/checkme
 share/ethumb/frames/default.edj
 share/ethumb_client/checkme
 share/evas/checkme
+share/evas/filters/lua/color.lua
 %%NLS%%share/locale/ca/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/de/LC_MESSAGES/efl.mo
@@ -811,8 +1069,8 @@ share/evas/checkme
 %%NLS%%share/locale/ko/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/efl.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/efl.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/efl.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/efl.mo