Clean up old revision.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 11 insertions, 454 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index d154e86fb092..91a0fd7b8385 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.150 2013/02/07 21:18:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.151 2013/03/05 22:50:29 eva Exp $
+
+  05 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/0001-Fix-build-link-libbrasero-burn-against-libm-for-ceil.patch,
+  -files/brasero-2.91.6-build-plugins-against-local-library.patch,
+  -brasero-3.4.1.ebuild:
+  Clean up old revision.
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> brasero-3.6.1.ebuild:
   Move Creative Commons licenses to shorter names.
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index a6bc28c596f4..8759a0109112 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,36 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0001-Fix-build-link-libbrasero-burn-against-libm-for-ceil.patch 1404 SHA256 3be8a395dbe3a6c1a9df08685af711801431562e78d87fa24fa9799220f3ef20 SHA512 173cd8166ceee80ce7b033e863e806e98d9912ae9088ed8de1e93f0ff7ad82e594af49effa58251ea24807ad24096efac3e247b7aeaf30d82891c12550970dbc WHIRLPOOL b17a75c86484ee1091d7a4b5a480e5718c413a42ab022d0039f499692b2beb90b12042363d7961a67a08c03744360a912faadfa178bb6a80e8b8ccbcfe5542c3
 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
-AUX brasero-2.91.6-build-plugins-against-local-library.patch 14905 SHA256 5978545e14615c43d306e7eb134f1efd6dab9be2e1f80756bd9948e6d6a9db69 SHA512 70adfce3d5786c7a901bd26c5f73291908c280a4a5e153c3a5cef3264d384f2b503e1487e1ff9294bf0df1aa409a1a14c9c28f34dcd91aa1b3788b3664a3974b WHIRLPOOL 242be18f8446d94e377cb110b73f677fa179855fcb3bf46e2108e1188e235164618ef77ffdb9d6889efe94a4ec0686707291175bc17e0ece90cab1577faddde3
 DIST brasero-2.32.1.tar.bz2 4530933 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b SHA512 ebd08f5ff21685a853c9b339b19b51ffe62e6050a6373883dee1266b45b490308ea5a25a1167a1ea48b89ff64625114a95c6a9f5f42d0d6defc2edd9c0295f25 WHIRLPOOL b01b935ac042bfa129c2245b0fb351ef4ed7c18e5e230cdf8a058073aa4fc28e78137f2bbae173784dc48b440153dcf21def3757dcd8f52065b3065bb42aa103
-DIST brasero-3.4.1.tar.xz 3233512 SHA256 e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6 SHA512 238baf251982adefc3a206adf6e244d2d6326dc7a5e4768d60acab7d116392e5bd24ca8b15a804e309aeeda0ff5b18f22c2230d8f219c3ea432a1611dfe4b330 WHIRLPOOL 0a858c4c6db489e738d5b8624eb039264ef6fb9bd7ae57be1ecd2e597353c1d6ce53109405bdb4f91e85509da6e55cf96a035597c0b3ddf4ee8afd334db7167a
 DIST brasero-3.6.1.tar.xz 3224840 SHA256 d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932 SHA512 2504b0b3127c1d5a8bcce6b9c95e25e317cc2d95f32e31e048522594366354cca1cc551b61e38ae56000eeadfedb3950ce7f99bfcf8e3b6aba0a96371b69606e WHIRLPOOL f951e7db0e6c2d5c265caa12037cbffcea1ac6489fc5af645628b51162d1a7284c0d81393f3e487963426bd15197f434accbc4746f3f6ac909e6b086b2e71087
 EBUILD brasero-2.32.1-r1.ebuild 3547 SHA256 cff1cead00536c2310eb337d602700690bde16fb5f7c3cb28eabf61588fa5fe7 SHA512 f9dd5669825d2a63466f79ecfeae1ebc1ad44e26192969b1bf5fdfff07792efb566dadc317c26fc6787efff8d70bd1c52a9f8a35e726f63600cc30eeecfa0f9d WHIRLPOOL e2a346c9b84e3f56f70b0dde77999817e2c09445a1d86e8eb978b5411c82137fe1050901283d9646c3f5df056446b4ea2976642aeae83e7b2849abc611518df5
