From 61d880d339a9eddef287eb64216f5d925782c5f5 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Thu, 14 Jun 2007 13:30:24 +0000 Subject: Rename amarok-9999-r2 to amarok-1.4.9999 to make explicit that it's a live subversion for the current stable (1.4) branch. Frees up the 9999 slot for 2.0 when it will be feasible. (Portage version: 2.1.2.9) --- media-sound/amarok/ChangeLog | 10 ++- media-sound/amarok/amarok-1.4.9999.ebuild | 104 ++++++++++++++++++++++++ media-sound/amarok/amarok-9999-r2.ebuild | 104 ------------------------ media-sound/amarok/files/digest-amarok-1.4.9999 | 0 media-sound/amarok/files/digest-amarok-9999-r2 | 0 5 files changed, 113 insertions(+), 105 deletions(-) create mode 100644 media-sound/amarok/amarok-1.4.9999.ebuild delete mode 100644 media-sound/amarok/amarok-9999-r2.ebuild create mode 100644 media-sound/amarok/files/digest-amarok-1.4.9999 delete mode 100644 media-sound/amarok/files/digest-amarok-9999-r2 (limited to 'media-sound/amarok') diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 121fbbae376b..e816493eb521 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/amarok # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.218 2007/06/10 22:54:48 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.219 2007/06/14 13:30:24 flameeyes Exp $ + +*amarok-1.4.9999 (14 Jun 2007) + + 14 Jun 2007; Diego Pettenò + +amarok-1.4.9999.ebuild, -amarok-9999-r2.ebuild: + Rename amarok-9999-r2 to amarok-1.4.9999 to make explicit that it's a live + subversion for the current stable (1.4) branch. Frees up the 9999 slot for + 2.0 when it will be feasible. *amarok-9999-r2 (10 Jun 2007) diff --git a/media-sound/amarok/amarok-1.4.9999.ebuild b/media-sound/amarok/amarok-1.4.9999.ebuild new file mode 100644 index 000000000000..5c16a40209c3 --- /dev/null +++ b/media-sound/amarok/amarok-1.4.9999.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9999.ebuild,v 1.1 2007/06/14 13:30:24 flameeyes Exp $ + +inherit kde subversion + +ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/stable/extragear/multimedia/amarok" +ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src/" + +PKG_SUFFIX="" + +DESCRIPTION="Advanced audio player based on KDE framework." +HOMEPAGE="http://amarok.kde.org/" + +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="" +IUSE="aac kde mysql noamazon opengl postgres +visualization ipod ifp real njb mtp musicbrainz daap +python" +# kde: enables compilation of the konqueror sidebar plugin + +RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) + >=media-libs/xine-lib-1.1.2_pre20060328-r8 + >=media-libs/taglib-1.4 + mysql? ( >=virtual/mysql-4.0 ) + postgres? ( dev-db/libpq ) + opengl? ( virtual/opengl ) + visualization? ( media-libs/libsdl + =media-plugins/libvisual-plugins-0.4* ) + ipod? ( >=media-libs/libgpod-0.3 ) + aac? ( media-libs/libmp4v2 ) + ifp? ( media-libs/libifp ) + real? ( media-video/realplayer ) + njb? ( >=media-libs/libnjb-2.2.4 ) + mtp? ( >=media-libs/libmtp-0.1.1 ) + musicbrainz? ( media-libs/tunepimp ) + =dev-lang/ruby-1.8*" + +DEPEND="${RDEPEND}" + +RDEPEND="${RDEPEND} + app-arch/unzip + python? ( dev-python/PyQt ) + daap? ( www-servers/mongrel )" + +need-kde 3.3 + +S="${WORKDIR}/${PN}" + +src_unpack() { + ESVN_UPDATE_CMD="svn update -N" \ + ESVN_FETCH_CMD="svn checkout -N" \ + ESVN_REPO_URI=`dirname ${ESVN_REPO_URI}` \ + subversion_src_unpack + + S="${WORKDIR}/${PN}/admin" \ + ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin" \ + subversion_src_unpack + + ESVN_UPDATE_CMD="svn up" \ + ESVN_FETCH_CMD="svn checkout" \ + S="${WORKDIR}/${PN}/amarok" \ + subversion_src_unpack +} + +src_compile() { + # Extra, unsupported engines are forcefully disabled. + local myconf="$(use_enable mysql) $(use_enable postgres postgresql) + $(use_with opengl) --without-xmms + $(use_with visualization libvisual) + $(use_enable !noamazon amazon) + $(use_with ipod libgpod) + $(use_with aac mp4v2) + $(use_with ifp) + $(use_with real helix) + $(use_with njb libnjb) + $(use_with mtp libmtp) + $(use_with musicbrainz) + $(use_with daap) + --with-xine + --without-mas + --without-nmm" + + kde_src_compile +} + +src_install() { + kde_src_install + + # As much as I respect Ian, I'd rather leave Amarok to use mongrel + # from Portage, for security and policy reasons. + rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \ + "${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \ + "${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \ + "${D}"/usr/share/apps/amarok/ruby_lib/gem* \ + "${D}"/usr/$(get_libdir)/ruby_lib + + if ! use python; then + rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \ + || die "Unable to remove webcontrol." + fi +} diff --git a/media-sound/amarok/amarok-9999-r2.ebuild b/media-sound/amarok/amarok-9999-r2.ebuild deleted file mode 100644 index 836ab0266ad1..000000000000 --- a/media-sound/amarok/amarok-9999-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999-r2.ebuild,v 1.1 2007/06/10 22:54:48 flameeyes Exp $ - -inherit kde subversion - -ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/stable/extragear/multimedia/amarok" -ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src/" - -PKG_SUFFIX="" - -DESCRIPTION="Advanced audio player based on KDE framework." -HOMEPAGE="http://amarok.kde.org/" - -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="" -IUSE="aac kde mysql noamazon opengl postgres -visualization ipod ifp real njb mtp musicbrainz daap -python" -# kde: enables compilation of the konqueror sidebar plugin - -RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) - >=media-libs/xine-lib-1.1.2_pre20060328-r8 - >=media-libs/taglib-1.4 - mysql? ( >=virtual/mysql-4.0 ) - postgres? ( dev-db/libpq ) - opengl? ( virtual/opengl ) - visualization? ( media-libs/libsdl - =media-plugins/libvisual-plugins-0.4* ) - ipod? ( >=media-libs/libgpod-0.3 ) - aac? ( media-libs/libmp4v2 ) - ifp? ( media-libs/libifp ) - real? ( media-video/realplayer ) - njb? ( >=media-libs/libnjb-2.2.4 ) - mtp? ( >=media-libs/libmtp-0.1.1 ) - musicbrainz? ( media-libs/tunepimp ) - =dev-lang/ruby-1.8*" - -DEPEND="${RDEPEND}" - -RDEPEND="${RDEPEND} - app-arch/unzip - python? ( dev-python/PyQt ) - daap? ( www-servers/mongrel )" - -need-kde 3.3 - -S="${WORKDIR}/${PN}" - -src_unpack() { - ESVN_UPDATE_CMD="svn update -N" \ - ESVN_FETCH_CMD="svn checkout -N" \ - ESVN_REPO_URI=`dirname ${ESVN_REPO_URI}` \ - subversion_src_unpack - - S="${WORKDIR}/${PN}/admin" \ - ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin" \ - subversion_src_unpack - - ESVN_UPDATE_CMD="svn up" \ - ESVN_FETCH_CMD="svn checkout" \ - S="${WORKDIR}/${PN}/amarok" \ - subversion_src_unpack -} - -src_compile() { - # Extra, unsupported engines are forcefully disabled. - local myconf="$(use_enable mysql) $(use_enable postgres postgresql) - $(use_with opengl) --without-xmms - $(use_with visualization libvisual) - $(use_enable !noamazon amazon) - $(use_with ipod libgpod) - $(use_with aac mp4v2) - $(use_with ifp) - $(use_with real helix) - $(use_with njb libnjb) - $(use_with mtp libmtp) - $(use_with musicbrainz) - $(use_with daap) - --with-xine - --without-mas - --without-nmm" - - kde_src_compile -} - -src_install() { - kde_src_install - - # As much as I respect Ian, I'd rather leave Amarok to use mongrel - # from Portage, for security and policy reasons. - rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \ - "${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \ - "${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \ - "${D}"/usr/share/apps/amarok/ruby_lib/gem* \ - "${D}"/usr/$(get_libdir)/ruby_lib - - if ! use python; then - rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \ - || die "Unable to remove webcontrol." - fi -} diff --git a/media-sound/amarok/files/digest-amarok-1.4.9999 b/media-sound/amarok/files/digest-amarok-1.4.9999 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/media-sound/amarok/files/digest-amarok-9999-r2 b/media-sound/amarok/files/digest-amarok-9999-r2 deleted file mode 100644 index e69de29bb2d1..000000000000 -- cgit v1.2.3-65-gdbad