virtual/cdrtools was added to tree with app-cdr/cdrtools as default. Brasero's cdrkit and cdrtools plugins do runtime detection of which one of the two is installed, so enable both plugins, and let Brasero do the runtime detection for which one to use (depending on which of the two satisfy virtual/cdrtools for the user)

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 23 insertions, 10 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index cc1e30d8fae1..4223abcc5e35 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,16 @@
 # 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.76 2009/05/26 18:20:17 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.77 2009/05/30 14:46:45 nirbheek Exp $
+
+*brasero-2.26.2-r1 (30 May 2009)
+
+  30 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -brasero-2.26.2.ebuild, +brasero-2.26.2-r1.ebuild:
+  virtual/cdrtools was added to tree with app-cdr/cdrtools as default.
+  Brasero's cdrkit and cdrtools plugins do runtime detection of which one of
+  the two is installed, so enable both plugins, and let Brasero do the
+  runtime detection for which one to use (depending on which of the two
+  satisfy virtual/cdrtools for the user)
 
   26 May 2009; Peter Alfredsen <loki_val@gentoo.org>
   brasero-2.26.1-r2.ebuild, brasero-2.26.2.ebuild:
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index a33c2889315b..9769cfa894eb 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -7,6 +7,6 @@ DIST brasero-2.26.2.tar.bz2 3326163 RMD160 5110cd570448b9f3c4213483ee90f8f13a7dc
 EBUILD brasero-0.8.2.ebuild 2293 RMD160 db9cf600805bc993b2a1c3ea35e6e50618f83729 SHA1 a35f861c29ed8a501b046ad77e252dd9b6c1ae1f SHA256 e64e3d420e299a8b3a910fdfbe056acedaf3e9e8fb7fdffbd44ff81ce507dd2a
 EBUILD brasero-0.8.4-r1.ebuild 1772 RMD160 346fcbda5942824a054d31157c8a06a9ec12c84d SHA1 f9a890b610dd791e5b03f57e26405b039d42c645 SHA256 aea8dbcf4864ab2861926fe72aef4a88bfec2b144f323033de28e335cbf6cbd3
 EBUILD brasero-2.26.1-r2.ebuild 2141 RMD160 71afbfbaaea047df89caf69fd6075fd9af0259f8 SHA1 b5fb093721dd9376781edfe1ee6b5d0df46d84e1 SHA256 b50c635c19400024e5d6095928dc1bca9ad58c2060d6ee48db61a30c93b13966
-EBUILD brasero-2.26.2.ebuild 2151 RMD160 bcd2da2ab06250926551782c1ee39714f762bb99 SHA1 8972f6ec63e7368bf9f2373125ac353356fe5d2b SHA256 112597e0b9b0514e46af2ad0a9a9de671c9dbf3867884595dcb5b2d737f39ccf
-MISC ChangeLog 12275 RMD160 f63bbb2b51f9d60f269b421c64d5e07b58506ce6 SHA1 7eeba49e61e646052db9edb3990538c304020805 SHA256 59344f871613ddc72ba5fa4dc3f7430c1258243bf0b28a5c0228d4f8307129db
+EBUILD brasero-2.26.2-r1.ebuild 2272 RMD160 59691ff6a6c26ca385d582b02d00ff13c56fb38c SHA1 a4126189393c2b2de9774f1104efa893819e1a68 SHA256 0e20984fa22e01a2365bc4ddf4ddca7d8a338203e33a3e3b27cc51cca6f7fa6e
+MISC ChangeLog 12749 RMD160 495e54a4f915a7f20536625d25944f692fb0690c SHA1 aafb13fcfda39f640df8a940b0cfd148f2beb1ac SHA256 004210e622713ec71928e177ccf9db2a272b12639320f91aa775da92b02658f5
 MISC metadata.xml 788 RMD160 25b113e7174f36580d53f82eb65ee682386ac508 SHA1 8074edfd66062214d8a8f66c9a8454ec4c316e2f SHA256 44a4a2f86efa9c3b4be07d3f896a7dfaac39f040247a4d3d6c8292993b97a6b8
diff --git a/app-cdr/brasero/brasero-2.26.2.ebuild b/app-cdr/brasero/brasero-2.26.2-r1.ebuild
index f6e77112123b..25d8266aad4d 100644
--- a/app-cdr/brasero/brasero-2.26.2.ebuild
+++ b/app-cdr/brasero/brasero-2.26.2-r1.ebuild
@@ -1,9 +1,8 @@
 # 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.ebuild,v 1.3 2009/05/26 18:20:17 loki_val Exp $
+# $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
@@ -14,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 +libburn +totem +cdrkit cdrtools +nautilus"
+IUSE="beagle +cdr +libburn +totem +nautilus"
 
 RDEPEND=">=dev-libs/glib-2.16.5
 	>=x11-libs/gtk+-2.14.0
@@ -28,8 +27,7 @@ RDEPEND=">=dev-libs/glib-2.16.5
 	>=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 )
+	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
@@ -47,8 +45,8 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
-		$(use_enable cdrtools)
-		$(use_enable cdrkit)
+		$(use_enable cdr cdrtools)
+		$(use_enable cdr cdrkit)
 		$(use_enable nautilus)
 		$(use_enable totem playlist)
 		$(use_enable beagle search)
@@ -78,4 +76,9 @@ src_test() {
 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
 }