Apply fedora patches, fix implicits, simplify deps, bump to EAPI4. Fixes bug 272006

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

8 files changed, 168 insertions, 18 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index 0a6b0794995e..0435424c7cea 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-cdr/gnomebaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.58 2011/03/27 09:59:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.59 2011/08/07 16:48:41 xarthisius Exp $
+
+*gnomebaker-0.6.4-r1 (07 Aug 2011)
+
+  07 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  +gnomebaker-0.6.4-r1.ebuild, +files/gnomebaker-0.6.4-implicits.patch,
+  +files/gnomebaker-0.6.4-ldadd.patch,
+  files/gnomebaker-0.6.4-libnotify-0.7.patch,
+  +files/gnomebaker-0.6.4-mimetype.patch,
+  +files/gnomebaker-0.6.4-seldata.patch:
+  Apply fedora patches, fix implicits, simplify deps, bump to EAPI4. Fixes bug
+  272006
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   gnomebaker-0.6.4.ebuild:
diff --git a/app-cdr/gnomebaker/Manifest b/app-cdr/gnomebaker/Manifest
index f4c931438072..5e17ff6de05b 100644
--- a/app-cdr/gnomebaker/Manifest
+++ b/app-cdr/gnomebaker/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gnomebaker-0.6.4-libnotify-0.7.patch 678 RMD160 01aa8d37bcb1c1bec6c48d7a3baa02b949e42ba3 SHA1 623d21137c4a3bf643b4599b398b67e4ef0188b2 SHA256 439006ede352ea5aa2d52e769f4eb611086123f220c3ac57da0d8f34b5d91e0c
+AUX gnomebaker-0.6.4-implicits.patch 724 RMD160 be1a985befd1e39d5903a89d7163c93a1a77d6ca SHA1 c28de292f3ee2015e9301144c341e1413864a5e7 SHA256 781c0de02940d595854dfd2a383c4d366da4abfd8a328e71ff1136407b2e340f
+AUX gnomebaker-0.6.4-ldadd.patch 279 RMD160 9278381e0fe93d37440cb91f6d7cfcc2c7bb599f SHA1 000f0cf32e57d645b18d1cbdabcf456a240a003b SHA256 c81ac7d443844cbb7d94c9cb3399766e1efccfba0cd6f0b5628ca146a2f794fc
+AUX gnomebaker-0.6.4-libnotify-0.7.patch 682 RMD160 ecc2eb419cbb84e8be024b63ce497cec989e0b5c SHA1 02bf481f9433e6ce9a5b55d8e7c8362263b05b95 SHA256 81d400bdaf7f6992c88842fecfb71cf1fc1b7e12ec0c69275f879442181c16e2
+AUX gnomebaker-0.6.4-mimetype.patch 346 RMD160 62c00b8075b569a12bc5b14b7a3c30642717b4aa SHA1 381ae13156d950e3e0b9f3fda936cad646274e0f SHA256 df2de7770bb8fe00ad2ed6c347004a988b07f100207cc24c7fda68b39eb514fa
+AUX gnomebaker-0.6.4-seldata.patch 1472 RMD160 ce051f45ebdb8ba23a29accea8e8d2db7fdb0bfd SHA1 9a1adb1c5891719e386dc6bf2b85e63b5cc50d39 SHA256 67ad4851d01017d510accf87bd4af79d920c845f6aa84dff7636b803cbb31b5a
 DIST gnomebaker-0.6.4.tar.gz 1276117 RMD160 a90d129866deefde31e859e45ad1260e6c1be4cc SHA1 ead0fe0091a1de7ae9197bf8e1b374749fc7c61b SHA256 6e1ef94cafca7536fc3211a7abd4732f6dc5adc3c7c1b73184f5a87738117fb7
+EBUILD gnomebaker-0.6.4-r1.ebuild 1673 RMD160 86d1e5dc3ad80819a8cc420d4664df683c0fbfff SHA1 d376060afbc53a7fe7dd287797f4680bf080b38f SHA256 c128d47aa53552e4e076c668ce82bbf57d9ed8b0f26a29e76c1e5286bc0ed48c
 EBUILD gnomebaker-0.6.4.ebuild 1607 RMD160 b8abedbdc99c8394e75966414ccca522b9af8cdb SHA1 2859d374085c415c526da3b8a96e837356257b6f SHA256 32b89877d981aadf8a3bdb26d20192161d9da0b9fc5ed8c79269b892a98f9e8c
