Beat configure.in into submission with patch from Michal Kurgan <moloh@moloh.net> of bug 258981.

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

6 files changed, 110 insertions, 143 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 0aba544d4374..cbe106d9c7f2 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,14 @@
 # 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.71 2009/05/14 09:57:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.72 2009/05/17 12:20:41 loki_val Exp $
+
+*brasero-2.26.1-r2 (17 May 2009)
+
+  17 May 2009; Peter Alfredsen <loki_val@gentoo.org> -brasero-0.7.1.ebuild,
+  -brasero-2.26.0.ebuild, -brasero-2.26.1-r1.ebuild,
+  +brasero-2.26.1-r2.ebuild, +files/brasero-2.26.1-configure.patch:
+  Beat configure.in into submission with patch from Michal Kurgan
+  <moloh@moloh.net> of bug 258981.
 
   14 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   -brasero-2.26.1.ebuild, +brasero-2.26.1-r1.ebuild:
diff --git a/app-cdr/brasero/brasero-0.7.1.ebuild b/app-cdr/brasero/brasero-0.7.1.ebuild
deleted file mode 100644
index 05413d16b2b5..000000000000
--- a/app-cdr/brasero/brasero-0.7.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.7.1.ebuild,v 1.8 2008/11/01 22:09:01 loki_val Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="beagle dbus dvd gdl libburn libnotify totem"
-
-RESTRICT="test"
-
-RDEPEND=">=x11-libs/gtk+-2.11.6
-	>=gnome-base/libgnome-2.10
-	>=gnome-base/libgnomeui-2.10
-	>=gnome-base/gnome-vfs-2.14.2
-	>=media-libs/gstreamer-0.10.6
-	>=media-libs/gst-plugins-base-0.10.6
-	>=media-plugins/gst-plugins-ffmpeg-0.10
-	>=gnome-extra/nautilus-cd-burner-2.16.0
-	>=dev-libs/libxml2-2.6
-	>=sys-apps/hal-0.5.5
-	app-cdr/cdrdao
-	virtual/cdrtools
-	gnome-base/gnome-mount
-	dbus? ( >=sys-apps/dbus-0.7.2 )
-	dvd? ( media-libs/libdvdcss
-		app-cdr/dvd+rw-tools )
-	gdl? ( >=dev-libs/gdl-0.6 )
-	totem? ( >=media-video/totem-1.4.2 )
-	beagle? ( || ( dev-libs/libbeagle ~app-misc/beagle-0.2.18 ) )
-	libnotify? ( >=x11-libs/libnotify-0.3.0 )
-	libburn? ( >=dev-libs/libburn-0.4.0
-		>=dev-libs/libisofs-0.2.8 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	gnome-base/gconf"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-caches
-		$(use_enable totem playlist)
-		$(use_enable beagle search)
-		$(use_enable dbus)
-		$(use_enable libburn libburnia)
-		$(use_enable libnotify)"
-
-	DOCS="AUTHORS ChangeLog NEWS README TODO.tasks"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "For the best experience you should have a Linux kernel >= 2.6.13"
-	elog "to enable system features such as Extended Attributes and inotify."
-	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-2.26.0.ebuild b/app-cdr/brasero/brasero-2.26.0.ebuild
deleted file mode 100644
index df2355de42c3..000000000000
--- a/app-cdr/brasero/brasero-2.26.0.ebuild
+++ /dev/null
@@ -1,70 +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.0.ebuild,v 1.2 2009/03/20 13:16:31 ranger Exp $
-
-EAPI=1
-
-GCONF_DEBUG=no
-
-inherit gnome2 eutils
-
-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="~amd64 ~ppc ~ppc64 ~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}
-	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 cdrtools|| printf %s --disable-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_test() {
-	BLING=$LINGUAS
-	unset LINGUAS
-	make check
-	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.1-r1.ebuild b/app-cdr/brasero/brasero-2.26.1-r2.ebuild
index 488de0b8a590..b1159af6e6b5 100644
--- a/app-cdr/brasero/brasero-2.26.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-2.26.1-r2.ebuild
@@ -1,12 +1,12 @@
 # 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-r1.ebuild,v 1.2 2009/05/14 15:04:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.1-r2.ebuild,v 1.1 2009/05/17 12:20:41 loki_val Exp $
 
-EAPI=1
+EAPI=2
 
 GCONF_DEBUG=no
 
-inherit gnome2 eutils
+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"
@@ -46,7 +46,7 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
-		$(use cdrtools|| printf %s --disable-cdrtools)
+		$(use_enable cdrtools)
 		$(use_enable cdrkit)
 		$(use_enable nautilus)
 		$(use_enable totem playlist)
@@ -56,8 +56,11 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+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"
diff --git a/app-cdr/brasero/files/brasero-2.26.1-configure.patch b/app-cdr/brasero/files/brasero-2.26.1-configure.patch
new file mode 100644
index 000000000000..91f7befb4112
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.26.1-configure.patch
@@ -0,0 +1,92 @@
+--- 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")
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 1ffd92345837..2e8396d078d4 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -6,7 +6,6 @@
 <use>
 	<flag name='beagle'>Enable <pkg>app-misc/beagle</pkg> support for
 		searches</flag>
-	<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>