Fix bug 239151. That damn GTK_DISABLE_DEPRECATED got us again.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64

5 files changed, 26 insertions, 133 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/Manifest b/app-cdr/brasero/Manifest
index a9f37f76420a..1a0883881fda 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,10 +1,6 @@
 DIST brasero-0.7.1.tar.bz2 1483716 RMD160 b39ece0728ff88258be1d17b81e11d493834edf2 SHA1 e1533547eb4f8ce4f0df2447ada99bab7c9ec7f7 SHA256 0ad851ba9f05c2e4ae0778e61c74aee56bbae3a4181b172009698cde03387f5c
-DIST brasero-0.8.0.tar.bz2 2243365 RMD160 eb15a510d370eb1903bf2c51bbd610482b469fa2 SHA1 d0e39523dd0c311febbadeed009240249c125b41 SHA256 3542d4cecc4675e8cdf0a1f84a4ef4284f9e8e7f6377df958a6cd15fdcf56dc7
-DIST brasero-0.8.1.tar.bz2 2391065 RMD160 fb1cbc2f666741ca50ce7855f3ea566376bb5647 SHA1 372926080b1ac46f830889b7bcecaa0b9551d7b3 SHA256 eb9df8e3cc9f616a675425d3e7a8bff04f624eb25be87a3bec999c6a025a8e6d
 DIST brasero-0.8.2.tar.bz2 2670945 RMD160 63e860786cf6d5abf56488a0780e652138fab70b SHA1 c8dcdc1dad13431f78e0aa038078615da532774a SHA256 bb682eb9569ee4e5fbba4637cdf80e76723ce29d5a4a06af3f988567b2347666
 EBUILD brasero-0.7.1.ebuild 1900 RMD160 e6022eecb1a264779abdf5ab1ba43fcbeecc80bf SHA1 3a3a29b7f78185ba791b87b22acb5d537a52756a SHA256 c668debba84e154a0f6fceea9efbd1b67a821e0b69a3839c3c3d4e03ee52bae1
-EBUILD brasero-0.8.0.ebuild 1661 RMD160 3e08aa4a241aec59a58b0f2688c1f3c4890287be SHA1 22c03e7f69c3b2d70f1aca2a25718e38387fe5fc SHA256 9ca933885343820e514a1415a9273725568e7bcc9ace07217efd6731cc823a18
-EBUILD brasero-0.8.1.ebuild 1679 RMD160 2296078dda72037fec7bc593047eb11101a87b58 SHA1 08e75180cd87e07cc38002e9ef5be682940115c3 SHA256 e39102d5eb859bba94cc0d533828b10b5fd8bf827578c803b651698d929939ad
-EBUILD brasero-0.8.2.ebuild 1675 RMD160 75526ce1684baee24aa677fecdb3800dca77fc15 SHA1 ac0680bd9e4ac179b0e03b6c3a2ce30832eb3cdd SHA256 b77e5df39eb5a29fe965b57320b0ce3998ad42f4cc9aad4b22d27615378c6ee6
-MISC ChangeLog 7213 RMD160 29f19babf56cee6a66212f39527fb5629f74275f SHA1 28370067bd76a33d2d35c9ae33f4c867b7ea0bb8 SHA256 bbc1b40decf30098e3f35d726fc2f9604d55e39c80e41424c4845758a1a769c1
+EBUILD brasero-0.8.2.ebuild 1953 RMD160 8a4c745b39a03cc474f3eb50ef43a8d98aaf7302 SHA1 cb547434e1f01564743d5a9957b424685b22a895 SHA256 c8eab587c105b34be30e6b857d4701022fde4a999c40e28ef0d37f1fcf2eaec8
+MISC ChangeLog 7402 RMD160 facc973d6b000c0fb8c3914c2601c886cc96a2ea SHA1 0a376d437b9fe62919a259d895e21d393afae978 SHA256 bad38120eaa3e5befcc9c558a1f2a702fc7cdb52e92b3aac5f6e1bc3dec5668d
 MISC metadata.xml 614 RMD160 7ca5bfee517c0a0c0f5ee648a59e3a5b5755d786 SHA1 40dcc5574f1fbae34e191b1793f8417f9e32d664 SHA256 bc69693b4601ec0968b1fbe366d3b30e581f26d51d912c43d4ffbf9e42ea79c1
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