Removed old, stabilized 0.3.2 on amd64 and fixed HAL behaviour with USE=-hal, thanks to Adam Penser (Bug 235243)

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64)

5 files changed, 31 insertions, 114 deletions

diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog
index 15b0006839cb..916f2794e6d2 100644
--- a/app-cdr/xfburn/ChangeLog
+++ b/app-cdr/xfburn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/xfburn
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.4 2008/07/24 21:43:06 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.5 2008/09/21 21:43:08 angelos Exp $
+
+  21 Sep 2008; Christoph Mende <angelos@gentoo.org>
+  +files/xfburn-disable-hal.patch, -xfburn-0.3.0.ebuild,
+  -xfburn-0.3.1.ebuild, xfburn-0.3.2.ebuild:
+  Removed old, stabilized 0.3.2 on amd64 and fixed HAL behaviour with
+  USE=-hal, thanks to Adam Penser (Bug 235243)
 
   24 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-cdr/xfburn/files/xfburn-disable-hal.patch b/app-cdr/xfburn/files/xfburn-disable-hal.patch
new file mode 100644
index 000000000000..9579b99e13f5
--- /dev/null
+++ b/app-cdr/xfburn/files/xfburn-disable-hal.patch
@@ -0,0 +1,14 @@
+--- xfburn/xfburn-blank-dialog.c.orig	2008-08-19 20:10:32.000000000 -0400
++++ xfburn/xfburn-blank-dialog.c	2008-08-19 20:11:03.000000000 -0400
+@@ -473,9 +473,11 @@
+   burn_finish ();
+   g_free (params);
+ 
++#ifdef HAVE_HAL
+   gdk_threads_enter ();
+   xfburn_hal_manager_send_volume_changed ();
+   gdk_threads_leave ();
++#endif
+ }
+ 
+ static XfburnBlankMode
diff --git a/app-cdr/xfburn/xfburn-0.3.0.ebuild b/app-cdr/xfburn/xfburn-0.3.0.ebuild
deleted file mode 100644
index f27082e0b7f8..000000000000
--- a/app-cdr/xfburn/xfburn-0.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.3.0.ebuild,v 1.2 2008/07/23 15:25:02 loki_val Exp $
-
-EAPI=1
-
-inherit gnome2-utils
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://www.xfce.org/projects/xfburn"
-SRC_URI="http://www.xfce.org/~pollux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="+dbus debug hal +xfce"
-
-RDEPEND=">=dev-libs/libburn-0.3
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.10
-	>=xfce-base/libxfcegui4-4.4
-	>=xfce-extra/exo-0.3
-	xfce? ( xfce-base/thunar )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		$(use_enable xfce thunar-vfs) \
-		$(use_enable dbus) \
-		$(use_enable hal) \
-		$(use_enable debug)
-	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.3.1.ebuild b/app-cdr/xfburn/xfburn-0.3.1.ebuild
deleted file mode 100644
index 12b330578f9a..000000000000
--- a/app-cdr/xfburn/xfburn-0.3.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.3.1.ebuild,v 1.2 2008/07/23 15:25:02 loki_val Exp $
-
-EAPI=1
-
-inherit gnome2-utils
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://www.xfce.org/projects/xfburn"
-SRC_URI="http://www.xfce.org/~pollux/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+dbus debug hal +xfce"
-
-RDEPEND=">=dev-libs/libburn-0.3
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.10
-	>=xfce-base/libxfcegui4-4.4
-	>=xfce-extra/exo-0.3
-	xfce? ( xfce-base/thunar )
-	dbus? ( dev-libs/dbus-glib )
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-src_compile() {
-	econf --disable-dependency-tracking \
-		$(use_enable xfce thunar-vfs) \
-		$(use_enable dbus) \
-		$(use_enable hal) \
-		$(use_enable debug)
-	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.3.2.ebuild b/app-cdr/xfburn/xfburn-0.3.2.ebuild
index 5cba173c6e4e..523fd1a87e47 100644
--- a/app-cdr/xfburn/xfburn-0.3.2.ebuild
+++ b/app-cdr/xfburn/xfburn-0.3.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.3.2.ebuild,v 1.1 2008/07/23 15:25:02 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.3.2.ebuild,v 1.2 2008/09/21 21:43:08 angelos Exp $
 
 EAPI=1
 
-inherit gnome2-utils
+inherit eutils gnome2-utils
 
 DESCRIPTION="GTK+ based CD and DVD burning application"
 HOMEPAGE="http://www.xfce.org/projects/xfburn"
@@ -12,7 +12,7 @@ SRC_URI="http://goodies.xfce.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+dbus debug hal +xfce"
 
 RDEPEND=">=dev-libs/libburn-0.3
@@ -28,6 +28,13 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-disable-hal.patch
+}
+
 src_compile() {
 	econf --disable-dependency-tracking \
 		$(use_enable xfce thunar-vfs) \