Version bump for Gnome 3.6.

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

3 files changed, 37 insertions, 25 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 984b2e425efe..bc942b97474d 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,9 @@
 # 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.146 2012/12/16 09:10:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.147 2012/12/16 14:07:18 eva Exp $
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> brasero-3.6.1.ebuild:
+  Version bump for Gnome 3.6.
 
 *brasero-3.6.1 (16 Dec 2012)
 
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 243fadd1f71f..b3f5754c80cc 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -13,17 +13,13 @@ DIST brasero-3.4.1.tar.xz 3233512 SHA256 e4fcd5dca1c7b0a930a43ae59953fa96db3f6be
 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
+EBUILD brasero-3.6.1.ebuild 2535 SHA256 1bce81740fc6cb449fc66cf1fd5ba17614275f96492360b63d7ea60c268959ed SHA512 2a0d2a92e1be6b94d5cb06c5b8cb843dd0d7721bd9da1c1bf1bd93cbbffb055793389784762bf5e9143e7aa0727ef43fee0411ae32588ff0bda621b11a77e867 WHIRLPOOL b4b24892f2d7736a962d46624f1c61b1f4e6e52fee7386236c46dafe03334d419e690257b8e9e7d06e1814ad32c26118f3a3f5151c957e962e46d9f782a8dfc3
+MISC ChangeLog 23899 SHA256 337f13ef1fb864bb3d20cd41dc63859c93e8078984e35dda52b1b0629a048b8c SHA512 5bf7465c54e8f3236243484d4708eedc4eba1d0b9d3f10d3a9023b0188422b6f2c31c414e8a54ea8700aa35c0efdf434854a51514d94553f16ba57959d2698cd WHIRLPOOL ae221f3ae3c73b798a4dc548b0784d5cd2f3f5fe06bcf060fbd2aff80a142a65829f289319ae0a31d8b904c1acfbf2b9356d6d5b3137e94d8c9e016dc6ea9dec
 MISC metadata.xml 701 SHA256 88db77e1d687f115e349955d16b87668900d105e5f8cf0baa99d04b32ff5da87 SHA512 ecd5c3323ab98e14ba515497af76b7a8c898a75cd0df05053557289b436b1f3fd8719828572ca849bd188d3e74082322c6441968f0b9d37a9983e677a5fb5a6b WHIRLPOOL 2e41f36a1cfe25ab7b0a99cf85e1f6e983f257cb04017d53f33e7899ce077db261b7978aae5b45ebde74951e70b81a2680ef6df859b4a2acf6fab0897b9ea1af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQzZAJAAoJEJ0WA1zPCt1huVMH/1QUctOT9RI9rPklF4SbTvtx
-9jDX9l4vCFsLw8cuvhy5dDAyHe3ciRvx9nwM0zvzBKM0KmPibBzuU79Kj7PCsCCS
-q/PvYG//fXs16sId4Z4EgBZ6UG0FgL9V/E3Gmw3tT6zETgHuO0/63SMnWSREsh3f
-lmW4IpXm6i2ClL3skX/dA0dZcCukzXa8qVKf96tMZECP2CIY0EMdACt4VKF4UIcj
-eeCgveJbaILHMdAL997TuqtI5OmvdtzBcmvswZqtHhW37babur7ZOYQVB3wAenR8
-GXPTQnrBJ1DebOy7nxrIN0leVYzUgOs2qcoeMhD011sWRUj32ABYqyHX7wUMhsY=
-=pcyW
+iEYEAREIAAYFAlDN1ZcACgkQ1fmVwcYIWAaBsACeMFtw8R1pVdHjR9eC61/ZASkg
+qf8AnROhX4x0SoDookKB+3BnXhaTacPq
+=yyNI
 -----END PGP SIGNATURE-----
diff --git a/app-cdr/brasero/brasero-3.6.1.ebuild b/app-cdr/brasero/brasero-3.6.1.ebuild
index 64c2a09ae4a9..55b4bd7c2999 100644
--- a/app-cdr/brasero/brasero-3.6.1.ebuild
+++ b/app-cdr/brasero/brasero-3.6.1.ebuild
@@ -1,28 +1,36 @@
 # 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.6.1.ebuild,v 1.1 2012/12/16 09:10:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.6.1.ebuild,v 1.2 2012/12/16 14:07:18 eva Exp $
 
-EAPI="5"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
 
 DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
 
-LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
-SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
+LICENSE="GPL-2+"
+SLOT="0"
 IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+if [[ ${PV} = 9999 ]]; then
+	IUSE="${IUSE} doc"
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
+	>=x11-libs/gtk+-3:3[introspection?]
 	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,11 +38,11 @@ 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:1.0
 	x11-themes/hicolor-icon-theme
@@ -55,10 +63,15 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	test? ( app-text/docbook-xml-dtd:4.3 )"
 # eautoreconf deps
-#	app-text/yelp-tools
 #	gnome-base/gnome-common
 PDEPEND="gnome-base/gvfs"
 
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/yelp-tools
+		doc? ( >=dev-util/gtk-doc-1.12 )"
+fi
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 	G2CONF="${G2CONF}
@@ -71,8 +84,8 @@ src_configure() {
 		$(use_enable libburn libburnia)
 		$(use_enable nautilus)
 		$(use_enable playlist)
-		$(use_enable tracker search)
-		ITSTOOL=$(type -P true)"
+		$(use_enable tracker search)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
 	gnome2_src_configure
 }
@@ -82,5 +95,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:1.0"
+	elog "your USE flags on media-plugins/gst-plugins-meta"
 }