applying alonbl's indent an myconf patches, thanks alonbl! great work

26 files changed, 190 insertions, 243 deletions

diff --git a/dev-python/python-evas/Manifest b/dev-python/python-evas/Manifest
index afa3729..7650ba6 100644
--- a/dev-python/python-evas/Manifest
+++ b/dev-python/python-evas/Manifest
@@ -1,3 +1,3 @@
 AUX python-evas-setup.diff 414 RMD160 f1e7e5ff5af953bcb96f7d8692e76002bcadee44 SHA1 dbe0009bd05922048bd8cd6c0fc3147395c4ba4c SHA256 b4fdb497fc7778ad713bf04a603a7571b423e6a4dbcfe3b50001b72a60d0fc95
 EBUILD python-evas-20090212.ebuild 486 RMD160 17a1fcc2acd7d7e0f94fe47c2be6c825ad3ff63d SHA1 774e70468cbd22e080195b2e7d70fcb5d1266bf6 SHA256 3683add117784578dfff5dfdcdc306882fb5e414e26f1df4eac9b45438311a97
-EBUILD python-evas-20090313.ebuild 486 RMD160 17a1fcc2acd7d7e0f94fe47c2be6c825ad3ff63d SHA1 774e70468cbd22e080195b2e7d70fcb5d1266bf6 SHA256 3683add117784578dfff5dfdcdc306882fb5e414e26f1df4eac9b45438311a97
+EBUILD python-evas-20090313.ebuild 494 RMD160 617a9a44ff83bbe6c171359075ba53564409ff96 SHA1 b6e2fb4988aaaf27a833ea54559b01e76b29effc SHA256 091773a3cad57f3874c2fe3d937f2d0b6c27197f19a6c883de6327cb4adc86a2
diff --git a/dev-python/python-evas/python-evas-20090313.ebuild b/dev-python/python-evas/python-evas-20090313.ebuild
index e873f00..b6fc9c7 100644
--- a/dev-python/python-evas/python-evas-20090313.ebuild
+++ b/dev-python/python-evas/python-evas-20090313.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit enlightenment-python
 
 DESCRIPTION="Python bindings for EVAS library"
diff --git a/media-libs/edje/Manifest b/media-libs/edje/Manifest
index 5ca249e..e96a0ce 100644
--- a/media-libs/edje/Manifest
+++ b/media-libs/edje/Manifest
@@ -2,4 +2,4 @@ AUX no_hardcoded_tmp.diff 617 RMD160 14b86ed8f8f4d9a5c88260b23bc273297b2ec487 SH
 DIST edje-0.9.9.050.tar.bz2 4144140 RMD160 28ec273828163590647f725598648fab3cea1553 SHA1 947abed60ea93a177cac2b5c20743a7afb3fdb86 SHA256 f72a585a521fc03ea20c0bd180182aa5330f26be3a984f1ac08ea0768526c796
 EBUILD edje-0.9.9.050.ebuild 672 RMD160 685ea375e75fa8b1615fcf206efe44f4f4d919d5 SHA1 173c4948c06b512fad6e79fd11b5f4622a9d1460 SHA256 ee656579fecdab2787270e44b5ee3f9061fd13a4de4a592907f996432698cce2
 EBUILD edje-20090212.ebuild 615 RMD160 110b0462baacca655893f873e9c4c97aa435b439 SHA1 51bfadd2dce73c8043665435b9eea1ab7d228848 SHA256 4dfeaea974be949c9dc359164908aa8296fdc080147a3d4c4811762f28162571
-EBUILD edje-20090313.ebuild 615 RMD160 110b0462baacca655893f873e9c4c97aa435b439 SHA1 51bfadd2dce73c8043665435b9eea1ab7d228848 SHA256 4dfeaea974be949c9dc359164908aa8296fdc080147a3d4c4811762f28162571
+EBUILD edje-20090313.ebuild 566 RMD160 0ba4ecef4081582b036bff382fce8629d0c89528 SHA1 125ae64e2d1218091b0d95a0d8152c69fe425534 SHA256 45c93193a2615aa81a70ad0220ea192e79e6e313befacac0e04047e41fc18378
diff --git a/media-libs/edje/edje-20090313.ebuild b/media-libs/edje/edje-20090313.ebuild
index b6cccf9..2c34e42 100644
--- a/media-libs/edje/edje-20090313.ebuild
+++ b/media-libs/edje/edje-20090313.ebuild
@@ -19,12 +19,12 @@ RDEPEND="=x11-libs/evas-${PVR}
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
 src_unpack() {
-        subversion_src_unpack
+	subversion_src_unpack
 
-        cd "${S}"
+	cd "${S}"
 
 	# I hate hardcoded paths
 	epatch "${FILESDIR}/no_hardcoded_tmp.diff"
 
-        eautoreconf || die "eautoreconf failed"
+	eautoreconf
 }
diff --git a/media-libs/emotion/Manifest b/media-libs/emotion/Manifest
index 2941a52..a04ae66 100644
--- a/media-libs/emotion/Manifest
+++ b/media-libs/emotion/Manifest
@@ -1,2 +1,2 @@
 EBUILD emotion-20090212.ebuild 852 RMD160 7e6d297b901e7865b24ecb3cad81d4cf2b436ef0 SHA1 b76781fde8860c3a77330a8b8328b16bba02bd08 SHA256 77ad63a6e4bc7a9fba199da5e433e42be9cd57edf9a29266075d4ef9e35b30da
