Clean up old revisions, move some deps around, update gst-plugins-meta message.

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

6 files changed, 15 insertions, 281 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 93288b1952d3..9681ed898ad9 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,13 @@
 # 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.79 2009/09/27 18:55:41 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.80 2009/09/27 21:09:01 eva Exp $
+
+  27 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/brasero-2.25.90-il8n.patch, -brasero-2.26.1-r2.ebuild,
+  -files/brasero-2.26.1-configure.patch, -brasero-2.26.2-r1.ebuild,
+  brasero-2.26.3.ebuild:
+  Clean up old revisions, move some deps around, update gst-plugins-meta
+  message.
 
   27 Sep 2009; Romain Perier <mrpouet@gentoo.org>
   brasero-2.26.3.ebuild:
diff --git a/app-cdr/brasero/brasero-2.26.1-r2.ebuild b/app-cdr/brasero/brasero-2.26.1-r2.ebuild
deleted file mode 100644
index 34157ef01628..000000000000
--- a/app-cdr/brasero/brasero-2.26.1-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.1-r2.ebuild,v 1.3 2009/05/26 18:20:17 loki_val Exp $
-
-EAPI=2
-
-GCONF_DEBUG=no
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
-HOMEPAGE="http://www.gnome.org/projects/brasero"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="beagle +libburn +totem cdrkit cdrtools +nautilus"
-
-RDEPEND=">=dev-libs/glib-2.16.5
-	>=x11-libs/gtk+-2.14.0
-	>=media-libs/gstreamer-0.10.15
-	>=media-libs/gst-plugins-base-0.10.15
-	>=media-plugins/gst-plugins-ffmpeg-0.10
-	>=dev-libs/libxml2-2.6
-	sys-apps/hal
-	gnome-base/gvfs
-	>=app-cdr/cdrdao-1.2.2-r3
-	>=dev-libs/dbus-glib-0.7.2
-	media-libs/libdvdcss
-	>=app-cdr/dvd+rw-tools-7.1
-	cdrtools? ( >=app-cdr/cdrtools-2.01.01_alpha57 )
-	cdrkit? ( >=app-cdr/cdrkit-1.1.9 )
-	totem? ( >=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 )
-	nautilus? ( >=gnome-base/nautilus-2.24.2 )"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	gnome-base/gconf"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable cdrtools)
-		$(use_enable cdrkit)
-		$(use_enable nautilus)
-		$(use_enable totem playlist)
-		$(use_enable beagle search)
-		$(use_enable libburn libburnia)"
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}/${P}-configure.patch"
-	eautoreconf
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-src_test() {
-	BLING=$LINGUAS
-	unset LINGUAS
-	emake check || die "emake check failed"
-	export LINGUAS=$BLING
-	unset BLING
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Brasero can use all audio files handled by the local Gstreamer installation"
-}
diff --git a/app-cdr/brasero/brasero-2.26.2-r1.ebuild b/app-cdr/brasero/brasero-2.26.2-r1.ebuild
deleted file mode 100644
index 25d8266aad4d..000000000000
--- a/app-cdr/brasero/brasero-2.26.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.2-r1.ebuild,v 1.1 2009/05/30 14:46:45 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 eutils autotools
-
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
-HOMEPAGE="http://www.gnome.org/projects/brasero"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="beagle +cdr +libburn +totem +nautilus"
-
-RDEPEND=">=dev-libs/glib-2.16.5
-	>=x11-libs/gtk+-2.14.0
-	>=media-libs/gstreamer-0.10.15
-	>=media-libs/gst-plugins-base-0.10.15
-	>=media-plugins/gst-plugins-ffmpeg-0.10
-	>=dev-libs/libxml2-2.6
-	sys-apps/hal
-	gnome-base/gvfs
-	>=app-cdr/cdrdao-1.2.2-r3
-	>=dev-libs/dbus-glib-0.7.2
-	media-libs/libdvdcss
-	>=app-cdr/dvd+rw-tools-7.1
-	cdr? ( virtual/cdrtools )
-	totem? ( >=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 )
-	nautilus? ( >=gnome-base/nautilus-2.24.2 )"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	gnome-base/gconf"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable cdr cdrtools)
-		$(use_enable cdr cdrkit)
-		$(use_enable nautilus)
-		$(use_enable totem playlist)
-		$(use_enable beagle search)
-		$(use_enable libburn libburnia)"
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}/${PN}-2.26.1-configure.patch"
-	eautoreconf
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-src_test() {
-	BLING=$LINGUAS
-	unset LINGUAS
-	emake check || die "emake check failed"
-	export LINGUAS=$BLING
-	unset BLING
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog "Brasero can use all audio files handled by the local Gstreamer installation"
-	if ! use cdr && ! use libburn; then
-		elog
-		ewarn "You have disabled all burning backends for Brasero"
-		ewarn "Brasero can now do nothing at all. Probably not what you want."
-	fi
-}
diff --git a/app-cdr/brasero/brasero-2.26.3.ebuild b/app-cdr/brasero/brasero-2.26.3.ebuild
index e6e7ddde86ee..e1901c4d66b5 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
 # 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.2 2009/09/27 18:55:41 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.3.ebuild,v 1.3 2009/09/27 21:09:01 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -13,14 +13,13 @@ 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 +totem +nautilus"
 
 COMMON_DEPEND=">=dev-libs/glib-2.16.5
 	>=x11-libs/gtk+-2.14.0
 	>=media-libs/gstreamer-0.10.15
 	>=media-libs/gst-plugins-base-0.10.15
 	>=media-plugins/gst-plugins-ffmpeg-0.10
