Sync with gnome overlay dependency fixes, bug #299117. Rename totem useflag to something more adequate to what the dependency does.

(Portage version: 2.2_rc61/cvs/Linux x86_64)

6 files changed, 97 insertions, 56 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 81460e7a15d9..0447bcfad476 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/brasero
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.88 2009/12/23 04:18:28 nirbheek Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.89 2010/01/03 23:16:16 eva Exp $
+
+  03 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  brasero-0.8.4-r1.ebuild, brasero-2.26.3.ebuild, brasero-2.28.2.ebuild,
+  brasero-2.28.3.ebuild, metadata.xml:
+  Sync with gnome overlay dependency fixes, bug #299117. Rename totem
+  useflag to something more adequate to what the dependency does.
 
 *brasero-2.28.3 (23 Dec 2009)
 
diff --git a/app-cdr/brasero/brasero-0.8.4-r1.ebuild b/app-cdr/brasero/brasero-0.8.4-r1.ebuild
index cbd8d36cb584..11f46b8f5f68 100644
--- a/app-cdr/brasero/brasero-0.8.4-r1.ebuild
+++ b/app-cdr/brasero/brasero-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.8.4-r1.ebuild,v 1.4 2009/03/20 12:59:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.8.4-r1.ebuild,v 1.5 2010/01/03 23:16:16 eva Exp $
 
 EAPI=1
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/brasero"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="beagle gnome +libburn totem cdrkit cdrtools +nautilus"
+IUSE="beagle gnome +libburn playlist cdrkit cdrtools +nautilus"
 
 RDEPEND=">=dev-libs/glib-2.15.6
 	>=x11-libs/gtk+-2.12.0
@@ -32,7 +32,7 @@ RDEPEND=">=dev-libs/glib-2.15.6
 	cdrkit? ( app-cdr/cdrkit )
 	gnome? ( >=gnome-base/libgnome-2.22.0
 		>=gnome-base/libgnomeui-2.22.0 )
-	totem? ( >=dev-libs/totem-pl-parser-2.20 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.20 )
 	beagle? ( >=dev-libs/libbeagle-0.3.0 )
 	libburn? ( >=dev-libs/libburn-0.4.0
 		>=dev-libs/libisofs-0.6.4 )
