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.

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

6 files changed, 59 insertions, 62 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/Manifest b/app-cdr/brasero/Manifest
index c6485b3cfc17..e53e5fa334f0 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,10 +1,10 @@
 DIST brasero-0.7.1.tar.bz2 1483716 RMD160 b39ece0728ff88258be1d17b81e11d493834edf2 SHA1 e1533547eb4f8ce4f0df2447ada99bab7c9ec7f7 SHA256 0ad851ba9f05c2e4ae0778e61c74aee56bbae3a4181b172009698cde03387f5c
 DIST brasero-0.8.2.tar.bz2 2670945 RMD160 63e860786cf6d5abf56488a0780e652138fab70b SHA1 c8dcdc1dad13431f78e0aa038078615da532774a SHA256 bb682eb9569ee4e5fbba4637cdf80e76723ce29d5a4a06af3f988567b2347666
-DIST brasero-0.8.3.tar.bz2 2697748 RMD160 392c7b7fc3cc894602aab1a706a8383c7fd0707c SHA1 2b1214dace988f344468967b3910212ad6af7cb0 SHA256 2c9b11bca084d1a240f6ee2ab27771cf32423960b0fc6ae9775ddf80ae056de7
 DIST brasero-0.8.4.tar.bz2 2755878 RMD160 4d6ef304130a950891733ffff34ab86c84b858f9 SHA1 f22308786c2ad66bfcdafa074a5d4a42a944982c SHA256 6cbe0367e9049f6c93d67f6d9a48b530430e52d3d48ec3ae4b9bc96b79870bba
+DIST brasero-0.9.1.tar.bz2 2872728 RMD160 8ec96d413c8aeb78ef03a06f441a52676e50283b SHA1 bc27acca4779be61adfa805df63305eb3caeaf1b SHA256 12bff9510552247a8dd54a293865bbe85a3d26eded814a92027583276642a055
 EBUILD brasero-0.7.1.ebuild 1920 RMD160 66a5f069f75082131333e8274b0c3a9f7c11b461 SHA1 2113214b6c6ebb9d0bc8496c46ad7bd2800d6c7c SHA256 24932a086da4fd228f9950ed0f61b73871f49ddca780e440a524f78edde1ac08
-EBUILD brasero-0.8.2.ebuild 2319 RMD160 73d5350e80a9f1a6fb3b0aed273a12abad4b5681 SHA1 fdbdf0073727791504e00d0f72dd4fb992d48541 SHA256 47148126c6845148b2d19c1d1f71bb0e5b2b348e4622612c82851ccd42cb42c9
-EBUILD brasero-0.8.3.ebuild 1974 RMD160 e1b520e5fe4a6761d5622996284c93fe6bd3e565 SHA1 e7f595f33eeb10b63a14f1bdc3fc7f190ec93952 SHA256 510912603f5d13fba3ad7b33d0690a15fa46d5b967fd3c0e8fdaacc87c8c5473
-EBUILD brasero-0.8.4.ebuild 1788 RMD160 91d6b7e4153551b0063b4f1bae69ab6d68c8b198 SHA1 95aee694394ec97aa73d7fb14d3bfcd8d60ac33d SHA256 cb1778fdc156c8387715e18b330c5112952f4e5215a6e20ddbc687282af4e96d
-MISC ChangeLog 8648 RMD160 8d057102b100e5bc5ed570f6837eb8e3a104f52e SHA1 3bc2320e706ea285fc16744068a852c705e82bd6 SHA256 93518740d404809c227bb3717c42271e5b18845bda8472106ab9f5c6520f4dde
-MISC metadata.xml 614 RMD160 7ca5bfee517c0a0c0f5ee648a59e3a5b5755d786 SHA1 40dcc5574f1fbae34e191b1793f8417f9e32d664 SHA256 bc69693b4601ec0968b1fbe366d3b30e581f26d51d912c43d4ffbf9e42ea79c1
+EBUILD brasero-0.8.2.ebuild 2293 RMD160 db9cf600805bc993b2a1c3ea35e6e50618f83729 SHA1 a35f861c29ed8a501b046ad77e252dd9b6c1ae1f SHA256 e64e3d420e299a8b3a910fdfbe056acedaf3e9e8fb7fdffbd44ff81ce507dd2a
+EBUILD brasero-0.8.4-r1.ebuild 1778 RMD160 92cbcc6b436501cccab59577e4eca2a30523f7eb SHA1 3f1fc85fc82f685295de417241efac2ca4ae9f4d SHA256 d4ba47ebfc243114679a24a90cecaf0be51482944856cef71cb54d550ac4e4f8
+EBUILD brasero-0.9.1.ebuild 1666 RMD160 cfde5cd25e0e7b6caa0aa587aa3ee7651ee218a9 SHA1 a17743eaa6b5e6095cdac00986d1d704c82551db SHA256 9f972c97e5e4419c296081ba94dacc663963c4ab129caffde769bdf32825c1b9
+MISC ChangeLog 9285 RMD160 6e2e6130e1145560e3b696133a425e107b06cc49 SHA1 5fb2d7a66755808432510efcf436db8ce1f42d75 SHA256 f6b197691a830f0edf3d8a3f1678d6aee1b0857c8f0816cc3e442d5de6d0f3b3
+MISC metadata.xml 834 RMD160 ea9d3c43f35db0fb8a31bebb96a6414ff72a4dbc SHA1 7d34ec02f8eb00af16c4730707d9a303e66e2f7e SHA256 d2d22014f33766c5af16f528768b597fb7643f00b7cc68fce273d0d7ea6b0394
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>