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.

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

7 files changed, 125 insertions, 20 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/Manifest b/app-cdr/brasero/Manifest
index 9a8c144ba85c..0bdf97668f35 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX brasero-2.32.0-build-plugins-against-local-library.patch 15544 RMD160 d24919b6f6b5e6abb5c22fc37c1d84a1f8484e49 SHA1 029eda8eedbd2be612de413f570fb8e2c63fabb7 SHA256 895d4ff2c349ddff6a8fcbc9d366808a3fed2c3aa54bd4bb7b717505801c3176
 AUX brasero-2.32.1-fix-size.patch 2244 RMD160 1a476af590d92c41f1d16aaa25b96f258c12e549 SHA1 9d9a2bc18e34d41d1c07090dd4e17bc5efd40fc5 SHA256 6cbedaa3e1ceb1140961afe925792b813a0ca5f894256c9330f756268c43d566
@@ -7,17 +7,20 @@ AUX brasero-2.32.1-useless-dialog.patch 2498 RMD160 f5ffa8cf8056201654f9be090b9a
 AUX brasero-2.32.1-warning-silenced.patch 690 RMD160 9081cdc99c30f3cf82ea02d2eef843697f024283 SHA1 41c92574d5320560ff209c3a5cd73cab12ad2a30 SHA256 899ca8171a751332957ec21c3028ebc4a4d303bda30699d57cf0f6607bd2ae58
 AUX brasero-2.32.1-warning-silenced2.patch 616 RMD160 6f69ff16b87b1432dae55849a40efc4b23c62181 SHA1 f4f8c233ade48d7c166b877d81573ac4f56462a2 SHA256 cb435ec18ba02e445ebbf55c5cee16ce078d0e6e762e5821222e911a13ce5f5d
 AUX brasero-2.91.6-build-plugins-against-local-library.patch 14905 RMD160 a84a15050c4b21999c4efdff520606d8d1d563f2 SHA1 bff5cd114b5f98a8b0a39132619a6d39a000d29e SHA256 5978545e14615c43d306e7eb134f1efd6dab9be2e1f80756bd9948e6d6a9db69
+AUX brasero-3.2.0-brasero-nautilus.desktop.patch 862 RMD160 f5277480e8a47eaff3a0bccaaa19a840f2aa9f8f SHA1 a603db175cc343fd236941f0c53b01e56f6f96e4 SHA256 08df6699fcb17d17adb0c6dd0628b10d94cb6d80440d46568abb2be2513007a9
+AUX brasero-3.2.0-brasero.desktop.patch 1195 RMD160 d4efc603d8e7370c64b9a4c53b15341e23949ab6 SHA1 07ad4cc2f27449ceed3b5d7758cf9833c8171363 SHA256 f2db32b293e54c628bed5e6cf84d8b1e6ca043511469aad3ce7ac8d1b7ae7ae4
+AUX brasero-3.2.0-drive-not-selected.patch 1111 RMD160 73db6908d150f83b0a03fa35c7ff64dfa7579100 SHA1 d7a3a25c99b6ae7d046360448f1d5cbb2bb0b5fc SHA256 cfcee75b004d618ca9e6bf1b7522814f3d2bef13887b12e908b305170014dd53
 DIST brasero-2.32.1.tar.bz2 4530933 RMD160 0acfcc53077cbbdaa5e0e593f290c41825f72838 SHA1 56141108561f2b8d45998662b86cf6e20f0ff4f2 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b
-DIST brasero-3.0.0.tar.bz2 4746147 RMD160 8a28a5f09ebcdc2638593fd0d16aa79ed2165577 SHA1 f8091b835aa9260a68de41c3b8f8bc47e9bea9de SHA256 aff1e900d6c68096e43a80443c8c367374fb980986d2f823d229606605a410e3
+DIST brasero-3.2.0.tar.xz 2923972 RMD160 73e5cf390e390aa9e10742462384541944b385e5 SHA1 2dc4deeaeb357b96969ac9aaaf23cef68fe81bec SHA256 2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c
 EBUILD brasero-2.32.1-r1.ebuild 3523 RMD160 49a42cb1b0c4b0113f0d4c3d8050f8809c603b94 SHA1 fd04090befd85e937a8716e4c48ef5a5777314a9 SHA256 4deae24b5ea120bae92ef030ec07eacf6c61adf0bcbf9ba66e92608024e72722
 EBUILD brasero-2.32.1.ebuild 3133 RMD160 6827f0836838fc34ec949ca09f9bf1dfc2a90b7d SHA1 50922bccf99e76e837f252f410660af265d4b871 SHA256 2f1811e303a3c6dbffa24d2b77c5dd91fd2de796efa98e5a271a0a9992103de3
-EBUILD brasero-3.0.0.ebuild 2596 RMD160 5f6ee4eefe024a7313ab0c4d37656b4a174d671c SHA1 952c210fcf67cbb92e867660915d2c7fe1b22b4e SHA256 5b8e5256aef26de7440ca33a6beae4fd2c23de4fc0508fa93cb89202a42b0644
-MISC ChangeLog 21526 RMD160 9f40e83893b72a7b3c69e891ee3f5d7b350bf937 SHA1 2769009c92c1fe5bef43c8f54fd01343d7ff2984 SHA256 2a051b1f4a0c57233e2ec103da71a8a2dfcd255f2e940730b0c289601e746d24
-MISC metadata.xml 696 RMD160 c4f0242ff0e0c6b0350e4c970136ed42db19a8d0 SHA1 12b1259a2591d75bc528ce4a8062842a181f2bf3 SHA256 c207472cce53a75fd920cf5fabf3d09cbb30d744f11acef6eb09dc6a7a158fa1
+EBUILD brasero-3.2.0-r1.ebuild 3000 RMD160 1d21c6501d214320e695dc7cd64cc19bd6b6b2d7 SHA1 8708394724b5609068d013428afe223f1211ee83 SHA256 1dff0ba030bf675f6aa50c26098f76636241bb7cd3054783ba9732f2f3367638
+MISC ChangeLog 21989 RMD160 ff46a324b8c8ee851f68ec2f0e24a224e1cec6b3 SHA1 4c9f664e2708323020a3b8f8fe08699cd4e4e517 SHA256 abff28149bfc8ae1ea1a428ccc51add326fd6a3d0b1b799a4bf87178a830786d
+MISC metadata.xml 804 RMD160 2b0255b1f898a373cf8b4ae0ae7c798515729d1d SHA1 26866824bdbd33577a9bc68b341a575031608380 SHA256 5cf5e6975460ecc9b4611798e81f3d299c3e808792ff1e553140a940cfa739bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6tYvEACgkQuQc30/atMkDPEwCgqjmWY+y4tlhrRC2QKFzr45vl
-K9MAoKKM7T/pA0OOu0vNY0kcI7KQz8ky
-=6ERZ
+iF4EAREIAAYFAk6zoFMACgkQdjK8w9WeBnB4xQEAhU6BCY00UytPH0ZK+z7SYJBU
+lD6IdpMh1+JYF+SWLX0BAJ+CwAtoBNILjQUh1XRa4koKVzROV5bI+piMyvof4CLw
+=YwF/
 -----END PGP SIGNATURE-----
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>