add dep on gst-plugins-gconf, fixes #132864. add as-needed patch, fixes #128904

Package-Manager: portage-2.1_pre10-r5

4 files changed, 94 insertions, 1 deletions

diff --git a/gnome-extra/gnome-media/ChangeLog b/gnome-extra/gnome-media/ChangeLog
index d6f149278545..6ad9c865c95a 100644
--- a/gnome-extra/gnome-media/ChangeLog
+++ b/gnome-extra/gnome-media/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-media
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.108 2006/05/06 12:48:50 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-media/ChangeLog,v 1.109 2006/05/11 02:10:08 allanonjl Exp $
+
+*gnome-media-2.14.0-r1 (11 May 2006)
+
+  11 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gnome-media-2.14.0-as-needed.patch, -gnome-media-2.14.0.ebuild,
+  +gnome-media-2.14.0-r1.ebuild:
+  add dep on gst-plugins-gconf, fixes #132864. add as-needed patch, fixes
+  #128904
 
   06 May 2006; John N. Laliberte <allanonjl@gentoo.org>
   gnome-media-2.14.0.ebuild:
diff --git a/gnome-extra/gnome-media/files/digest-gnome-media-2.14.0-r1 b/gnome-extra/gnome-media/files/digest-gnome-media-2.14.0-r1
new file mode 100644
index 000000000000..ed162fdece6b
--- /dev/null
+++ b/gnome-extra/gnome-media/files/digest-gnome-media-2.14.0-r1
@@ -0,0 +1,3 @@
+MD5 e1304b3fb5e069025bb2c1ea3f9f8b62 gnome-media-2.14.0.tar.bz2 2933013
+RMD160 152cae421bdfc0a9f193e5f84b37403c6222d356 gnome-media-2.14.0.tar.bz2 2933013
+SHA256 f43324636c0ee8b7485a9a5d2baf8e3fb5db0cc87c55afdb350774dfafc8b280 gnome-media-2.14.0.tar.bz2 2933013
diff --git a/gnome-extra/gnome-media/files/gnome-media-2.14.0-as-needed.patch b/gnome-extra/gnome-media/files/gnome-media-2.14.0-as-needed.patch
new file mode 100644
index 000000000000..8e471b4c26b9
--- /dev/null
+++ b/gnome-extra/gnome-media/files/gnome-media-2.14.0-as-needed.patch
@@ -0,0 +1,23 @@
+diff -uNr gnome-media-2.14.0.orig/gnome-cd/Makefile.am gnome-media-2.14.0/gnome-cd/Makefile.am
+--- gnome-media-2.14.0.orig/gnome-cd/Makefile.am	2006-04-08 14:33:23.000000000 +0100
++++ gnome-media-2.14.0/gnome-cd/Makefile.am	2006-04-08 14:46:01.000000000 +0100
+@@ -88,14 +88,14 @@
+ 
+ ACCESS_LT_LIB = $(top_builddir)/gnome-cd/access/libgnomecdaccess.la
+ 
+-gnome_cd_LDADD = $(MEDIA_LIBS)		\
++gnome_cd_LDADD = $(top_builddir)/cddb-slave2/libcddb-slave2.la \
++		 libgnomemedia-cddbslave2.la \
++		 $(ACCESS_LT_LIB)	\
++		 $(MEDIA_LIBS)		\
+ 		 $(GNOMECD_LIBS)	\
+ 		 $(INTLLIBS)		\
+ 		 $(GAILUTIL_LIBS)	\
+-		 $(ACCESS_LT_LIB)	\
+-		 $(GSR_LIBS)		\
+-		 $(top_builddir)/cddb-slave2/libcddb-slave2.la	\
+-		 libgnomemedia-cddbslave2.la
++		 $(GSR_LIBS)
+ 
+ 
+ @INTLTOOL_DESKTOP_RULE@
diff --git a/gnome-extra/gnome-media/gnome-media-2.14.0-r1.ebuild b/gnome-extra/gnome-media/gnome-media-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..696425876eaa
--- /dev/null
+++ b/gnome-extra/gnome-media/gnome-media-2.14.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 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.14.0-r1.ebuild,v 1.1 2006/05/11 02:10:08 allanonjl Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="Multimedia related programs for the GNOME desktop"
+HOMEPAGE="http://ronald.bitfreak.net/gnome-media.php"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 mad ogg static vorbis"
+
+RDEPEND=">=dev-libs/glib-1.3.7
+	>=gnome-base/libgnomeui-2.13.2
+	>=media-sound/esound-0.2.23
+	>=gnome-base/libbonobo-2
+	>=x11-libs/gtk+-2.6
+	>=media-libs/gstreamer-0.10
+	>=media-libs/gst-plugins-base-0.10
+	>=media-libs/gst-plugins-good-0.10
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/orbit-2
+	>=gnome-extra/nautilus-cd-burner-2.12
+	>=gnome-base/gail-0.0.3
+	>=gnome-base/libglade-1.99.12
+	dev-libs/libxml2
+	>=gnome-base/gconf-1.2.1
+	ogg? ( >=media-plugins/gst-plugins-ogg-0.10 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10 )
+	mad? ( >=media-plugins/gst-plugins-mad-0.10 )
+	>=media-plugins/gst-plugins-gconf-0.10.1"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/intltool-0.28"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_enable ipv6) $(use_enable static) --disable-esdtest"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch ${FILESDIR}/${PN}-2.14.0-as-needed.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	addpredict "/root/.gconfd"
+	addpredict "/root/.gconf"
+
+	gnome2_src_compile
+}