Version bump for gnome-3.6, now uses gstreamer-1.0. Update description and license. Drop useless doc USE flag. Switch to global introspection flag. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

10 files changed, 60 insertions, 247 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 7542989ad674..984b2e425efe 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.145 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.146 2012/12/16 09:10:31 tetromino Exp $
+
+*brasero-3.6.1 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  brasero-2.32.1-r1.ebuild, -brasero-3.2.0-r1.ebuild,
+  -files/brasero-3.2.0-brasero.desktop.patch,
+  -files/brasero-3.2.0-brasero-nautilus.desktop.patch,
+  -files/brasero-3.2.0-drive-not-selected.patch, -brasero-3.4.0.ebuild,
+  brasero-3.4.1.ebuild, +brasero-3.6.1.ebuild, metadata.xml:
+  Version bump for gnome-3.6, now uses gstreamer-1.0. Update description and
+  license. Drop useless doc USE flag. Switch to global introspection flag. Drop
+  old.
 
   07 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   brasero-2.32.1-r1.ebuild, brasero-3.2.0-r1.ebuild, brasero-3.4.0.ebuild,
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 793eb5ec0145..243fadd1f71f 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -8,27 +8,22 @@ AUX brasero-2.32.1-useless-dialog.patch 2498 SHA256 0be1c75fea2e0d9b72130c266873
 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
-AUX brasero-3.2.0-brasero-nautilus.desktop.patch 862 SHA256 08df6699fcb17d17adb0c6dd0628b10d94cb6d80440d46568abb2be2513007a9 SHA512 8680a241600f8bfc5af6ee920be2ad1d8e117ff1b561ee17aab35460f233b34944324bf562284a114a454f9adfaae241eb60a1ff6b6afa4b2adb88d310694652 WHIRLPOOL 3941e8f8831a4159b3cda2c7a23b376be0c42248801cfe1f899fe4bd663fcd6762d9089c8c4d9fe3693672647c6b4214b6da1ef28f0ad618735b019a9b861461
-AUX brasero-3.2.0-brasero.desktop.patch 1195 SHA256 f2db32b293e54c628bed5e6cf84d8b1e6ca043511469aad3ce7ac8d1b7ae7ae4 SHA512 d47fdb0e9c21357edab3823400448cd1eff3254c0e47c29fca760123456e67b151ad9ef782318b371ff1ef42294b4d861cb813a344e6f3d1d8f82a004daaccb4 WHIRLPOOL ca1b4e36ad90dae69bbd94ad4749ee2c83a316e95e1c0708b157e75b385df4bf6c77fd02cea141e06dc3de841d74e5da7d11dacbb72012a2a57900db8681de96
-AUX brasero-3.2.0-drive-not-selected.patch 1111 SHA256 cfcee75b004d618ca9e6bf1b7522814f3d2bef13887b12e908b305170014dd53 SHA512 29ff982c89583bace14bc19c56c779222a562014634ddcd03cb178bf0ff9795995152a3c85c6cae94f3618c96c9e091807f0688a8c62abb6f6792e8f2ac2a826 WHIRLPOOL 5c0cae242035555d297606980ae48ab248844cfc2b035d9ec9ce93a16b3722b792278d65d513c3053dcfc02480113bed759669690c854c69b00663cbd58b9019
 DIST brasero-2.32.1.tar.bz2 4530933 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b SHA512 ebd08f5ff21685a853c9b339b19b51ffe62e6050a6373883dee1266b45b490308ea5a25a1167a1ea48b89ff64625114a95c6a9f5f42d0d6defc2edd9c0295f25 WHIRLPOOL b01b935ac042bfa129c2245b0fb351ef4ed7c18e5e230cdf8a058073aa4fc28e78137f2bbae173784dc48b440153dcf21def3757dcd8f52065b3065bb42aa103
-DIST brasero-3.2.0.tar.xz 2923972 SHA256 2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c SHA512 6809374acedf105915448750df361e2fd47bceecb348baf3a571aea4ff8c5bffc5f3550004e92acaa1235cbf7ce58e0343837ea1024a962603c872df1b3d22b8 WHIRLPOOL 8c791acaa908032f930b94799785136e614a3188bdff497d1fcb5025e49624a8900a23e6467a9101bcad86aa6190ff5cb25d2d537f961f679fb05fbaf57a6b43
-DIST brasero-3.4.0.tar.xz 3229628 SHA256 e35b739a7db54d21564232303bb9d12609a02976c36cdd8848ff4376a0809198 SHA512 b162f9785a5ad549ffc3bb6790d6a9dbcf982f5cdfd214655156aabae401dc6b25b389ed2d8f5f6d3ab3c71768acc1a19e941d4b62de83e779289ab77f9ceca5 WHIRLPOOL 308e2941d9083cfc63b5b0acfa867307d08f93983aafb1b448929241aca55d40314fced35971e42f4a38c5258b714eaff99f55c5c37f15dad6795038c764161f
 DIST brasero-3.4.1.tar.xz 3233512 SHA256 e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6 SHA512 238baf251982adefc3a206adf6e244d2d6326dc7a5e4768d60acab7d116392e5bd24ca8b15a804e309aeeda0ff5b18f22c2230d8f219c3ea432a1611dfe4b330 WHIRLPOOL 0a858c4c6db489e738d5b8624eb039264ef6fb9bd7ae57be1ecd2e597353c1d6ce53109405bdb4f91e85509da6e55cf96a035597c0b3ddf4ee8afd334db7167a
