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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

6 files changed, 37 insertions, 123 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/Manifest b/app-cdr/xfburn/Manifest
index 5228f6921f8f..2ccb259a9fd7 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST xfburn-0.3.0.tar.gz 631845 RMD160 5c07fccdaa6f93d7b24a4998e2f11855a9163e4d SHA1 6f610277d4fe9075cb439e6b39741ec1b0b3aba2 SHA256 6a449219ddad5ae5deafe918e3409384178223e48a4d45a109fd2f15e5b87764
-DIST xfburn-0.3.1.tar.gz 605973 RMD160 f606611c5438a4a0b2b8e3ac042c987b1b5505f9 SHA1 99e759e6e4ad2d7117f2b7f43c9271ec7e0bbcbe SHA256 94cb39a418f9d7d1f5eaf178a5a83cd662281707fcbbf6b80602030ddf9e8313
+AUX xfburn-disable-hal.patch 355 RMD160 ce8e398d486493e9247874e590da3803a72c060d SHA1 ad29551662271ca8b3cc2ea0171cc4551115f2b0 SHA256 bfdb9e2d016b86f067df302346fa75e354c5cb0399299871a24cc0cde289c704
 DIST xfburn-0.3.2.tar.gz 688828 RMD160 a58adf59c7ef76425a0f23b474d9ef13660ba8c3 SHA1 1de7525454f929f69f74558190e83e5763acefaa SHA256 ce2a0835071ef42fdb55222bd041a15367c06c9d6fa2caca38795fef3b668eb0
-EBUILD xfburn-0.3.0.ebuild 1225 RMD160 a81f25404c47fba6a3b3c5f9b8414b015b76ada5 SHA1 2487a25e9fa39ebb768da82ebf5ea8cc747d718a SHA256 e260f757d34ee366959982651eb82eace0e52d9b9fa15a1ef04d35685a783b2d
-EBUILD xfburn-0.3.1.ebuild 1226 RMD160 1a58191938b3fe944eed071c1f9a8234ff4e1ae5 SHA1 ce9ad3ce904422abc6cac201a2c0f0039a520069 SHA256 b16f49dac9db44d96e816e197ac20c98695de34c6429f85f8c1d5e8644606759
-EBUILD xfburn-0.3.2.ebuild 1231 RMD160 54058d67640b0a51207776cc6fdf22226a4df68c SHA1 eb82afccb5c963393158f0335224070eb62797d2 SHA256 65ff046ff787dd4f7891e941f58d05984f08fe73f105f383dd22e8268e6a1117
-MISC ChangeLog 2248 RMD160 26a4f2ce729054ddd6d26ada55b9ba5eb8076f81 SHA1 f02f02126404dc1c63346429a5f5606d9b153754 SHA256 71ad0923db611af1bfea408186e03da38766b33adc9ede75ac2bfdf618e68045
+EBUILD xfburn-0.3.2.ebuild 1325 RMD160 f6ab276d439e1ec1669b71613b7753131644248d SHA1 70ada4b19d08d43c81db6c5d58524a491814831b SHA256 82f92db200666fb9518887bb4428f7c3d812f350a1ef676505531391ea1db427
+MISC ChangeLog 2521 RMD160 ca4d97ea041524422cf47e6abe494d0c9e24ad0e SHA1 d7f6ee65f0716219b52b1fff24afbca8b6df1cef SHA256 17668e6983c1da6622c98e6bf4a46dea4413289f4eb013e6ae0ec267ac4cda35
 MISC metadata.xml 244 RMD160 12c5d9cc4bf4ac11904a2ac67a1dc5317b21c940 SHA1 341081a79f570112e2ac0bc0feefc369505396b2 SHA256 79e3e34001e21fc1a7866ec42b167d80927f7757a01f614dc24261ffed4db87d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiI928ACgkQoeSe8B0zEfxDWgCffrqwnmUYPjefN5pvu2WNcZst
-f8QAn2TUBU9aADqQS3PUHuN9sQkHk1/Y
-=k1ag
+iEYEARECAAYFAkjWv/4ACgkQKhnDs22gwa9n1ACbBVVX70K4O5Z+iX7BzFs7tUwg
+/L8AoNWuoIRTlfzHJi9qDRnSktR01fXy
+=ZAqZ
 -----END PGP SIGNATURE-----
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) \