@@ -51,7 +51,7 @@ pkg_setup() {
 		$(use cdrtools|| printf %s --disable-cdrtools)
 		$(use_enable cdrkit)
 		$(use_enable nautilus)
-		$(use_enable totem playlist)
+		$(use_enable playlist)
 		$(use_enable beagle search)
 		$(use_enable libburn libburnia)
 		$(use_enable gnome gnome2)"
diff --git a/app-cdr/brasero/brasero-2.26.3.ebuild b/app-cdr/brasero/brasero-2.26.3.ebuild
index bf4737e59a31..2a613876484d 100644
--- a/app-cdr/brasero/brasero-2.26.3.ebuild
+++ b/app-cdr/brasero/brasero-2.26.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.3.ebuild,v 1.9 2009/12/03 17:23:52 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.3.ebuild,v 1.10 2010/01/03 23:16:16 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/projects/brasero"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="beagle +cdr +css +libburn +totem +nautilus"
+IUSE="beagle +cdr +css +libburn +playlist +nautilus"
 
 COMMON_DEPEND=">=dev-libs/glib-2.16.5
 	>=x11-libs/gtk+-2.14.0
@@ -27,7 +27,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16.5
 	>=dev-libs/dbus-glib-0.7.2
 	>=app-cdr/dvd+rw-tools-7.1
 	cdr? ( virtual/cdrtools )
-	totem? ( >=dev-libs/totem-pl-parser-2.20 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.20 )
 	beagle? ( >=dev-libs/libbeagle-0.3.0 )
 	libburn? ( >=dev-libs/libburn-0.6.0
 		>=dev-libs/libisofs-0.6.12 )
@@ -50,7 +50,7 @@ pkg_setup() {
 		$(use_enable cdr cdrtools)
 		$(use_enable cdr cdrkit)
 		$(use_enable nautilus)
-		$(use_enable totem playlist)
+		$(use_enable playlist)
 		$(use_enable beagle search)
 		$(use_enable libburn libburnia)"
 
diff --git a/app-cdr/brasero/brasero-2.28.2.ebuild b/app-cdr/brasero/brasero-2.28.2.ebuild
index 4a8fae85ac83..c1cfa30ca339 100644
--- a/app-cdr/brasero/brasero-2.28.2.ebuild
+++ b/app-cdr/brasero/brasero-2.28.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.28.2.ebuild,v 1.2 2009/10/28 18:32:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.28.2.ebuild,v 1.3 2010/01/03 23:16:16 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
-EAPI=2
-GCONF_DEBUG=no
 inherit gnome2 multilib
 
 DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
@@ -12,9 +13,9 @@ HOMEPAGE="http://www.gnome.org/projects/brasero"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="beagle +cdr +css +libburn totem nautilus test"
+IUSE="beagle +cdr +css +libburn nautilus playlist test"
 
-CDEPEND=">=dev-libs/glib-2.15.6:2
+COMMON_DEPEND=">=dev-libs/glib-2.15.6:2
 	>=x11-libs/gtk+-2.16:2
 	>=gnome-base/gconf-2
 	>=media-libs/gstreamer-0.10.15
@@ -22,36 +23,43 @@ CDEPEND=">=dev-libs/glib-2.15.6:2
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libunique-1
 	>=dev-libs/dbus-glib-0.7.2
-	totem? ( >=dev-libs/totem-pl-parser-2.22 )
 	beagle? ( >=dev-libs/libbeagle-0.3 )
-	libburn? ( >=dev-libs/libburn-0.4
+	libburn? (
+		>=dev-libs/libburn-0.4
 		>=dev-libs/libisofs-0.6.4 )
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
-RDEPEND="${CDEPEND}
-	sys-apps/hal
-	app-cdr/dvd+rw-tools
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.22 )"
+RDEPEND="${COMMON_DEPEND}
 	app-cdr/cdrdao
+	app-cdr/dvd+rw-tools
+	gnome-base/gvfs
+	media-plugins/gst-plugins-meta
 	css? ( media-libs/libdvdcss )
 	cdr? ( virtual/cdrtools )
-	!libburn? ( virtual/cdrtools )
-	media-plugins/gst-plugins-meta"
-DEPEND="${CDEPEND}
+	!libburn? ( virtual/cdrtools )"
+DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
 	sys-devel/gettext
 	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1.3 )
 	test? ( app-text/docbook-xml-dtd:4.3 )"
+# eautoreconf deps
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
 
 pkg_setup() {
-	G2CONF="--disable-dependency-tracking
+	G2CONF="${G2CONF}
+		--disable-schemas-install
 		--disable-scrollkeeper
-		$(use_enable nautilus)
-		$(use_enable libburn libburnia)
+		--disable-caches
+		--disable-dependency-tracking
+		$(use_enable beagle search)
 		$(use_enable cdr cdrtools)
 		$(use_enable cdr cdrkit)
-		$(use_enable beagle search)
-		$(use_enable totem playlist)
-		--disable-caches"
+		$(use_enable libburn libburnia)
+		$(use_enable nautilus)
+		$(use_enable playlist)"
 
 	if ! use libburn; then
 		G2CONF="${G2CONF} --enable-cdrtools --enable-cdrkit"
@@ -62,5 +70,16 @@ pkg_setup() {
 
 src_install() {
 	gnome2_src_install
+
+	# Remove useless .la files
 	rm -f "${D}"/usr/$(get_libdir)/brasero/plugins/*.la
+	rm -f "${D}"/usr/$(get_libdir)/nautilus/extensions-2.0/*.la
+}
+
+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"
 }
diff --git a/app-cdr/brasero/brasero-2.28.3.ebuild b/app-cdr/brasero/brasero-2.28.3.ebuild
index 47fd02d4447a..8e38cf50ebfd 100644
--- a/app-cdr/brasero/brasero-2.28.3.ebuild
+++ b/app-cdr/brasero/brasero-2.28.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.28.3.ebuild,v 1.1 2009/12/23 04:18:28 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.28.3.ebuild,v 1.2 2010/01/03 23:16:16 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
-EAPI=2
-GCONF_DEBUG=no
 inherit gnome2 multilib
 
 DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
@@ -12,9 +13,9 @@ HOMEPAGE="http://www.gnome.org/projects/brasero"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="beagle +cdr +css +libburn totem nautilus test"
+IUSE="beagle +cdr +css +libburn nautilus playlist test"
 
-CDEPEND=">=dev-libs/glib-2.15.6:2
+COMMON_DEPEND=">=dev-libs/glib-2.15.6:2
 	>=x11-libs/gtk+-2.16:2
 	>=gnome-base/gconf-2
 	>=media-libs/gstreamer-0.10.15
@@ -22,36 +23,43 @@ CDEPEND=">=dev-libs/glib-2.15.6:2
 	>=dev-libs/libxml2-2.6
 	>=dev-libs/libunique-1
 	>=dev-libs/dbus-glib-0.7.2
-	totem? ( >=dev-libs/totem-pl-parser-2.22 )
 	beagle? ( >=dev-libs/libbeagle-0.3 )
-	libburn? ( >=dev-libs/libburn-0.4
+	libburn? (
+		>=dev-libs/libburn-0.4
 		>=dev-libs/libisofs-0.6.4 )
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
-RDEPEND="${CDEPEND}
-	sys-apps/hal
-	app-cdr/dvd+rw-tools
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )
+	playlist? ( >=dev-libs/totem-pl-parser-2.22 )"
+RDEPEND="${COMMON_DEPEND}
 	app-cdr/cdrdao
+	app-cdr/dvd+rw-tools
+	gnome-base/gvfs
+	media-plugins/gst-plugins-meta
 	css? ( media-libs/libdvdcss )
 	cdr? ( virtual/cdrtools )
-	!libburn? ( virtual/cdrtools )
-	media-plugins/gst-plugins-meta"
-DEPEND="${CDEPEND}
+	!libburn? ( virtual/cdrtools )"
+DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
 	sys-devel/gettext
 	dev-util/intltool
+	doc? ( >=dev-util/gtk-doc-1.3 )
 	test? ( app-text/docbook-xml-dtd:4.3 )"
+# eautoreconf deps
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
 
 pkg_setup() {
-	G2CONF="--disable-dependency-tracking
+	G2CONF="${G2CONF}
+		--disable-schemas-install
 		--disable-scrollkeeper
-		$(use_enable nautilus)
-		$(use_enable libburn libburnia)
+		--disable-caches
+		--disable-dependency-tracking
+		$(use_enable beagle search)
 		$(use_enable cdr cdrtools)
 		$(use_enable cdr cdrkit)
-		$(use_enable beagle search)
-		$(use_enable totem playlist)
-		--disable-caches"
+		$(use_enable libburn libburnia)
+		$(use_enable nautilus)
+		$(use_enable playlist)"
 
 	if ! use libburn; then
 		G2CONF="${G2CONF} --enable-cdrtools --enable-cdrkit"
@@ -67,3 +75,11 @@ src_install() {
 	rm -f "${D}"/usr/$(get_libdir)/brasero/plugins/*.la
 	rm -f "${D}"/usr/$(get_libdir)/nautilus/extensions-2.0/*.la
 }
+
+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"
+}
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 2e8396d078d4..33b24b3b14a7 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -12,7 +12,7 @@
 	<flag name='libburn'>Enable <pkg>dev-libs/libburn</pkg> backend</flag>
 	<flag name='cdrtools'>Enable <pkg>app-cdr/cdrtools</pkg> backend</flag>
 	<flag name='cdrkit'>Enable <pkg>app-cdr/cdrkit</pkg> backend</flag>
-	<flag name='totem'>Enable support for <pkg>media-video/totem</pkg>
-		playlists</flag>
+	<flag name='playlist'>Enable support for playlists through
+		<pkg>dev-libs/totem-pl-parser</pkg></flag>
 </use>
 </pkgmetadata>