-EBUILD brasero-2.32.1-r1.ebuild 3640 SHA256 b3cb1288645b98a66b17e73e7ed38592c5252aa5edac1d7ae83a0fa508c2ce5b SHA512 6bb640b3100ee8f9fb4a9333bb75bd352123c83ee35972eab9968bdbf2b1cbb828294b247f38781bad2d41b56b73f60c92b9e84fedd32838995a33e2ba1467b2 WHIRLPOOL 70ebd3dea74a71f49314c45d4b3217059a9e45834b2bc9d7d6b762a89fad3b1a5ba34d20e8b7a0f5c2b02af93c7050f35be98c96889e96dbdcff1360cb3221c2
-EBUILD brasero-3.2.0-r1.ebuild 3004 SHA256 78e680ef7c77ed4b28d474138676b8f7689c44a4fee884620190636e96d0f59c SHA512 5b89ba7b2e0e483cb0e2aa3d24c1c40dfdd4fb94e94ccaca4179854d11e08854b80b65cc891e42d7774d9cd76137006968cd374ec6659877da98fb67e3d272a9 WHIRLPOOL 4a4992dda01d71a3bf109c096fa1f6d084cc0345766c398c7953d1b311cc6c6a40fdf840212db65c073b62a39043ca81afc5707c038c81f30530613e8ef31ba4
-EBUILD brasero-3.4.0.ebuild 2470 SHA256 b286e749afba0b6bc98c49a5f26e583bc54cc1ccc8a6a84fff74d4b15801cd7d SHA512 eb6552edde847d006439f03c0978054732c5a47e438a348e15838e2229b117ca916d9666fd223068d0197b558bb16cac65d80eba947966da5b4bfcfd12ad6742 WHIRLPOOL df5578cee87032e2cc9ca159effdd2db00718108b41b144dc8b159c24a07a66ddede4961d54894bbc0a1c8579df7db59d659fdc3125875c2d3dafe3eb8378c65
-EBUILD brasero-3.4.1.ebuild 2470 SHA256 5664158ab091148de81e3d5b33a380619fd31bf392978f681a74e8d8a26784ac SHA512 7fe205af0e24ae675d901d41710b6b340de26b9d3d4998cdd66a4b2aa2cc903bc22d0d76f56bf8a9418affcf57cd104840a20111e9721e4ef12d2baf1ec6ca29 WHIRLPOOL fbf2f11aabfe52d24c5eff9abcc48c0abbaaec09fc0640246198f3d2542937f98fe82a423a8db6a17ad6fb2f6647d5f05d944df04292f750d4d50f8b02b371ae
-MISC ChangeLog 23256 SHA256 5e340fa53fe3f1284fa07ab8451c3ad7a0a6381bdfa0474ce565f15f294382b8 SHA512 ee35789b9dee4f7e2dbf8d3b5e55ab31eb1712b752769242298ba80b001a06092e4d60d6ae993d7f4c353da535a3d86ce23d36826cb3151743e25e8df7ce5a71 WHIRLPOOL e4baf2e53529f40b888268247521e1ee6892a4bdc1f5315b30c27646567a3ebf8d05ebebd34649ba624e3314ccd8ec6c8f631a5da8f58a20ac61b182fdc85950
-MISC metadata.xml 804 SHA256 5cf5e6975460ecc9b4611798e81f3d299c3e808792ff1e553140a940cfa739bb SHA512 d05f12fa3a358a293b0e1d04b3463396bdb2aaa285f6096fa3c4a8a9c5c9086c984106ee3f36d23d3244a96714445132e7d3d3f55c456959a7d718e01b93b8bd WHIRLPOOL 6945585208ccf32bc3efda2965ded655e2223d9cbb0e9c5fe54ac8c54aed98e2cbcca40e3c89b9a6b121761a4ad8c39c7ac1d34c7082960b52af59f9ed4a1352
+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 2373 SHA256 e5c35eaec307af9796d73bba100a205ff93f459ee85de785f2a5ee45d50c0812 SHA512 2a244edf1b047b0cf64f3f43482526b04239f815bbe3d6d736a3d251a62b73114746d16cbbc63f6fc40949742996a2067c01a35fe9422c1d8719dd3f6b7c7818 WHIRLPOOL 85e4d1011899ee18a4dd1a4b5219bb89ce97a092ffcb2b630641216fd8dd158dcb699f09931baafe23a5106ad627b366aaa29a3276a686fbde8dbf4919259a3b
+EBUILD brasero-3.6.1.ebuild 2387 SHA256 6ab89bbc29ff10708463e87bf1b4fc093939e36c5cab33df8f12e0eff3986969 SHA512 dc04c584510240cdebedce19373fe32e8cfa854013dc3e29baa3345c325c1bf09a66eeaee8690c870212ccf3aab0fc828f652dd2224dab0c58d75a93e81d16ef WHIRLPOOL 75a45d36b7ca5179d54f6d1f8642532a9fc82008f17b5784a338027108bd58e78fb1589f6dd18328dc262d45ee1312b6602c7b3f2d520789c3869a7af4518274
+MISC ChangeLog 23798 SHA256 8dbcc78eeb01a0484cce505aa58b411cb64cd1e852a51ab122c29df14345f733 SHA512 f68f3389f4c75c8c38fcd7397f87fe6a7e0ecccfa068b51a3c042add38f5a26d6827e0eae055151ff7cdb4f9550218798d5766cd4c6da42d91f86eda8c3df563 WHIRLPOOL 112c15ea5d5d5e18555096cbe2439ace5e96519320efae22ed75a10abb85a3348188aa043a1b236f9b8838b6f709092badf82d549d8dfd4e7de7bb84734a8eab
+MISC metadata.xml 701 SHA256 88db77e1d687f115e349955d16b87668900d105e5f8cf0baa99d04b32ff5da87 SHA512 ecd5c3323ab98e14ba515497af76b7a8c898a75cd0df05053557289b436b1f3fd8719828572ca849bd188d3e74082322c6441968f0b9d37a9983e677a5fb5a6b WHIRLPOOL 2e41f36a1cfe25ab7b0a99cf85e1f6e983f257cb04017d53f33e7899ce077db261b7978aae5b45ebde74951e70b81a2680ef6df859b4a2acf6fab0897b9ea1af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQmtYlAAoJEJ0WA1zPCt1hCncIAK04qNqlek70QOhi0YVbrj2J
-hc6M+AGINp6oiG1m6dyjzHFZwTTGcmdIa9OQgONGTy+5TyQ2ZuWSlNasXg6YSNm1
-TXs8c2D0Lpk2XQ8L2tuCO92cHII2nYXigz44mbKxgZr8/WLrDVqIoWBCf9PwgvQy
-vMQaejqAKQ4jZdt+qBx5ZsH1JIm9NAlvQRGUfPSKkM1iogUcA6j0VOOjUDnyvsXx
-IVEhwcW2Imy6H5yP3Usq6QaEkHYb81twgs3XMun1LQrhuwT5ZRbxMUrnPBAd8aQk
-mK/Ou7jKNcwy/LjrcE41jrwa86lW4/qkqJrccuS61AYikZhE7y5SjETgsxrELTI=
-=sVW7
+iQEcBAEBCAAGBQJQzZAJAAoJEJ0WA1zPCt1huVMH/1QUctOT9RI9rPklF4SbTvtx
+9jDX9l4vCFsLw8cuvhy5dDAyHe3ciRvx9nwM0zvzBKM0KmPibBzuU79Kj7PCsCCS
+q/PvYG//fXs16sId4Z4EgBZ6UG0FgL9V/E3Gmw3tT6zETgHuO0/63SMnWSREsh3f
+lmW4IpXm6i2ClL3skX/dA0dZcCukzXa8qVKf96tMZECP2CIY0EMdACt4VKF4UIcj
+eeCgveJbaILHMdAL997TuqtI5OmvdtzBcmvswZqtHhW37babur7ZOYQVB3wAenR8
+GXPTQnrBJ1DebOy7nxrIN0leVYzUgOs2qcoeMhD011sWRUj32ABYqyHX7wUMhsY=
+=pcyW
 -----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
