Use e17 eclass better

10 files changed, 16 insertions, 39 deletions

diff --git a/media-libs/edje/Manifest b/media-libs/edje/Manifest
index e96a0ce..8c3743f 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 566 RMD160 0ba4ecef4081582b036bff382fce8629d0c89528 SHA1 125ae64e2d1218091b0d95a0d8152c69fe425534 SHA256 45c93193a2615aa81a70ad0220ea192e79e6e313befacac0e04047e41fc18378
+EBUILD edje-20090313.ebuild 465 RMD160 84d016e6fb1917cc7b1ed85ac358357922eb2c99 SHA1 101e35d3192244a9eb66b3cdaf4f79082278895d SHA256 1bd2abd93bafd2289e9174e8f778b4ac51d9a540fc621d441c3262fdca78f0d0
diff --git a/media-libs/edje/edje-20090313.ebuild b/media-libs/edje/edje-20090313.ebuild
index 2c34e42..be7ec62 100644
--- a/media-libs/edje/edje-20090313.ebuild
+++ b/media-libs/edje/edje-20090313.ebuild
@@ -18,13 +18,4 @@ RDEPEND="=x11-libs/evas-${PVR}
 	=dev-libs/embryo-${PVR}"
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
-src_unpack() {
-	subversion_src_unpack
-
-	cd "${S}"
-
-	# I hate hardcoded paths
-	epatch "${FILESDIR}/no_hardcoded_tmp.diff"
-
-	eautoreconf
-}
+E17_PATCHES="no_hardcoded_tmp.diff"
diff --git a/media-libs/emotion/Manifest b/media-libs/emotion/Manifest
index a04ae66..ab87725 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 881 RMD160 0f6ed6e365b51fc518bf3bf430c642edfc2cf3de SHA1 77ae9f0763a5ddc5a3d247225ad81cf3dc79731c SHA256 8a71d8c175ce98a465dfc6e51e565f4db470afac1d6ec6de588b9e0950476ad5
+EBUILD emotion-20090313.ebuild 866 RMD160 510e2ad0e46f5d155bf5066f22e1abef66d7cf64 SHA1 ae5216e821bf28cde89b454a1875c5ff032e9c5a SHA256 783cd8677fa34801c365bcf3b20982206519f6c52603a63d785aaeb443d9e7a2
diff --git a/media-libs/emotion/emotion-20090313.ebuild b/media-libs/emotion/emotion-20090313.ebuild
index 405fef6..566313c 100644
--- a/media-libs/emotion/emotion-20090313.ebuild
+++ b/media-libs/emotion/emotion-20090313.ebuild
@@ -24,17 +24,14 @@ RDEPEND="=dev-libs/eet-${PVR}
 DEPEND=">=dev-util/pkgconfig-0.9.0
 	media-libs/edje"
 
-S="${WORKDIR}/${PN}"
+E17_EXTRA_CONF="$(use_enable gstreamer) \
+	$(use_enable xine) \
+	$(use_enable vlc)"
 
 src_compile() {
 	# fix sandbox issue, patch stolen by tomboy64
 	# from http://bugs.gentoo.org/show_bug.cgi?id=133341
 	addpredict "/root/.gstreamer-0.10"
 
-	econf \
-		$(use_enable gstreamer) \
-		$(use_enable xine) \
-		$(use_enable vlc) \
-		|| die
-	emake || die
+	enlightenment_src_compile
 }
diff --git a/media-libs/epsilon/Manifest b/media-libs/epsilon/Manifest
index 8bda37c..eb43d7e 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 557 RMD160 8a03caf77189c7da68b08eafdfc924a65668a3a1 SHA1 ba19a163e3caa875c566353bf0074a44789cbacf SHA256 c27127efa69d94a452d6aa74cd34e67b0be6cdedf0c672fd1ab3bee2670a6532
+EBUILD epsilon-20090313.ebuild 519 RMD160 b3da29522cb19566e4b0013884bf2932cf9bf1c4 SHA1 16541aa3a7ae86efa26cca354fc8665539039b49 SHA256 eabfb3f01d9404129cd58b5aa9d012e3175af83ab5e4c2f4f44430f628c713cb
diff --git a/media-libs/epsilon/epsilon-20090313.ebuild b/media-libs/epsilon/epsilon-20090313.ebuild
index 786bd20..bb9ae74 100644
--- a/media-libs/epsilon/epsilon-20090313.ebuild
+++ b/media-libs/epsilon/epsilon-20090313.ebuild
@@ -18,12 +18,6 @@ RDEPEND="
 	=x11-libs/ecore-${PVR}
 	=media-libs/edje-${PVR}
 	xine? ( media-libs/xine-lib )"