-MISC ChangeLog 8487 RMD160 95f418025c8ec587df5d3c792dc2b943ea1ee330 SHA1 971ddf52845e76c410bd39d1c45fb223aebd9513 SHA256 e6ed58a403ad66c9190c017e19b53aa60958ca6f3b6bc0a69a64c55c828efd3e
+MISC ChangeLog 8908 RMD160 d5d93a79c357685e728f9130aa1b9f7f9909b3c3 SHA1 dac470ca52c93ab909dbca4110a73fc9cb0e2ab7 SHA256 e6d7953ee4c40aa6578c208268704445407c05a23f04db2e2b6f1ada56ebd1cf
 MISC metadata.xml 168 RMD160 0f4531db7705cd8bc36b75d29d850bf7104855ae SHA1 d5eb7a704881bd8a8a83d83679d791b1e17633b4 SHA256 78253ccb8cd8df7179b1776b7e98a02f8df32368476727fef07ad0c9d164e180
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjwqYAAoJEO/kOhxWD91k/D0P/3LvGWHpWL9yzvC7vX1eC6Wc
-6y4Td0f8XwC7kIPD0eNFELiAQAT2+NBllcNBovmmV2V1BDrJ38eFCEzVhlDqVYVT
-IkTNEN4B2ZVUwFaIUbkuLqmlXqNLAeQqzWQ3J9dIyYIipYpykbRNHDVrCrrGQHWT
-HtpxpAw9JGWYQUkiPG2pxQjhr5B6gmx8jiu/blJcUYgmE9tYhR3sQ5ZA2ehjBq8k
-WFdiBF2kYtfFb6G756T96XNS8l7dZSUrhtncLW0/b3TTKmjisnqF56zvjq2XbFg6
-kh1PlHUYP0arXueTF8bkqiUHVZTrG03c8gz1D7CTJDiTY1IwE2z0unIjBivKuFbz
-Jrd0w/sPlznbF0h/obed3jG/wFmJH9iD4OW7Wb99YwvkRSioNJQPK0StIXwDPHTV
-yfJpcbA/Y6765H62AeKiFo+aPKR1LIHhDOPRGTrkJk8l+3/ZCyl7WNxwWM2WybE7
-CP3xL8aBLOz55EiVowspIGxzYcrYP++TEHh73DDje3VsNoHLjCvKC6xQ6IjRHbSx
-+mSUQRCg3/DI+bUg1KySsQQkMnOrNxKe6oYKkak1O9Gy+nDD72biA+WDuEmH5D31
-yFxFAMlLuM0Bg33wEfVxVw0KUWZ2gjF/B/zFWlPKvvcg32sfBcjOOdJf1Kwq1Is+
-UdyRwJrJ761yVqVHzUbn
-=//Sr
+iJwEAQECAAYFAk4+wfMACgkQIiMqcbOVdxTHxAP+JJ1gGLe8B69dggGAvpjdSZed
+Zn02VCSnDVmh4YRDBDwYeIUEmlIfYg0nQymY4Kd1V3VeizQKQ6gkusMwoIdQ54C0
+6wv68VJRVj5KugMZeLsgUejPd3D8DqXInHVHU/f4uM1ZQuPeZaixhVgQUa83Edgo
+/A3gOXn6qy7KXUEQFAg=
+=v9au
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch
new file mode 100644
index 000000000000..bbc8ec7abc52
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-implicits.patch
@@ -0,0 +1,30 @@
+--- a/src/preferences.h
++++ b/src/preferences.h
+@@ -85,6 +85,7 @@
+ 
+ gboolean preferences_init();
+ void preferences_finalise();
++int preferences_get_default_backend();
+ 
+ gchar *preferences_get_copy_data_cd_image();
+ gchar *preferences_get_copy_dvd_image();
+--- a/src/backend.h
++++ b/src/backend.h
+@@ -30,6 +30,7 @@
+ 
+  
+ gboolean backend_is_backend_supported(enum backend b);
++gboolean backend_does_prog_exist(gchar* program);
+ 
+ 
+ #endif /* _BACKEND_H_ */
+--- a/src/gnomebaker.c
++++ b/src/gnomebaker.c
+@@ -32,6 +32,7 @@
+ #include "splashdlg.h"
+ #include "gbcommon.h"
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
++#include <libgnomevfs/gnome-vfs-ops.h>
+ #include <gst/gst.h>
+ #include "media.h"
+ #include "dataproject.h"
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch
new file mode 100644
index 000000000000..b8e4cf1ed551
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-ldadd.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -255,7 +255,7 @@ gnomebaker_SOURCES = \
+ 	cairofillbar.c cairofillbar.h \
+ 	backend.c backend.h
+ 
+-gnomebaker_LDADD = @GNOMEBAKER_LIBS@
++gnomebaker_LDADD = @GNOMEBAKER_LIBS@ -lm
+ gnomebaker_LDFLAGS = -export-dynamic 
+ all: all-am
+ 
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
index 27ae276d77a3..772d4f5d23d9 100644
--- a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-libnotify-0.7.patch
@@ -1,5 +1,5 @@
---- src/gblibnotify.c
-+++ src/gblibnotify.c
+--- a/src/gblibnotify.c
++++ b/src/gblibnotify.c
 @@ -87,7 +87,15 @@
  #ifdef HAVE_LIBNOTIFY
  #if (LIBNOTIFY_VERSION_MINOR >= 3)
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch
new file mode 100644
index 000000000000..c0e29e66ad34
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-mimetype.patch
@@ -0,0 +1,8 @@
+--- a/gnomebaker.desktop.in
++++ b/gnomebaker.desktop.in
+@@ -17,4 +17,4 @@ X-MultipleArgs=false
+ Type=Application
+ Categories=AudioVideo;DiscBurning;
+ StartupNotify=true
+-
++MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-toc;application/x-cue;x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch
new file mode 100644
index 000000000000..0be6f1e09c43
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.4-seldata.patch
@@ -0,0 +1,31 @@
+--- a/src/filebrowser.c
++++ b/src/filebrowser.c	
+@@ -866,7 +866,7 @@ filebrowser_get_selection(gboolean from_
+     else
+         tree = glade_xml_get_widget(gnomebaker_getxml(), widget_browser_filelist);
+ 
+-    GtkSelectionData *selection_data = g_new0(GtkSelectionData, 1);
++    GtkSelectionData *selection_data = g_slice_new0(GtkSelectionData);
+     filebrowser_on_drag_data_get(tree, NULL, selection_data, 0, 0, NULL);
+     return selection_data;
+ }
+--- a/src/gnomebaker.c
++++ b/src/gnomebaker.c
+@@ -529,7 +529,7 @@ gnomebaker_on_add_files(gpointer widget,
+         }
+ 
+         /*gtk_selection_data_set_uris(selection_data, uris);*/
+-        selection_data = g_new0(GtkSelectionData, 1);
++        selection_data = g_slice_new0(GtkSelectionData);
+         gtk_selection_data_set(selection_data, selection_data->target, 8,
+                 (const guchar*)text->str, strlen(text->str) * sizeof(gchar));
+         GB_TRACE("gnomebaker_on_add_files - [%s]\n", selection_data->data);
+@@ -1073,7 +1073,7 @@ gnomebaker_select_files_or_folders(const
+         }
+ 
+         /*gtk_selection_data_set_uris(selection_data, uris);*/
+-        selection_data = g_new0(GtkSelectionData, 1);
++        selection_data = g_slice_new0(GtkSelectionData);
+         gtk_selection_data_set(selection_data, selection_data->target, 8,
+             (const guchar*)text->str, strlen(text->str) * sizeof(gchar));
+         GB_TRACE("gnomebaker_select_files_or_folders - [%s]\n", selection_data->data);
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
new file mode 100644
index 000000000000..873d77f2f2e0
--- /dev/null
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/08/07 16:48:41 xarthisius Exp $
+
+EAPI=4
+GCONF_DEBUG=no
+inherit eutils gnome2
+
+DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
+HOMEPAGE="http://sourceforge.net/projects/gnomebaker"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dvdr flac libnotify mp3 vorbis"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libgnomeui
+	dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/gstreamer:0.10
+	x11-libs/cairo
+	app-cdr/cdrdao
+	virtual/cdrtools
+	dvdr? ( app-cdr/dvd+rw-tools )
+	flac? ( media-plugins/gst-plugins-flac
+		media-libs/gst-plugins-good )
+	libnotify? ( x11-libs/libnotify )
+	mp3? ( media-plugins/gst-plugins-mad
+		media-libs/gst-plugins-good )
+	vorbis? ( media-plugins/gst-plugins-vorbis
+		media-libs/libogg
+		media-libs/gst-plugins-good )"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/intltool
+	dev-util/pkgconfig
+	sys-devel/gettext"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-dependency-tracking
+		$(use_enable libnotify)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+		"${FILESDIR}"/${P}-ldadd.patch \
+		"${FILESDIR}"/${P}-seldata.patch \
+		"${FILESDIR}"/${P}-mimetype.patch \
+		"${FILESDIR}"/${P}-implicits.patch
+	gnome2_src_prepare
+}
+
+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
+}