--- evas-9999.ebuild.old	2011-08-13 00:54:53.305489841 +0800
+++ evas-9999.ebuild.old	2011-08-13 00:54:34.458489844 +0800
@@ -43,23 +43,33 @@ 
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	local STATIC="" ESTATIC=""
+	MY_ECONF=""
+	if use static-libs; then
+		STATIC="static"
+		ESTATIC="=static"
+		MY_ECONF+="
+			--enable-static-software-generic
+		"
+	fi
+
 	if use X ; then
 		if use xcb ; then
 			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
-			$(use_enable opengl gl-xlib static)
+			$(use_enable opengl gl-xlib ${STATIC})
 		"
 	elif use xcb ; then
-		MY_ECONF="
+		MY_ECONF+="
 			--disable-gl-xlib
-			--enable-software-xcb=static
-			$(use_enable opengl gl-xcb static)
+			--enable-software-xcb${ESTATIC}
+			$(use_enable opengl gl-xcb ${STATIC})
 		"
 	else
-		MY_ECONF="
+		MY_ECONF+="
 			--disable-gl-xlib
 			--disable-software-xcb
 			--disable-gl-xcb
@@ -69,38 +79,37 @@ 
 	MY_ECONF+="
 		$(use_enable altivec cpu-altivec)
 		$(use_enable bidi fribidi)
-		$(use_enable bmp image-loader-bmp static)
-		$(use_enable bmp image-loader-wbmp static)
+		$(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 directfb ${STATIC})
 		$(use_enable doc)
-		$(use_enable eet font-loader-eet static)
-		$(use_enable eet image-loader-eet static)
-		$(use_enable fbcon fb static)
+		$(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 static)
-		$(use_enable ico image-loader-ico static)
-		$(use_enable jpeg image-loader-jpeg static)
+		$(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 static)
-		$(use_enable ppm image-loader-pmaps static)
-		$(use_enable sdl software-sdl static)
+		$(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 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)
 		$(use_enable threads async-preload)
 		$(use_enable threads async-render)
-		$(use_enable X software-xlib static)
-		$(use_enable xpm image-loader-xpm static)
+		$(use_enable X software-xlib ${STATIC})
+		$(use_enable xpm image-loader-xpm ${STATIC})
 		--enable-evas-magic-debug \
-		--enable-static-software-generic \
-		--enable-buffer=static \
+		--enable-buffer${ESTATIC} \
 		--enable-cpu-c \
 		--enable-scale-sample \
 		--enable-scale-smooth \