-	media-plugins/gst-plugins-meta
 	>=dev-libs/libxml2-2.6
 	sys-apps/hal
 	gnome-base/gvfs
@@ -35,6 +34,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16.5
 	nautilus? ( >=gnome-base/nautilus-2.24.2 )
 	gnome-base/gconf"
 RDEPEND="${COMMOND_DEPEND}
+	media-plugins/gst-plugins-meta
 	css? ( media-libs/libdvdcss )"
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
@@ -67,7 +67,10 @@ src_prepare() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	elog "Brasero can use all audio files handled by the local Gstreamer installation"
+	elog
+	elog "If ${PN} doesn't handle some music or video format, please check"
+	elog "your USE flags on media-plugins/gst-plugins-meta"
+
 	if ! use cdr && ! use libburn; then
 		elog
 		ewarn "You have disabled all burning backends for Brasero"
diff --git a/app-cdr/brasero/files/brasero-2.25.90-il8n.patch b/app-cdr/brasero/files/brasero-2.25.90-il8n.patch
deleted file mode 100644
index c3699c86ce6c..000000000000
--- a/app-cdr/brasero/files/brasero-2.25.90-il8n.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- trunk/libbrasero-media/brasero-media.c	2009/01/17 20:49:29	1775
-+++ trunk/libbrasero-media/brasero-media.c	2009/02/04 19:57:46	1873
-@@ -514,13 +514,14 @@
- void
- brasero_media_library_start (void)
- {
--	if (default_monitor)
-+	if (default_monitor) {
-+		g_object_ref (default_monitor);
- 		return;
-+	}
- 
- 	/* Initialize i18n */
- 	bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
- 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
--	textdomain (GETTEXT_PACKAGE);
- 
- 	/* Initialize icon-theme */
- 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
diff --git a/app-cdr/brasero/files/brasero-2.26.1-configure.patch b/app-cdr/brasero/files/brasero-2.26.1-configure.patch
deleted file mode 100644
index 91f7befb4112..000000000000
--- a/app-cdr/brasero/files/brasero-2.26.1-configure.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.in.orig	2009-05-10 18:37:25.000000000 -0600
-+++ configure.in	2009-05-10 18:49:21.000000000 -0600
-@@ -196,7 +196,8 @@
- NAUTILUS_REQUIRED=2.22.2
- 
- AC_ARG_ENABLE(nautilus,
--			[  --enable-nautilus		Build Nautilus extension [[default = yes]]],,
-+			[  --enable-nautilus		Build Nautilus extension [[default = yes]]],
-+			[enable_nautilus=$enableval],
- 			[enable_nautilus="yes"])
- 
- if test x"$enable_nautilus" = "xyes"; then
-@@ -223,7 +224,8 @@
- LIBISOFS_REQUIRED=0.6.4
- 
- AC_ARG_ENABLE(libburnia,
--			[  --enable-libburnia		Build libburnia plugins [[default = yes]]],,
-+			[  --enable-libburnia		Build libburnia plugins [[default = yes]]],
-+			[enable_libburnia=$enableval],
- 			[enable_libburnia="yes"])
- 
- if test x"$enable_libburnia" = "xyes"; then
-@@ -244,7 +246,8 @@
- 
- dnl **************** check for cdrtools **********************
- AC_ARG_ENABLE(cdrtools,
--			[  --enable-cdrtools		Build cdrtools plugins [[default = yes]]],,
-+			[  --enable-cdrtools		Build cdrtools plugins [[default = yes]]],
-+			[build_cdrtools=$enableval],
- 			[build_cdrtools="yes"])
- 
- if test x"$build_cdrtools" = "xyes"; then
-@@ -256,7 +259,8 @@
- 
- dnl **************** check for cdrkit ************************
- AC_ARG_ENABLE(cdrkit,
--			[  --enable-cdrkit		Build cdrkit plugins [[default = yes]]],,
-+			[  --enable-cdrkit		Build cdrkit plugins [[default = yes]]],
-+			[build_cdrkit=$enableval],
- 			[build_cdrkit="yes"])
- 
- if test x"$build_cdrkit" = "xyes"; then
-@@ -291,7 +295,8 @@
- BEAGLE_REQUIRED=0.3.0
- 
- AC_ARG_ENABLE(search,
--			[  --enable-search		build search pane (if beagle is available) [[default = yes]]],,
-+			[  --enable-search		build search pane (if beagle is available) [[default = yes]]],
-+			[enable_search=$enableval],
- 			[enable_search="yes"])
- 
- if test x"$enable_search" = "xyes"; then
-@@ -313,7 +318,8 @@
- TOTEM_REQUIRED=2.22.0
- 
- AC_ARG_ENABLE(playlist,
--			[  --enable-playlist		build playlist pane (if totem is available)[[default = yes]]],,
-+			[  --enable-playlist		build playlist pane (if totem is available)[[default = yes]]],
-+			[enable_playlist=$enableval],
- 			[enable_playlist="yes"])
- 
- if test x"$enable_playlist" = "xyes"; then
-@@ -334,7 +340,8 @@
- dnl ****************check for preview (optional)**************
- GSTREAMER_MODULE_REQUIRED=0.10.0
- AC_ARG_ENABLE(preview,
--			[  --enable-preview		build preview pane [[default = yes]]],,
-+			[  --enable-preview		build preview pane [[default = yes]]],
-+			[enable_preview=$enableval],
- 			[enable_preview="yes"])
- 
- if test x"$enable_preview" = "xyes"; then
-@@ -354,7 +361,8 @@
- 
- dnl ****************check for inotify (optional)**************
- AC_ARG_ENABLE(inotify,
--			[  --enable-inotify		use inotify [[default = yes]]],,
-+			[  --enable-inotify		use inotify [[default = yes]]],
-+			[enable_inotify=$enableval],
- 			[enable_inotify="yes"])
- 
- if test x"$enable_inotify" = "xyes"; then
-@@ -364,7 +372,8 @@
- 
- dnl ****** Update mime, desktop and icon caches *******
- AC_ARG_ENABLE(caches,
--			[  --enable-caches	Run update-* to update mime, desktop and icon caches when installing [[default = yes]]],,
-+			[  --enable-caches	Run update-* to update mime, desktop and icon caches when installing [[default = yes]]],
-+			[enable_caches=$enableval],
- 			[enable_caches="yes"])
- 
- AM_CONDITIONAL(UPDATE_CACHES, test x"$enable_caches" = "xyes")