Ticket #128: e-20090313.ebuild.diff

.ebuild

@@ -1 +1 @@
 # 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 +19 @@
         =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 +32 @@
 
 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
 }