From 0003004399b8195a51843ba4d68ef66ebe722502 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 20 Apr 2004 15:53:48 +0000 Subject: Fixed DEPs. Other ebuild cleanup per foser's request. Bump due to gst-plugins-ogg DEP being added. --- media-sound/rhythmbox/ChangeLog | 9 ++- media-sound/rhythmbox/Manifest | 4 +- media-sound/rhythmbox/files/digest-rhythmbox-0.8.0 | 1 - .../rhythmbox/files/digest-rhythmbox-0.8.0-r1 | 1 + media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild | 78 +++++++++++++++++++++ media-sound/rhythmbox/rhythmbox-0.8.0.ebuild | 79 ---------------------- 6 files changed, 89 insertions(+), 83 deletions(-) delete mode 100644 media-sound/rhythmbox/files/digest-rhythmbox-0.8.0 create mode 100644 media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1 create mode 100644 media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild delete mode 100644 media-sound/rhythmbox/rhythmbox-0.8.0.ebuild (limited to 'media-sound/rhythmbox') diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog index 43e9d53de2f5..8f89f1e68182 100644 --- a/media-sound/rhythmbox/ChangeLog +++ b/media-sound/rhythmbox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/rhythmbox # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.38 2004/04/16 20:28:23 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.39 2004/04/20 15:53:48 eradicator Exp $ + +*rhythmbox-0.8.0-r1 (20 Apr 2004) + + 20 Apr 2004; Jeremy Huddleston + rhythmbox-0.8.0-r1.ebuild, rhythmbox-0.8.0.ebuild: + Fixed DEPs. Other ebuild cleanup per foser's request. Bump due to + gst-plugins-ogg DEP being added. *rhythmbox-0.8.0 (16 Apr 2004) diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest index 99b309a919a7..caf8bf25150b 100644 --- a/media-sound/rhythmbox/Manifest +++ b/media-sound/rhythmbox/Manifest @@ -1,12 +1,12 @@ -MD5 90ea93242527dd2f7d6b249de84d0b20 rhythmbox-0.8.0.ebuild 1983 +MD5 aee67630418455937bcd42df36b0525e rhythmbox-0.8.0-r1.ebuild 2143 MD5 f2bc8e88c96b61efb6cac592f42ecf04 rhythmbox-0.6.8.ebuild 2433 MD5 7384484f9de551f0107a30ef2f7aa281 rhythmbox-0.6.1-r1.ebuild 1904 MD5 aca1c2bd5d6e541aab2661c0c5c58c1c ChangeLog 4146 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177 MD5 98928ba8bd7737a9a219c2ee50464b40 files/rhythmbox-0.6.8-amd64.patch 998 MD5 54be0f7e8c504930e7a42cc08fabe6a0 files/digest-rhythmbox-0.6.8 69 -MD5 3605cdb3536723e6994ffcaee8288b51 files/digest-rhythmbox-0.8.0 69 MD5 f056f5e64663168cb7c702613c9a8322 files/rhythmbox-0.6.5-amd64.patch 2301 MD5 7eba43d939d371b937ef3bf3428338e8 files/rhythmbox-0.6-fix_flac_test.patch 1393 MD5 5680d5f2fa4f98cf505fe60818d91e66 files/digest-rhythmbox-0.6.1-r1 69 MD5 6c5001723b759bda9528d5ebc03b470e files/rhythmbox-0.6.5-gcc2_fix.patch 637 +MD5 3605cdb3536723e6994ffcaee8288b51 files/digest-rhythmbox-0.8.0-r1 69 diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0 deleted file mode 100644 index ebd89cc0aa5c..000000000000 --- a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 e8572dbd8e33024ea5d8beb4dec314c6 rhythmbox-0.8.0.tar.bz2 1776804 diff --git a/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1 b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1 new file mode 100644 index 000000000000..ebd89cc0aa5c --- /dev/null +++ b/media-sound/rhythmbox/files/digest-rhythmbox-0.8.0-r1 @@ -0,0 +1 @@ +MD5 e8572dbd8e33024ea5d8beb4dec314c6 rhythmbox-0.8.0.tar.bz2 1776804 diff --git a/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild new file mode 100644 index 000000000000..bedbae6b9a17 --- /dev/null +++ b/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.8.0-r1.ebuild,v 1.1 2004/04/20 15:53:48 eradicator Exp $ + +inherit gnome2 flag-o-matic + +DESCRIPTION="Music management and playback software for GNOME" +HOMEPAGE="http://www.rhythmbox.org/" +LICENSE="GPL-2" + +KEYWORDS="~x86 ~ppc ~amd64" +IUSE="oggvorbis xine flac faad mad pda" +SLOT="0" + +RDEPEND=">=x11-libs/gtk+-2.2 + >=gnome-base/libgnomeui-2 + >=gnome-base/libglade-2 + >=gnome-base/gnome-vfs-2 + >=gnome-base/libbonobo-2 + !xine? ( >=media-libs/gst-plugins-0.8.0 + >=media-plugins/gst-plugins-gnomevfs-0.8.0 + oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0 + >=media-plugins/gst-plugins-ogg-0.8.0 ) + mad? ( >=media-plugins/gst-plugins-mad-0.8.0 ) + flac? ( >=gst-plugins-flac-0.8.0 ) ) + xine? ( faad? ( >=media-libs/faad2-2.0_rc3 ) + flac? ( >=media-libs/flac-1 + >=media-libs/libid3tag-0.15.0b ) + oggvorbis? ( >=media-libs/libvorbis-1 ) + mad? ( >=media-libs/libid3tag-0.15.0b ) + >=media-libs/xine-lib-1_rc3 )" + +# REMIND : should we really force flac ? +# I want to drop flac deps when rb get proper gst only/non monkey-media +# flac support. Made it a local USE flag for now +# 06 Oct 2003 + +DEPEND="${RDEPEND} + dev-util/pkgconfig + app-text/scrollkeeper" + +MAKEOPTS="${MAKEOPTS} -j1" + +use xine &&\ + G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\ + G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer" + +G2CONF="${G2CONF} \ + $(use_enable oggvorbis vorbis) \ + $(use_enable flac) \ + $(use_enable mad mp3) \ + $(use_enable faad mp4) \ + $(use_enable pda ipod) \ + --enable-mmkeys \ + --enable-audiocd \ + --disable-schemas-install" + +# Disabled per foser's request +# --enable-dashboard \ + +DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \ + MAINTAINERS NEWS README README.iPod THANKS TODO" + +export GST_INSPECT=/bin/true + +src_unpack( ) { + unpack ${A} + + cd ${S} + # sandbox errors work around + gnome2_omf_fix ${S}/help/C/Makefile.in +} + +src_compile() { + # Removed by default per foser's request. If you have problems, try removing -ffast-math + # filter-flags "-ffast-math" + gnome2_src_compile +} diff --git a/media-sound/rhythmbox/rhythmbox-0.8.0.ebuild b/media-sound/rhythmbox/rhythmbox-0.8.0.ebuild deleted file mode 100644 index 9b6a943452a4..000000000000 --- a/media-sound/rhythmbox/rhythmbox-0.8.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: - -inherit gnome2 flag-o-matic - -DESCRIPTION="Music management and playback software for GNOME" -HOMEPAGE="http://www.rhythmbox.org/" -LICENSE="GPL-2" - -KEYWORDS="~x86" -IUSE="oggvorbis xine flac faad mad pda" -SLOT="0" - -RDEPEND=">=x11-libs/gtk+-2.2.2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libglade-2 - >=gnome-base/gnome-vfs-2 - >=gnome-base/libbonobo-2 - !xine? ( >=media-libs/gst-plugins-0.8.0 - >=media-plugins/gst-plugins-gnomevfs-0.8.0 - oggvorbis? ( >=media-plugins/gst-plugins-vorbis-0.8.0 ) - mp3? ( >=media-plugins/gst-plugins-mad-0.8.0 ) ) - xine? ( faad? ( >=media-libs/faad2-2.0_rc3 ) - flac? ( >=media-libs/flac-1 - >=media-libs/libid3tag-0.15.0b ) - oggvorbis? ( >=media-libs/libvorbis-1 ) - mad? ( >=media-libs/libid3tag-0.15.0b ) - >=media-libs/xine-lib-1_rc3 )" - -# REMIND : should we really force flac ? -# I want to drop flac deps when rb get proper gst only/non monkey-media -# flac support. Made it a local USE flag for now -# 06 Oct 2003 - -DEPEND="${RDEPEND} - dev-util/pkgconfig - app-text/scrollkeeper" - -MAKEOPTS="${MAKEOPTS} -j1" - -use xine &&\ - G2CONF="${G2CONF} --with-player=xine --with-metadata=monkeymedia" ||\ - G2CONF="${G2CONF} --with-player=gstreamer --with-metadata=gstreamer" - -G2CONF="${G2CONF} \ - $(use_enable oggvorbis vorbis) \ - $(use_enable flac) \ - $(use_enable mad mp3) \ - $(use_enable faad mp4) \ - $(use_enable pda ipod) \ - --enable-mmkeys \ - --enable-audiocd \ - --enable-dashboard \ - --disable-schemas-install" - -DOCS="AUTHORS COPYING ChangeLog DOCUMENTERS INSTALL INTERNALS \ - MAINTAINERS NEWS README README.iPod THANKS TODO" - -export GST_INSPECT=/bin/true - -src_unpack( ) { - unpack ${A} - - cd ${S} - # sandbox errors work around - gnome2_omf_fix ${S}/help/C/Makefile.in -} - -src_compile() { - filter-flags "-ffast-math" - gnome2_src_compile -} - -src_install() { - gnome2_src_install - cd ${D}/usr/share/rhythmbox -} - -- cgit v1.2.3-65-gdbad