Bump to 3.0.0, from gnome overlay for GNOME 3, drop keywords, bug 379651

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 429 insertions, 17 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 4957a5c30766..bd933f018793 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.130 2011/07/19 13:14:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.131 2011/08/19 15:19:22 nirbheek Exp $
+
+*brasero-3.0.0 (19 Aug 2011)
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/brasero-2.91.6-build-plugins-against-local-library.patch,
+  +brasero-3.0.0.ebuild, metadata.xml:
+  Bump to 3.0.0, from gnome overlay for GNOME 3, drop keywords, bug 379651
 
 *brasero-2.32.1-r1 (19 Jul 2011)
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index f10686cf3070..7ae25c82081b 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -6,15 +6,28 @@ AUX brasero-2.32.1-fix-size.patch 2244 RMD160 1a476af590d92c41f1d16aaa25b96f258c
 AUX brasero-2.32.1-useless-dialog.patch 2498 RMD160 f5ffa8cf8056201654f9be090b9a12a9fbd533a3 SHA1 fe872decc38c16557ec8fd1d024d59f9f0df3159 SHA256 0be1c75fea2e0d9b72130c26687338f33061a96202c99fcf85c06e2749560912
 AUX brasero-2.32.1-warning-silenced.patch 690 RMD160 9081cdc99c30f3cf82ea02d2eef843697f024283 SHA1 41c92574d5320560ff209c3a5cd73cab12ad2a30 SHA256 899ca8171a751332957ec21c3028ebc4a4d303bda30699d57cf0f6607bd2ae58
 AUX brasero-2.32.1-warning-silenced2.patch 616 RMD160 6f69ff16b87b1432dae55849a40efc4b23c62181 SHA1 f4f8c233ade48d7c166b877d81573ac4f56462a2 SHA256 cb435ec18ba02e445ebbf55c5cee16ce078d0e6e762e5821222e911a13ce5f5d
+AUX brasero-2.91.6-build-plugins-against-local-library.patch 14905 RMD160 a84a15050c4b21999c4efdff520606d8d1d563f2 SHA1 bff5cd114b5f98a8b0a39132619a6d39a000d29e SHA256 5978545e14615c43d306e7eb134f1efd6dab9be2e1f80756bd9948e6d6a9db69
 DIST brasero-2.32.1.tar.bz2 4530933 RMD160 0acfcc53077cbbdaa5e0e593f290c41825f72838 SHA1 56141108561f2b8d45998662b86cf6e20f0ff4f2 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b
+DIST brasero-3.0.0.tar.bz2 4746147 RMD160 8a28a5f09ebcdc2638593fd0d16aa79ed2165577 SHA1 f8091b835aa9260a68de41c3b8f8bc47e9bea9de SHA256 aff1e900d6c68096e43a80443c8c367374fb980986d2f823d229606605a410e3
 EBUILD brasero-2.32.1-r1.ebuild 3528 RMD160 18ffc8155ee93efbfe766d330e000a54d8180939 SHA1 59cc9066a2695ca958b736ce417c01b850bb3345 SHA256 a63479be71bfc33ca0fb39261f541e40cb440aa0c32f0af126bc77ffa9f28f59
 EBUILD brasero-2.32.1.ebuild 3133 RMD160 6827f0836838fc34ec949ca09f9bf1dfc2a90b7d SHA1 50922bccf99e76e837f252f410660af265d4b871 SHA256 2f1811e303a3c6dbffa24d2b77c5dd91fd2de796efa98e5a271a0a9992103de3
