Update evas live ebuild, patch from Gustavo Sverzut Barbieri

(Portage version: 2.2.0_alpha28-r1/svn/Linux x86_64)

2 files changed, 27 insertions, 22 deletions

diff --git a/media-libs/evas/evas-9999.ebuild b/media-libs/evas/evas-9999.ebuild
index aa3c124..3436b8b 100644
--- a/media-libs/evas/evas-9999.ebuild
+++ b/media-libs/evas/evas-9999.ebuild
@@ -9,7 +9,7 @@ inherit enlightenment
 DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
 
-IUSE="altivec bidi +cache directfb +eet fbcon +fontconfig gles gif +jpeg mmx opengl +png sdl sse svg static-libs +threads tiff X xcb xpm"
+IUSE="altivec bidi +bmp +cache directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm sdl sse svg static-libs +threads tiff X xcb xpm"
 
 RDEPEND="
 	>=dev-libs/eina-9999
@@ -48,50 +48,51 @@ src_configure() {
 			ewarn "You have enabled both 'X' and 'xcb', so we will use"
 			ewarn "X as it's considered the most stable for evas"
 		fi
-		MY_ECONF+="
+		MY_ECONF="
 			--disable-software-xcb
 			--disable-xrender-xcb
 			$(use_enable opengl gl-x11 static)
 		"
 	elif use xcb ; then
 		use opengl && ewarn "opengl support is not implemented with xcb"
-		MY_ECONF+="
+		MY_ECONF="
 			--disable-gl-x11
 			--enable-software-xcb=static
 			--enable-xrender-xcb=static
 		"
 	else
-		MY_ECONF+="
+		MY_ECONF="
 			--disable-gl-x11
 			--disable-software-xcb
 			--disable-xrender-xcb
 		"
 	fi
 
-	if use opengl ; then
-		MY_ECONF+=" $(use_enable cache metric-cache)"
-	else
-		MY_ECONF+=" $(use_enable cache word-cache)"
-	fi
-
-	MY_ECONF="
+	MY_ECONF+="
 		$(use_enable altivec cpu-altivec)
 		$(use_enable bidi fribidi)
-		$(use_enable directfb)
+		$(use_enable bmp image-loader-bmp static)
+		$(use_enable bmp image-loader-wbmp static)
+		$(use_enable cache metric-cache)
+		$(use_enable cache word-cache)
+		$(use_enable directfb static)
 		$(use_enable doc)
-		$(use_enable fbcon fb)
+		$(use_enable eet font-loader-eet static)
+		$(use_enable eet image-loader-eet static)
+		$(use_enable fbcon fb static)
 		$(use_enable fontconfig)
 		$(use_enable gles gl-flavor-gles)
 		$(use_enable gles gles-variety-sgx)
-		$(use_enable gif image-loader-gif)
-		$(use_enable jpeg image-loader-jpeg)
-		$(use_enable eet font-loader-eet)
-		$(use_enable eet image-loader-eet)
+		$(use_enable gif image-loader-gif static)
+		$(use_enable ico image-loader-ico static)
+		$(use_enable jpeg image-loader-jpeg static)
 		$(use_enable mmx cpu-mmx)
-		$(use_enable png image-loader-png)
-		$(use_enable sdl software-sdl)
+		$(use_enable png image-loader-png static)
+		$(use_enable ppm image-loader-pmaps static)
+		$(use_enable sdl software-sdl static)
 		$(use_enable sse cpu-sse)
 		$(use_enable svg image-loader-svg static)
+		$(use_enable tga image-loader-tga static)
 		$(use_enable tiff image-loader-tiff static)
 		$(use_enable threads pthreads)
 		$(use_enable threads async-events)
@@ -99,11 +100,10 @@ src_configure() {
 		$(use_enable threads async-render)
 		$(use_enable X software-xlib static)
 		$(use_enable X xrender-x11 static)
-		$(use_enable X software-16-x11 static)
 		$(use_enable xpm image-loader-xpm static)
 		--enable-evas-magic-debug \
 		--enable-static-software-generic \
-		--enable-buffer \
+		--enable-buffer=static \
 		--enable-cpu-c \
 		--enable-scale-sample \
 		--enable-scale-smooth \
@@ -129,7 +129,9 @@ src_configure() {
 		--enable-convert-32-rgb-rot-0 \
 		--enable-convert-32-rgb-rot-270 \
 		--enable-convert-32-rgb-rot-90 \
-		--disable-image-loader-edb"
+		--disable-image-loader-edb
+		--disable-static-software-16
+		--disable-software-16-x11"
 
 	enlightenment_src_configure
 }
diff --git a/media-libs/evas/metadata.xml b/media-libs/evas/metadata.xml
index 1df5e03..036b5ac 100644
--- a/media-libs/evas/metadata.xml
+++ b/media-libs/evas/metadata.xml
@@ -6,9 +6,12 @@
  <email>enlightenment@gentoo.org</email>
 </maintainer>
 <use>
+ <flag name='bmp'>Support windows bitmap (bmp) image loader</flag>
  <flag name='eet'>Support dev-libs/eet</flag>
+ <flag name='ico'>Support windows icon (ico) image loader</flag>
  <flag name='cache'>Enable experimental caching to speed up rendering</flag>
  <flag name='gles'>Enable gles flavor of gl instead of standard</flag>
+ <flag name='ppm'>Support PPM image loader</flag>
 </use>
 <longdescription>
 Evas is a hardware-accelerated canvas API for X-Windows that can draw