-EBUILD brasero-3.4.1.ebuild 2523 SHA256 29cf3e16eed224b28931f9ca2c40d65ab0ccf79597d83cf4ee1391ce60a1bd04 SHA512 ec60ec5daefaec5fc96d5f3f38518080dd88d5bb552848bf4f1508280c0c22ca673e7219022ff518af4942c8aea6d53c3513c9823112ef5052192ec198cc753e WHIRLPOOL 414faa052bd9cc33a9525927daeebe35e7463f1aa872910c62da0dcfc282f9ef2a67649af5b6d15bb7e1741e2296a07ed34ff9f95f2f82efcbbdc7d333ae484e
 EBUILD brasero-3.6.1.ebuild 2362 SHA256 999d30e1d767cbbe3bac5c1e9eb9798385e1c4c504c1944c439965587cadcb57 SHA512 8d2892c149081920a9ad65087cc4af51c58ba2271dd3f640c37d76afd749da87c944c3f3b88a8b7f02216c28aaf327191716c7c710020d66fdb90429e38223a4 WHIRLPOOL 144e9e680147a5a6cb361c5acc5f681d3a0e958b3b29225f7e8f7e4a70e1b5bf28b8f60e1908e7b9aa8707434f786e2f3233362a0a4c2dd4bb70300433d7c560
-MISC ChangeLog 24320 SHA256 5f76574fd46cb16580de4684cbf00a680f44816a43436f43c9b82f564bbd334d SHA512 f4481776d6203440db95615f85e15088edb4b9cfd8689c4add6d27546dd79b735badc18e82d51b6841ab78f76f92f1c61b54796317255b87f1875bfb9c22b770 WHIRLPOOL 961e22c9ab423e28c006244d001f4dede828fbbe87dccc0904bd7d08d4fb197bbdfbf923446d5196b8e874ce707874567562dd1ae165ec813676a2db7cb25bea
+MISC ChangeLog 24566 SHA256 e27d17797d4815d7534e2b7d3acce5ccc1cdc8db4f7a19b87620548f5db1e61f SHA512 a388fef58a046574d65c49901372271b84af118071c0d78720b9b01ed81c03caa1201c9626385d550198f5304e831715a3c89a4418d327500771591f706c9322 WHIRLPOOL 2dbdd2220e4eee3542c92f2e4e2cead168e67540197cba07a532f8a3608963fdb393cf84d3fe5b1b0050e9a1fb57e9cfebdd01f6357c1a9f2a4edbb184b89df4
 MISC metadata.xml 701 SHA256 88db77e1d687f115e349955d16b87668900d105e5f8cf0baa99d04b32ff5da87 SHA512 ecd5c3323ab98e14ba515497af76b7a8c898a75cd0df05053557289b436b1f3fd8719828572ca849bd188d3e74082322c6441968f0b9d37a9983e677a5fb5a6b WHIRLPOOL 2e41f36a1cfe25ab7b0a99cf85e1f6e983f257cb04017d53f33e7899ce077db261b7978aae5b45ebde74951e70b81a2680ef6df859b4a2acf6fab0897b9ea1af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFBsjAAoJEDxpGckxwJCBixAP/3RRErSOUjOKX3KgU96/TQYY
