Bump to 0.9.1, bug 254838. libgnome is no longer a dependency. W.r.t. bug 248275, add nautilus useflag. Add cdrtools and cdrkit use flags, since they are now selectable, do not make them default on. IUSE="+libburn", libburn is now used whenever possible, which should be 90% of cases, according to upstream. Backport these changes to brasero-0.8.4-r1 and punt old versions.

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

5 files changed, 53 insertions, 56 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index d4729d8501fa..515b5fd7be11 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-cdr/brasero
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.58 2008/12/16 01:05:44 loki_val Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.59 2009/01/23 17:00:41 loki_val Exp $
+
+*brasero-0.9.1 (23 Jan 2009)
+*brasero-0.8.4-r1 (23 Jan 2009)
+
+  23 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> metadata.xml,
+  brasero-0.8.2.ebuild, -brasero-0.8.3.ebuild, -brasero-0.8.4.ebuild,
+  +brasero-0.8.4-r1.ebuild, +brasero-0.9.1.ebuild:
+  Bump to 0.9.1, bug 254838. libgnome is no longer a dependency. W.r.t. bug
+  248275, add nautilus useflag. Add cdrtools and cdrkit use flags, since
+  they are now selectable, do not make them default on. IUSE="+libburn",
+  libburn is now used whenever possible, which should be 90% of cases,
+  according to upstream. Backport these changes to brasero-0.8.4-r1 and punt
+  old versions.
 
 *brasero-0.8.4 (16 Dec 2008)
 
diff --git a/app-cdr/brasero/brasero-0.8.2.ebuild b/app-cdr/brasero/brasero-0.8.2.ebuild
index 0aeff9029c65..fd7ceab700f1 100644
--- a/app-cdr/brasero/brasero-0.8.2.ebuild
+++ b/app-cdr/brasero/brasero-0.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-0.8.2.ebuild,v 1.8 2008/11/26 16:38:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.8.2.ebuild,v 1.9 2009/01/23 17:00:41 loki_val Exp $
 
 EAPI=1
 
@@ -69,11 +69,11 @@ src_unpack() {
 
 	eautoreconf
 
-        # Prevent scrollkeeper access violations
-        gnome2_omf_fix
+	# Prevent scrollkeeper access violations
+	gnome2_omf_fix
 
-        # Run libtoolize
-        elibtoolize ${ELTCONF}
+	# Run libtoolize
+	elibtoolize ${ELTCONF}
 }
 
 src_test() {
diff --git a/app-cdr/brasero/brasero-0.8.4.ebuild b/app-cdr/brasero/brasero-0.8.4-r1.ebuild
index e3c3e332a6cb..0f415921b222 100644
--- a/app-cdr/brasero/brasero-0.8.4.ebuild
+++ b/app-cdr/brasero/brasero-0.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-0.8.4.ebuild,v 1.1 2008/12/16 01:05:44 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.8.4-r1.ebuild,v 1.1 2009/01/23 17:00:41 loki_val Exp $
 
 EAPI=1
 
@@ -14,12 +14,10 @@ HOMEPAGE="http://www.gnome.org/projects/brasero"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="beagle +dvd gnome +libburn totem"
+IUSE="beagle gnome +libburn totem cdrkit cdrtools +nautilus"
 
 RDEPEND=">=dev-libs/glib-2.15.6
 	>=x11-libs/gtk+-2.12.0
-	gnome? ( >=gnome-base/libgnome-2.22.0
-		>=gnome-base/libgnomeui-2.22.0 )
 	>=media-libs/gstreamer-0.10.15
 	>=media-libs/gst-plugins-base-0.10.15
 	>=media-plugins/gst-plugins-ffmpeg-0.10
@@ -27,14 +25,18 @@ RDEPEND=">=dev-libs/glib-2.15.6
 	sys-apps/hal
 	gnome-base/gvfs
 	app-cdr/cdrdao
-	virtual/cdrtools
 	>=dev-libs/dbus-glib-0.7.2
-	dvd? ( media-libs/libdvdcss
-		app-cdr/dvd+rw-tools )
+	media-libs/libdvdcss
+	app-cdr/dvd+rw-tools
+	cdrtools? ( app-cdr/cdrtools )
+	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 )
 	beagle? ( >=dev-libs/libbeagle-0.3.0 )
 	libburn? ( >=dev-libs/libburn-0.4.0
-		>=dev-libs/libisofs-0.6.4 )"
+		>=dev-libs/libisofs-0.6.4 )
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
@@ -46,6 +48,9 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
+		$(use cdrtools|| printf %s --disable-cdrtools)
+		$(use_enable cdrkit)
+		$(use_enable nautilus)
 		$(use_enable totem playlist)
 		$(use_enable beagle search)
 		$(use_enable libburn libburnia)
