amd64 stable wrt #209877

(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc3 x86_64)

5 files changed, 9 insertions, 106 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index cb13789ac9c2..03fcb6d88abf 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/gnomebaker
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.53 2008/07/24 17:24:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.54 2008/07/26 00:04:17 drac Exp $
+
+  26 Jul 2008; Samuli Suominen <drac@gentoo.org>
+  -files/gnomebaker-0.6.2-fix_fstab_parsing.patch,
+  -files/gnomebaker-0.6.2-genisofs.patch, -gnomebaker-0.6.2.ebuild,
+  gnomebaker-0.6.4.ebuild:
+  amd64 stable wrt #209877
 
   24 Jul 2008; Raúl Porcel <armin76@gentoo.org> gnomebaker-0.6.4.ebuild:
   ia64/sparc stable wrt #209877
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.2-fix_fstab_parsing.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.2-fix_fstab_parsing.patch
deleted file mode 100644
index 98c404f89bf1..000000000000
--- a/app-cdr/gnomebaker/files/gnomebaker-0.6.2-fix_fstab_parsing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urNad gnomebaker-0.6.2~/src/devices.c gnomebaker-0.6.2/src/devices.c
---- gnomebaker-0.6.2~/src/devices.c	2007-09-16 13:36:33.000000000 -0300
-+++ gnomebaker-0.6.2/src/devices.c	2007-10-23 17:30:38.000000000 -0200
-@@ -111,7 +111,10 @@
- 		g_strstrip(*line);
- 		if((*line)[0] != '#') /* ignore commented out lines */
- 		{
--			gchar node[64], mount[64];
-+			gchar *node, *mount;
-+			int line_size = strlen(*line);
-+			node = g_new0(gchar, line_size);
-+			mount = g_new0(gchar, line_size);
- 			if(sscanf(*line, "%s\t%s", node, mount) == 2)
- 			{
- 				GB_TRACE("devices_add_device - node [%s] mount [%s]\n", node, mount);
-@@ -134,8 +137,14 @@
- 				}
- 
- 				if(mount_point != NULL)
-+				{
-+					g_free(node);
-+					g_free(mount);
- 					break;
-+				}
- 			}
-+			g_free(node);
-+			g_free(mount);
- 		}
- 		++line;
- 	}
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.2-genisofs.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.2-genisofs.patch
deleted file mode 100644
index 6914efc267df..000000000000
--- a/app-cdr/gnomebaker/files/gnomebaker-0.6.2-genisofs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnomebaker-0.6.2/src/execfunctions.c.genisofs	2007-09-19 14:50:19.000000000 +0200
-+++ gnomebaker-0.6.2/src/execfunctions.c	2007-09-19 14:50:47.000000000 +0200
-@@ -868,7 +868,7 @@
- 			exec_cmd_add_arg(e, "mkisofs");			
- 			break;
- 		case BACKEND_WODIM:
--			exec_cmd_add_arg(e, "genisofs");
-+			exec_cmd_add_arg(e, "genisoimage");
- 			break;			
- 	}
- 
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.2.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.2.ebuild
deleted file mode 100644
index 65c1fb44f33c..000000000000
--- a/app-cdr/gnomebaker/gnomebaker-0.6.2.ebuild
+++ /dev/null
@@ -1,62 +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/gnomebaker/gnomebaker-0.6.2.ebuild,v 1.8 2008/06/12 08:56:05 armin76 Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
-HOMEPAGE="http://gnomebaker.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dvdr flac libnotify mp3 nls vorbis"
-KEYWORDS="amd64 ia64 ~ppc ppc64 sparc x86"
-
-RDEPEND="app-cdr/cdrdao
-	virtual/cdrtools
-	>=dev-libs/glib-2.4.0
-	>=dev-libs/libxml2-2.4.0
-	>=gnome-base/libglade-2.4.2
-	>=gnome-base/libgnomeui-2.10
-	>=media-libs/gstreamer-0.10.0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8
-	dev-perl/XML-Parser
-	dvdr? ( app-cdr/dvd+rw-tools )
-	flac? ( >=media-plugins/gst-plugins-flac-0.10.0
-		media-libs/gst-plugins-good )
-	libnotify? ( x11-libs/libnotify )
-	mp3? ( >=media-plugins/gst-plugins-mad-0.10.0
-		media-libs/gst-plugins-good	)
-	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.0
-		>=media-libs/libogg-1.1.2
-		media-libs/gst-plugins-good )"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable libnotify)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	echo gnomebaker.desktop.in >> po/POTFILES.skip
-
-	epatch "${FILESDIR}"/${P}-genisofs.patch \
-		"${FILESDIR}"/${P}-fix_fstab_parsing.patch
-
-	gnome2_omf_fix
-}
-
-src_install() {
-	gnome2_src_install \
-		gnomebakerdocdir=/usr/share/doc/${P} \
-		docdir=/usr/share/gnome/help/${PN}/C \
-		gnomemenudir=/usr/share/applications
-	rm -rf "${D}"/usr/share/doc/${P}/*.make "${D}"/var
-	use nls || rm -rf "${D}"/usr/share/locale
-}
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
index 5fa3f8cc3e94..a72374762b13 100644
--- a/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild,v 1.4 2008/07/24 17:24:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.4.ebuild,v 1.5 2008/07/26 00:04:17 drac Exp $
 
 GCONF_DEBUG=no
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ia64 ~ppc ppc64 sparc x86"
 IUSE="dvdr flac libnotify mp3 vorbis"
 
 RDEPEND=">=x11-libs/gtk+-2.8