diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-12 20:56:38 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-02-12 20:56:38 +0000 |
commit | 0895f2cd2bfa4efd8f1eaeff2a10882f013d8e82 (patch) | |
tree | c61c07f786f616af204f1bc2b560e4a787d93799 /media-sound | |
parent | version bump (diff) | |
download | gentoo-2-0895f2cd2bfa4efd8f1eaeff2a10882f013d8e82.tar.gz gentoo-2-0895f2cd2bfa4efd8f1eaeff2a10882f013d8e82.tar.bz2 gentoo-2-0895f2cd2bfa4efd8f1eaeff2a10882f013d8e82.zip |
Drop old 1.3.7-r1 version, foreseeing 1.3.8 as future stable.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/amarok/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/amarok/amarok-1.3.7-r1.ebuild | 103 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-1.3.7-lyrc.patch | 15 | ||||
-rw-r--r-- | media-sound/amarok/files/digest-amarok-1.3.7-r1 | 1 |
4 files changed, 5 insertions, 120 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index c9704f24671b..1de56831d322 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/amarok # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.103 2006/02/12 20:45:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.104 2006/02/12 20:56:38 flameeyes Exp $ + + 12 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/amarok-1.3.7-lyrc.patch, -amarok-1.3.7-r1.ebuild: + Drop old 1.3.7-r1 version, foreseeing 1.3.8 as future stable. *amarok-1.4_beta1 (12 Feb 2006) diff --git a/media-sound/amarok/amarok-1.3.7-r1.ebuild b/media-sound/amarok/amarok-1.3.7-r1.ebuild deleted file mode 100644 index 6d64796ee785..000000000000 --- a/media-sound/amarok/amarok-1.3.7-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.7-r1.ebuild,v 1.3 2006/01/09 22:42:51 flameeyes Exp $ - -inherit kde eutils flag-o-matic - -MY_P="${P/_rc/-rc}" -S="${WORKDIR}/${P/_rc*//}" - -DESCRIPTION="amaroK - the audio player for KDE." -HOMEPAGE="http://amarok.kde.org/" -SRC_URI="mirror://sourceforge/amarok/${MY_P}.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="arts flac gstreamer kde mp3 mysql noamazon opengl postgres xine xmms -visualization vorbis musicbrainz" -# kde: enables compilation of the konqueror sidebar plugin - -DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) - arts? ( kde-base/arts - || ( kde-base/kdemultimedia-arts kde-base/kdemultimedia ) ) - xine? ( >=media-libs/xine-lib-1_rc4 ) - gstreamer? ( =media-libs/gstreamer-0.8* - =media-libs/gst-plugins-0.8* ) - musicbrainz? ( =media-libs/tunepimp-0.3* ) - >=media-libs/taglib-1.4 - mysql? ( >=dev-db/mysql-4.0.16 ) - postgres? ( dev-db/postgresql ) - opengl? ( virtual/opengl ) - xmms? ( >=media-sound/xmms-1.2 ) - visualization? ( media-libs/libsdl - >=media-plugins/libvisual-plugins-0.2 )" - -RDEPEND="${DEPEND} - gstreamer? ( mp3? ( =media-plugins/gst-plugins-mad-0.8* ) - vorbis? ( =media-plugins/gst-plugins-ogg-0.8* - =media-plugins/gst-plugins-vorbis-0.8* ) - flac? ( =media-plugins/gst-plugins-flac-0.8* ) )" - -DEPEND="${DEPEND} - >=dev-util/pkgconfig-0.9.0" - -PATCHES="${FILESDIR}/${P}-lyrc.patch" - -need-kde 3.3 - -pkg_setup() { - if use arts && ! use xine && ! use gstreamer; then - ewarn "aRts support is deprecated, if you have problems please consider" - ewarn "enabling support for Xine (preferred) or GStreamer" - ewarn "(emerge amarok again with USE=\"xine\" or USE=\"gstreamer\")." - ebeep 2 - fi - - if ! use arts && ! use xine && ! use gstreamer; then - eerror "amaroK needs either aRts (deprecated), Xine (preferred) or GStreamer to work," - eerror "please try again with USE=\"arts\", USE=\"xine\" or USE=\"gstreamer\"." - die - fi - - # check whether kdelibs was compiled with arts support - kde_pkg_setup - - append-flags -fno-inline -} - -src_compile() { - # amarok does not respect kde coding standards, and makes a lot of - # assuptions regarding its installation directory. For this reason, - # it must be installed in the KDE install directory. - PREFIX="${KDEDIR}" - - # Extra, unsupported engines are forcefully disabled. - local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer) - $(use_enable mysql) $(use_enable postgres postgresql) - $(use_with opengl) $(use_with xmms) - $(use_with visualization libvisual) - $(use_enable !noamazon amazon) - $(use_with musicbrainz) - --without-helix - --without-mas - --without-nmm" - - kde_src_compile -} - -src_install() { - kde_src_install - - # Workaround to use amaroK from outside KDE - - # move the desktop file in /usr/share - dodir /usr/share/applications/kde - mv ${D}${KDEDIR}/share/applications/kde/amarok.desktop \ - ${D}/usr/share/applications/kde/amarok.desktop || die - # move icons, too - dodir /usr/share/icons - mv ${D}${KDEDIR}/share/icons/hicolor \ - ${D}/usr/share/icons || die -} - diff --git a/media-sound/amarok/files/amarok-1.3.7-lyrc.patch b/media-sound/amarok/files/amarok-1.3.7-lyrc.patch deleted file mode 100644 index 7fa6f6a5a2e9..000000000000 --- a/media-sound/amarok/files/amarok-1.3.7-lyrc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- branches/stable/extragear/multimedia/amarok/src/contextbrowser.cpp 2005/10/24 00:55:23 473539 -+++ branches/stable/extragear/multimedia/amarok/src/contextbrowser.cpp 2005/12/15 19:57:48 488756 -@@ -2534,9 +2534,10 @@ - m_lyrics.replace( QRegExp("<[iI][mM][gG][^>]*>"), QString::null ); - m_lyrics.replace( QRegExp("<[sS][cC][rR][iI][pP][tT][^>]*>[^<]*(<!--[^>]*>)*[^<]*</[sS][cC][rR][iI][pP][tT]>"), QString::null ); - -- if ( m_lyrics.find( "<font size='2'>" ) != -1 ) -+ int lyricsPos = m_lyrics.find( QRegExp( "<[fF][oO][nN][tT][ ]*[sS][iI][zZ][eE][ ]*='2'[ ]*>" ) ); -+ if ( lyricsPos != -1 ) - { -- m_lyrics = m_lyrics.mid( m_lyrics.find( "<font size='2'>" ) ); -+ m_lyrics = m_lyrics.mid( lyricsPos ); - if ( m_lyrics.find( "<p><hr" ) != -1 ) - m_lyrics = m_lyrics.mid( 0, m_lyrics.find( "<p><hr" ) ); - else diff --git a/media-sound/amarok/files/digest-amarok-1.3.7-r1 b/media-sound/amarok/files/digest-amarok-1.3.7-r1 deleted file mode 100644 index 5c1c70976b8f..000000000000 --- a/media-sound/amarok/files/digest-amarok-1.3.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 e2297042070643c105f8bb0e524c73ad amarok-1.3.7.tar.bz2 8591963 |