3 files changed, 15 insertions, 70 deletions
diff --git a/app-cdr/xfburn/xfburn-0.4.0.ebuild b/app-cdr/xfburn/xfburn-0.4.0.ebuild
index 2c8b5175b14c..7830049d02ca 100644
--- a/app-cdr/xfburn/xfburn-0.4.0.ebuild
+++ b/app-cdr/xfburn/xfburn-0.4.0.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.0.ebuild,v 1.5 2009/03/19 13:39:18 ranger Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.0.ebuild,v 1.6 2009/08/23 17:50:15 ssuominen Exp $
 
+EAPI=2
 inherit gnome2-utils
 
 DESCRIPTION="GTK+ based CD and DVD burning application"
@@ -19,7 +18,7 @@ RDEPEND=">=dev-libs/libburn-0.4.2
 	>=dev-libs/libisofs-0.6.2
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfcegui4-4.4
-	>=xfce-extra/exo-0.3
+	>=xfce-base/exo-0.3
 	dbus? ( dev-libs/dbus-glib )
 	gstreamer? ( media-libs/gstreamer
 		>=media-libs/gst-plugins-base-0.10.20 )
@@ -30,14 +29,14 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
-src_compile() {
-	econf --disable-dependency-tracking \
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable gstreamer) \
 		$(use_enable hal) \
 		$(use_enable xfce thunar-vfs)
-	emake || die "emake failed"
 }
 
 pkg_preinst() {
diff --git a/app-cdr/xfburn/xfburn-0.4.1.ebuild b/app-cdr/xfburn/xfburn-0.4.1.ebuild
deleted file mode 100644
index 00a184756c30..000000000000
--- a/app-cdr/xfburn/xfburn-0.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.1.ebuild,v 1.1 2009/02/25 11:27:16 angelos Exp $
-
-EAPI=1
-
-inherit gnome2-utils
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://www.xfce.org/projects/xfburn"
-SRC_URI="http://goodies.xfce.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+dbus debug +gstreamer hal +xfce"
-
-RDEPEND=">=dev-libs/libburn-0.4.2
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.10:2
-	>=xfce-base/libxfcegui4-4.4
-	>=xfce-extra/exo-0.3
-	dbus? ( dev-libs/dbus-glib )
-	gstreamer? ( media-libs/gstreamer
-		>=media-libs/gst-plugins-base-0.10.20 )
-	hal? ( sys-apps/hal )
-	xfce? ( xfce-base/thunar )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable gstreamer) \
-		$(use_enable hal) \
-		$(use_enable xfce thunar-vfs)
-	emake || die "emake failed"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-cdr/xfburn/xfburn-0.4.2.ebuild b/app-cdr/xfburn/xfburn-0.4.2.ebuild
index a8908a427a9c..4da3009232f0 100644
--- a/app-cdr/xfburn/xfburn-0.4.2.ebuild
+++ b/app-cdr/xfburn/xfburn-0.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.2.ebuild,v 1.1 2009/08/23 14:32:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.2.ebuild,v 1.2 2009/08/23 17:50:15 ssuominen Exp $
 
-EAPI="2"
+EAPI=2
 inherit xfconf
 
 DESCRIPTION="GTK+ based CD and DVD burning application"
@@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/libburn-0.4.2
 	>=dev-libs/libisofs-0.6.2
 	>=x11-libs/gtk+-2.10:2
 	>=xfce-base/libxfcegui4-4.4
-	>=xfce-extra/exo-0.3
+	>=xfce-base/exo-0.3
 	dbus? ( dev-libs/dbus-glib )
 	gstreamer? ( media-libs/gstreamer
 		>=media-libs/gst-plugins-base-0.10.20 )
@@ -30,7 +30,11 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 pkg_setup() {
-	XFCONF="--disable-dependency-tracking $(use_enable dbus) $(use_enable debug)
-		$(use_enable gstreamer) $(use_enable hal) $(use_enable xfce thunar-vfs)"
+	XFCONF="--disable-dependency-tracking
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable gstreamer)
+		$(use_enable hal)
+		$(use_enable xfce thunar-vfs)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }