Drop old (#508854)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

9 files changed, 14 insertions, 605 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 3b6207e3892d..95aba8101060 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.165 2014/09/24 11:28:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.166 2014/11/13 10:45:26 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -brasero-2.32.1-r1.ebuild,
+  -files/brasero-2.32.0-build-plugins-against-local-library.patch,
+  -files/brasero-2.32.1-fix-size.patch,
+  -files/brasero-2.32.1-underlinking.patch,
+  -files/brasero-2.32.1-useless-dialog.patch,
+  -files/brasero-2.32.1-warning-silenced.patch,
+  -files/brasero-2.32.1-warning-silenced2.patch:
+  Drop old (#508854)
 
 *brasero-3.11.4 (24 Sep 2014)
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 8f119354eaf7..da3307f65c21 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,24 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX brasero-2.32.0-build-plugins-against-local-library.patch 15544 SHA256 895d4ff2c349ddff6a8fcbc9d366808a3fed2c3aa54bd4bb7b717505801c3176 SHA512 046dbe903f6af5b08f0ac9211ce3325d11082c54f7af68476bed10b82f3480775346da99f34b4d0ee5a81589e66c512e69a3f32106040782ba08971fe85987e6 WHIRLPOOL 6d9bdff897ef51d1d13af99b694cc146c15d9ac315d4b83808f983becd214dc5f578a304f3a4f5a5fee8468d7a71000ef48436d82ad92b1f26455f5648a19db3
-AUX brasero-2.32.1-fix-size.patch 2244 SHA256 6cbedaa3e1ceb1140961afe925792b813a0ca5f894256c9330f756268c43d566 SHA512 5024ea4c499f5055ebaf685e518b3eb2aec8f57cff9c3593f1b0810c3ec3c4ca126f6b2dde2161a71955d8f48c45515bc0900d2bd785fc96534649b69d0fff14 WHIRLPOOL 26064f0dd93b460bed53a0e79a762ac8dbd72af489f805e6275f04ec9cdbf875ea9d863b6907e920505cf262ea305439469f89a8c74766f6a02c95628c030b0d
-AUX brasero-2.32.1-underlinking.patch 1144 SHA256 72ed1ac03ebd454e895ec1f12755950fd69a95bbe9f98f92b262215112d96165 SHA512 53796638edd1d888c82fd1b295e919275b7224b140a59a1c5614ee092784d92310e98540d99bd1bd71cfea86db0f05717a4ab1af2f83a7fb160375ec3196da06 WHIRLPOOL 8edf230310a47e8fa74c6694f1400847ddc4fd924e91eedb6a862b44be355ef8044e1798f358c40674c8eb9b95c0f7ce2669c6547fa270708c53dc465142eb95
-AUX brasero-2.32.1-useless-dialog.patch 2498 SHA256 0be1c75fea2e0d9b72130c26687338f33061a96202c99fcf85c06e2749560912 SHA512 83364ed4aced2c7a72ea40dbd32f4e7aaa9ccd7541b232977dde19c8b331c23d1cf088ce8954b5213fc9d5646e1604ec3cd7e5a749aebe7351dcc68a7455d358 WHIRLPOOL 7b7b41e4732e951e47ce1d1bd785c7b5af14b29d1d74e35a5eb117181b355505e32ea009a84c4d8426989fb4854e0b047db597d75bfd9af91905527c68c41182
-AUX brasero-2.32.1-warning-silenced.patch 690 SHA256 899ca8171a751332957ec21c3028ebc4a4d303bda30699d57cf0f6607bd2ae58 SHA512 b5eaa2983d429f5a3859380630671e939e663a272e2ba4c53e1a564125a1d4e0deeae4bf87a4ac3c9499d5c2dd6fbe2e9ee55f468f39720e3dbbf467046d184f WHIRLPOOL 25350037165df534a3ee34fbd2852deb736c3e55fead219eff0dc1280bf397d864a8e6c6b0ab0392c9d45a4dea5f03f65ead6d7947164085232d794ed8ac682f
-AUX brasero-2.32.1-warning-silenced2.patch 616 SHA256 cb435ec18ba02e445ebbf55c5cee16ce078d0e6e762e5821222e911a13ce5f5d SHA512 4369db4c27e5756be36a2be036428a25c6d73c7427aaebd8bc830f1308ca778fb46f4cfeaeb0e2efcfc62488542fa458a9a39f07e349e86594a4d41494ce2189 WHIRLPOOL aaae12f221af00cdc47072706ad98fc761452d833e53505e8f1a1ec6b8f797d18f2e1deaa3821847bdd71c6334c44ffe405659341923b88aa63ad5cc70e371f2
-DIST brasero-2.32.1.tar.bz2 4530933 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b SHA512 ebd08f5ff21685a853c9b339b19b51ffe62e6050a6373883dee1266b45b490308ea5a25a1167a1ea48b89ff64625114a95c6a9f5f42d0d6defc2edd9c0295f25 WHIRLPOOL b01b935ac042bfa129c2245b0fb351ef4ed7c18e5e230cdf8a058073aa4fc28e78137f2bbae173784dc48b440153dcf21def3757dcd8f52065b3065bb42aa103
 DIST brasero-3.11.3.tar.xz 3362000 SHA256 0b6fa557d67845b7a4f9978b565a6769e1a023c397a73f2891a8f1c7c55e2d4c SHA512 ac4e5948c27b0925a0ac9ae1a39afbadd7075cb221ea748750b0c1400489a2dac82fc96f317ab82c1243b29346f4ec889f2b0819e7c2459d79bb771dd9129813 WHIRLPOOL 63593dd8fc7b03fab29dfa3e63224012a80310dc909c165bf7cefc7e967f8f1f3cbbfb0c8fbc24fe8ab944814ccebe4915a7ced57ac8a1e5b60e6dff9e403f67
 DIST brasero-3.11.4.tar.xz 3605076 SHA256 bd02eb845de0a91a4acaf941d4ea7b7584d073894270f121781692dc34eb9693 SHA512 5c7014022bcb0494d5b7d67e468cb54df9945ba4cc35ad835c39bdbfacc21cc5ab2bb466e40973abc64ee12386dae5ef71a1401fea4169a97652b763d9ad36b7 WHIRLPOOL bec6972c55d7aacbe67aa00a44f0a816d6ddcd68c5eaf0ecbd415516b2129ecc41e7c97a6ac52a55b7ba6585c430f1e683d18aa1e1bddf001ed9ce9b4745e6b9
-EBUILD brasero-2.32.1-r1.ebuild 3547 SHA256 cff1cead00536c2310eb337d602700690bde16fb5f7c3cb28eabf61588fa5fe7 SHA512 f9dd5669825d2a63466f79ecfeae1ebc1ad44e26192969b1bf5fdfff07792efb566dadc317c26fc6787efff8d70bd1c52a9f8a35e726f63600cc30eeecfa0f9d WHIRLPOOL e2a346c9b84e3f56f70b0dde77999817e2c09445a1d86e8eb978b5411c82137fe1050901283d9646c3f5df056446b4ea2976642aeae83e7b2849abc611518df5
 EBUILD brasero-3.11.3.ebuild 2414 SHA256 2c4618c45582c1c8ea23b80f9bcc9c7875d9333d3251875689c339c8b41f4601 SHA512 fd232ae6aca10c074a786bc975cb2c2548fa8dfd10a5b6008b7ee2f7431026fc40407256d213d17814dc7a52f2c671fbe8c34d7264563a0c1d50f70abfb60d9c WHIRLPOOL b19349e6a2ad1b411234c3a6ac6cee63f2ed3c2b93baa0a4b618fa8af8f36f80d23998bd5cbf2e0dca588f630f0cf45b90b01d09edcdb17c4b4cfbf8ea5fe1fb
 EBUILD brasero-3.11.4.ebuild 2202 SHA256 f03aec341197c791fa5d0e9b6ecca2b72c14d362829ef2efc81a8717e2129413 SHA512 35dc2af48d6a59ecd5c17ff08f8a1285add5e77f0281398d23e7586c85c603675f886b9ea73187c0427a69ce540a0fde69ddedefb66ce1416c21e1fac835e758 WHIRLPOOL 3e5832cc4578cd0dc6e429c06df2f954c2f23205a257cbf29225c5db8367819a42380b1372930e0e45c75c6fe88972660eea95e1a743a9ea8924b04fa74d5eb9
-MISC ChangeLog 26355 SHA256 7c9a6f45e9ad25fa7a3597497b947755a3cbb1547f771c387ef60c87ecaa98d3 SHA512 5a217ee20be43b9c05025378208c48a796fc7bb3548b1164a19521acfc566b2a2a62ccca9bf6c8edf46d4a1ba75447787e4dfdd7e58826684e65a51aa138660f WHIRLPOOL d5bda0e438ec818e91ffaf145fe1027721ffeda1f88b276421bee7637370918716aacf50ebb11bcbbb49dfd8b4af02a4125415fd7bc82144ee1b1537c186522f
+MISC ChangeLog 26744 SHA256 7312d5f041633cb8e12d77e2e843399d9d8d4baeb5598b1f8a63fb4f96045b57 SHA512 ffeea58909d8d6d9abb66b035ee578d40dd0bc262f94c6c9485632ef6079503088a2aa6441187d84abce0264fe9b34093981a8475723771c764cc07ecd2c29bd WHIRLPOOL 9cc9aeee9856a6334381f4b7e67aa55d70a68b6a7081d3e54dedb4972d139ec6918fb3fc09edfde3369b31f450e6d9b6b57f4e11c8d3c3d1097d09d11c1b8581
 MISC metadata.xml 701 SHA256 a71510c2b1630ee022e0bc2d7622cd5023fbe4c573feb31d20ee03cb0bc2e5d6 SHA512 fe7e6a04fd4c1ad63832256b331fde2370456fe9eb02ba152de7e2771aa7d90f1aaa8fcc3a92fac1f5cd07a07af10b5164f35da3cb36479fbe489b0b645a1917 WHIRLPOOL b1d52e712520514429c80494c3a57173ec19dbef0e85fac0c1be71ec4d6d750adb92802162d64c146cfca145da0f58bfa1d9e162949605fa516976a0807e06c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQiqvcACgkQCaWpQKGI+9Q4rACfd7wNlhfVWk+iLb1UQadSfmAf
-iSUAn0TKKZgd2QdhRGFde1gIhLH5mdTV
-=SVdu
+iEYEAREIAAYFAlRki8gACgkQCaWpQKGI+9TfhQCfaP56IjRD7ooUnmAj3nuj4Xk1
+KXYAniuOaoGP0Ts3ArIqIPlBzx5cN+aA
+=+j0U
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/brasero/brasero-2.32.1-r1.ebuild b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
deleted file mode 100644
index 1eb7a7613e22..000000000000
--- a/app-cdr/brasero/brasero-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.12 2012/12/16 09:10:31 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="CD/DVD burning application for the GNOME desktop"
-HOMEPAGE="http://projects.gnome.org/brasero/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="+cdr +css doc dvd +introspection +libburn nautilus playlist test vcd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.25.10:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/gtk+-2.21.9:2[introspection?]
-	>=gnome-base/gconf-2.31.1:2
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libunique-1:1
-	x11-libs/libICE
-	x11-libs/libSM
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
-	libburn? (
-		>=dev-libs/libburn-0.4
-		>=dev-libs/libisofs-0.6.4 )
-	nautilus? ( >=gnome-base/nautilus-2.31.3 <gnome-base/nautilus-3 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
-RDEPEND="${COMMON_DEPEND}
-	app-cdr/cdrdao
-	app-cdr/dvd+rw-tools
-	>=media-plugins/gst-plugins-meta-0.10-r6:0.10[dvd?,vcd?]
-	x11-themes/hicolor-icon-theme
-	css? ( media-libs/libdvdcss:1.2 )
-	cdr? ( virtual/cdrtools )
-	dvd? ( media-video/dvdauthor )
-	vcd? ( media-video/vcdimager )
-	!libburn? ( virtual/cdrtools )"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	gnome-base/gnome-common:3
-	>=dev-util/gtk-doc-am-1.12
-	test? ( app-text/docbook-xml-dtd:4.3 )"
-# eautoreconf deps
-#	gnome-base/gnome-common
-PDEPEND="gnome-base/gvfs"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-silent-rules
-		--disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		--with-gtk=2.0
-		--disable-search
-		$(use_enable cdr cdrtools)
-		$(use_enable cdr cdrkit)
-		$(use_enable introspection)
-		$(use_enable libburn libburnia)
-		$(use_enable nautilus)
-		$(use_enable playlist)"
-
-	if ! use libburn; then
-		G2CONF="${G2CONF} --enable-cdrtools --enable-cdrkit"
-	fi
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-
-	# Fix link against installed libraries, bug #340767
-	epatch "${FILESDIR}/${PN}-2.32.0-build-plugins-against-local-library.patch"
-
-	# Silenced some warnings
-	epatch "${FILESDIR}/${P}-warning-silenced.patch"
-	epatch "${FILESDIR}/${P}-warning-silenced2.patch"
-
-	# Make sure that the size is displayed correctly when burning tracks internally copied with cdda2wav
-	epatch "${FILESDIR}/${P}-fix-size.patch"
-
-	# Do not show useless dialog warning about the nature of the medium when we are copying audio from a CDRW
-	epatch "${FILESDIR}/${P}-useless-dialog.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	preserve_old_lib /usr/$(get_libdir)/libbrasero-burn.so.0
-	preserve_old_lib /usr/$(get_libdir)/libbrasero-media.so.0
-	preserve_old_lib /usr/$(get_libdir)/libbrasero-utils.so.0
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-burn.so.0
-	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-media.so.0
-	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-utils.so.0
-
-	echo
-	elog "If ${PN} doesn't handle some music or video format, please check"
-	elog "your USE flags on media-plugins/gst-plugins-meta:0.10"
-}
diff --git a/app-cdr/brasero/files/brasero-2.32.0-build-plugins-against-local-library.patch b/app-cdr/brasero/files/brasero-2.32.0-build-plugins-against-local-library.patch
deleted file mode 100644
index 031cb250c33b..000000000000
--- a/app-cdr/brasero/files/brasero-2.32.0-build-plugins-against-local-library.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
-index 3076101..b3d90af 100644
---- a/nautilus/Makefile.am
-+++ b/nautilus/Makefile.am
-@@ -49,10 +49,10 @@ libnautilus_brasero_extension_la_SOURCES = 	\
- 	$(top_srcdir)/src/brasero-drive-settings.c
- 
- libnautilus_brasero_extension_la_LIBADD =	\
--	$(NAUTILUS_EXTENSION_LIBS)		\
- 	../libbrasero-utils/libbrasero-utils@BRASERO_LIBRARY_SUFFIX@.la	\
- 	../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la	\
--	../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+	../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la	\
-+	$(NAUTILUS_EXTENSION_LIBS)		
- 	
- libnautilus_brasero_extension_la_LDFLAGS = $(module_flags)
- 
-diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
-index abed438..cd46238 100644
---- a/plugins/audio2cue/Makefile.am
-+++ b/plugins/audio2cue/Makefile.am
-@@ -18,7 +18,7 @@ INCLUDES = \
- audio2cuedir = $(BRASERO_PLUGIN_DIRECTORY)
- audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
- libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
--libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_audio2cue_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_audio2cue_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/cdrdao/Makefile.am b/plugins/cdrdao/Makefile.am
-index 0cf0c51..06817b6 100644
---- a/plugins/cdrdao/Makefile.am
-+++ b/plugins/cdrdao/Makefile.am
-@@ -18,7 +18,7 @@ INCLUDES = \
- cdrdaodir = $(BRASERO_PLUGIN_DIRECTORY)
- cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
- libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c 
--libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_cdrdao_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/cdrkit/Makefile.am b/plugins/cdrkit/Makefile.am
-index 9900c6d..d15caf3 100644
---- a/plugins/cdrkit/Makefile.am
-+++ b/plugins/cdrkit/Makefile.am
-@@ -19,7 +19,7 @@ wodimdir = $(BRASERO_PLUGIN_DIRECTORY)
- wodim_LTLIBRARIES = libbrasero-wodim.la
- libbrasero_wodim_la_SOURCES = burn-wodim.c \
- 	burn-cdrkit.h 
--libbrasero_wodim_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_wodim_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_wodim_la_LDFLAGS = -module -avoid-version
- 
- #genisoimage
-@@ -27,7 +27,7 @@ genisoimagedir = $(BRASERO_PLUGIN_DIRECTORY)
- genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
- libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
- 	burn-cdrkit.h 
--libbrasero_genisoimage_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_genisoimage_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
- 
- #readom
-@@ -35,7 +35,7 @@ readomdir = $(BRASERO_PLUGIN_DIRECTORY)
- readom_LTLIBRARIES = libbrasero-readom.la
- libbrasero_readom_la_SOURCES = burn-readom.c \
- 	burn-cdrkit.h 
--libbrasero_readom_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_readom_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_readom_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/cdrtools/Makefile.am b/plugins/cdrtools/Makefile.am
-index c70d497..69da3da 100644
---- a/plugins/cdrtools/Makefile.am
-+++ b/plugins/cdrtools/Makefile.am
-@@ -19,7 +19,7 @@ cdrecorddir = $(BRASERO_PLUGIN_DIRECTORY)
- cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
- libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
- 	burn-cdrtools.h 
--libbrasero_cdrecord_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_cdrecord_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
- 
- #mkisofs
-@@ -27,7 +27,7 @@ mkisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
- mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
- libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
- 	burn-cdrtools.h 
--libbrasero_mkisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_mkisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
- 
- #readcd
-@@ -35,14 +35,14 @@ readcddir = $(BRASERO_PLUGIN_DIRECTORY)
- readcd_LTLIBRARIES = libbrasero-readcd.la
- libbrasero_readcd_la_SOURCES = burn-readcd.c \
- 	burn-cdrtools.h 
--libbrasero_readcd_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_readcd_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_readcd_la_LDFLAGS = -module -avoid-version
- 
- #cdda2wav
- cdda2wavdir = $(BRASERO_PLUGIN_DIRECTORY)
- cdda2wav_LTLIBRARIES = libbrasero-cdda2wav.la
- libbrasero_cdda2wav_la_SOURCES = burn-cdda2wav.c burn-cdrtools.h 
--libbrasero_cdda2wav_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_cdda2wav_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_cdda2wav_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/checksum/Makefile.am b/plugins/checksum/Makefile.am
-index f7069bf..0edf711 100644
---- a/plugins/checksum/Makefile.am
-+++ b/plugins/checksum/Makefile.am
-@@ -20,7 +20,7 @@ checksum_LTLIBRARIES = libbrasero-checksum.la
- libbrasero_checksum_la_SOURCES = burn-checksum-image.c	
- 
- libbrasero_checksum_la_LDFLAGS = -module -avoid-version
--libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_checksum_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- 
- checksumfiledir = $(BRASERO_PLUGIN_DIRECTORY)
- checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
-@@ -29,6 +29,6 @@ libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c	\
- 				      burn-volume-read.h
- 
- libbrasero_checksum_file_la_LDFLAGS = -module -avoid-version
--libbrasero_checksum_file_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_checksum_file_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GTK_LIBS)
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/dvdauthor/Makefile.am b/plugins/dvdauthor/Makefile.am
-index 9bbc9ce..4b9b06f 100644
---- a/plugins/dvdauthor/Makefile.am
-+++ b/plugins/dvdauthor/Makefile.am
-@@ -19,7 +19,7 @@ dvdauthordir = $(BRASERO_PLUGIN_DIRECTORY)
- dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
- 
- libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
--libbrasero_dvdauthor_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_dvdauthor_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
- libbrasero_dvdauthor_la_LDFLAGS = -module -avoid-version
- 
- 
-diff --git a/plugins/dvdcss/Makefile.am b/plugins/dvdcss/Makefile.am
-index 19dc213..506b8ac 100644
---- a/plugins/dvdcss/Makefile.am
-+++ b/plugins/dvdcss/Makefile.am
-@@ -17,7 +17,7 @@ plugindir = $(BRASERO_PLUGIN_DIRECTORY)
- plugin_LTLIBRARIES = libbrasero-dvdcss.la
- libbrasero_dvdcss_la_SOURCES = burn-dvdcss.c \
- 	burn-dvdcss-private.h 
--libbrasero_dvdcss_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS) ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_dvdcss_la_LIBADD = ../../libbrasero-media/libbrasero-media@BRASERO_LIBRARY_SUFFIX@.la ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GMODULE_LIBS)
- libbrasero_dvdcss_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/growisofs/Makefile.am b/plugins/growisofs/Makefile.am
-index cee046b..a220f31 100644
---- a/plugins/growisofs/Makefile.am
-+++ b/plugins/growisofs/Makefile.am
-@@ -19,14 +19,14 @@ growisofsdir = $(BRASERO_PLUGIN_DIRECTORY)
- growisofs_LTLIBRARIES = libbrasero-growisofs.la
- libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
- 	burn-growisofs-common.h 
--libbrasero_growisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_growisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
- 
- #dvdrwformat
- dvdrwformatdir = $(BRASERO_PLUGIN_DIRECTORY)
- dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
- libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c 
--libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_dvdrwformat_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS)
- libbrasero_dvdrwformat_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/libburnia/Makefile.am b/plugins/libburnia/Makefile.am
-index 379501a..53e5df4 100644
---- a/plugins/libburnia/Makefile.am
-+++ b/plugins/libburnia/Makefile.am
-@@ -23,7 +23,7 @@ libbrasero_libburn_la_SOURCES = burn-libburn.c 		\
- 				burn-libburn-common.c	\
- 				burn-libburn-common.h  \
- 				burn-libburnia.h 
--libbrasero_libburn_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_libburn_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS)
- libbrasero_libburn_la_LDFLAGS = -module -avoid-version
- 
- #libisofs (apparently libisofs needs one libburn function)
-@@ -32,7 +32,7 @@ libisofs_LTLIBRARIES = libbrasero-libisofs.la
- libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
- 	burn-libburn-common.c burn-libburn-common.h			\
- 	burn-libburnia.h 
--libbrasero_libisofs_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_libisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBBURNIA_LIBS)
- libbrasero_libisofs_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/local-track/Makefile.am b/plugins/local-track/Makefile.am
-index 0991bfe..f13214c 100644
---- a/plugins/local-track/Makefile.am
-+++ b/plugins/local-track/Makefile.am
-@@ -20,7 +20,7 @@ local_trackdir = $(BRASERO_PLUGIN_DIRECTORY)
- local_track_LTLIBRARIES = libbrasero-local-track.la
- 
- libbrasero_local_track_la_SOURCES = burn-local-image.c 
--libbrasero_local_track_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_local_track_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS)
- libbrasero_local_track_la_LDFLAGS = -module -avoid-version
- 
- #burn-uri
-@@ -28,7 +28,7 @@ burn_uridir = $(BRASERO_PLUGIN_DIRECTORY)
- burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
- 
- libbrasero_burn_uri_la_SOURCES = burn-uri.c 
--libbrasero_burn_uri_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_burn_uri_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GIO_LIBS)
- libbrasero_burn_uri_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/transcode/Makefile.am b/plugins/transcode/Makefile.am
-index 3a029e0..2a7eb1b 100644
---- a/plugins/transcode/Makefile.am
-+++ b/plugins/transcode/Makefile.am
-@@ -19,21 +19,21 @@ transcodedir = $(BRASERO_PLUGIN_DIRECTORY)
- transcode_LTLIBRARIES = libbrasero-transcode.la
- 
- libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
--libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_transcode_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
- libbrasero_transcode_la_LDFLAGS = -module -avoid-version
- 
- normalizedir = $(BRASERO_PLUGIN_DIRECTORY)
- normalize_LTLIBRARIES = libbrasero-normalize.la
- 
- libbrasero_normalize_la_SOURCES = burn-normalize.c burn-normalize.h
--libbrasero_normalize_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_normalize_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
- libbrasero_normalize_la_LDFLAGS = -module -avoid-version
- 
- vobdir = $(BRASERO_PLUGIN_DIRECTORY)
- vob_LTLIBRARIES = libbrasero-vob.la
- 
- libbrasero_vob_la_SOURCES = burn-vob.c 
--libbrasero_vob_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_vob_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS)
- libbrasero_vob_la_LDFLAGS = -module -avoid-version
- 
- -include $(top_srcdir)/git.mk
-diff --git a/plugins/vcdimager/Makefile.am b/plugins/vcdimager/Makefile.am
-index d11a077..27fcab3 100644
---- a/plugins/vcdimager/Makefile.am
-+++ b/plugins/vcdimager/Makefile.am
-@@ -19,7 +19,7 @@ vcdimagerdir = $(BRASERO_PLUGIN_DIRECTORY)
- vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
- 
- libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
--libbrasero_vcdimager_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS) ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la
-+libbrasero_vcdimager_la_LIBADD = ../../libbrasero-burn/libbrasero-burn@BRASERO_LIBRARY_SUFFIX@.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
- libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
- 
- 
diff --git a/app-cdr/brasero/files/brasero-2.32.1-fix-size.patch b/app-cdr/brasero/files/brasero-2.32.1-fix-size.patch
deleted file mode 100644
index cbdcbef5d032..000000000000
--- a/app-cdr/brasero/files/brasero-2.32.1-fix-size.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6ddf46d1477bb6e2a3e86afa699c52b643bfcef7 Mon Sep 17 00:00:00 2001
-From: Philippe Rouquier <bonfire-app@wanadoo.fr>
-Date: Wed, 24 Nov 2010 15:29:32 +0000
-Subject: Make sure that the size is displayed correctly when burning tracks internally copied with cdda2wav
-
----
-diff --git a/libbrasero-burn/brasero-track-stream.c b/libbrasero-burn/brasero-track-stream.c
-index f041676..e3ee6df 100644
---- a/libbrasero-burn/brasero-track-stream.c
-+++ b/libbrasero-burn/brasero-track-stream.c
-@@ -243,6 +243,7 @@ brasero_track_stream_set_boundaries (BraseroTrackStream *track,
-  * This function returns the path or the URI (if @uri is TRUE)
-  * of the stream (song or video file).
-  *
-+ * Note: this function resets any length previously set to 0.
-  * Return value: a #gchar.
-  **/
- 
-@@ -347,7 +348,6 @@ brasero_track_stream_get_length (BraseroTrackStream *track,
- 		return BRASERO_BURN_ERR;
- 
- 	*length = BRASERO_STREAM_LENGTH (priv->start, priv->end + priv->gap);
--
- 	return BRASERO_BURN_OK;
- }
- 
-diff --git a/plugins/cdrtools/burn-cdda2wav.c b/plugins/cdrtools/burn-cdda2wav.c
-index 16343bd..797b3f9 100644
---- a/plugins/cdrtools/burn-cdda2wav.c
-+++ b/plugins/cdrtools/burn-cdda2wav.c
-@@ -108,10 +108,6 @@ brasero_cdda2wav_post (BraseroJob *job)
- 
- 		brasero_medium_get_track_space (medium, i + 1, NULL, &block_num);
- 		track_stream = brasero_track_stream_new ();
--		brasero_track_stream_set_boundaries (track_stream,
--		                                     0,
--		                                     BRASERO_BYTES_TO_DURATION (block_num * 2352),
--		                                     0);
- 
- 		brasero_track_stream_set_format (track_stream,
- 		                                 BRASERO_AUDIO_FORMAT_RAW|
-@@ -147,6 +143,12 @@ brasero_cdda2wav_post (BraseroJob *job)
- 			g_free (filename);
- 		}
- 
-+		/* Always set the boundaries after the source as
-+		 * brasero_track_stream_set_source () resets the length */
-+		brasero_track_stream_set_boundaries (track_stream,
-+		                                     0,
-+		                                     BRASERO_BYTES_TO_DURATION (block_num * 2352),
-+		                                     0);
- 		brasero_job_add_track (job, BRASERO_TRACK (track_stream));
- 		g_object_unref (track_stream);
- 	}
---
-cgit v0.9
diff --git a/app-cdr/brasero/files/brasero-2.32.1-underlinking.patch b/app-cdr/brasero/files/brasero-2.32.1-underlinking.patch
deleted file mode 100644
index c4b20580c862..000000000000
--- a/app-cdr/brasero/files/brasero-2.32.1-underlinking.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Aug 4 11:21:07 2012 +0200
-
-    fix underlinking wrt #429280
-
---- configure.in
-+++ configure.in
-@@ -269,6 +269,10 @@ esac
- AC_SUBST(BRASERO_CANBERRA_CFLAGS)
- AC_SUBST(BRASERO_CANBERRA_LIBS)
- 
-+PKG_CHECK_MODULES([BRASERO_ICE], [ice])
-+AC_SUBST(BRASERO_ICE_CFLAGS)
-+AC_SUBST(BRASERO_ICE_LIBS)
-+
- dnl ****************Nautilus**********************************
- # Note: the extension is built against gtk+-2.0 so we cannot build extension with gtk+-3.0
- NAUTILUS_REQUIRED=2.22.2
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -24,7 +24,8 @@ INCLUDES = \
- 	$(BRASERO_LIBUNIQUE_CFLAGS) 					\
- 	$(BRASERO_SEARCH_CFLAGS)					\
- 	$(BRASERO_PL_PARSER_CFLAGS)					\
--	$(BRASERO_SM_CFLAGS)
-+	$(BRASERO_SM_CFLAGS)						\
-+	$(BRASERO_ICE_CFLAGS)
- 
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
- RECMARSHALFILES = brasero-marshal.h brasero-marshal.c
-@@ -171,7 +172,8 @@ brasero_LDADD =						\
- 	$(BRASERO_LIBUNIQUE_LIBS) 	\
- 	$(BRASERO_SEARCH_LIBS)		\
- 	$(BRASERO_PL_PARSER_LIBS)	\
--	$(BRASERO_SM_LIBS)
-+	$(BRASERO_SM_LIBS)		\
-+	$(BRASERO_ICE_LIBS)
- 
- EXTRA_DIST =			\
- 	brasero-marshal.list
diff --git a/app-cdr/brasero/files/brasero-2.32.1-useless-dialog.patch b/app-cdr/brasero/files/brasero-2.32.1-useless-dialog.patch
deleted file mode 100644
index c24d5d5439e5..000000000000
--- a/app-cdr/brasero/files/brasero-2.32.1-useless-dialog.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From dfe0b01a5193cbb631b2afbd37042c5124259d7b Mon Sep 17 00:00:00 2001
-From: Philippe Rouquier <bonfire-app@wanadoo.fr>
-Date: Wed, 24 Nov 2010 15:48:29 +0000
-Subject: Do not show useless dialog warning about the nature of the medium when we are copying audio from a CDRW
-
----
-diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
-index 6dcf53a..f8b64c5 100644
---- a/libbrasero-burn/brasero-burn.c
-+++ b/libbrasero-burn/brasero-burn.c
-@@ -1881,28 +1881,38 @@ brasero_burn_check_session_consistency (BraseroBurn *burn,
- 
- static BraseroBurnResult
- brasero_burn_check_data_loss (BraseroBurn *burn,
-+                              BraseroTrackType *temp_output,
-                               GError **error)
- {
- 	BraseroMedia media;
- 	BraseroBurnFlag flags;
- 	BraseroTrackType *input;
- 	BraseroBurnResult result;
--	BraseroTrackType *output;
- 	BraseroBurnPrivate *priv = BRASERO_BURN_PRIVATE (burn);
- 
--	output = brasero_track_type_new ();
--	brasero_burn_session_get_output_type (priv->session, output);
--	if (!brasero_track_type_get_has_medium (output)) {
-+	if (!temp_output) {
-+		BraseroTrackType *output;
-+
-+		output = brasero_track_type_new ();
-+		brasero_burn_session_get_output_type (priv->session, output);
-+		if (!brasero_track_type_get_has_medium (output)) {
-+			brasero_track_type_free (output);
-+			return BRASERO_BURN_OK;
-+		}
-+
-+		media = brasero_track_type_get_medium_type (output);
- 		brasero_track_type_free (output);
--		return BRASERO_BURN_OK;
- 	}
-+	else {
-+		if (!brasero_track_type_get_has_medium (temp_output))
-+			return BRASERO_BURN_OK;
- 
--	flags = brasero_burn_session_get_flags (priv->session);
--	media = brasero_track_type_get_medium_type (output);
--	brasero_track_type_free (output);
-+		media = brasero_track_type_get_medium_type (temp_output);
-+	}
- 
- 	input = brasero_track_type_new ();
- 	brasero_burn_session_get_input_type (priv->session, input);
-+	flags = brasero_burn_session_get_flags (priv->session);
- 
- 	if (media & (BRASERO_MEDIUM_HAS_DATA|BRASERO_MEDIUM_HAS_AUDIO)) {
- 		if (flags & BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE) {
-@@ -2056,7 +2066,7 @@ brasero_burn_run_tasks (BraseroBurn *burn,
- 
- 	/* performed some additional tests that can only be performed at this
- 	 * point. They are mere warnings. */
--	result = brasero_burn_check_data_loss (burn, error);
-+	result = brasero_burn_check_data_loss (burn, temp_output, error);
- 	if (result != BRASERO_BURN_OK) {
- 		brasero_burn_session_pop_settings (priv->session);
- 		return result;
---
-cgit v0.9
diff --git a/app-cdr/brasero/files/brasero-2.32.1-warning-silenced.patch b/app-cdr/brasero/files/brasero-2.32.1-warning-silenced.patch
deleted file mode 100644
index 2a1c131c51de..000000000000
--- a/app-cdr/brasero/files/brasero-2.32.1-warning-silenced.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 6638f341240231001f6a3aeb92faeae4e9fefa7a Mon Sep 17 00:00:00 2001
-From: Philippe Rouquier <bonfire-app@wanadoo.fr>
-Date: Wed, 24 Nov 2010 14:29:01 +0000
-Subject: Silenced a warning
-
----
-diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
-index fa67cca..73d8642 100644
---- a/libbrasero-burn/brasero-session.c
-+++ b/libbrasero-burn/brasero-session.c
-@@ -2059,7 +2059,7 @@ brasero_burn_session_get_src_medium (BraseroBurnSession *self)
- 		return NULL;
- 
- 	track = priv->tracks->data;
--	if (!BRASERO_TRACK_DISC (track))
-+	if (!BRASERO_IS_TRACK_DISC (track))
- 		return NULL;
- 
- 	drive = brasero_track_disc_get_drive (BRASERO_TRACK_DISC (track));
---
-cgit v0.9
diff --git a/app-cdr/brasero/files/brasero-2.32.1-warning-silenced2.patch b/app-cdr/brasero/files/brasero-2.32.1-warning-silenced2.patch
deleted file mode 100644
index bf756e4e942f..000000000000
--- a/app-cdr/brasero/files/brasero-2.32.1-warning-silenced2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From af1abd9dc9fd85074c9866195f1fb767e16a9a29 Mon Sep 17 00:00:00 2001
-From: Philippe Rouquier <bonfire-app@wanadoo.fr>
-Date: Wed, 24 Nov 2010 14:33:09 +0000
-Subject: Silenced a warning when unhibiting
-
----
-diff --git a/libbrasero-burn/burn-dbus.c b/libbrasero-burn/burn-dbus.c
-index fe5dea0..a6d77cc 100644
---- a/libbrasero-burn/burn-dbus.c
-+++ b/libbrasero-burn/burn-dbus.c
-@@ -81,7 +81,6 @@ brasero_uninhibit_suspend (guint cookie)
- 			    error->message);
- 		g_error_free (error);
- 	} else {
--                g_variant_get (res, "(u)", &cookie);
-                 g_variant_unref (res);
-         }
- 
---
-cgit v0.9