[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-media/files/, gnome-extra/gnome-media/

[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-media/files/, gnome-extra/gnome-media/

[Alexandre Restovtsev]

commit:     610e3c2c28cb34371cd21ed62fb18660252eb312
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 00:32:31 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun May 13 00:32:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=610e3c2c

gnome-extra/gnome-media: in gx86

---
 ....0-disable-gnome-audio-profile-properties.patch |   42 ----------
 .../gnome-media/gnome-media-2.32.0-r300.ebuild     |   80 --------------------
 2 files changed, 0 insertions(+), 122 deletions(-)

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
deleted file mode 100644
index 453511b..0000000
--- a/gnome-extra/gnome-media/files/gnome-media-2.32.0-disable-gnome-audio-profile-properties.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 5af1c21..0000000
--- a/gnome-extra/gnome-media/gnome-media-2.32.0-r300.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.ebuild,v 1.1 2010/10/17 18:56:04 pacho 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
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig"
-
-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
-}