Version bump for gnome-3.6, now uses gstreamer-1.0. Update description and license. Drop useless doc USE flag. Switch to global introspection flag. Drop old.

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

9 files changed, 47 insertions, 229 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 7542989ad674..984b2e425efe 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.145 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.146 2012/12/16 09:10:31 tetromino Exp $
+
+*brasero-3.6.1 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  brasero-2.32.1-r1.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, -brasero-3.4.0.ebuild,
+  brasero-3.4.1.ebuild, +brasero-3.6.1.ebuild, metadata.xml:
+  Version bump for gnome-3.6, now uses gstreamer-1.0. Update description and
+  license. Drop useless doc USE flag. Switch to global introspection flag. Drop
+  old.
 
   07 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   brasero-2.32.1-r1.ebuild, brasero-3.2.0-r1.ebuild, brasero-3.4.0.ebuild,
diff --git a/app-cdr/brasero/brasero-2.32.1-r1.ebuild b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
index 9020d43a9ced..1eb7a7613e22 100644
--- a/app-cdr/brasero/brasero-2.32.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.11 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.12 2012/12/16 09:10:31 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -9,10 +9,10 @@ GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2 multilib
 
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="+cdr +css doc dvd +introspection +libburn nautilus playlist test vcd"
@@ -51,11 +51,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	gnome-base/gnome-common:3
 	>=dev-util/gtk-doc-am-1.12
-	doc? ( >=dev-util/gtk-doc-1.12 )
 	test? ( app-text/docbook-xml-dtd:4.3 )"
 # eautoreconf deps
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 PDEPEND="gnome-base/gvfs"
 
 pkg_setup() {
diff --git a/app-cdr/brasero/brasero-3.2.0-r1.ebuild b/app-cdr/brasero/brasero-3.2.0-r1.ebuild
deleted file mode 100644
index 943d27b8c798..000000000000
--- a/app-cdr/brasero/brasero-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.2.0-r1.ebuild,v 1.3 2012/11/07 21:44:04 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
-HOMEPAGE="http://projects.gnome.org/brasero/"
-
-LICENSE="GPL-2"
-SLOT="0"
-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.29.14:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1
-
-	media-libs/libcanberra[gtk3]
-	x11-libs/libICE
-	x11-libs/libSM
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
-	libburn? (
-		>=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 )
-	tracker? ( >=app-misc/tracker-0.12 )"
-RDEPEND="${COMMON_DEPEND}
-	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
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	gnome-base/gnome-common:3
-	>=dev-util/gtk-doc-am-1.12
-	doc? ( >=dev-util/gtk-doc-1.12 )
-	test? ( app-text/docbook-xml-dtd:4.3 )"
-# eautoreconf deps
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-PDEPEND="gnome-base/gvfs"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable !libburn cdrtools)
-		$(use_enable !libburn cdrkit)
-		$(use_enable !libburn cdrdao)
-		$(use_enable !libburn growisofs)
-		$(use_enable introspection)
-		$(use_enable libburn libburnia)
-		$(use_enable nautilus)
-		$(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"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	echo
-	elog "If ${PN} doesn't handle some music or video format, please check"
-	elog "your USE flags on media-plugins/gst-plugins-meta:0.10"
-}
diff --git a/app-cdr/brasero/brasero-3.4.1.ebuild b/app-cdr/brasero/brasero-3.4.1.ebuild
index e6a5893bcca0..c53cb92876fe 100644
--- a/app-cdr/brasero/brasero-3.4.1.ebuild
+++ b/app-cdr/brasero/brasero-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.4.1.ebuild,v 1.2 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.4.1.ebuild,v 1.3 2012/12/16 09:10:31 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,13 +8,13 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+css doc +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
@@ -54,11 +54,9 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	gnome-base/gnome-common:3
 	>=dev-util/gtk-doc-am-1.12
-	doc? ( >=dev-util/gtk-doc-1.12 )
 	test? ( app-text/docbook-xml-dtd:4.3 )"
 # eautoreconf deps
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 PDEPEND="gnome-base/gvfs"
 
 pkg_setup() {
diff --git a/app-cdr/brasero/brasero-3.4.0.ebuild b/app-cdr/brasero/brasero-3.6.1.ebuild
index 7d8c26c83a60..64c2a09ae4a9 100644
--- a/app-cdr/brasero/brasero-3.4.0.ebuild
+++ b/app-cdr/brasero/brasero-3.6.1.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.4.0.ebuild,v 1.3 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.6.1.ebuild,v 1.1 2012/12/16 09:10:31 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2"
-SLOT="0"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
 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.29.14:2
 	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
 	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1
+	>=x11-libs/libnotify-0.6.1:=
 
 	media-libs/libcanberra[gtk3]
 	x11-libs/libICE
@@ -30,42 +30,39 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 	libburn? (
-		>=dev-libs/libburn-0.4
-		>=dev-libs/libisofs-0.6.4 )
+		>=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 )
-	tracker? ( >=app-misc/tracker-0.12 )"
+	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
+	tracker? ( >=app-misc/tracker-0.12:= )"
 RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-good:0.10
-	media-plugins/gst-plugins-gconf:0.10
-	media-plugins/gst-plugins-meta:0.10[mp3?]
+	media-libs/gst-plugins-good:1.0
 	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 )
+	mp3? (
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-mad:1.0 )
 	packagekit? ( app-admin/packagekit-base )"
 DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-	sys-devel/gettext
 	dev-util/intltool
-	gnome-base/gnome-common:3
 	>=dev-util/gtk-doc-am-1.12
-	doc? ( >=dev-util/gtk-doc-1.12 )
+	gnome-base/gnome-common:3
+	sys-devel/gettext
+	virtual/pkgconfig
 	test? ( app-text/docbook-xml-dtd:4.3 )"
 # eautoreconf deps
+#	app-text/yelp-tools
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 PDEPEND="gnome-base/gvfs"
 
-pkg_setup() {
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
-		--disable-scrollkeeper
 		--disable-caches
-		--disable-dependency-tracking
 		$(use_enable !libburn cdrtools)
 		$(use_enable !libburn cdrkit)
 		$(use_enable !libburn cdrdao)
@@ -74,9 +71,10 @@ pkg_setup() {
 		$(use_enable libburn libburnia)
 		$(use_enable nautilus)
 		$(use_enable playlist)
-		$(use_enable tracker search)"
+		$(use_enable tracker search)
+		ITSTOOL=$(type -P true)"
 
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure
 }
 
 pkg_postinst() {
@@ -84,5 +82,5 @@ pkg_postinst() {
 
 	echo
 	elog "If ${PN} doesn't handle some music or video format, please check"
-	elog "your USE flags on media-plugins/gst-plugins-meta:0.10"
+	elog "your USE flags on media-plugins/gst-plugins-meta:1.0"
 }
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
deleted file mode 100644
index a7d9865ce989..000000000000
--- a/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 5af07f48584c..000000000000
--- a/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 812a8a5fbdc3..000000000000
--- a/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 2715dd3fdb8e..1ba9e6470da3 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -6,8 +6,6 @@
 	<use>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
 		<flag name='nautilus'>Build the <pkg>gnome-base/nautilus</pkg>
 			extension</flag>
 		<flag name='libburn'>Enable <pkg>dev-libs/libburn</pkg> backend</flag>