old

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 6 insertions, 120 deletions

diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog
index edc167a0e78f..c409254eaf23 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.54 2012/11/28 12:35:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.55 2012/11/28 12:36:56 ssuominen Exp $
+
+  28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfburn-0.4.3_p20120601.ebuild,
+  -files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch:
+  old
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfburn-0.4.3_p20121021.ebuild:
diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch b/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
deleted file mode 100644
index 55f21b3dcf65..000000000000
--- a/app-cdr/xfburn/files/xfburn-0.4.3-empty_directory_segmentation_fault-2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-This patch is OBSOLETE and fixed differently in git already. DO NOT CARRY THIS AROUND ANYMORE.
-
-http://bugs.gentoo.org/331135
-http://bugzilla.xfce.org/show_bug.cgi?id=6805
-
---- xfburn/xfburn-data-composition.c
-+++ xfburn/xfburn-data-composition.c
-@@ -1852,26 +1852,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_dialog_show_warning(NULL, NULL, _("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_dialog_show_warning(NULL, NULL, _("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/xfburn-0.4.3_p20120601.ebuild b/app-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild
deleted file mode 100644
index 67eb9456a57e..000000000000
--- a/app-cdr/xfburn/xfburn-0.4.3_p20120601.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 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_p20120601.ebuild,v 1.6 2012/07/03 16:38:15 ranger Exp $
-
-EAPI=4
-#EAUTORECONF=yes
-inherit autotools xfconf
-
-DESCRIPTION="GTK+ based CD and DVD burning application"
-HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug gstreamer udev"
-
-RDEPEND=">=dev-libs/glib-2.30
-	>=dev-libs/libburn-0.4.2
-	>=dev-libs/libisofs-0.6.2
-	>=x11-libs/gtk+-2.24:2
-	>=xfce-base/exo-0.6
-	>=xfce-base/libxfce4ui-4.8
-	gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 )
-	udev? ( || ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] ) )"
-# dev-libs/libxslt -> xsltproc -> --enable-maintainer-mode -> docs/Makefile.am
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.9.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=(
-		"${FILESDIR}"/${PN}-0.4.3-empty_directory_segmentation_fault-2.patch
-		)
-
-	XFCONF=(
-		--enable-maintainer-mode
-		$(use_enable udev gudev)
-		$(use_enable gstreamer)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
-
-src_prepare() {
-	# http://bugzilla.xfce.org/show_bug.cgi?id=8976
-	sed -i -e 's:BM_DEBUG_SUPPORT:XDT_FEATURE_DEBUG:' configure.in.in || die
-
-	# .in.in -> .in
-	sed -i -e '/^exec.*xdt-autogen/d' autogen.sh || die
-	./autogen.sh
-
-	# Prevent glib-gettextize from running wrt #420639
-	intltoolize --automake --copy --force
-	_elibtoolize --copy --force --install
-	AT_M4DIR=${EPREFIX}/usr/share/xfce4/dev-tools/m4macros eaclocal
-	eautoconf
-	eautoheader
-	eautomake
-
-	xfconf_src_prepare
-}