Use e17 eclass better

12 files changed, 99 insertions, 168 deletions

diff --git a/x11-libs/e_dbus/Manifest b/x11-libs/e_dbus/Manifest
index 0536c14..f19f204 100644
--- a/x11-libs/e_dbus/Manifest
+++ b/x11-libs/e_dbus/Manifest
@@ -2,4 +2,4 @@ AUX e_dbus-0.5.0.050-e_notify_send-Makefile.patch 566 RMD160 a16d9b3c30468ebe6ea
 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
+EBUILD e_dbus-20090313.ebuild 519 RMD160 4617e8e09850ff188459ea7ccac326816a459fd3 SHA1 67d5d176cf56a6074a7ecab22ffcd6358df23c78 SHA256 b1ac1071cbb08dcc33130584227942eac6918ae22f9de8534d8d52763a327f73
diff --git a/x11-libs/e_dbus/e_dbus-20090313.ebuild b/x11-libs/e_dbus/e_dbus-20090313.ebuild
index afdb88b..b01791d 100644
--- a/x11-libs/e_dbus/e_dbus-20090313.ebuild
+++ b/x11-libs/e_dbus/e_dbus-20090313.ebuild
@@ -17,12 +17,7 @@ RDEPEND="=dev-libs/eina-${PVR}
 	=x11-libs/ecore-${PVR}"
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
-src_compile() {
-	econf \
-		--enable-enm \
-		--enable-build-test-gui \
-		--enable-enotify \
-		$(use_enable hal ehal) \
-		|| die
-	emake || die
-}
+E17_EXTRA_CONF="--enable-enm \
+	--enable-build-test-gui \
+	--enable-enotify \
+	$(use_enable hal ehal)"
diff --git a/x11-libs/ecore/Manifest b/x11-libs/ecore/Manifest
index d5c4370..cb99489 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 1869 RMD160 c7126ec15276e4f2a2dcb87a1ceedfb31ad2ca76 SHA1 a2e159629e0ad114f1a9c45f26e3b39d1f0d9ad4 SHA256 f5fe603fa4a5c806f061490f593808f02d7d7bd14def95abaad46446939ad95f
+EBUILD ecore-20090313.ebuild 1523 RMD160 5db3e79a92752dbfd2c79f58639343cf6f03d459 SHA1 edac4ad1d0b3a55f04de26b94922e67edd8d2e12 SHA256 bb05fc4b55735719068063bf3ee8d1baad7a0a4b28447b9a04b5204872fdc637
diff --git a/x11-libs/ecore/ecore-20090313.ebuild b/x11-libs/ecore/ecore-20090313.ebuild
index df88db9..ed09ca2 100644
--- a/x11-libs/ecore/ecore-20090313.ebuild
+++ b/x11-libs/ecore/ecore-20090313.ebuild
@@ -23,25 +23,9 @@ RDEPEND="=x11-libs/evas-${PVR}
 	sdl?		( media-libs/libsdl )"
 
 DEPEND="X? ( x11-proto/xextproto
-	     x11-proto/xproto )"
+	x11-proto/xproto )"
 