index 9020d43a9ced..1eb7a7613e22 100644
--- a/app-cdr/brasero/brasero-2.32.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.11 2012/11/07 21:44:04 tetromino Exp $
+# $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"
@@ -9,10 +9,10 @@ GCONF_DEBUG="no"
 
 inherit autotools eutils gnome2 multilib
 
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2"
+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"
@@ -51,11 +51,9 @@ DEPEND="${COMMON_DEPEND}
 	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() {
diff --git a/app-cdr/brasero/brasero-3.2.0-r1.ebuild b/app-cdr/brasero/brasero-3.2.0-r1.ebuild
deleted file mode 100644
index 943d27b8c798..000000000000
--- a/app-cdr/brasero/brasero-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,104 +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.2.0-r1.ebuild,v 1.3 2012/11/07 21:44:04 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-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="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+css doc +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
-	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
-		$(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() {
-	# Useful upstream patches, will be in next release
-	epatch "${FILESDIR}/${P}-brasero-nautilus.desktop.patch"
-	epatch "${FILESDIR}/${P}-brasero.desktop.patch"
-	epatch "${FILESDIR}/${P}-drive-not-selected.patch"
-
-	# Fix linking against installed libraries, bug #340767, gnome #641233
-	# requires eautoreconf
-	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:0.10"
-}
diff --git a/app-cdr/brasero/brasero-3.4.1.ebuild b/app-cdr/brasero/brasero-3.4.1.ebuild
index e6a5893bcca0..c53cb92876fe 100644
--- a/app-cdr/brasero/brasero-3.4.1.ebuild
+++ b/app-cdr/brasero/brasero-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.4.1.ebuild,v 1.3 2012/12/16 09:10:31 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -8,13 +8,13 @@ GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+css doc +introspection +libburn mp3 nautilus packagekit playlist test tracker"
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
@@ -54,11 +54,9 @@ DEPEND="${COMMON_DEPEND}
 	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() {
diff --git a/app-cdr/brasero/brasero-3.4.0.ebuild b/app-cdr/brasero/brasero-3.6.1.ebuild
index 7d8c26c83a60..64c2a09ae4a9 100644
--- a/app-cdr/brasero/brasero-3.4.0.ebuild
+++ b/app-cdr/brasero/brasero-3.6.1.ebuild
@@ -1,28 +1,28 @@
 # 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.0.ebuild,v 1.3 2012/11/07 21:44:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.6.1.ebuild,v 1.1 2012/12/16 09:10:31 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
+DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2"
-SLOT="0"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
+SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+css doc +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
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
 	>=dev-libs/libxml2-2.6:2
-	>=x11-libs/libnotify-0.6.1
+	>=x11-libs/libnotify-0.6.1:=
 
 	media-libs/libcanberra[gtk3]
 	x11-libs/libICE
@@ -30,42 +30,39 @@ COMMON_DEPEND="
 
 	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 	libburn? (
-		>=dev-libs/libburn-0.4
-		>=dev-libs/libisofs-0.6.4 )
+		>=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 )"
+	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?]
+	media-libs/gst-plugins-good:1.0
 	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 )
+	mp3? (
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-mad:1.0 )
 	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
-	doc? ( >=dev-util/gtk-doc-1.12 )
+	gnome-base/gnome-common:3
+	sys-devel/gettext
+	virtual/pkgconfig
 	test? ( app-text/docbook-xml-dtd:4.3 )"
 # eautoreconf deps
+#	app-text/yelp-tools
 #	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
 PDEPEND="gnome-base/gvfs"
 