-
 DEPEND=">=dev-util/pkgconfig-0.9.0"
 
-src_compile() {
-	econf \
-		$(use_enable xine thumbnailer-xine) \
-		|| die
-	emake || die
-}
+E17_EXTRA_CONF="$(use_enable xine thumbnailer-xine)"
diff --git a/media-libs/esmart/Manifest b/media-libs/esmart/Manifest
index 0211f50..1c6c3d1 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 543 RMD160 26cfaf5cd64dccc7924e0a96b4a82d6fb82f2609 SHA1 cde6e4dd7c38d9da8ed95f19fd3ee91789416b2b SHA256 2a723e5d3664151d687b8a8ce7f9539a69cfc7f8b1528d307b5ea9c9a47814de
+EBUILD esmart-20090313.ebuild 513 RMD160 985b5a0c4f18f52cb2731265f686af78f999e888 SHA1 7d0df324a4199b4786cfe72c5a01f761efb810ad SHA256 4d2c7bf24a4ddaa7d208ba8e5f712c533319fd6fdac1f6eec150bb72c5ba02e5
diff --git a/media-libs/esmart/esmart-20090313.ebuild b/media-libs/esmart/esmart-20090313.ebuild
index 5619312..6ee8e17 100644
--- a/media-libs/esmart/esmart-20090313.ebuild
+++ b/media-libs/esmart/esmart-20090313.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~arm ~x86 ~amd64"
 IUSE=""
+E17_EXTRA_CONF="--with-edje-cc=edje_cc"
 
 RDEPEND="media-libs/imlib2
 	=x11-libs/evas-${PVR}
@@ -20,8 +21,3 @@ RDEPEND="media-libs/imlib2
 
 DEPEND=">=dev-util/pkgconfig-0.9.0
 	media-libs/edje"
-
-src_compile() {
-	econf --with-edje-cc=edje_cc || die
-	emake || die
-}
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 9831b77..e291a09 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 1321 RMD160 2ebf65d13604b1a321f25eded1c258be5dc5247f SHA1 c7909851a9a25dc37e8031592b88f51917def68b SHA256 67474735f80521dd0951f060161d27cc228917dda284df00242379e903019e55
+EBUILD imlib2-20090313.ebuild 1331 RMD160 d671f9894b5344a8c01138540544eedfb6d25578 SHA1 c5bdb5c07d8d88048c1904d637676763db2e2783 SHA256 2404e170107f3587c12cdf2e3b34239882a82b035f4b737c001a7378bd61e8eb
 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 c7e8df4..0d2b85d 100644
--- a/media-libs/imlib2/imlib2-20090313.ebuild
+++ b/media-libs/imlib2/imlib2-20090313.ebuild
@@ -33,8 +33,7 @@ src_compile() {
 
 	[[ $(gcc-major-version) -ge 4 ]] && myconf="${myconf} --enable-visibility-hiding"
 
-	econf \
-		$(use_with X x) \
+	E17_EXTRA_CONF="$(use_with X x) \
 		$(use_with jpeg) \
 		$(use_with png) \
 		$(use_with tiff) \
@@ -44,7 +43,7 @@ src_compile() {
 		$(use_with mp3 id3) \
 		--x-includes=${SYSROOT}/usr/X11R6/include \
 		--x-libraries=${SYSROOT}/usr/X11R6/lib \
-		${myconf} \
-		|| die
-	emake || die
+		${myconf}"
+
+	enlightenment_src_compile
 }