amd64 stable wrt #209877

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc3 x86_64

6 files changed, 11 insertions, 112 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/Manifest b/app-cdr/gnomebaker/Manifest
index 84a207aa23fc..31899f0a1173 100644
--- a/app-cdr/gnomebaker/Manifest
+++ b/app-cdr/gnomebaker/Manifest
@@ -1,12 +1,8 @@
 AUX gnomebaker-0.6.1-export-dynamic_for_glade.patch 757 RMD160 6baea894c72f5e832ba1da719bbe34e36e4419c2 SHA1 674a9c78ac4d39d1a5d618f46d83cddf59bc8183 SHA256 26d12231a3960831802306793ff3c89b4ce528a708be82046407ddd79b5c023c
 AUX gnomebaker-0.6.1-thread_init.patch 840 RMD160 7a512a1719d8f86e1ce42416794d0482c97dd801 SHA1 6346085435d62455d68a6b7b6231484f6472319f SHA256 6f64206d107cca34823f81f0de045c683228488c15f36c4290431229de169eaa
-AUX gnomebaker-0.6.2-fix_fstab_parsing.patch 811 RMD160 cbc39e35f631a85d498640008c2b32520dc433ab SHA1 7f83b35debddb5ab8b95d2c42e504655840c69c8 SHA256 62eaaf2bcf6eff3e3ac23f4715495947a2a86317c5fd46a09fd7e66bd356e85e
-AUX gnomebaker-0.6.2-genisofs.patch 353 RMD160 92a312753c5b7b58ac70970bc58a7bf6b1d19d79 SHA1 73c293ba3414a5a10605a8cd218fcd36993e22dc SHA256 e656f59e0cadcda38edadd5f1da369bc31fef558f87ea2444471fdf40bed886f
 DIST gnomebaker-0.6.1.tar.gz 1235841 RMD160 86ba9efd07700e6fedab7a5bd8d59011048998ec SHA1 27be843a1d5a33848bb37cd549984ea9b7ecfd52 SHA256 bca2306042405779881bd72fb4824c93ccd79328a811f52b3dcd037b01d3b129
-DIST gnomebaker-0.6.2.tar.gz 1286713 RMD160 e829fad99d4dc8307a42f3ace43abe316d683fec SHA1 0c4581eb9639172d1221817e621582b22c54a236 SHA256 6cc1d1a065512fe26ebb2d1e6204a34eebc66e521bf9e2950472f61e11602e42
 DIST gnomebaker-0.6.4.tar.gz 1276117 RMD160 a90d129866deefde31e859e45ad1260e6c1be4cc SHA1 ead0fe0091a1de7ae9197bf8e1b374749fc7c61b SHA256 6e1ef94cafca7536fc3211a7abd4732f6dc5adc3c7c1b73184f5a87738117fb7
 EBUILD gnomebaker-0.6.1-r2.ebuild 1640 RMD160 ec57569fa4b64aaace63012e585b3287fa1f5e2f SHA1 77c994b330b53a1bb5dea1272d05d4f1a72b773a SHA256 e0d148313b535fe26c768f4f4ec8c2b71606c260eaec1673371a82dbca4a5f49
-EBUILD gnomebaker-0.6.2.ebuild 1670 RMD160 9cf32bc55f76e5526b044ba4786c1a41c87aa56b SHA1 c7140da2eefd15c97872fb1775cdfab7c3294f51 SHA256 a00069566895eaca57e38e42c24a5ac28c331c9cdf2bf88ea3fd399910c2ce5b
-EBUILD gnomebaker-0.6.4.ebuild 1489 RMD160 f9310e52787ef2c6c1d09f1fc48f4d738abfc0de SHA1 a08023dfd8a5fb36cfa112ff2f1ef27c5ac2c560 SHA256 3bd92e2bf7f666553ff68c4cec4adb81abfdce22b8413638d30fbbc7e916e7b3
-MISC ChangeLog 7662 RMD160 a1391386964227b4c9f048eedc54ff744acadda2 SHA1 97f29f99249cf38cfc93c4c388afa1388227a6b8 SHA256 0778440b4b389dd09f1de10f592f7b85af06e477d9367697cc4c8ffb49f2ad20
+EBUILD gnomebaker-0.6.4.ebuild 1485 RMD160 8a820ec14a2aa038e506124df8ca6f0150431b30 SHA1 c5ea3a160f83a79d0931fe05e10f746b0fe3bec4 SHA256 ba4efa928e1093527bc6509e5bc8383d21d2a904556cd40babad2098daddde24
+MISC ChangeLog 7882 RMD160 b18dabaf08a775cc5e808f918bbb92132c8ab0b8 SHA1 ce73e8e76051a8d62b434da4a94255a0ac94bfd9 SHA256 2d74ea3aad052c57ae17f909057acef7143fb0468caec04968ee7385ad92eed2
 MISC metadata.xml 168 RMD160 0f4531db7705cd8bc36b75d29d850bf7104855ae SHA1 d5eb7a704881bd8a8a83d83679d791b1e17633b4 SHA256 78253ccb8cd8df7179b1776b7e98a02f8df32368476727fef07ad0c9d164e180
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