-MISC ChangeLog 20497 RMD160 05b42f502af474f2f51125d8fc79971424b6a1fc SHA1 33c31193945a15a4fbad52f01ccb340abb2cea51 SHA256 02c8b6b4e101d5a683c955b8066da133b1a85cc3723b3a3f8724465369c089fc
-MISC metadata.xml 556 RMD160 d56c60c90e372b42082fb29ebc27c848c3797b4e SHA1 5c235714b113475a72165d00c81851f3e51823f6 SHA256 a51028424ee10f80ab9b13171dca9e317d109a37883b609cf337362d43d383da
+EBUILD brasero-3.0.0.ebuild 2593 RMD160 df4750791e6e850f61fe261188e059a6d8a304cc SHA1 3c4c2b95a73c95e4f46a9308bdadc276af8e8a40 SHA256 48e3a95c6e44d1893678e5006af6b6734e61182fdc33b4738901cd7ea95ac6ae
+MISC ChangeLog 20766 RMD160 7cef35368c6a61647c079dcfc59a2f9976411539 SHA1 6030c683edd5b58491c4520df71d14f721a84c33 SHA256 8c4a121b290673b98313d5183383d55a29082f0ee2b37ac407eead8d3400fbb2
+MISC metadata.xml 696 RMD160 c4f0242ff0e0c6b0350e4c970136ed42db19a8d0 SHA1 12b1259a2591d75bc528ce4a8062842a181f2bf3 SHA256 c207472cce53a75fd920cf5fabf3d09cbb30d744f11acef6eb09dc6a7a158fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4lg0wACgkQCaWpQKGI+9QMUQCdH/V2MSgN1lz8tFJpARl71y9B
-FJUAniZe1VK95Dw6SDxrHiu6NWmOVARA
-=s2Uh
+iQIcBAEBAgAGBQJOTn8FAAoJEO/kOhxWD91kxLAP/2hOq/IYz0J2fa7F9G2DED6t
+SzJZoKoRtJ0SvFNCM4Os7ELpw77vx5Qpga9T68J20NF/cnHg2XltocM2SGr873j9
+isO5rgdgq75npjVjzCNeCuEJd4065yOtKno5n2C3x9CFtq48nDv4IuxcIrBg8D0d
++0OOiVUzVcprHc1q+OM7AADRk+A1EsQuCMoUi4TbGBoIq4cinQxw9mAIfpf5LGX9
++FgLphBBomvdf/xVPmlTC701UNJqIW0FNDWPkKmrZJywaSrboJIFrN9x3HTRLDku
+y2/uNlVFvyFamGZzKmS/gGl+MayvJqxM+ChNj9hNnosCaKZry0D5gK6cRBhO5wnj
+vwUzeg2KfO1reKNCaAegClRaBp/CF32OmnHBVN9avZX+BzqVxfAyvzpYZ7UYgDgO
+98VjbB80pB8/ra9rLxoGicdmSFB85qxoEX+K1YG6L30VpszcCxWttF/AEabKTT2i
+NwmjRj/jkB0SkY6M9zE2HBkv76CJT1VOEp3sK/ydwbvUrW8xM4vRJKUcW9U2yXfA
+EW9Az3C8vmnle89/WF6dgY/lsDO+S3bM6musu6MxnEPyfPK9S0v/nmaUWC3gIssE
++YKQyBbHbfQBOA1dod8rMzf5d8daZNEC9ZxWxswTHXDhq7HUKb63CAsZllwQFTWl
+9/vTL2Xdvcnyl1qhpyvo
+=6y5v
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/brasero/brasero-3.0.0.ebuild b/app-cdr/brasero/brasero-3.0.0.ebuild
new file mode 100644
index 000000000000..edb010105225
--- /dev/null
+++ b/app-cdr/brasero/brasero-3.0.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.0.0.ebuild,v 1.1 2011/08/19 15:19:22 nirbheek Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2 multilib
+
+DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+HOMEPAGE="http://projects.gnome.org/brasero/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+css doc +introspection +libburn nautilus packagekit playlist test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.28:2
+	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=gnome-base/gconf-2.32.0:2
+	>=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 )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:0.10
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
+	packagekit? ( app-admin/packagekit-base )"
+DEPEND="${COMMON_DEPEND}
+	app-text/gnome-doc-utils
+	dev-util/pkgconfig
+	sys-devel/gettext
+	dev-util/intltool
+	gnome-base/gnome-common:3
+	>=dev-util/gtk-doc-am-1.12
+	doc? ( >=dev-util/gtk-doc-1.12 )
+	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-scrollkeeper
+		--disable-caches
+		--disable-dependency-tracking
+		--disable-search
+		$(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)"
+
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+}
+
+src_prepare() {
+	# Fix linking against installed libraries, bug #340767, gnome #641233
+	epatch "${FILESDIR}/${PN}-2.91.6-build-plugins-against-local-library.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	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"
+}
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
new file mode 100644
index 000000000000..31beb4c1f6f2
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-2.91.6-build-plugins-against-local-library.patch
@@ -0,0 +1,294 @@
+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
+
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 65f429789245..9c440cd5ad41 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-optical</herd>
-<herd>gnome</herd>
-<use>
-	<flag name="introspection">Use
-		<pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
-	<flag name='nautilus'> Build <pkg>gnome-base/nautilus</pkg> extension</flag>
-	<flag name='libburn'>Enable <pkg>dev-libs/libburn</pkg> backend</flag>
-	<flag name='playlist'>Enable support for playlists through
-		<pkg>dev-libs/totem-pl-parser</pkg></flag>
-</use>
+	<herd>media-optical</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="packagekit">Enable support for the distro-neutral package
+			manager GUI <pkg>app-admin/packagekit</pkg></flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+		<flag name='nautilus'>Build the <pkg>gnome-base/nautilus</pkg>
+			extension</flag>
+		<flag name='libburn'>Enable <pkg>dev-libs/libburn</pkg> backend</flag>
+		<flag name='playlist'>Enable support for playlists through
+			<pkg>dev-libs/totem-pl-parser</pkg></flag>
+	</use>
 </pkgmetadata>