Bump to 3.2.0 from the gnome overlay, drop old. Add gstreamer plugins needed for normal usage to rdepend. Notable changes: optional tracker support.

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

6 files changed, 113 insertions, 11 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 0fff5c81475b..3062cfbce2bc 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.136 2011/10/30 14:44:59 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.137 2011/11/04 08:20:30 tetromino Exp $
+
+*brasero-3.2.0-r1 (04 Nov 2011)
+
+  04 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -brasero-3.0.0.ebuild, +brasero-3.2.0-r1.ebuild,
+  +files/brasero-3.2.0-brasero.desktop.patch,
+  +files/brasero-3.2.0-brasero-nautilus.desktop.patch,
+  +files/brasero-3.2.0-drive-not-selected.patch, metadata.xml:
+  Bump to 3.2.0 from the gnome overlay, drop old. Add gstreamer plugins needed
+  for normal usage to rdepend. Notable changes: optional tracker support.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> brasero-2.32.1-r1.ebuild:
   alpha/ia64/sparc stable wrt #385699
diff --git a/app-cdr/brasero/brasero-3.0.0.ebuild b/app-cdr/brasero/brasero-3.2.0-r1.ebuild
index 6fe777b7e6b3..693e6466a641 100644
--- a/app-cdr/brasero/brasero-3.0.0.ebuild
+++ b/app-cdr/brasero/brasero-3.2.0-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.0.0.ebuild,v 1.2 2011/09/05 20:32:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.2.0-r1.ebuild,v 1.1 2011/11/04 08:20:30 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools eutils gnome2 multilib
 
@@ -14,13 +13,12 @@ HOMEPAGE="http://projects.gnome.org/brasero/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+css doc +introspection +libburn nautilus packagekit playlist test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+css doc +introspection +libburn mp3 nautilus packagekit playlist test tracker"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.28:2
+	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=gnome-base/gconf-2.32.0:2
 	>=media-libs/gstreamer-0.10.15:0.10
 	>=media-libs/gst-plugins-base-0.10:0.10
 	>=dev-libs/libxml2-2.6:2
@@ -35,15 +33,19 @@ COMMON_DEPEND="
 		>=dev-libs/libburn-0.4
 		>=dev-libs/libisofs-0.6.4 )
 	nautilus? ( >=gnome-base/nautilus-2.91.90 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )
+	tracker? ( >=app-misc/tracker-0.12 )"
 RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:0.10
+	media-libs/gst-plugins-good:0.10
+	media-plugins/gst-plugins-gconf:0.10
+	media-plugins/gst-plugins-meta:0.10[mp3?]
 	x11-themes/hicolor-icon-theme
 	css? ( media-libs/libdvdcss:1.2 )
 	!libburn? (
 		app-cdr/cdrdao
 		app-cdr/dvd+rw-tools
 		virtual/cdrtools )
+	mp3? ( media-libs/gst-plugins-ugly:0.10 )
 	packagekit? ( app-admin/packagekit-base )"
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
@@ -64,7 +66,6 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
-		--disable-search
 		$(use_enable !libburn cdrtools)
 		$(use_enable !libburn cdrkit)
 		$(use_enable !libburn cdrdao)
@@ -72,13 +73,20 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_enable libburn libburnia)
 		$(use_enable nautilus)
