Version bump following upstream.

(Portage version: 2.0.53_rc4)

4 files changed, 104 insertions, 16 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index c1adbf88934c..55cb96b586d6 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.75 2005/09/22 17:18:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.76 2005/10/09 19:28:58 flameeyes Exp $
+
+*amarok-1.3.3 (09 Oct 2005)
+
+  09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> +amarok-1.3.3.ebuild:
+  Version bump following upstream.
 
 *amarok-1.3.2-r1 (22 Sep 2005)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index aff11db83934..913625193ffb 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8240bf9b40bf80592500ff6cad53eb2f amarok-1.3.2-r1.ebuild 2986
 MD5 a8663f9d3d242387af88ce7e1053902c ChangeLog 12189
 MD5 a62708867dd0a86debc654ed4ab63800 amarok-1.2.3.ebuild 2331
-MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 MD5 25af04c1ed653efd29b66d9a0f2fc564 amarok-1.2.4.ebuild 2400
-MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
-MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
+MD5 8240bf9b40bf80592500ff6cad53eb2f amarok-1.3.2-r1.ebuild 2986
+MD5 df69d04791b277cd06561076a29e1ba8 amarok-1.3.3.ebuild 2943
 MD5 bef07b91d43dae9962ad11eafc579922 files/amarok-1.3.2-playlist.patch 1111
-MD5 60980fa0862b2fc7960d57c1cd290769 files/digest-amarok-1.3.2-r1 66
+MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
 MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDMueqj5H05b2HAEkRAvXyAJ4isjKjRxepUTisyVLv0BraO19sUgCfY/rY
-2YiC+UM7We28FvJukqKwyzc=
-=I67L
------END PGP SIGNATURE-----
+MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
+MD5 60980fa0862b2fc7960d57c1cd290769 files/digest-amarok-1.3.2-r1 66
+MD5 a4cca185adb8c61a54fe5f239f11ad7f files/digest-amarok-1.3.3 66
+MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
diff --git a/media-sound/amarok/amarok-1.3.3.ebuild b/media-sound/amarok/amarok-1.3.3.ebuild
new file mode 100644
index 000000000000..05c74ab64857
--- /dev/null
+++ b/media-sound/amarok/amarok-1.3.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3.3.ebuild,v 1.1 2005/10/09 19:28:58 flameeyes Exp $
+
+inherit kde eutils
+
+MY_P=${P/_/-}
+
+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 -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
+
+S=${WORKDIR}/${MY_P}
+
+DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
+	 arts? ( kde-base/arts
+		 || ( ( kde-base/kdemultimedia-arts kde-base/akode )
+		 	kde-base/kdemultimedia ) )
+	 xine? ( >=media-libs/xine-lib-1_rc4 )
+	 gstreamer? ( >=media-libs/gstreamer-0.8.8
+	              >=media-libs/gst-plugins-0.8.6 )
+	 musicbrainz? ( >=media-libs/tunepimp-0.3.0 )
+	 >=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.6 )
+	             vorbis? ( >=media-plugins/gst-plugins-ogg-0.8.6
+	                       >=media-plugins/gst-plugins-vorbis-0.8.6 )
+	             flac? ( >=media-plugins/gst-plugins-flac-0.8.6 ) )"
+
+DEPEND="${DEPEND}
+	>=dev-util/pkgconfig-0.9.0"
+
+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
+}
+
+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}"
+
+	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)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# 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
+}
+
diff --git a/media-sound/amarok/files/digest-amarok-1.3.3 b/media-sound/amarok/files/digest-amarok-1.3.3
new file mode 100644
index 000000000000..f5d298b605cc
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.3.3
@@ -0,0 +1 @@
+MD5 13f02c3cce06d9c1d0511171d736efa3 amarok-1.3.3.tar.bz2 7665719