-src_unpack() {
-	subversion_src_unpack
-
-	cd "${S}"
-
-	# Point to the sysroot SDL includes/libs on cross-compilation
-	if tc-is-cross-compiler; then
-		sed -i -e 's%SDL_CFLAGS=`$SDL_CONFIG --cflags`%SDL_CFLAGS=`$SDL_CONFIG --prefix='${SYSROOT}'/usr --cflags`%' configure.ac
-	fi
-
-	touch README
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-ecore-job \
+E17_EXTRA_CONF="--enable-ecore-job \
 		--enable-ecore-con \
 		--enable-ecore-ipc \
 		--enable-ecore-config \
@@ -66,7 +50,4 @@ src_compile() {
 		--enable-ecore-evas-buffer \
 		--enable-ecore-file \
 		--enable-inotify \
-		--disable-poll \
-		|| die
-	emake || die
-}
+		--disable-poll"
diff --git a/x11-libs/elementary/Manifest b/x11-libs/elementary/Manifest
index cee0cad..40f0175 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 534 RMD160 6c8196acb109bc1389bded9efafdbef9b7e9b97f SHA1 068d20d770d4d940ef847fc153cc029c49754dab SHA256 f4929b0a0bc8e6b539ad0220db0d8f1686b18f585a0203a65ef72cbbb465f652
+EBUILD elementary-20090313.ebuild 497 RMD160 2cd07d796ce058d019c2ad0d9ac4d92abe558c33 SHA1 bfaa31bc370d7ac3d2f5a0cd7597e31ac363042a SHA256 b5ce4fa12385fb7d7337af73387411db15347c491d560c334de40fc716da9cf8
diff --git a/x11-libs/elementary/elementary-20090313.ebuild b/x11-libs/elementary/elementary-20090313.ebuild
index eb4c3c2..c08d52f 100644
--- a/x11-libs/elementary/elementary-20090313.ebuild
+++ b/x11-libs/elementary/elementary-20090313.ebuild
@@ -21,9 +21,4 @@ RDEPEND="=x11-libs/e_dbus-${PVR}
 
 DEPEND="media-libs/edje"
 
-src_compile() {
-	econf \
-		--with-edje-cc=/usr/bin/edje_cc \
-		|| die
-	emake || die
-}
+E17_EXTRA_CONF="--with-edje-cc=/usr/bin/edje_cc"
diff --git a/x11-libs/etk/Manifest b/x11-libs/etk/Manifest
index b1d6579..bad65c5 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 752 RMD160 41868b2cc1b4815d4c776412c80286f95793a251 SHA1 c1838d5829478a52f7cba394cf2dde88a491f796 SHA256 d5ab101dd428bdd3156f98c6c33c7dcf21415a8ae6634c59ba756d39636c7551
+EBUILD etk-20090313.ebuild 598 RMD160 0af860501719bc2874910d8aaa8c4155955bc4f0 SHA1 7c42373a146d0ddf4d5a59397c61096f4f394ae4 SHA256 e541a25d45d3a768d90538bd8773736f0af1fcf0cc08a811c549e4821d318531
diff --git a/x11-libs/etk/etk-20090313.ebuild b/x11-libs/etk/etk-20090313.ebuild
index 5e98281..d316f81 100644
--- a/x11-libs/etk/etk-20090313.ebuild
+++ b/x11-libs/etk/etk-20090313.ebuild
@@ -24,21 +24,5 @@ RDEPEND="net-libs/gnutls
 DEPEND=">=dev-util/pkgconfig-0.9.0
         media-libs/edje"
 
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	subversion_src_unpack
-
-	cd "${S}"
-
-	autopoint -f || die
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-	    --x-includes=${SYSROOT}/usr/X11R6/include \
-	    --x-libraries=${SYSROOT}/usr/X11R6/lib \
-		|| die
-	emake || die
-}
+E17_EXTRA_CONF="--x-includes=${SYSROOT}/usr/X11R6/include \
+	--x-libraries=${SYSROOT}/usr/X11R6/lib"
diff --git a/x11-libs/evas/Manifest b/x11-libs/evas/Manifest
index 36e2efe..3393361 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 3093 RMD160 b9bb27561e3f317214ac8fcdad60fb50f3d8bbcb SHA1 c504e1961c76923cf0a0c5ce665dfce4ab5e2b73 SHA256 8d61d87c34c5ab48dd74a69b2e7a895ae9d1ad68d31974673d03bf7cf4a39b3e
+EBUILD evas-20090313.ebuild 2799 RMD160 d258c23504f306526d427d7131c896bd0f3842d7 SHA1 95d4b1f34c723e06b3d9d5089f40044a8c03bdd6 SHA256 64ca21652aaa5fd0f855a90408c1787745595186d8bd62fea3f256bde575bc35
diff --git a/x11-libs/evas/evas-20090313.ebuild b/x11-libs/evas/evas-20090313.ebuild
index 0a47e5c..cc596fa 100644
--- a/x11-libs/evas/evas-20090313.ebuild
+++ b/x11-libs/evas/evas-20090313.ebuild
@@ -11,94 +11,78 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~x86 ~amd64"
 IUSE="X xcb sdl fbcon opengl directfb threads mmx sse altivec cairo fontconfig
