Version bump. gtk3 related fixes, translation updates.

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

5 files changed, 96 insertions, 158 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index bdc688f240aa..86e66cce1459 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.249 2012/05/13 00:33:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.250 2012/10/21 11:03:25 eva Exp $
+
+*gnome-media-3.4.0 (21 Oct 2012)
+
+  21 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-media-2.30.0-r1.ebuild, -gnome-media-2.32.0.ebuild,
+  +gnome-media-3.4.0.ebuild:
+  Version bump. gtk3 related fixes, translation updates.
 
   13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-media-2.32.0-r300.ebuild:
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index fc9b84c8b509..11f8eb1860b8 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gnome-media-2.30.0-lamemp3enc.patch 1196 RMD160 4dc9df3ddf49985b02c623dc8a4bef033a5752dd SHA1 2440963d6ae65addcb779609a7dca1ce1ea35a0a SHA256 0e12477ed7d8e94bb342f60205d5dc438f611915f1029141603c6f6f3322b6f4
-AUX gnome-media-2.30.0-microphone-icon.patch 1109 RMD160 8fcfb5a0bebd64fec8e16d455c5b7ee8b05b47df SHA1 f4593423110dd80afe511b069654621d273f7e99 SHA256 ea2c50ea6945598ca7c0ef495acc2934da19fb3fddea824160b46a339e16ccff
-AUX gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch 1177 RMD160 eff854f32eb30c4ee52ddf2e00f3996d8f7df825 SHA1 3228e83aec221d0422f311fd5c6dc52919950869 SHA256 7aa02ad5ebcd45dafcf70ef9fff61f9689c3aa84e623988d94f3d099ee5bd2a6
-AUX gnome-media-2.32.0-gvc-channel.patch 690 RMD160 4b3f300287c7bca073dd9e719d83d734ce251658 SHA1 b6dab90f2e10b03d022e5456a14ccbc208034944 SHA256 51e59fb42114d70118f4b750a06a33e0e40b0a03ed6509dc1348c641cc274d74
-DIST gnome-media-2.30.0.tar.bz2 2707711 RMD160 9ba6f6fdc25afa34072e80ca4102800d7d75e2bc SHA1 c077f1c0a4ef97908c7bb36e41477c77069fdcd0 SHA256 994cd9b88ff22e4815585629b14efc828a95284900809b0b4f8ebcde0c6e2926
-DIST gnome-media-2.32.0.tar.bz2 2814365 RMD160 c24ec7d76ca1c63610ca78f6291b2abb19f05a3c SHA1 63fd51515338e4a67d0bd2871ff4d554245bc57c SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6
-EBUILD gnome-media-2.30.0-r1.ebuild 2146 RMD160 67d7385335c5c7c672586876358eb5146d79b4de SHA1 4d93d5191dcb78318244ce095b060225bd2a2abb SHA256 3a56eb2cfbb173b17e6a81e7670f25662dd8ca53157342dc99f08a055c4b4f68
-EBUILD gnome-media-2.32.0-r1.ebuild 2567 RMD160 43d83cc506322a7eaf59e9cb19772c9775ff0e41 SHA1 345fd17ae10509634ae11f3f46f9080ccfc1b329 SHA256 871f0d1f4e69b159810c8c4d7389184354202dfaf0bce7221487428974aa3b24
-EBUILD gnome-media-2.32.0-r300.ebuild 2529 RMD160 da844a08ce50325861fbcbd16743e91451950751 SHA1 832a736a085f9bff0bb84da63899f550304efc83 SHA256 1e54217bad49e7b83a862569594c9e8d2eabce65360314fc908bd73c4f01313c
-EBUILD gnome-media-2.32.0.ebuild 1865 RMD160 e54d761ec3390a56b911378a6433b0ea5ebb1f2f SHA1 4b55181df41201caed2c429ff82203815859c552 SHA256 a6ec35665954accb33ad18296c7b046ce612c270a77df26baedd53c8c6f1b73e
-MISC ChangeLog 33103 RMD160 fa8813a9c1dda5e05abb4c6c193f57f63535918c SHA1 51fc5cf235a41195f515fe46792f5d6e0c9b8302 SHA256 6174f157d30a5140cce29497779ef5e357928f035720579d7e29680ee1c63f87
-MISC metadata.xml 262 RMD160 bf55b10dc025acd11da20309b2d0bd2a178d21f9 SHA1 cdd85a8b21f4d1bfb58a9cab84ac3b08a90c8dc5 SHA256 42eae4d6a844319a18ef286c46ebd42bf18b415e5acffb38b77a4c5f6f9bd95b
+AUX gnome-media-2.30.0-lamemp3enc.patch 1196 SHA256 0e12477ed7d8e94bb342f60205d5dc438f611915f1029141603c6f6f3322b6f4 SHA512 b16a3616eff6b9a4e74d7dfe56f64b391eec3b721db561bc40d5e49533d40cb8cff9b6a8b76ba976c749ab5a57a6320512174a94496221f6272bce88b2c07a26 WHIRLPOOL 8b7b346246eff999ef1e6326ff9beadd254d83040c44d5e26680ce19405e8f4e4235996127af17d0c30bb75754db136097cca14116398a714a1c2a2cd144f5f2
+AUX gnome-media-2.30.0-microphone-icon.patch 1109 SHA256 ea2c50ea6945598ca7c0ef495acc2934da19fb3fddea824160b46a339e16ccff SHA512 119fea384c6f2382dcc671a826a593c018580d00d77bac381e1158868f456d51ad5aad83504ef6b4a9f4861935f02590a6ab9d81989fad962f6ea45006abe46e WHIRLPOOL 9c6489621640d78b4e7da4c3a39c69857c250d65eb39f8472773b0c5c525e01a12479957e9a030467879b8a94c81fc536c8f5aa57b8487897ede673aac52045b
+AUX gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch 1177 SHA256 7aa02ad5ebcd45dafcf70ef9fff61f9689c3aa84e623988d94f3d099ee5bd2a6 SHA512 825a0feaaed2771a777f2d79978f735a4137898cb56cb30c24991f91a73f3da0ba83f5c08909d70074fc383cc4c0e544f3cdc9495a52ee442b1ecc1687cacf30 WHIRLPOOL 461c52319bd4977ca7c2b1c70dff05fcf73031a82f2c445c40c5df7f96b854e96b80b568ac5c133d9c01ffeeb2dfaa578580ebdf893ba4cbdf6657dd0e8404b5
+AUX gnome-media-2.32.0-gvc-channel.patch 690 SHA256 51e59fb42114d70118f4b750a06a33e0e40b0a03ed6509dc1348c641cc274d74 SHA512 80996307f6c6870d5a148414f25eaeb5c9f974cd93971ad29a7e49468eec1270e7e2ee7d78914967b8cddb605967b1930af6a32b279d7d9c82d879d4e4539f90 WHIRLPOOL a4d15f7693c99babd0a9b8c73da9ab5d2eab0c0f13286cd15d420a162b6c8012f4b725c02c5b1f791738cb01db7dd65c60b3f84c2591a936307d6864f50ccc97
+DIST gnome-media-2.32.0.tar.bz2 2814365 SHA256 2b0ad4decd75406398f46e82a170e53bcbc6e1bdc3363f03a07b00f59c2fe5e6 SHA512 c43aa3d88811dbd5e8f4aa0f44c6efbc5aa3576170280c27ed95a1f45cb5f18bf40b4c2cfcc27db1a97b7e216070255e74f15cf39d66af5a70c4065f4e609592 WHIRLPOOL 18fe0424a40b5692ae9925c3cb4d9e2ec0238f866a67d76f0484a605b6ff9236fbb2716d4a7e011722ffeb6a20bacc8e5d07ce4a6f2f9d74512bbcecc022a47a
+DIST gnome-media-3.4.0.tar.xz 1832200 SHA256 a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f SHA512 6466b7f451a6c6fb2dd3569bb3a83fb7b7826593cb09b6608daf8e99bee6afec628a547e63d1139d2a4358cf9ceb4891bb02b503ea04c88de874a16ea6a1babb WHIRLPOOL 5fd481f7d38ee67aa32c3eb9b4c473b86297b7b6f89d6605fda53a813da11d5ab0a133e5523d3dded3d3e2b567cc9de76fd693a51f18ebdd94f61d2585261b66
+EBUILD gnome-media-2.32.0-r1.ebuild 2567 SHA256 871f0d1f4e69b159810c8c4d7389184354202dfaf0bce7221487428974aa3b24 SHA512 924294c090d414dfc09ae2b9cc40ab94ec7260d88cd80fc3767404dbdeda7b7a4241c7acf0473c07424e5e950a1869a53afa5d9452f48a8cf3d32b4b9bd60209 WHIRLPOOL b3974112363375e4fffec9eae5bb76468855013e80e90f5dea2aec891aabe221a8f092e346ef721c8abdbc88e21eb5ece625bbf9ea4e85131ae3bad6cf96a44f
+EBUILD gnome-media-2.32.0-r300.ebuild 2529 SHA256 1e54217bad49e7b83a862569594c9e8d2eabce65360314fc908bd73c4f01313c SHA512 548dbd47f614b9483161b551e58ea1206975a4f65674047de4c40cb8a40a1e7813d95150b99973e7d13e8fcd589a4c69661e272fe7ee1d4d92dcf63eecbcc61c WHIRLPOOL 4f59c9daa05c3c99e4185884b5c7128dc51b9a290946ffa4a49f915ce8eb6bbf644d29f624cb5e62c05aa94b656da7691a7f69c092bfc95cc354abce35b931fd
+EBUILD gnome-media-3.4.0.ebuild 1970 SHA256 f6b7eb48629ab3b161d79d2cc1f51f5cbe32a2760b95dab9f7af35b5ac93b8a6 SHA512 b9abb1c6306a44b4200e4a26837ffed62f81a4dd3990676cc3dd2b7c559aa398b9efac73437eb580e5dd9bb0a4a11fa5d973efe389abe87c47619e0895d9c31e WHIRLPOOL a96ac6a1d657c32632557bce432105e9d7cdcc0d7951fcfd32877c4164fa873a1f54bbe2a6fbf0fdbd0d1201bc7452f7d207f4a67aec32541d1241000204f106
+MISC ChangeLog 33333 SHA256 6679588b24cb21485d87b3b578609d074b3d28f717d684ff903a98b5c728b598 SHA512 8d2288ff24d99a45552251a25e6df09c4ead7180d7fc44e333d1ca5b77fb6697bb06585b065bdb48bad66c645e4295e833499592ce7905598abfd122eca2f6be WHIRLPOOL d5df7abdd1bcb77abdd649e8d745dc87749d06e826454a25cfdc129799267103a91b63086c1199b2ae107a9e9a5e25cce6aa9e9a25a56ff8886573c95d9391ea
+MISC metadata.xml 262 SHA256 42eae4d6a844319a18ef286c46ebd42bf18b415e5acffb38b77a4c5f6f9bd95b SHA512 b2761e09eb629c400246ce3f4eae088cc03ebd8e3ac38db5720ff0a2dbbc14f32e7bde3e0b686b39c9b04da6aeff28b18882b80f89e71c6be9b34fa6baa40127 WHIRLPOOL 5873647e180f616936cdd81e09b7cbf2d2f7a1610b3cff325c5b3716b9f3040bcb57525ab8b1bd3f3a011686fa43d797f23c5493d03fb805c366f9a183185c36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPrwFmAAoJEJ0WA1zPCt1h53IH/3Aqb+fjRQdpj6cWjfF+j65d
-oT4zbdSoao8x7u0pIzOPMIdwbbTVox5BdrklNk/W6pTLYUlRpTIBrUcFr6F9R3AG
-Lwlc/QAJWmXPQGB4EjhuExcKLVlYjN6x2NVsAiFrW7zXRBRAvmpV5BhO/sdV+BqZ
-3NXQcz1idIYJG5AlUm4BUgQPpEVsTMcc169nLucNpA2MCGycsuid34VWTVr5fKpX
-OTmmqlUfpMYMegwo7Mo3EnAidQ5e/wKvluyubJF+6X1bsl6LzLombmX1K1Jo4Zj9
-iz2vx4cry8rwBx+cfJZPv0d/tQRmIQmxZeLN3rihf0nsnbVFIg7aLHXuGRhOjFY=
-=ZZhY
+iEYEAREIAAYFAlCD1n4ACgkQ1fmVwcYIWAbl7QCcCSS/zcYyYUCwnsPJnJdt7GqC
+5AEAnizdU/8Ap0tJD03Lx+whbV7An+Rw
+=cEjQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild
deleted file mode 100644
index 259038a445a8..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.30.0-r1.ebuild,v 1.13 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Multimedia related programs for the GNOME desktop"
-HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
-
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="pulseaudio"
-
-# FIXME: automagic dev-util/glade:3 support
-RDEPEND=">=dev-libs/glib-2.18.2:2
-	>=x11-libs/gtk+-2.15.1:2
-	>=gnome-base/gconf-2.6.1:2
-	>=media-libs/gstreamer-0.10.23:0.10
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-libs/gst-plugins-good-0.10:0.10
-	dev-libs/libunique:1
-
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15[glib] )
-	>=media-libs/libcanberra-0.4[gtk]
-	dev-libs/libxml2:2
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gconf-0.10.1:0.10"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35.0"
-
-DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-gstprops
-		--enable-grecord
-		--enable-profiles
-		$(use_enable pulseaudio)
-		$(use_enable !pulseaudio gstmix)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Use lamemp3enc and xingmux instead of the deprecated lame element
-	epatch "${FILESDIR}/${P}-lamemp3enc.patch"
-
-	# Show a microphone icon even if the stream has no ID
-	epatch "${FILESDIR}/${P}-microphone-icon.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn
-	ewarn "If you cannot play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-	if use pulseaudio; then
-		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
-		ewarn "If you do not use pulseaudio, you do not want this"
-	fi
-}
diff --git a/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild b/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild
deleted file mode 100644
index ee384b8c79ac..000000000000
--- a/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-2.32.0.ebuild,v 1.11 2012/05/05 06:25:24 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="Multimedia related programs for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="pulseaudio"
-
-# FIXME: automagic dev-util/glade:3 support
-RDEPEND=">=dev-libs/glib-2.18.2:2
-	>=x11-libs/gtk+-2.18.0:2
-	>=gnome-base/gconf-2.6.1:2
-	>=media-libs/gstreamer-0.10.23:0.10
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-libs/gst-plugins-good-0.10:0.10
-	dev-libs/libunique:1
-
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.16[glib] )
-	>=media-libs/libcanberra-0.13[gtk]
-	dev-libs/libxml2:2
-	>=media-libs/gst-plugins-base-0.10.23:0.10
-	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gconf-0.10.1:0.10"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35.0"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-scrollkeeper
-		--disable-schemas-install
-		--enable-gstprops
-		--enable-grecord
-		--enable-profiles
-		$(use_enable pulseaudio)
-		$(use_enable !pulseaudio gstmix)"
-	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn
-	ewarn "If you cannot play some music format, please check your"
-	ewarn "USE flags on media-plugins/gst-plugins-meta"
-	ewarn
-	if use pulseaudio; then
-		ewarn "You have enabled pulseaudio support, gstmixer will not be built"
-		ewarn "If you do not use pulseaudio, you do not want this"
-	fi
-}
diff --git a/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild b/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild
new file mode 100644
index 000000000000..9b7a6da6622a
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/gnome-media-3.4.0.ebuild,v 1.1 2012/10/21 11:03:25 eva Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~amd64 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+# NOTE: This package provides the following:
+#  * libgnome-media-profiles.so.0
+#  * gstreamer-properties
+#  * gnome-sound-recorder
+#  * gnome-audio-profiles
+RDEPEND="
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.18.2:2
+	>=x11-libs/gtk+-2.91:3
+	>=gnome-base/gconf-2.6.1:2
+	>=media-libs/gstreamer-0.10.23:0.10
+	>=media-libs/gst-plugins-base-0.10.23:0.10
+	>=media-libs/gst-plugins-good-0.10:0.10
+	>=media-libs/libcanberra-0.13[gtk3]
+	media-libs/libgnome-media-profiles:3
+	>=media-plugins/gst-plugins-gconf-0.10.1:0.10
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
+	app-text/rarian
+	>=dev-util/intltool-0.35.0
+	gnome-base/gnome-common
+	virtual/pkgconfig
+"
+
+src_configure() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--disable-gstmix
+	"
+	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+
+	gnome2_src_configure
+}
+
+src_install() {
+	gnome2_src_install
+
+	# These files are now provided by gnome-control-center-2.91's sound applet
+	# These won't be used if gnome-volume-control is not installed
+	rm -v "${ED}"/usr/share/gnome-media/sounds/gnome-sounds-default.xml
+	rm -v "${ED}"/usr/share/sounds/gnome/default/alerts/*.ogg || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	ewarn
+	ewarn "If you cannot play some music format, please check your"
+	ewarn "USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+}