-EBUILD emotion-20090313.ebuild 984 RMD160 7ee751cb4e08a8860d0de73bb6e3684bbba86998 SHA1 d40d17134ee9ce2d3724a2f813c6dd91ea27f916 SHA256 b89501cd6c03d4086b792ee19b24ffdff2b2783c9f029e1a26a085a8d7953644
+EBUILD emotion-20090313.ebuild 881 RMD160 0f6ed6e365b51fc518bf3bf430c642edfc2cf3de SHA1 77ae9f0763a5ddc5a3d247225ad81cf3dc79731c SHA256 8a71d8c175ce98a465dfc6e51e565f4db470afac1d6ec6de588b9e0950476ad5
diff --git a/media-libs/emotion/emotion-20090313.ebuild b/media-libs/emotion/emotion-20090313.ebuild
index 7f129df..405fef6 100644
--- a/media-libs/emotion/emotion-20090313.ebuild
+++ b/media-libs/emotion/emotion-20090313.ebuild
@@ -17,7 +17,7 @@ RDEPEND="=dev-libs/eet-${PVR}
 	=x11-libs/ecore-${PVR}
 	=media-libs/edje-${PVR}
 	gstreamer? ( media-libs/gstreamer
-		     media-libs/gst-plugins-base )
+		media-libs/gst-plugins-base )
 	xine?	   ( media-libs/xine-lib )
 	vlc?	   ( media-video/vlc )"
 
@@ -31,13 +31,10 @@ src_compile() {
 	# from http://bugs.gentoo.org/show_bug.cgi?id=133341
 	addpredict "/root/.gstreamer-0.10"
 
-	local myconf
-
-	myconf="${myconf}
-	    $(use_enable gstreamer) \
-	    $(use_enable xine)      \
-            $(use_enable vlc)"
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	econf \
+		$(use_enable gstreamer) \
+		$(use_enable xine) \
+		$(use_enable vlc) \
+		|| die
+	emake || die
 }
diff --git a/media-libs/epsilon/Manifest b/media-libs/epsilon/Manifest
index 052495c..8bda37c 100644
--- a/media-libs/epsilon/Manifest
+++ b/media-libs/epsilon/Manifest
@@ -1,2 +1,2 @@
 EBUILD epsilon-20090212.ebuild 644 RMD160 04002cda6b591fa5575c0a1d242e38618fc58dae SHA1 4ac688218290e572cdb92527c472d5933c0411c8 SHA256 3659038d893dda57f3f28e493ade0c89dd28d629dae40d0b72deae6b3515346d
-EBUILD epsilon-20090313.ebuild 644 RMD160 04002cda6b591fa5575c0a1d242e38618fc58dae SHA1 4ac688218290e572cdb92527c472d5933c0411c8 SHA256 3659038d893dda57f3f28e493ade0c89dd28d629dae40d0b72deae6b3515346d
+EBUILD epsilon-20090313.ebuild 557 RMD160 8a03caf77189c7da68b08eafdfc924a65668a3a1 SHA1 ba19a163e3caa875c566353bf0074a44789cbacf SHA256 c27127efa69d94a452d6aa74cd34e67b0be6cdedf0c672fd1ab3bee2670a6532
diff --git a/media-libs/epsilon/epsilon-20090313.ebuild b/media-libs/epsilon/epsilon-20090313.ebuild
index 43ff3d6..786bd20 100644
--- a/media-libs/epsilon/epsilon-20090313.ebuild
+++ b/media-libs/epsilon/epsilon-20090313.ebuild
@@ -22,12 +22,8 @@ RDEPEND="
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
 src_compile() {
-    local myconf
-
-    myconf="${myconf}
-	    $(use_enable xine thumbnailer-xine)"
-
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	econf \
+		$(use_enable xine thumbnailer-xine) \
+		|| die
+	emake || die
 }
diff --git a/media-libs/esmart/Manifest b/media-libs/esmart/Manifest
index ad2a508..0211f50 100644
--- a/media-libs/esmart/Manifest
+++ b/media-libs/esmart/Manifest
@@ -1,2 +1,2 @@
 EBUILD esmart-20090212.ebuild 645 RMD160 7ee8c1ae77a0c60557625a6dcfc812ed6dee16f9 SHA1 a8996a3c4fe14957b3e977e6fdb9452e41e1b674 SHA256 0947e38827798e0ba49f222204aed6a319b4ab7a3ab1a5693dbea138b8e07bf8
-EBUILD esmart-20090313.ebuild 645 RMD160 7ee8c1ae77a0c60557625a6dcfc812ed6dee16f9 SHA1 a8996a3c4fe14957b3e977e6fdb9452e41e1b674 SHA256 0947e38827798e0ba49f222204aed6a319b4ab7a3ab1a5693dbea138b8e07bf8
+EBUILD esmart-20090313.ebuild 543 RMD160 26cfaf5cd64dccc7924e0a96b4a82d6fb82f2609 SHA1 cde6e4dd7c38d9da8ed95f19fd3ee91789416b2b SHA256 2a723e5d3664151d687b8a8ce7f9539a69cfc7f8b1528d307b5ea9c9a47814de
diff --git a/media-libs/esmart/esmart-20090313.ebuild b/media-libs/esmart/esmart-20090313.ebuild
index 3c84410..5619312 100644
--- a/media-libs/esmart/esmart-20090313.ebuild
+++ b/media-libs/esmart/esmart-20090313.ebuild
@@ -19,15 +19,9 @@ RDEPEND="media-libs/imlib2
 	=media-libs/epsilon-${PVR}"
 
 DEPEND=">=dev-util/pkgconfig-0.9.0
