Clean up old revisions. Add missing patch from overlay.

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

5 files changed, 275 insertions, 167 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index e53baba5cce8..6055c0bbd9c8 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.111 2010/10/17 19:08:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.112 2010/10/20 20:23:44 eva Exp $
+
+  20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -brasero-2.26.3.ebuild, -brasero-2.28.3.ebuild, brasero-2.32.0.ebuild,
+  +files/brasero-2.32.0-build-plugins-against-local-library.patch:
+  Clean up old revisions. Add missing patch from overlay.
 
 *brasero-2.32.0 (17 Oct 2010)
 
diff --git a/app-cdr/brasero/brasero-2.26.3.ebuild b/app-cdr/brasero/brasero-2.26.3.ebuild
deleted file mode 100644
index 81258e17793a..000000000000
--- a/app-cdr/brasero/brasero-2.26.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.26.3.ebuild,v 1.13 2010/07/20 02:00:06 jer Exp $
-
-EAPI="2"
-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="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="beagle +cdr +css +libburn +playlist +nautilus"
-
-COMMON_DEPEND=">=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
-	>=app-cdr/dvd+rw-tools-7.1
-	cdr? ( virtual/cdrtools )
-	playlist? ( >=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 )
-	gnome-base/gconf"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta
-	css? ( media-libs/libdvdcss )"
-DEPEND="${COMMON_DEPEND}
-	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 cdr cdrtools)
-		$(use_enable cdr cdrkit)
-		$(use_enable nautilus)
-		$(use_enable playlist)
-		$(use_enable beagle search)
-		$(use_enable libburn libburnia)"
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	elog
-	elog "If ${PN} doesn't handle some music or video format, please check"
-	elog "your USE flags on media-plugins/gst-plugins-meta"
-
-	if ! use cdr && ! use libburn; then
-		elog
-		ewarn "You have disabled all burning backends for Brasero"
-		ewarn "Brasero can now do nothing at all. Probably not what you want."
-	fi
-}
diff --git a/app-cdr/brasero/brasero-2.28.3.ebuild b/app-cdr/brasero/brasero-2.28.3.ebuild
deleted file mode 100644
index 83d0903a4541..000000000000
--- a/app-cdr/brasero/brasero-2.28.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.28.3.ebuild,v 1.11 2010/08/14 18:57:50 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib
-
-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="alpha amd64 arm ia64 ~ppc ~ppc64 sparc x86"
-IUSE="beagle +cdr +css doc +libburn nautilus playlist test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.15.6:2
-	>=x11-libs/gtk+-2.16:2
-	>=gnome-base/gconf-2
-	>=media-libs/gstreamer-0.10.15
-	>=media-libs/gst-plugins-base-0.10
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libunique-1
-	>=dev-libs/dbus-glib-0.7.2
-	beagle? ( >=dev-libs/libbeagle-0.3 )
-	libburn? (
-		>=dev-libs/libburn-0.4
-		>=dev-libs/libisofs-0.6.4 )
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.22 )"
-RDEPEND="${COMMON_DEPEND}
-	app-cdr/cdrdao
-	app-cdr/dvd+rw-tools
-	media-plugins/gst-plugins-meta
-	css? ( media-libs/libdvdcss )
-	cdr? ( virtual/cdrtools )
-	!libburn? ( virtual/cdrtools )"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1.3 )
-	test? ( app-text/docbook-xml-dtd:4.3 )"
-# eautoreconf deps
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-PDEPEND="gnome-base/gvfs"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		$(use_enable beagle search)
-		$(use_enable cdr cdrtools)
-		$(use_enable cdr cdrkit)
-		$(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_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	rm -f "${D}"/usr/$(get_libdir)/brasero/plugins/*.la
-	rm -f "${D}"/usr/$(get_libdir)/nautilus/extensions-2.0/*.la
-}
-
-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"
-}
diff --git a/app-cdr/brasero/brasero-2.32.0.ebuild b/app-cdr/brasero/brasero-2.32.0.ebuild
index 691249d48a74..4b54f2e89417 100644
--- a/app-cdr/brasero/brasero-2.32.0.ebuild
+++ b/app-cdr/brasero/brasero-2.32.0.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.0.ebuild,v 1.1 2010/10/17 19:08:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.0.ebuild,v 1.2 2010/10/20 20:23:44 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 multilib
+inherit autotools eutils gnome2 multilib
 
 DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
 HOMEPAGE="http://www.gnome.org/projects/brasero"
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
new file mode 100644
index 000000000000..031cb250c33b
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.32.0-build-plugins-against-local-library.patch
@@ -0,0 +1,267 @@
+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
+ 
+