4 files changed, 24 insertions, 127 deletions
diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 2d229769d91e..90e0fffb3b2e 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,10 @@
 # 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.47 2008/09/28 10:19:15 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.48 2008/10/01 09:35:06 loki_val Exp $
+
+  01 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> -brasero-0.8.0.ebuild,
+  -brasero-0.8.1.ebuild, brasero-0.8.2.ebuild:
+  Fix bug 239151. That damn GTK_DISABLE_DEPRECATED got us again.
 
 *brasero-0.8.2 (28 Sep 2008)
 
diff --git a/app-cdr/brasero/brasero-0.8.0.ebuild b/app-cdr/brasero/brasero-0.8.0.ebuild
deleted file mode 100644
index 0d1cadc25aab..000000000000
--- a/app-cdr/brasero/brasero-0.8.0.ebuild
+++ /dev/null
@@ -1,62 +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.8.0.ebuild,v 1.1 2008/07/16 12:33:41 loki_val Exp $
-
-EAPI=1
-
-GCONF_DEBUG=no
-
-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 +dvd gdl +libburn totem"
-
-RDEPEND=">=dev-libs/glib-2.15.6
-	>=x11-libs/gtk+-2.12.0
-	>=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
-	>=dev-libs/libxml2-2.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 )
-	gdl? ( >=dev-libs/gdl-0.6 )
-	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 )"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable totem playlist)
-		$(use_enable beagle search)
-		$(use_enable libburn libburnia)"
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-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.1.ebuild b/app-cdr/brasero/brasero-0.8.1.ebuild
deleted file mode 100644
index 1a2c6f1efa0a..000000000000
--- a/app-cdr/brasero/brasero-0.8.1.ebuild
+++ /dev/null
@@ -1,62 +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.8.1.ebuild,v 1.1 2008/08/21 20:11:25 ford_prefect Exp $
-
-EAPI=1
-
-GCONF_DEBUG=no
-
-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 +dvd gnome +libburn totem"
-
-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
-	>=dev-libs/libxml2-2.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 )
-	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 )"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable totem playlist)
-		$(use_enable beagle search)
-		$(use_enable libburn libburnia)
-		$(use_enable gnome gnome2)"
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-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.2.ebuild b/app-cdr/brasero/brasero-0.8.2.ebuild
index 92c3912911d5..f5e9b7c0cb07 100644
--- a/app-cdr/brasero/brasero-0.8.2.ebuild
+++ b/app-cdr/brasero/brasero-0.8.2.ebuild
@@ -1,12 +1,12 @@
 # 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.8.2.ebuild,v 1.1 2008/09/28 10:19:15 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-0.8.2.ebuild,v 1.2 2008/10/01 09:35:06 loki_val Exp $
 
 EAPI=1
 
 GCONF_DEBUG=no
 
-inherit gnome2
+inherit gnome2 autotools
 
 DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
 HOMEPAGE="http://www.gnome.org/projects/brasero"
@@ -53,6 +53,23 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e '/-DGTK_DISABLE_DEPRECATED/d' \
+		src/Makefile.am \
+		|| die "404"
+
+	eautoreconf
+
+        # Prevent scrollkeeper access violations
+        gnome2_omf_fix
+
+        # Run libtoolize
+        elibtoolize ${ELTCONF}
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	echo