-        media-libs/edje"
+	media-libs/edje"
 
 src_compile() {
-    local myconf
-
-    myconf="${myconf}
-	    --with-edje-cc=edje_cc"
-
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	econf --with-edje-cc=edje_cc || die
+	emake || die
 }
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 2ef6c4a..9831b77 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,4 +1,4 @@
 AUX imlib2-1.4.2-CVE-2008-5187.patch 678 RMD160 fd7b0078640a3bc7a297d6b32f3063ed48227319 SHA1 aafad3c0692b6f1d78b3d0db902b2c3e7c4a178e SHA256 30e1e7a1185e71efb0c822a01553b2322d4f25dc4da997a02366ab7b365b5852
 EBUILD imlib2-20090212.ebuild 1479 RMD160 c68c086782a02ff143cfb7dcbfa76f379b8e37cb SHA1 358927ab237a0750edc247b60f5e63ba901a1434 SHA256 177e583db5babc0adb91642aeb5c8f50232c2f459b898fbd04aa18ecd2c7c8aa
-EBUILD imlib2-20090313.ebuild 1479 RMD160 c68c086782a02ff143cfb7dcbfa76f379b8e37cb SHA1 358927ab237a0750edc247b60f5e63ba901a1434 SHA256 177e583db5babc0adb91642aeb5c8f50232c2f459b898fbd04aa18ecd2c7c8aa
+EBUILD imlib2-20090313.ebuild 1321 RMD160 2ebf65d13604b1a321f25eded1c258be5dc5247f SHA1 c7909851a9a25dc37e8031592b88f51917def68b SHA256 67474735f80521dd0951f060161d27cc228917dda284df00242379e903019e55
 MISC metadata.xml 2255 RMD160 da6c5bba4102a0a0bf263ed8f986704d74292a8f SHA1 5e968e9ca6c3640ee5e3c98c6939099014edbb27 SHA256 81f9771e8e64255ed50d174fe917f9ed0507db9afe88df9f29ce311a6075b30f