-qljPhmllpJuH2eTcS417g5eEQIWL4T48+76XHuc9o0Nr6ob3tyWyUVFn7OLN+gQM
-B0+nABkgrrHZZnV7RPd+o0TLG+vjeiGe8ZizXRU9b8yjosalLHqXZKtmqNSO/Whf
-0ZrwW7UfAqfpMVJnfZI2RpL77223Nx45ePWQPhj8H7BuLT7DWoal52YRefpVjHQB
-mez3/5wtKvBDsxo6IWUXrvhhCy7d0mQW3v1dv8K72YawBF8HCcVu5b08qpLUmJ/7
-T5VBcrpVM2Dg8b/MfDOVMNVSinBfj+Xn/MA/voElzro2IKgAL1EK9z8InQQIndnw
-2tnpNsnnPg66AGCmfYhOaOS8Ub5dxP+rOaTR17bkZpQEjsVhmhyKYkLzAoqRCjBr
-AApoAjNsCiY7FVCjntMqE1OAZSrf9Jagn9hWVDJ1MRtVihrYAey66JuSZUuaC9Vf
-ZFXvSu/WwqCPZ5m/9F83tcsk6AFmAAaprfrskKsuynp/6IH6gyWi6ZdQtWXepFw3
-woC+EzMr/R0LFCEtdkbixLytsGY42Eg2ObSqgmlEjdWtw2wD/Le05PzfYa0izZvW
-xdcQDXAAwuHdXmeA0R6MpQvoqB6EmpjBxfHbQTLp/ZK4v4s8dTFNtUp+SabMAB7s
-c5CEbpdVgtnJB6n577k0
-=9fWq
+iEYEAREIAAYFAlE2drYACgkQ1fmVwcYIWAZK6QCgg/aG3VMi59/fh/qtsf79DwP2
+Mu0An2DZ5xeJs52dpdX0ozlFbq4rDiu4
+=S22o
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/brasero/brasero-3.4.1.ebuild b/app-cdr/brasero/brasero-3.4.1.ebuild
deleted file mode 100644
index da3a725669c0..000000000000
--- a/app-cdr/brasero/brasero-3.4.1.ebuild
+++ /dev/null
@@ -1,92 +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-3.4.1.ebuild,v 1.4 2012/12/17 11:12:54 jlec Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-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="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10
-	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1
-
-	media-libs/libcanberra[gtk3]
-	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.91.90 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )
-	tracker? ( >=app-misc/tracker-0.12 )"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/gst-plugins-good:0.10
-	media-plugins/gst-plugins-gconf:0.10
-	media-plugins/gst-plugins-meta:0.10[mp3?]
-	x11-themes/hicolor-icon-theme
-	css? ( media-libs/libdvdcss:1.2 )
-	!libburn? (
-		app-cdr/cdrdao
-		app-cdr/dvd+rw-tools
-		virtual/cdrtools )
-	mp3? ( media-libs/gst-plugins-ugly:0.10 )
-	packagekit? ( app-admin/packagekit-base )"
-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-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable !libburn cdrtools)
-		$(use_enable !libburn cdrkit)
-		$(use_enable !libburn cdrdao)
-		$(use_enable !libburn growisofs)
-		$(use_enable introspection)
-		$(use_enable libburn libburnia)
-		$(use_enable nautilus)
-		$(use_enable playlist)
-		$(use_enable tracker search)"
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Fix-build-link-libbrasero-burn-against-libm-for-ceil.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	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/0001-Fix-build-link-libbrasero-burn-against-libm-for-ceil.patch b/app-cdr/brasero/files/0001-Fix-build-link-libbrasero-burn-against-libm-for-ceil.patch
deleted file mode 100644
index 05ad98156792..000000000000
--- a/app-cdr/brasero/files/0001-Fix-build-link-libbrasero-burn-against-libm-for-ceil.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8410d2f7cddb6f5d102f9a1fa5d60ce50ca08696 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
-Date: Wed, 19 Sep 2012 11:38:53 +0200
-Subject: [PATCH] Fix build, link libbrasero-burn against libm (for ceil(3))
-
----
- configure.in                | 4 ++++
- libbrasero-burn/Makefile.am | 3 ++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 4ba113c..9b0df2d 100644
---- a/configure.in
-+++ b/configure.in
-@@ -138,6 +138,7 @@ dnl ***************** LARGE FILE SUPPORT ***********************
- AC_SYS_LARGEFILE
- 
- dnl ********** Required libraries **********************
-+
- GLIB_REQUIRED=2.29.14
- GTHREAD_REQUIRED=2.6.0
- GMODULE_REQUIRED=2.6.0
-@@ -209,6 +210,9 @@ PKG_CHECK_MODULES(BRASERO_SM,
- AC_SUBST(BRASERO_SM_CFLAGS)
- AC_SUBST(BRASERO_SM_LIBS)
- 
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- #
- # GTK+ stuff (taken and adapted from empathy)
- #
-diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
-index 2e64449..3c723ce 100644
---- a/libbrasero-burn/Makefile.am
-+++ b/libbrasero-burn/Makefile.am
-@@ -67,7 +67,8 @@ libbrasero_burn3_la_LIBADD =					\
- 	$(BRASERO_GTK_LIBS)					\
- 	$(BRASERO_GSTREAMER_LIBS)				\
- 	$(BRASERO_LIBNOTIFY_LIBS)					\
--	$(BRASERO_CANBERRA_LIBS)
-+	$(BRASERO_CANBERRA_LIBS)				\
-+	$(LIBM)
- 
- libbrasero_burn3_la_LDFLAGS =					\
- 	-version-info $(LIBBRASERO_LT_VERSION)			\
--- 
-1.8.0.2
-
diff --git a/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch b/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
deleted file mode 100644
index 31beb4c1f6f2..000000000000
--- a/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-From 80dc44efc63e5e16d13852a6c2163d2ad07249b7 Mon Sep 17 00:00:00 2001
-From: Mike Auty <ikelos@gentoo.org>
-Date: Wed, 2 Feb 2011 13:14:32 +0200
-Subject: [PATCH] Fix linking against system brasero instead of current source
-
----
- nautilus/Makefile.am            |    2 +-
- plugins/audio2cue/Makefile.am   |    2 +-
- plugins/cdrdao/Makefile.am      |    2 +-
- plugins/cdrkit/Makefile.am      |    6 +++---
- plugins/cdrtools/Makefile.am    |    8 ++++----
- plugins/checksum/Makefile.am    |    4 ++--
- plugins/dvdauthor/Makefile.am   |    2 +-
- plugins/dvdcss/Makefile.am      |    2 +-
- plugins/growisofs/Makefile.am   |    4 ++--
- plugins/libburnia/Makefile.am   |    4 ++--
- plugins/local-track/Makefile.am |    4 ++--
- plugins/transcode/Makefile.am   |    6 +++---
- plugins/vcdimager/Makefile.am   |    2 +-
- 13 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/nautilus/Makefile.am b/nautilus/Makefile.am
-index dc74eed..aee736a 100644
---- a/nautilus/Makefile.am
-+++ b/nautilus/Makefile.am
-@@ -9,7 +9,6 @@ INCLUDES =					\
- 	-I$(top_builddir)/libbrasero-burn/	\
- 	-I$(top_srcdir)/src/			\
- 	-I$(top_builddir)/src/			\
--	$(NAUTILUS_EXTENSION_CFLAGS)		\
- 	$(WARN_CFLAGS)							\
- 	$(WERROR)				\
- 	-D_FILE_OFFSET_BITS=64			\
-@@ -22,6 +21,7 @@ INCLUDES =					\
- 	-DLIBEXECDIR=\""$(libexecdir)"\"	\
- 	-DSHAREDIR=\""$(datadir)"\"		\
- 	-DDATADIR=\""$(datadir)/brasero"\"	\
-+	$(NAUTILUS_EXTENSION_CFLAGS)		\
- 	$(DISABLE_DEPRECATED)
- 
- @INTLTOOL_DESKTOP_RULE@
-diff --git a/plugins/audio2cue/Makefile.am b/plugins/audio2cue/Makefile.am
-index 60fcae7..ebe6caf 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-burn3.la
-+libbrasero_audio2cue_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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 b46c9a8..86024fa 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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_cdrdao_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 20e7f8a..4359720 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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_wodim_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_genisoimage_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_readom_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 b82b753..d8b4650 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-burn3.la
-+libbrasero_cdrecord_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_mkisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_readcd_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_cdda2wav_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 57855e4..4acef8c 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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_checksum_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_checksum_file_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 3ecbff4..0fcd411 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-burn3.la
-+libbrasero_dvdauthor_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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 8f6718c..467a5e1 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-media3.la ../../libbrasero-burn/libbrasero-burn3.la
-+libbrasero_dvdcss_la_LIBADD = ../../libbrasero-media/libbrasero-media3.la ../../libbrasero-burn/libbrasero-burn3.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 8dd3328..99d3efd 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-burn3.la
-+libbrasero_growisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_dvdrwformat_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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 1351967..b4062a2 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-burn3.la
-+libbrasero_libburn_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_libisofs_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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 5f75139..b553220 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-burn3.la
-+libbrasero_local_track_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_burn_uri_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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 3ce1d28..4cdf5ec 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-burn3.la
-+libbrasero_transcode_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_normalize_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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-burn3.la
-+libbrasero_vob_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.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 2a55f8c..b265585 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-burn3.la
-+libbrasero_vcdimager_la_LIBADD = ../../libbrasero-burn/libbrasero-burn3.la $(BRASERO_GLIB_LIBS) $(BRASERO_LIBXML_LIBS)
- libbrasero_vcdimager_la_LDFLAGS = -module -avoid-version
- 
- 
--- 
-1.7.4.rc2
-