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

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

7 files changed, 113 insertions, 62 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/Manifest b/app-cdr/brasero/Manifest
index 5e6b3d61a396..7b328742578c 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST brasero-0.8.4.tar.bz2 2755878 RMD160 4d6ef304130a950891733ffff34ab86c84b858f9 SHA1 f22308786c2ad66bfcdafa074a5d4a42a944982c SHA256 6cbe0367e9049f6c93d67f6d9a48b530430e52d3d48ec3ae4b9bc96b79870bba
 DIST brasero-2.26.3.tar.bz2 3312144 RMD160 f1f811b239f4b5edfa0a3dfde65b028c43e4906c SHA1 97273908948481ea2f97d4a12e7bf5031ca613cb SHA256 a426e4d451a271137bd1c9fe246e7631f8e98276694ce136529d66810e1dfd91
 DIST brasero-2.28.2.tar.bz2 4072165 RMD160 2c836d0096cb0457c839dfcd3d1acbf0cb641d8c SHA1 7475e8ea33eaf2bf7c9f5cb8397a30642311820a SHA256 7c3493b1f4e90b4b9a4bcf155c1cd85142bb24a038cc5baa8defdad8526650df
 DIST brasero-2.28.3.tar.bz2 4025939 RMD160 71b679e581015399851172d72b4b13259634b1a1 SHA1 8aeb042bd23d5a31f1233d0f3064213e21e8a4db SHA256 adaee8f93170d5799cddcd116a01a8687fabb86575dd5dc88f1f668bb397623c
-EBUILD brasero-0.8.4-r1.ebuild 1772 RMD160 346fcbda5942824a054d31157c8a06a9ec12c84d SHA1 f9a890b610dd791e5b03f57e26405b039d42c645 SHA256 aea8dbcf4864ab2861926fe72aef4a88bfec2b144f323033de28e335cbf6cbd3
-EBUILD brasero-2.26.3.ebuild 2180 RMD160 ffe0ce4c752c1da109d52bdc92608c988fad8452 SHA1 4e76b939513e7e5d9e4b060423da4104308da059 SHA256 eb1518ee7a1ae8c989b0ed79127d9790e6772cb3d65b70ec61432ba877118877
-EBUILD brasero-2.28.2.ebuild 1814 RMD160 ca1b9fb8065ee02690bf4002c7a9bc3764af9e87 SHA1 1802edc223fd7957d49c814ec0a0314e74ba7889 SHA256 be657dcfd33c17cc5cdc74581e638f2f415b4cb2dc56d76740083d6e04fdee84
-EBUILD brasero-2.28.3.ebuild 1903 RMD160 41112dfaa0a146db2579f429424ea5273660acd2 SHA1 4f98c701ea8f1ebaf6c1584b29237397e7403d0d SHA256 83ebbb271eb80c6d578eb6121962b231f271b6eb0a4bc29b586441a4f2bb6637
-MISC ChangeLog 14327 RMD160 32f30710b5df62a9c0e093385eb0df63dca351e9 SHA1 cac42bce94162cdc3285542165a7a8960b8e429b SHA256 047ecc483dedbdf4648306228350d2258c710ec45304f45f4ec7b3e2fa00f379
-MISC metadata.xml 788 RMD160 25b113e7174f36580d53f82eb65ee682386ac508 SHA1 8074edfd66062214d8a8f66c9a8454ec4c316e2f SHA256 44a4a2f86efa9c3b4be07d3f896a7dfaac39f040247a4d3d6c8292993b97a6b8
+EBUILD brasero-0.8.4-r1.ebuild 1769 RMD160 8aeb68ec1a79dcffafb85b2056d5ac06f56cabb4 SHA1 fe856c3e2fc8071d1bb31db0e7d951f38c7a3320 SHA256 48824d56dd52cefa74250340be95865f504aa591599a61a37deca3f1a5786121
+EBUILD brasero-2.26.3.ebuild 2178 RMD160 a3168ffe409f76125c2e4a80add8e9408aa19148 SHA1 116af25c13e9c08e7b238e96e6ca6309c74b0736 SHA256 2307bf33588ffe1b15bfc3946c0e568f1001f9e87d97e1ab9e465df6787fa136
+EBUILD brasero-2.28.2.ebuild 2244 RMD160 b4873cc4c21a5922a76d0b8ccf4cababef911806 SHA1 378d89c90028a1454c8a21691d1532fca20ecfaf SHA256 6ba68c1154280006b8d0fe30e0ab490387236c3b590ab4bd98c4dd421a8470b0
+EBUILD brasero-2.28.3.ebuild 2244 RMD160 4c0cf47ebf2c82987c1e16d811ec5b721a5d80cd SHA1 2a9b7db9aa87960b114d82b87b3b7042f9ecaae5 SHA256 09e575363c4d98bf37aa6b8f71a9b5b990f1621fc30cd7b07299af06aefb29ed
+MISC ChangeLog 14625 RMD160 f8334e172e685fe02469e96a5bf3635a1944d265 SHA1 b91a84c5e0fe4848c68c831b3cf06497ca4fcc75 SHA256 8f837f7d576bc10c809af3a671c468c6af90898160dd6835a5a07e0d7b9a604f
+MISC metadata.xml 806 RMD160 acf1127bfdc9bb5cf01aa89b69d98d3e101408d2 SHA1 b04562c28398bc5e59c08723bb9313c103350628 SHA256 4eea5937a2e358635ff976f85bb5ec699b26d251801fa942eb688f7beb5b4355
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAktBJUcACgkQ1fmVwcYIWAYk+ACfRHF7O47tb/mvJX06wqCgbqVT
+33UAoIglMgAyGbvVm1mKpOq5cqvTVjEc
+=PZw3
+-----END PGP SIGNATURE-----
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>