diff --git a/media-libs/imlib2/imlib2-20090313.ebuild b/media-libs/imlib2/imlib2-20090313.ebuild
index c5afbba..c7e8df4 100644
--- a/media-libs/imlib2/imlib2-20090313.ebuild
+++ b/media-libs/imlib2/imlib2-20090313.ebuild
@@ -33,13 +33,7 @@ src_compile() {
 
 	[[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
 
-
-	# Make sure the stuff also builds on cross-compilation
-	myconf="${myconf} \
-		--x-includes=${SYSROOT}/usr/X11R6/include \
-		--x-libraries=${SYSROOT}/usr/X11R6/lib"
-
-	export MY_ECONF="
+	econf \
 		$(use_with X x) \
 		$(use_with jpeg) \
 		$(use_with png) \
@@ -48,9 +42,9 @@ src_compile() {
 		$(use_with zlib) \
 		$(use_with bzip2) \
 		$(use_with mp3 id3) \
+		--x-includes=${SYSROOT}/usr/X11R6/include \
+		--x-libraries=${SYSROOT}/usr/X11R6/lib \
 		${myconf} \
-	"
-
-        econf ${myconf} || die "Configuration failed"
-        emake || die "Make failed"
+		|| die
+	emake || die
 }
diff --git a/x11-libs/e_dbus/Manifest b/x11-libs/e_dbus/Manifest
index d5d1005..0536c14 100644
--- a/x11-libs/e_dbus/Manifest
+++ b/x11-libs/e_dbus/Manifest
@@ -1,5 +1,5 @@
-EBUILD e_dbus-0.5.0.050.ebuild 1028 RMD160 afeb8a93d7986dc65e837d5ac78ca320204bf826 SHA1 b05a6cf9f0434ae7928a8139721c2e4a35e8df4a SHA256 0e96b2e78a9270813b0ae1949a4908af7b6c9afaa3ee22dc504c4a8f4ebe434a
-EBUILD e_dbus-20090212.ebuild 639 RMD160 46ff6b0395f29b1b6dd1191cef809f1c85cc9851 SHA1 cc2159134154adf9c40b0b97ffe2e97e1a3c164f SHA256 f265d6de920eb219a984dd4ed1eb1fb2d40392bf6747b3cbcc97c96f3dfa05a5
-EBUILD e_dbus-20090313.ebuild 639 RMD160 46ff6b0395f29b1b6dd1191cef809f1c85cc9851 SHA1 cc2159134154adf9c40b0b97ffe2e97e1a3c164f SHA256 f265d6de920eb219a984dd4ed1eb1fb2d40392bf6747b3cbcc97c96f3dfa05a5
 AUX e_dbus-0.5.0.050-e_notify_send-Makefile.patch 566 RMD160 a16d9b3c30468ebe6ea5c389f95cfc5a62657ba1 SHA1 da6799956de2c0a477a0435c9ed551f0fe5b3f0c SHA256 b36435962b294cb3146b930bc7da46844f2641f437b62d133762c94e02a16c77
 DIST e_dbus-0.5.0.050.tar.bz2 240402 RMD160 a8709338da65aa9a8422a8f550f5e1a125f2fdca SHA1 4780cb3ce37cd3be6fe86af901db1215bda15c4b SHA256 7008c8f6e009b165108afc59319442eb98d6506409d9c4f11c31dac6cbcc06df
+EBUILD e_dbus-0.5.0.050.ebuild 1028 RMD160 afeb8a93d7986dc65e837d5ac78ca320204bf826 SHA1 b05a6cf9f0434ae7928a8139721c2e4a35e8df4a SHA256 0e96b2e78a9270813b0ae1949a4908af7b6c9afaa3ee22dc504c4a8f4ebe434a
+EBUILD e_dbus-20090212.ebuild 639 RMD160 46ff6b0395f29b1b6dd1191cef809f1c85cc9851 SHA1 cc2159134154adf9c40b0b97ffe2e97e1a3c164f SHA256 f265d6de920eb219a984dd4ed1eb1fb2d40392bf6747b3cbcc97c96f3dfa05a5
+EBUILD e_dbus-20090313.ebuild 559 RMD160 e1e9ca5ac5a93d37b9bb9e0f1056c650a786c8d0 SHA1 495f9949ec9a9b1709ca2c6d0d62131f0dbfc65a SHA256 7fff8f6babd40b7aa00caec000324de8ec779813e2a0a536ef0b7c4562dfdafb
diff --git a/x11-libs/e_dbus/e_dbus-20090313.ebuild b/x11-libs/e_dbus/e_dbus-20090313.ebuild
index 4121c74..afdb88b 100644
--- a/x11-libs/e_dbus/e_dbus-20090313.ebuild
+++ b/x11-libs/e_dbus/e_dbus-20090313.ebuild
@@ -18,14 +18,11 @@ RDEPEND="=dev-libs/eina-${PVR}
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
 src_compile() {
-	local myconf
-
-	myconf="${myconf}
-	        $(use_enable hal ehal)
-		--enable-enm
-		--enable-build-test-gui
-		--enable-enotify"
-		
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	econf \
+		--enable-enm \
+		--enable-build-test-gui \
+		--enable-enotify \
+		$(use_enable hal ehal) \
+		|| die
+	emake || die
 }
diff --git a/x11-libs/ecore/Manifest b/x11-libs/ecore/Manifest
index 051d870..d5c4370 100644
--- a/x11-libs/ecore/Manifest
+++ b/x11-libs/ecore/Manifest
@@ -1,4 +1,4 @@
+DIST ecore-0.9.9.050.tar.bz2 10412842 RMD160 f6e25f96fad4e6ab81c119162384ba6780d83c4a SHA1 8d63e2e7c8eed83e3cee1360ef3e4520003d21dd SHA256 66380d748e4fc8d9763a1cadc5438ba95febbf3dc98105828b9795f3db687095
 EBUILD ecore-0.9.9.050.ebuild 2400 RMD160 c4c922e8360e32802a4634f757ce03f057850f98 SHA1 5087613b11584ca1ac1264f3b8611acf5a18706c SHA256 b6757bb0d6f68b723a524fd8627e7555f1c88ee657a23f1a8a9dfdddd35ea93d
 EBUILD ecore-20090212.ebuild 2575 RMD160 9a52246b926f382b26648f99c66c1107fc59da86 SHA1 dcd6d5d847ed60d58dee0e2d3167437c65903461 SHA256 0ac13d8ca77d4c58d72faf49987026378f826469117309432ac91d4d9d93c233
-EBUILD ecore-20090313.ebuild 2575 RMD160 9a52246b926f382b26648f99c66c1107fc59da86 SHA1 dcd6d5d847ed60d58dee0e2d3167437c65903461 SHA256 0ac13d8ca77d4c58d72faf49987026378f826469117309432ac91d4d9d93c233
-DIST ecore-0.9.9.050.tar.bz2 10412842 RMD160 f6e25f96fad4e6ab81c119162384ba6780d83c4a SHA1 8d63e2e7c8eed83e3cee1360ef3e4520003d21dd SHA256 66380d748e4fc8d9763a1cadc5438ba95febbf3dc98105828b9795f3db687095
+EBUILD ecore-20090313.ebuild 1869 RMD160 c7126ec15276e4f2a2dcb87a1ceedfb31ad2ca76 SHA1 a2e159629e0ad114f1a9c45f26e3b39d1f0d9ad4 SHA256 f5fe603fa4a5c806f061490f593808f02d7d7bd14def95abaad46446939ad95f
diff --git a/x11-libs/ecore/ecore-20090313.ebuild b/x11-libs/ecore/ecore-20090313.ebuild
index 0daaf64..df88db9 100644
--- a/x11-libs/ecore/ecore-20090313.ebuild
+++ b/x11-libs/ecore/ecore-20090313.ebuild
@@ -13,14 +13,14 @@ KEYWORDS="~arm ~x86 ~amd64"
 IUSE="ssl curl X xcb opengl directfb fbcon sdl"
 
 RDEPEND="=x11-libs/evas-${PVR}
-	 ssl?      ( dev-libs/openssl )
-	 curl?     ( net-misc/curl )
-	 X?        ( x11-libs/libXrender
-		     x11-libs/libXtst )
-	 xcb?      ( x11-libs/libxcb )
-	 opengl?   ( virtual/opengl )
-	 directfb? ( dev-libs/DirectFB )
-	 sdl?      ( media-libs/libsdl )"
+	ssl?		( dev-libs/openssl )
+	curl?		( net-misc/curl )
+	X?			( x11-libs/libXrender
+				  x11-libs/libXtst )
+	xcb?		( x11-libs/libxcb )
+	opengl?		( virtual/opengl )
+	directfb?	( dev-libs/DirectFB )
+	sdl?		( media-libs/libsdl )"
 
 DEPEND="X? ( x11-proto/xextproto
 	     x11-proto/xproto )"
@@ -36,42 +36,37 @@ src_unpack() {
 	fi
 
 	touch README
-	touch ABOUT-NLS
-
-	eautoreconf || die "Autoreconf failed"
+	eautoreconf
 }
 
 src_compile() {
-	local myconf
-
-	# See the complete list at the end of this file
-	myconf="$(use_enable ssl      openssl)                    \
-		$(use_enable curl)                                \
-		--enable-ecore-job                                \
-		--enable-ecore-con                                \
-		--enable-ecore-ipc                                \
-		--enable-ecore-config                             \
-		--enable-ecore-txt                                \
-		--enable-ecore-evas                               \
-		--enable-ecore-imf                                \
-		--enable-ecore-imf-evas                           \
-		$(use_enable X        simple-x11)                 \
-		$(use_enable xcb      ecore-x-xcb)                \
-		$(use_enable X        ecore-x)                    \
-		$(use_enable opengl   ecore-evas-opengl-x11)      \
-		$(use_enable X        ecore-evas-xrender-x11)     \
+	econf \
+		--enable-ecore-job \
+		--enable-ecore-con \
+		--enable-ecore-ipc \
+		--enable-ecore-config \
+		--enable-ecore-txt \
+		--enable-ecore-evas \
+		--enable-ecore-imf \
+		--enable-ecore-imf-evas \
+		$(use_enable curl) \
+		$(use_enable ssl      openssl) \
+		$(use_enable xcb      ecore-x-xcb) \
+		$(use_enable opengl   ecore-evas-opengl-x11) \
+		$(use_enable X        ecore-x) \
+		$(use_enable X        simple-x11) \
+		$(use_enable X        ecore-evas-xrender-x11) \
 		$(use_enable X        ecore-evas-software-16-x11) \
-		$(use_enable directfb ecore-directfb)             \
-		$(use_enable directfb ecore-evas-dfb)             \
-		$(use_enable fbcon    ecore-fb)                   \
-		$(use_enable fbcon    ecore-evas-fb)              \
-		$(use_enable sdl      ecore-sdl)                  \
-		$(use_enable sdl      ecore-evas-sdl)             \
-		--enable-ecore-evas-buffer                        \
-		--enable-ecore-file                               \
-		--enable-inotify                                  \
-		--disable-poll"
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+		$(use_enable directfb ecore-directfb) \
+		$(use_enable directfb ecore-evas-dfb) \
+		$(use_enable fbcon    ecore-fb) \
+		$(use_enable fbcon    ecore-evas-fb) \
+		$(use_enable sdl      ecore-sdl) \
+		$(use_enable sdl      ecore-evas-sdl) \
+		--enable-ecore-evas-buffer \
+		--enable-ecore-file \
+		--enable-inotify \
+		--disable-poll \
+		|| die
+	emake || die
 }
diff --git a/x11-libs/elementary/Manifest b/x11-libs/elementary/Manifest
index f05753e..cee0cad 100644
--- a/x11-libs/elementary/Manifest
+++ b/x11-libs/elementary/Manifest
@@ -1,2 +1,2 @@
 EBUILD elementary-20090212.ebuild 655 RMD160 6dfa9fbd038e96403f6bde42f1ff084febb04401 SHA1 4806823500dac8122749a7e1c216a9a5a3c9a265 SHA256 8bdd256a0e2bc0cac8f64d3503e08052cd098cb8e0cac9a4944cd03ec121032e
-EBUILD elementary-20090313.ebuild 655 RMD160 6dfa9fbd038e96403f6bde42f1ff084febb04401 SHA1 4806823500dac8122749a7e1c216a9a5a3c9a265 SHA256 8bdd256a0e2bc0cac8f64d3503e08052cd098cb8e0cac9a4944cd03ec121032e
+EBUILD elementary-20090313.ebuild 534 RMD160 6c8196acb109bc1389bded9efafdbef9b7e9b97f SHA1 068d20d770d4d940ef847fc153cc029c49754dab SHA256 f4929b0a0bc8e6b539ad0220db0d8f1686b18f585a0203a65ef72cbbb465f652
diff --git a/x11-libs/elementary/elementary-20090313.ebuild b/x11-libs/elementary/elementary-20090313.ebuild
index 8978191..eb4c3c2 100644
--- a/x11-libs/elementary/elementary-20090313.ebuild
+++ b/x11-libs/elementary/elementary-20090313.ebuild
@@ -22,11 +22,8 @@ RDEPEND="=x11-libs/e_dbus-${PVR}
 DEPEND="media-libs/edje"
 
 src_compile() {
-       local myconf
-
-        myconf="${myconf}             \
-                --with-edje-cc=/usr/bin/edje_cc"
-
-       econf $myconf || die "econf failed"
-       emake || die "emake failed"
+	econf \
+		--with-edje-cc=/usr/bin/edje_cc \
+		|| die
+	emake || die
 }
diff --git a/x11-libs/etk/Manifest b/x11-libs/etk/Manifest
index 536b1e1..3543026 100644
--- a/x11-libs/etk/Manifest
+++ b/x11-libs/etk/Manifest
@@ -1,2 +1,2 @@
 EBUILD etk-20090212.ebuild 935 RMD160 50fb31db6f97cb207a6363f1b2e71694c83f5574 SHA1 66b4ad4181029453625892cce7423943ec084b11 SHA256 0be25402a6e91fb7a5f29ed177e2b2b49a6a2963c5d8f480016ccb253b0024be
-EBUILD etk-20090313.ebuild 935 RMD160 50fb31db6f97cb207a6363f1b2e71694c83f5574 SHA1 66b4ad4181029453625892cce7423943ec084b11 SHA256 0be25402a6e91fb7a5f29ed177e2b2b49a6a2963c5d8f480016ccb253b0024be
+EBUILD etk-20090313.ebuild 758 RMD160 05d07d45939fa453e6859b6f79ed95970a0dbfc2 SHA1 ecf58e58b2441fbc19dc619aff22f7525c95d79c SHA256 59ac616d272dcd8995752887f96d647268de8080b283deec6af87c2789a9bf61
diff --git a/x11-libs/etk/etk-20090313.ebuild b/x11-libs/etk/etk-20090313.ebuild
index dca516e..0efa5bd 100644
--- a/x11-libs/etk/etk-20090313.ebuild
+++ b/x11-libs/etk/etk-20090313.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit enlightenment
 
 DESCRIPTION="The Enlightenment etk library."
@@ -29,20 +31,14 @@ src_unpack() {
 
 	cd "${S}"
 
-	# autoreconf fails without autopoinf -f
-	autopoint -f > /dev/null || die "autopoint failed"
-
-	eautoreconf || die "eautoreconf failed"
+	autopoint -f || die
+	eautoreconf
 }
 
 src_compile() {
-    local myconf
-
-    myconf="${myconf}
+	econf \
 	    --x-includes=${SYSROOT}/usr/X11R6/include \
-	    --x-libraries=${SYSROOT}/usr/X11R6/lib"
-
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	    --x-libraries=${SYSROOT}/usr/X11R6/lib \
+		|| die
+	emake || die
 }
diff --git a/x11-libs/evas/Manifest b/x11-libs/evas/Manifest
index 705d52e..36e2efe 100644
--- a/x11-libs/evas/Manifest
+++ b/x11-libs/evas/Manifest
@@ -1,4 +1,4 @@
 DIST evas-0.9.9.050.tar.bz2 12291950 RMD160 d358956e690c439b5d1bcdf5a05aae87a7ebfd98 SHA1 13cc5791023038b1ab12955fa52f1c93bf218859 SHA256 8c238493ec1649d100c624345aa16db055c7bc7c651a5bdf8efaa37de7e512d2
 EBUILD evas-0.9.9.050.ebuild 3958 RMD160 af36154dc23cc84f329561f820dcbc2f7a29d63c SHA1 90a05bfca64d7bb6e93e186deed9c33707479601 SHA256 211f73c9621cc0239303ee8254987c855929f4330166ae8679bacbbea560f6da
 EBUILD evas-20090212.ebuild 3840 RMD160 f1582cc19fecdec0972331a7ad08033d6ac1189f SHA1 03b9d1ae527094cf8bda90c10215acabb2d4c68e SHA256 26a3dd2b2fb725fe538fc4c4dc911f6762038f7181da82b30a81bc6f79d85c6f
-EBUILD evas-20090313.ebuild 3841 RMD160 f856200352953c6f38abf8264070835d991c6e66 SHA1 f09edbce8ea64cdb92c5834ffa200330894aadac SHA256 b4103e8356896336a623aca5a3295e725228e1a9c3940290fa87d3a3609081cf
+EBUILD evas-20090313.ebuild 3093 RMD160 b9bb27561e3f317214ac8fcdad60fb50f3d8bbcb SHA1 c504e1961c76923cf0a0c5ce665dfce4ab5e2b73 SHA256 8d61d87c34c5ab48dd74a69b2e7a895ae9d1ad68d31974673d03bf7cf4a39b3e
diff --git a/x11-libs/evas/evas-20090313.ebuild b/x11-libs/evas/evas-20090313.ebuild
index ce579aa..0a47e5c 100644
--- a/x11-libs/evas/evas-20090313.ebuild
+++ b/x11-libs/evas/evas-20090313.ebuild
@@ -40,70 +40,65 @@ src_unpack() {
 	cd "${S}"
 
 	touch README
-	touch ABOUT-NLS
-
-	eautoreconf || die "eautoreconf failed"
+	eautoreconf
 }
 
 src_compile() {
-    local myconf
-
-    myconf="${myconf}
-	    $(use_enable fontconfig)               \
-	    $(use_enable X      software-x11)      \
-	    $(use_enable X      software-16-x11)   \
-	    $(use_enable xcb    software-xcb)      \
-	    $(use_enable sdl    software-sdl)      \
-	    $(use_enable sdl    sdl-primitive)     \
-	    $(use_enable fbcon  fb)                \
-	    $(use_enable opengl gl-x11)            \
-	    $(use_enable X      xrender-x11)       \
-	    $(use_enable xcb    xrender-xcb)       \
-	    $(use_enable gif    image-loader-gif)  \
-	    $(use_enable png    image-loader-png)  \
-	    $(use_enable jpeg   image-loader-jpeg) \
-	    $(use_enable eet    image-loader-eet)  \
-	    $(use_enable eet    font-loader-eet)   \
-	    $(use_enable edb    image-loader-edb)  \
-	    $(use_enable tiff   image-loader-tiff) \
-	    $(use_enable xpm    image-loader-xpm)  \
-	    $(use_enable svg    image-loader-svg)  \
-	    $(use_enable threads pthreads)         \
-	    $(use_enable mmx     cpu-mmx)          \
-	    $(use_enable sse     cpu-sse)          \
-	    $(use_enable altivec cpu-altivec)      \
-	    $(use_enable directfb)                 \
-	    --enable-buffer                        \
-	    --disable-cairo-x11                    \
-	    --disable-image-loader-pmaps           \
-	    --enable-cpu-c                         \
-	    --enable-scale-sample                  \
-	    --enable-scale-smooth                  \
-	    --enable-convert-8-rgb-332             \
-	    --enable-convert-8-rgb-666             \
-	    --enable-convert-8-rgb-232             \
-	    --enable-convert-8-rgb-222             \
-	    --enable-convert-8-rgb-221             \
-	    --enable-convert-8-rgb-121             \
-	    --enable-convert-8-rgb-111             \
-	    --enable-convert-16-rgb-565            \
-	    --enable-convert-16-rgb-555            \
-	    --enable-convert-16-rgb-444            \
-	    --enable-convert-16-rgb-rot-0          \
-	    --enable-convert-16-rgb-rot-270        \
-	    --enable-convert-16-rgb-rot-90         \
-	    --enable-convert-24-rgb-888            \
-	    --enable-convert-24-bgr-888            \
-	    --enable-convert-32-rgb-8888           \
-	    --enable-convert-32-rgbx-8888          \
-	    --enable-convert-32-bgr-8888           \
-	    --enable-convert-32-bgrx-8888          \
-	    --enable-convert-32-rgb-rot-0          \
-	    --enable-convert-32-rgb-rot-270        \
-	    --enable-convert-32-rgb-rot-90	   \
-	    --x-includes=${SYSROOT}/usr/X11R6/include \
-	    --x-libraries=${SYSROOT}/usr/X11R6/lib"
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	econf \
+		$(use_enable fontconfig) \
+		$(use_enable X      software-x11) \
+		$(use_enable X      software-16-x11) \
+		$(use_enable xcb    software-xcb) \
+		$(use_enable sdl    software-sdl) \
+		$(use_enable sdl    sdl-primitive) \
+		$(use_enable fbcon  fb) \
+		$(use_enable opengl gl-x11) \
+		$(use_enable X      xrender-x11) \
+		$(use_enable xcb    xrender-xcb) \
+		$(use_enable gif    image-loader-gif) \
+		$(use_enable png    image-loader-png) \
+		$(use_enable jpeg   image-loader-jpeg) \
+		$(use_enable eet    image-loader-eet) \
+		$(use_enable eet    font-loader-eet) \
+		$(use_enable edb    image-loader-edb) \
+		$(use_enable tiff   image-loader-tiff) \
+		$(use_enable xpm    image-loader-xpm) \
+		$(use_enable svg    image-loader-svg) \
+		$(use_enable threads pthreads) \
+		$(use_enable mmx     cpu-mmx) \
+		$(use_enable sse     cpu-sse) \
+		$(use_enable altivec cpu-altivec) \
+		$(use_enable directfb) \
+		--enable-buffer \
+		--disable-cairo-x11 \
+		--disable-image-loader-pmaps \
+		--enable-cpu-c \
+		--enable-scale-sample \
+		--enable-scale-smooth \
+		--enable-convert-8-rgb-332 \
+		--enable-convert-8-rgb-666 \
+		--enable-convert-8-rgb-232 \
+		--enable-convert-8-rgb-222 \
+		--enable-convert-8-rgb-221 \
+		--enable-convert-8-rgb-121 \
+		--enable-convert-8-rgb-111 \
+		--enable-convert-16-rgb-565 \
+		--enable-convert-16-rgb-555 \
+		--enable-convert-16-rgb-444 \
+		--enable-convert-16-rgb-rot-0 \
+		--enable-convert-16-rgb-rot-270 \
+		--enable-convert-16-rgb-rot-90 \
+		--enable-convert-24-rgb-888 \
+		--enable-convert-24-bgr-888 \
+		--enable-convert-32-rgb-8888 \
+		--enable-convert-32-rgbx-8888 \
+		--enable-convert-32-bgr-8888 \
+		--enable-convert-32-bgrx-8888 \
+		--enable-convert-32-rgb-rot-0 \
+		--enable-convert-32-rgb-rot-270 \
+		--enable-convert-32-rgb-rot-90	 \
+		--x-includes=${SYSROOT}/usr/X11R6/include \
+		--x-libraries=${SYSROOT}/usr/X11R6/lib \
+		|| die
+	emake || die
 }
diff --git a/x11-libs/ewl/Manifest b/x11-libs/ewl/Manifest
index cab1935..04e4a7f 100644
--- a/x11-libs/ewl/Manifest
+++ b/x11-libs/ewl/Manifest
@@ -1,2 +1,2 @@
 EBUILD ewl-20090212.ebuild 1239 RMD160 ad9fef05270a0483e91fd0d31e163f4c099a98b4 SHA1 d25d098252efbfb1887d54860cb7b7acc62adbc4 SHA256 6cbc57a4ccdb887da41f4879b7e9730e40acc6953d0d73c48ee769673a5e1541
-EBUILD ewl-20090313.ebuild 1239 RMD160 ad9fef05270a0483e91fd0d31e163f4c099a98b4 SHA1 d25d098252efbfb1887d54860cb7b7acc62adbc4 SHA256 6cbc57a4ccdb887da41f4879b7e9730e40acc6953d0d73c48ee769673a5e1541
+EBUILD ewl-20090313.ebuild 1043 RMD160 b46714b4f677136f226bb268bb1b6bcdd35d4d85 SHA1 0a18243fe2584ced0d85c92af3fbb80e676cac01 SHA256 0f06f3be6e5bef05dd5df866246dbbea0f14795529aa960507b943183cb4291f
diff --git a/x11-libs/ewl/ewl-20090313.ebuild b/x11-libs/ewl/ewl-20090313.ebuild
index 06f3532..e9a6aab 100644
--- a/x11-libs/ewl/ewl-20090313.ebuild
+++ b/x11-libs/ewl/ewl-20090313.ebuild
@@ -13,10 +13,10 @@ KEYWORDS="~arm ~x86 ~amd64"
 IUSE="X xcb sdl fbcon opengl"
 
 RDEPEND="
-        X?           ( x11-libs/libXrender )
-	xcb?         ( x11-misc/xcb )
-        sdl?         ( media-libs/libsdl )
-        opengl?      ( virtual/opengl )
+	X?			( x11-libs/libXrender )
+	xcb?		( x11-misc/xcb )
+	sdl?		( media-libs/libsdl )
+	opengl?		( virtual/opengl )
 	=media-libs/emotion-${PVR}
 	=media-libs/epsilon-${PVR}"
 
@@ -25,22 +25,18 @@ DEPEND=">=dev-util/pkgconfig-0.9.0"
 S="${WORKDIR}/${PN}"
 
 src_compile() {
-    local myconf
-
-    myconf="${myconf}
-	    $(use_enable X      software-x11)      \
-	    $(use_enable X      software-16-x11)   \
-	    $(use_enable xcb    software-xcb)      \
-	    $(use_enable sdl    software-sdl)      \
-	    $(use_enable fbcon  fb)                \
-	    $(use_enable opengl opengl-glew)       \
-	    $(use_enable opengl opengl-x11)        \
-	    $(use_enable X      xrender-x11)       \
-	    --enable-software-buffer               \
+	econf \
+	    $(use_enable X      software-x11) \
+	    $(use_enable X      software-16-x11) \
+	    $(use_enable xcb    software-xcb) \
+	    $(use_enable sdl    software-sdl) \
+	    $(use_enable fbcon  fb) \
+	    $(use_enable opengl opengl-glew) \
+	    $(use_enable opengl opengl-x11) \
+	    $(use_enable X      xrender-x11) \
+	    --enable-software-buffer \
 	    --x-includes=${SYSROOT}/usr/X11R6/include \
-	    --x-libraries=${SYSROOT}/usr/X11R6/lib"
-
-
-	econf ${myconf} || die "Configuration failed"
-	emake || die "Make failed"
+	    --x-libraries=${SYSROOT}/usr/X11R6/lib \
+		|| die
+	emake || die
 }
diff --git a/x11-wm/e/Manifest b/x11-wm/e/Manifest
index f94a491..cac98d3 100644
--- a/x11-wm/e/Manifest
+++ b/x11-wm/e/Manifest
@@ -1,3 +1,3 @@
 AUX applications.menu 2267 RMD160 812c2384ccbd6e0403c593ca7cd9295f15a22fcd SHA1 5a83b3f38fdf605cbe40809a9b5c70e1e3c62ba1 SHA256 f3d7dda0693bc51be70acb267fb5b5183c9dffc05c37d13cb6b1ced66d1c61f8
 EBUILD e-20090212.ebuild 1682 RMD160 21337d72a50c8e659e1867c6e424493154aa468f SHA1 3f1e25f1f700b607bf6907fe2528417d73423a17 SHA256 a5a523dcd991a32279532c11275a0551b5c7530766d2e7acda692d97c0d31f5b
-EBUILD e-20090313.ebuild 1687 RMD160 faa352f20dfbd2071ab4b213d3b594a333c5209a SHA1 07a5a48b947479b378b26868275599d99b576c40 SHA256 6777265a3601b3aa532332dc47433df531e0d8c14879e64e99e5bb5ab00584ef
+EBUILD e-20090313.ebuild 1358 RMD160 9447456a41c29235b42bc6236f5903ab788f63bf SHA1 9fead5372647be217aae0203ff0638bdf2076614 SHA256 5fa7dff01f67289e2410bb1840b30f3822dbacb741455770ce33d94a3977b6c9
diff --git a/x11-wm/e/e-20090313.ebuild b/x11-wm/e/e-20090313.ebuild
index 5d43c60..ba3988a 100644
--- a/x11-wm/e/e-20090313.ebuild
+++ b/x11-wm/e/e-20090313.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=2
+
 inherit enlightenment
 
 DESCRIPTION="Enlightenment E17 window manager"
@@ -17,9 +19,9 @@ RDEPEND="=dev-libs/eet-${PVR}
 	=dev-libs/eina-${PVR}
 	=dev-libs/efreet-${PVR}
 	=x11-libs/ecore-${PVR}
-	=x11-libs/evas-${PVR}[eet]
+	=x11-libs/evas-${PVR}[gif,jpeg,png,tiff,fontconfig,eet,X?]
 	=media-libs/edje-${PVR}
-	dbus? ( =x11-libs/e_dbus-${PVR} )
+	dbus? ( =x11-libs/e_dbus-${PVR}[hal] )
 	X?    ( x11-libs/libX11 )
 	alsa? ( media-libs/alsa-lib )
 	pam? ( sys-libs/pam )"
@@ -30,49 +32,35 @@ DEPEND=">=dev-util/pkgconfig-0.9.0
 
 S="${WORKDIR}/${PN}"
 
-pkg_setup() {
-	if use dbus && ! built_with_use x11-libs/e_dbus hal; then
-		die "Please rebuild x11-libs/e_dbus with the hal use flag enabled!"
-	fi
-}
-
 src_unpack() {
 	subversion_src_unpack
 
 	cd "${S}"
 
-	touch README
-	touch ABOUT-NLS
-
-	autopoint -f || die "autopoint failed"
-	eautoreconf || die "eautoreconf failed"
+	autopoint -f || die
+	eautoreconf
 }
 
 src_compile() {
-	local myconf
-
-	myconf="${myconf}             \
-		$(use_enable alsa)    \
-		$(use_enable files)   \
-		$(use_enable nls)     \
-		$(use_enable pam)     \
-		$(use_with   X     x) \
+	econf \
+		$(use_enable alsa) \
+		$(use_enable files) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with   X x) \
 		--x-includes=${SYSROOT}/usr/X11R6/include \
 		--x-libraries=${SYSROOT}/usr/X11R6/lib\
 		--with-edje-cc=/usr/bin/edje_cc\
-		--with-eet-eet=/usr/bin/eet"
-
-	econf $myconf || die "econf failed"
-
-	emake || die "emake failed"
+		--with-eet-eet=/usr/bin/eet \
+		|| die
+	emake || die
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog COPYING NEWS README
 
-        keepdir /etc/xdg/menus
-        insinto /etc/xdg/menus
-        newins "${FILESDIR}/applications.menu" applications.menu
-
+	keepdir /etc/xdg/menus
+	insinto /etc/xdg/menus
+	newins "${FILESDIR}/applications.menu" applications.menu
 }