Add gnome-media-2.32.0-r300 from the gnome overlay, needed for rhythmbox-0.13 under gnome3. It comes with a patch to not install media profiles, meaning it can be installed in parallel with libgnome-media-profiles.

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

4 files changed, 139 insertions, 5 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index 6fcb420f6f9a..3b7e133288c3 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.245 2011/11/03 18:28:03 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.246 2011/11/25 06:54:55 tetromino Exp $
+
+*gnome-media-2.32.0-r300 (25 Nov 2011)
+
+  25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-media-2.32.0-r300.ebuild,
+  +files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch:
+  Add gnome-media-2.32.0-r300 from the gnome overlay, needed for
+  rhythmbox-0.13 under gnome3. It comes with a patch to not install media
+  profiles, meaning it can be installed in parallel with
+  libgnome-media-profiles.
 
   03 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-media-2.32.0-r1.ebuild, metadata.xml:
diff --git a/gnome-extra/gnome-media/Manifest b/gnome-extra/gnome-media/Manifest
index 743292e201c4..647eadc4e64e 100644
--- a/gnome-extra/gnome-media/Manifest
+++ b/gnome-extra/gnome-media/Manifest
@@ -3,18 +3,20 @@ 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 2155 RMD160 cf21714819ec693c340a09069ced24dc9b0755b8 SHA1 6b8fe4e230261a1a8ca54306e3e81df127876344 SHA256 cfc8ddd1d8f2b33903cc11c0d06f708212de79b22488b7318b387064b9669355
 EBUILD gnome-media-2.32.0-r1.ebuild 2577 RMD160 03393d35d45f4e654b93acec2543b21d679d3982 SHA1 cba9f95b75bc23da06aa0abdfe215f2f3e397ee9 SHA256 b3ff4357f8ba044fe355dcae7059d046b0ff40335ca4819b06988e89b10de1bf
+EBUILD gnome-media-2.32.0-r300.ebuild 2514 RMD160 68db9ba090fccfbaaac2a11a3db670a126ffd51b SHA1 0b75030e4e5eed895c5bd1e7b444b9655ba74086 SHA256 c217e9f13d7fe38130a35bce6b972fcb7a128f45ce1972fe0f0f033083973dfa
 EBUILD gnome-media-2.32.0.ebuild 1872 RMD160 59958dde4cd37661ec04e55a4c1d2b4e7fe71e84 SHA1 b6ab096c85e69a50ee57bf63d908b496afb42d6f SHA256 031d433b4743cb0eff197d55f7efed3b65fe77615a00e77212b1e233f073ba56
-MISC ChangeLog 32124 RMD160 940998b27ae8fb660027248d8e87b137928d0815 SHA1 6b624acfd303c70b3da170cad1badcb5ecf1248a SHA256 37f05e168d2809b793bb51cdb2cbc2eebba70f4109831b89498642065ed21764
+MISC ChangeLog 32556 RMD160 cada3150ee343bd4462a07e1c1f602b247403416 SHA1 63960b929574a3f52421a3495d8589ad0247af16 SHA256 66a2cf54204941687e6374ac466781f1b3205963d634f84d911b12a70af3a704
 MISC metadata.xml 262 RMD160 bf55b10dc025acd11da20309b2d0bd2a178d21f9 SHA1 cdd85a8b21f4d1bfb58a9cab84ac3b08a90c8dc5 SHA256 42eae4d6a844319a18ef286c46ebd42bf18b415e5acffb38b77a4c5f6f9bd95b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6y3TkACgkQdjK8w9WeBnCSNAD/QcTL9d1SJgSZKc+hl3wY1aEE
-78OQLNVBTshpRefWfnsBAIWv0n4pYkn2/WczPpGaz2eRuAiCr0LEUJTPMONtkEUh
-=tI0O
+iF4EAREIAAYFAk7PO8QACgkQdjK8w9WeBnDTPAD/cQtKQiIGgQSS107FwfSYg0li
+1UrInPpyfGxgQIbTI9QA/RQ+t3obSCh+4akwrB2MlZ/bZNtZlNllPQGZGQLk2kaI
+=CfET
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch b/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
new file mode 100644
index 000000000000..453511bdef4e
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
@@ -0,0 +1,42 @@
+gnome-audio-profiles-properties and related files are now provided by
+media-libs/libgnome-media-profiles:3
+
+So we don't build them, or install them to avoid file collisions
+
+---
+--- profiles/Makefile.am
++++ profiles/Makefile.am
+@@ -1,4 +1,3 @@
+-bin_PROGRAMS = gnome-audio-profiles-properties
+ noinst_PROGRAMS =
+ 
+ defines = \
+@@ -21,11 +20,6 @@
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ uidir = $(pkgdatadir)
+-ui_DATA = gnome-audio-profile-new.ui gnome-audio-profile-edit.ui
+-
+-gnome_audio_profiles_properties_SOURCES = gnome-audio-profiles-properties.c
+-gnome_audio_profiles_properties_CFLAGS = $(GMP_CFLAGS) $(defines) -I$(top_srcdir)
+-gnome_audio_profiles_properties_LDADD = libgnome-media-profiles.la $(GMP_LIBS)
+ 
+ libgnome_media_profiles_la_SOURCES = \
+ 	audio-profile.c \
+@@ -67,15 +61,8 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gnome-media-profiles.pc
+-EXTRA_DIST = $(ui_DATA) $(schema_DATA) $(pkgconfig_DATA)
++EXTRA_DIST = $(schema_DATA) $(pkgconfig_DATA)
+ 
+ CLEANFILES = $(schema_DATA)
+ 
+-# "." is dirty hack to first build our .la in this dir before moving to glade
+-SUBDIRS =  . help
+-
+-if HAVE_GLADEUI
+-SUBDIRS += glade
+-endif
+-
+ -include $(top_srcdir)/git.mk
diff --git a/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild b/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild
new file mode 100644
index 000000000000..bcc255b9e5c7
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 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-r300.ebuild,v 1.1 2011/11/25 06:54:55 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit autotools 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=""
+
+# NOTE: This package provides the following:
+#  * libgnome-media-profiles.so.0
+#  * gstreamer-properties
+#  * gnome-sound-recorder
+#  * gnome-audio-profiles
+# NOTE: It has /stopped/ providing the following:
+#  * gnome-volume-control (moved to gnome-control-center)
+#  * gstmixer (won't work under GNOME 3, even in classic-gnome)
+#  * gnome-audio-profile-properties (moved to libgnome-media-profiles)
+RDEPEND="dev-libs/libxml2:2
+	>=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
+	>=media-libs/libcanberra-0.13[gtk]
+	>=media-plugins/gst-plugins-meta-0.10-r2:0.10
+	>=media-plugins/gst-plugins-gconf-0.10.1:0.10
+	>=dev-libs/libunique-1:1
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.35.0"
+
+src_prepare() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		--enable-gstprops
+		--enable-grecord
+		--enable-profiles
+		--disable-pulseaudio
+		--disable-gstmix"
+	DOCS="AUTHORS ChangeLog* NEWS MAINTAINERS README"
+
+	# This has been moved to media-libs/libgnome-media-profiles:3,
+	# but the library libgnome-media-profiles.so.0 is still used
+	epatch "${FILESDIR}/${P}-disable-gnome-audio-profile-properties.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+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/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
+}