-		$(use_enable playlist)"
+		$(use_enable playlist)
+		$(use_enable tracker search)"
 
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 }
 
 src_prepare() {
+	# Useful upstream patches, will be in next release
+	epatch "${FILESDIR}/${P}-brasero-nautilus.desktop.patch"
+	epatch "${FILESDIR}/${P}-brasero.desktop.patch"
+	epatch "${FILESDIR}/${P}-drive-not-selected.patch"
+
 	# Fix linking against installed libraries, bug #340767, gnome #641233
+	# requires eautoreconf
 	epatch "${FILESDIR}/${PN}-2.91.6-build-plugins-against-local-library.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
diff --git a/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch b/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch
new file mode 100644
index 000000000000..a7d9865ce989
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch
@@ -0,0 +1,26 @@
+From 6df46b408e03e88801c6a84695d387a85452c320 Mon Sep 17 00:00:00 2001
+From: Luis Medinas <lmedinas@gnome.org>
+Date: Thu, 20 Oct 2011 22:48:58 +0100
+Subject: [PATCH] Fix for Broken (and useless) brasero-nautilus.desktop desktop file
+
+Closes bgo #662275
+---
+ nautilus/brasero-nautilus.desktop.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nautilus/brasero-nautilus.desktop.in.in b/nautilus/brasero-nautilus.desktop.in.in
+index c55b160..83fa123 100644
+--- a/nautilus/brasero-nautilus.desktop.in.in
++++ b/nautilus/brasero-nautilus.desktop.in.in
+@@ -8,7 +8,7 @@ Icon=system-file-manager
+ MimeType=x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
+ StartupNotify=true
+ Terminal=false
+-#Type=Application
++Type=Application
+ OnlyShowIn=GNOME;
+ NoDisplay=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+-- 
+1.7.7.2
+
diff --git a/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch b/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch
new file mode 100644
index 000000000000..5af07f48584c
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch
@@ -0,0 +1,30 @@
+From f8aef8ae82831ebfda9520d6e7e82a2cad99383d Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Fri, 7 Oct 2011 00:04:17 +0200
+Subject: [PATCH] Update categories in brasero.desktop
+
+I don't think Utility (nor Core) should be there, and it exposes a
+gnome-shell bug where brasero appears twice because it's in two
+categories.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661134
+---
+ data/brasero.desktop.in.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/brasero.desktop.in.in b/data/brasero.desktop.in.in
+index ac83297..ce560c2 100644
+--- a/data/brasero.desktop.in.in
++++ b/data/brasero.desktop.in.in
+@@ -2,7 +2,7 @@
+ _Name=Brasero
+ _GenericName=Disc Burner and Copier
+ _Comment=Create and copy CDs and DVDs
+-Categories=GNOME;AudioVideo;DiscBurning;Core;Utility;
++Categories=GTK;GNOME;AudioVideo;DiscBurning;
+ MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-cue;application/x-toc;audio/x-scpls;audio/x-ms-asx;audio/x-mp3-playlist;audio/x-mpegurl;application/x-brasero;x-content/audio-cdda;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-content/image-picturecd;
+ Exec=brasero %U
+ Icon=brasero
+-- 
+1.7.7.2
+
diff --git a/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch b/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch
new file mode 100644
index 000000000000..812a8a5fbdc3
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch
@@ -0,0 +1,26 @@
+From f9d1053a648110efbeb02bee6ee162eaaa809306 Mon Sep 17 00:00:00 2001
+From: Luis Medinas <lmedinas@gnome.org>
+Date: Mon, 24 Oct 2011 00:52:08 +0100
+Subject: [PATCH] Add a fix for optical drive not selected by default.
+
+Fixes bgo #662541 - Optical drive selection not displayed
+---
+ libbrasero-media/brasero-medium-selection.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/libbrasero-media/brasero-medium-selection.c b/libbrasero-media/brasero-medium-selection.c
+index bdf2044..858b1d1 100644
+--- a/libbrasero-media/brasero-medium-selection.c
++++ b/libbrasero-media/brasero-medium-selection.c
+@@ -562,6 +562,8 @@ brasero_medium_selection_show_media_type (BraseroMediumSelection *selector,
+ 			                                   MEDIUM_COL, medium,
+ 			                                   -1);
+ 
++			gtk_combo_box_set_active_iter (GTK_COMBO_BOX (selector), &iter);
++
+ 			medium_name = brasero_medium_selection_get_medium_string (selector, medium);
+ 			medium_icon = brasero_volume_get_icon (BRASERO_VOLUME (medium));
+ 			gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+-- 
+1.7.7.2
+
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 9c440cd5ad41..2715dd3fdb8e 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -13,5 +13,7 @@
 		<flag name='libburn'>Enable <pkg>dev-libs/libburn</pkg> backend</flag>
 		<flag name='playlist'>Enable support for playlists through
 			<pkg>dev-libs/totem-pl-parser</pkg></flag>
+		<flag name="tracker">Enable audio playlist search using the
+			<pkg>app-misc/tracker</pkg> indexer</flag>
 	</use>
 </pkgmetadata>