@@ -61,11 +66,3 @@ src_test() {
 	export LINGUAS=$BLING
 	unset BLING
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "To use the libburn backend you need to add USE=libburn and activate"
-	elog "it in gconf editor. Note that the default backend is cdrtools/cdrkit."
-	echo
-}
diff --git a/app-cdr/brasero/brasero-0.8.3.ebuild b/app-cdr/brasero/brasero-0.9.1.ebuild
index 55db3bbbcef2..fae497e53e0c 100644
--- a/app-cdr/brasero/brasero-0.8.3.ebuild
+++ b/app-cdr/brasero/brasero-0.9.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-0.8.3.ebuild,v 1.4 2008/11/30 09:21:07 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.9.1.ebuild,v 1.1 2009/01/23 17:00:41 loki_val Exp $
 
 EAPI=1
 
 GCONF_DEBUG=no
 
-inherit gnome2 autotools
+inherit gnome2
 
 DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
 HOMEPAGE="http://www.gnome.org/projects/brasero"
@@ -14,12 +14,10 @@ HOMEPAGE="http://www.gnome.org/projects/brasero"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="beagle +dvd gnome +libburn totem"
+IUSE="beagle +libburn totem cdrkit cdrtools +nautilus"
 
 RDEPEND=">=dev-libs/glib-2.15.6
-	>=x11-libs/gtk+-2.12.0
-	gnome? ( >=gnome-base/libgnome-2.22.0
-		>=gnome-base/libgnomeui-2.22.0 )
+	>=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
@@ -27,14 +25,16 @@ RDEPEND=">=dev-libs/glib-2.15.6
 	sys-apps/hal
 	gnome-base/gvfs
 	app-cdr/cdrdao
-	virtual/cdrtools
 	>=dev-libs/dbus-glib-0.7.2
-	dvd? ( media-libs/libdvdcss
-		app-cdr/dvd+rw-tools )
+	media-libs/libdvdcss
+	app-cdr/dvd+rw-tools
+	cdrtools? ( app-cdr/cdrtools )
+	cdrkit? ( app-cdr/cdrkit )
 	totem? ( >=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 )"
+		>=dev-libs/libisofs-0.6.4 )
+	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
@@ -46,24 +46,16 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
+		$(use cdrtools|| printf %s --disable-cdrtools)
+		$(use_enable cdrkit)
+		$(use_enable nautilus)
 		$(use_enable totem playlist)
 		$(use_enable beagle search)
-		$(use_enable libburn libburnia)
-		$(use_enable gnome gnome2)"
+		$(use_enable libburn libburnia)"
 
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	for i in am in
-	do
-		find . -type f -name "Makefile.${type}" -exec \
-			sed -i -e '/DISABLE_DEPRECATED/d' '{}' \; || die "404"
-	done
-}
-
 src_test() {
 	BLING=$LINGUAS
 	unset LINGUAS
@@ -71,11 +63,3 @@ src_test() {
 	export LINGUAS=$BLING
 	unset BLING
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "To use the libburn backend you need to add USE=libburn and activate"
-	elog "it in gconf editor. Note that the default backend is cdrtools/cdrkit."
-	echo
-}
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 28da7dd27a10..64229ea8e1c2 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -8,7 +8,10 @@
 	<flag name='gdl'>Enable gdl support for customisable GUI</flag>
 	<flag name='gnome'>Enable integration with the <pkg>gnome-base/gnome</pkg>
 		desktop (help, session management, etc.)</flag>
+	<flag name='nautilus'> Build <pkg>gnome-base/nautilus</pkg> extension</flag>
 	<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>
 </use>