-pkg_setup() {
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
-		--disable-scrollkeeper
 		--disable-caches
-		--disable-dependency-tracking
 		$(use_enable !libburn cdrtools)
 		$(use_enable !libburn cdrkit)
 		$(use_enable !libburn cdrdao)
@@ -74,9 +71,10 @@ pkg_setup() {
 		$(use_enable libburn libburnia)
 		$(use_enable nautilus)
 		$(use_enable playlist)
-		$(use_enable tracker search)"
+		$(use_enable tracker search)
+		ITSTOOL=$(type -P true)"
 
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+	gnome2_src_configure
 }
 
 pkg_postinst() {
@@ -84,5 +82,5 @@ 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"
+	elog "your USE flags on media-plugins/gst-plugins-meta:1.0"
 }
diff --git a/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch b/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch
deleted file mode 100644
index a7d9865ce989..000000000000
--- a/app-cdr/brasero/files/brasero-3.2.0-brasero-nautilus.desktop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 6df46b408e03e88801c6a84695d387a85452c320 Mon Sep 17 00:00:00 2001
-From: Luis Medinas <lmedinas@gnome.org>
-Date: Thu, 20 Oct 2011 22:48:58 +0100
-Subject: [PATCH] Fix for Broken (and useless) brasero-nautilus.desktop desktop file
-
-Closes bgo #662275
----
- nautilus/brasero-nautilus.desktop.in.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/nautilus/brasero-nautilus.desktop.in.in b/nautilus/brasero-nautilus.desktop.in.in
-index c55b160..83fa123 100644
---- a/nautilus/brasero-nautilus.desktop.in.in
-+++ b/nautilus/brasero-nautilus.desktop.in.in
-@@ -8,7 +8,7 @@ Icon=system-file-manager
- MimeType=x-content/blank-cd;x-content/blank-dvd;x-content/blank-bd;x-content/blank-hddvd;
- StartupNotify=true
- Terminal=false
--#Type=Application
-+Type=Application
- OnlyShowIn=GNOME;
- NoDisplay=true
- X-GNOME-Bugzilla-Bugzilla=GNOME
--- 
-1.7.7.2
-
diff --git a/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch b/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch
deleted file mode 100644
index 5af07f48584c..000000000000
--- a/app-cdr/brasero/files/brasero-3.2.0-brasero.desktop.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f8aef8ae82831ebfda9520d6e7e82a2cad99383d Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Fri, 7 Oct 2011 00:04:17 +0200
-Subject: [PATCH] Update categories in brasero.desktop
-
-I don't think Utility (nor Core) should be there, and it exposes a
-gnome-shell bug where brasero appears twice because it's in two
-categories.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661134
----
- data/brasero.desktop.in.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/data/brasero.desktop.in.in b/data/brasero.desktop.in.in
-index ac83297..ce560c2 100644
---- a/data/brasero.desktop.in.in
-+++ b/data/brasero.desktop.in.in
-@@ -2,7 +2,7 @@
- _Name=Brasero
- _GenericName=Disc Burner and Copier
- _Comment=Create and copy CDs and DVDs
--Categories=GNOME;AudioVideo;DiscBurning;Core;Utility;
-+Categories=GTK;GNOME;AudioVideo;DiscBurning;
- MimeType=application/x-cd-image;application/x-cdrdao-toc;application/x-cue;application/x-toc;audio/x-scpls;audio/x-ms-asx;audio/x-mp3-playlist;audio/x-mpegurl;application/x-brasero;x-content/audio-cdda;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;x-content/image-picturecd;
- Exec=brasero %U
- Icon=brasero
--- 
-1.7.7.2
-
diff --git a/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch b/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch
deleted file mode 100644
index 812a8a5fbdc3..000000000000
--- a/app-cdr/brasero/files/brasero-3.2.0-drive-not-selected.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f9d1053a648110efbeb02bee6ee162eaaa809306 Mon Sep 17 00:00:00 2001
-From: Luis Medinas <lmedinas@gnome.org>
-Date: Mon, 24 Oct 2011 00:52:08 +0100
-Subject: [PATCH] Add a fix for optical drive not selected by default.
-
-Fixes bgo #662541 - Optical drive selection not displayed
----
- libbrasero-media/brasero-medium-selection.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libbrasero-media/brasero-medium-selection.c b/libbrasero-media/brasero-medium-selection.c
-index bdf2044..858b1d1 100644
---- a/libbrasero-media/brasero-medium-selection.c
-+++ b/libbrasero-media/brasero-medium-selection.c
-@@ -562,6 +562,8 @@ brasero_medium_selection_show_media_type (BraseroMediumSelection *selector,
- 			                                   MEDIUM_COL, medium,
- 			                                   -1);
- 
-+			gtk_combo_box_set_active_iter (GTK_COMBO_BOX (selector), &iter);
-+
- 			medium_name = brasero_medium_selection_get_medium_string (selector, medium);
- 			medium_icon = brasero_volume_get_icon (BRASERO_VOLUME (medium));
- 			gtk_list_store_set (GTK_LIST_STORE (model), &iter,
--- 
-1.7.7.2
-
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index 2715dd3fdb8e..1ba9e6470da3 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -6,8 +6,6 @@
 	<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>