old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 8 insertions, 146 deletions

diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog
index 6dba783624f8..9e707c4696a0 100644
--- a/app-cdr/xfburn/ChangeLog
+++ b/app-cdr/xfburn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/xfburn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.40 2012/01/02 12:59:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.41 2012/01/02 13:02:04 ssuominen Exp $
+
+  02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -xfburn-0.4.3-r1.ebuild,
+  -xfburn-0.4.3-r2.ebuild,
+  -files/xfburn-0.4.3-empty_directory_segmentation_fault.patch:
+  old
 
   02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> xfburn-0.4.3-r3.ebuild:
   ppc stable wrt #395727
diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch
deleted file mode 100644
index d80f98eff580..000000000000
--- a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=331135
-http://bugzilla.xfce.org/show_bug.cgi?id=6805
-
---- xfburn/xfburn-data-composition.c
-+++ xfburn/xfburn-data-composition.c
-@@ -1874,26 +1874,29 @@
-           g_error ("Failed adding %s as a node to the image: code %X!", src, r);
-       }
- 
--      basename = g_path_get_basename (src);
-+      /* Check names only for items not manually created (#613563) */
-+      if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) {
-+        basename = g_path_get_basename (src);
-+
-+        /* check if the file has been renamed */
-+        if (strcmp (basename, name) != 0) {
-+          /* rename the iso_node */
-+          r = iso_node_set_name (node, name);
-+
-+          if (r == 0) {
-+            /* The first string is the renamed name, the second one the original name */
-+            xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
-+
-+            g_free (basename);
-+            g_free (name);
-+            g_free (src);
- 
--      /* check if the file has been renamed */
--      if (strcmp (basename, name) != 0) {
--        /* rename the iso_node */
--        r = iso_node_set_name (node, name);
--
--        if (r == 0) {
--          /* The first string is the renamed name, the second one the original name */
--          xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
--
--          g_free (basename);
--          g_free (name);
--          g_free (src);
--
--          continue;
-+            continue;
-+          }
-         }
-+        g_free (basename);
-       }
- 
--      g_free (basename);
-       g_free (name);
-       g_free (src);
- 
diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml
index e9e695875599..3f7e35e557e2 100644
--- a/app-cdr/xfburn/metadata.xml
+++ b/app-cdr/xfburn/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xfce</herd>
-<herd>media-optical</herd>
+  <herd>xfce</herd>
+  <herd>media-optical</herd>
   <upstream>
     <maintainer>
       <email>mario@xfce.org</email>
@@ -14,7 +14,4 @@
       <name>David Mohr</name>
     </maintainer>
   </upstream>
-  <use>
-    <flag name='thunar'>Use Thunar VFS layer for mimetype and icons support (WARNING: deprecated, will be replaced by GIO in future)</flag>
-  </use>
 </pkgmetadata>
diff --git a/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild
deleted file mode 100644
index ff8c3aa3cab7..000000000000
--- a/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r1.ebuild,v 1.8 2011/05/19 22:18:17 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbus debug gstreamer thunar"
-
-RDEPEND=">=dev-libs/libburn-0.4.2
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.10:2
-	x11-themes/hicolor-icon-theme
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/exo-0.6
-	dbus? ( >=dev-libs/dbus-glib-0.88 )
-	gstreamer? ( media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.20:0.10 )
-	thunar? ( xfce-extra/thunar-vfs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable dbus)
-		$(xfconf_use_debug)
-		$(use_enable gstreamer)
-		--disable-hal
-		$(use_enable thunar thunar-vfs)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
diff --git a/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild
deleted file mode 100644
index b5c6419cdac1..000000000000
--- a/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r2.ebuild,v 1.2 2011/10/29 17:06:28 ssuominen Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus debug gstreamer thunar"
-
-RDEPEND=">=dev-libs/libburn-0.4.2
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.10:2
-	x11-themes/hicolor-icon-theme
-	>=xfce-base/libxfcegui4-4.8
-	>=xfce-base/exo-0.6
-	dbus? ( >=dev-libs/dbus-glib-0.88 )
-	gstreamer? ( media-libs/gstreamer:0.10
-		>=media-libs/gst-plugins-base-0.10.20:0.10 )
-	thunar? ( xfce-extra/thunar-vfs )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${P}-update_desktop_entry.patch
-		"${FILESDIR}"/${P}-empty_directory_segmentation_fault.patch
-		)
-
-	XFCONF=(
-		$(use_enable dbus)
-		$(xfconf_use_debug)
-		$(use_enable gstreamer)
-		--disable-hal
-		$(use_enable thunar thunar-vfs)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}