-      gif png jpeg +eet edb tiff xpm svg"
+	gif png jpeg +eet edb tiff xpm svg"
 
 RDEPEND="=dev-libs/eina-${PVR}
-		fontconfig? ( media-libs/fontconfig )
-        X?           ( x11-libs/libXrender )
-        sdl?         ( media-libs/libsdl )
-        opengl?      ( virtual/opengl )
-        gif?         ( media-libs/giflib )
-        png?         ( media-libs/libpng )
-        jpeg?        ( media-libs/jpeg )
-        eet?         ( dev-libs/eet )
-        edb?         ( dev-db/edb )
-        tiff?        ( media-libs/tiff )
-        xpm?         ( x11-libs/libXpm )
-        svg?         ( >=gnome-base/librsvg-2.22.2 )
-        directfb?    ( dev-libs/DirectFB )"
+	fontconfig? ( media-libs/fontconfig )
+	X?           ( x11-libs/libXrender )
+	sdl?         ( media-libs/libsdl )
+	opengl?      ( virtual/opengl )
+	gif?         ( media-libs/giflib )
+	png?         ( media-libs/libpng )
+	jpeg?        ( media-libs/jpeg )
+	eet?         ( dev-libs/eet )
+	edb?         ( dev-db/edb )
+	tiff?        ( media-libs/tiff )
+	xpm?         ( x11-libs/libXpm )
+	svg?         ( >=gnome-base/librsvg-2.22.2 )
+	directfb?    ( dev-libs/DirectFB )"
 
 DEPEND=">=dev-util/pkgconfig-0.9.0
 	X? ( x11-proto/xextproto
-             x11-proto/xproto )"
+		x11-proto/xproto )"
 
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	subversion_src_unpack
-
-	cd "${S}"
-
-	touch README
-	eautoreconf
-}
-
-src_compile() {
-	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
-}
+E17_EXTRA_CONF="$(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"
diff --git a/x11-libs/ewl/Manifest b/x11-libs/ewl/Manifest
index 04e4a7f..c29dd6a 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 1043 RMD160 b46714b4f677136f226bb268bb1b6bcdd35d4d85 SHA1 0a18243fe2584ced0d85c92af3fbb80e676cac01 SHA256 0f06f3be6e5bef05dd5df866246dbbea0f14795529aa960507b943183cb4291f
+EBUILD ewl-20090313.ebuild 939 RMD160 14577ef389652c7a16bf8f33335421ef17a0a256 SHA1 8cb79d163db5bb5158fcd93bd845d8699ee55599 SHA256 9cbc3ab1ae485ae58c4ed76dc8d5653cf21803c22932dbd17f55d73dba13346c
diff --git a/x11-libs/ewl/ewl-20090313.ebuild b/x11-libs/ewl/ewl-20090313.ebuild
index e9a6aab..1bfe4d5 100644
--- a/x11-libs/ewl/ewl-20090313.ebuild
+++ b/x11-libs/ewl/ewl-20090313.ebuild
@@ -12,31 +12,23 @@ SLOT="0"
 KEYWORDS="~arm ~x86 ~amd64"
 IUSE="X xcb sdl fbcon opengl"
 
-RDEPEND="
+RDEPEND="=media-libs/emotion-${PVR}
+	=media-libs/epsilon-${PVR}
 	X?			( x11-libs/libXrender )
 	xcb?		( x11-misc/xcb )
 	sdl?		( media-libs/libsdl )
-	opengl?		( virtual/opengl )
-	=media-libs/emotion-${PVR}
-	=media-libs/epsilon-${PVR}"
+	opengl?		( virtual/opengl )"
 
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	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 \
-		|| die
-	emake || die
-}
+E17_EXTRA_CONF="$(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"