Drop old, unsupported version, and compressed gcc4 patch.

Package-Manager: portage-2529-svn

5 files changed, 9 insertions, 83 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index bd03c9794fb1..4dc16e7fe0e6 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.98 2006/01/19 12:29:32 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.99 2006/01/26 20:15:03 flameeyes Exp $
+
+  26 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> -files/amarok-gcc4.gz,
+  -amarok-1.2.4.ebuild:
+  Drop old, unsupported version, and compressed gcc4 patch.
 
   19 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> amarok-1.3.6.ebuild:
   Stable on amd64, bug 114493.
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 0343fca33612..7b76181d598d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,14 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d7aa8d6f371af63c830ed75a810b283e ChangeLog 15614
-MD5 fae91b0167ef3ca3233931dbb86a52e9 amarok-1.2.4.ebuild 2385
+MD5 91c0430f694b5a77459f7e29fb67fd5c ChangeLog 15779
 MD5 1e105a96a7b5945e07d2e2febbf464a6 amarok-1.3.6.ebuild 3206
 MD5 df7e9ec392b1691ca97bd5c2c67f1dc8 amarok-1.3.7-r1.ebuild 3353
 MD5 13b9e7010d2936b4376342e9de8f08f9 amarok-1.3.8.ebuild 3835
 MD5 540d52ae55cc72876ea41f14032b6abf files/amarok-1.3.7-lyrc.patch 869
-MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
-MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
 MD5 d8cfb3a78866379e2ac9b439de887551 files/digest-amarok-1.3.6 66
 MD5 cbac7ded5054d6932dda9754aa7d8aa7 files/digest-amarok-1.3.7-r1 66
 MD5 4cdce240143e17652ea80b4b7c58ddaa files/digest-amarok-1.3.8 66
@@ -16,7 +13,7 @@ MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDz4Y3ntT9W3vfTuoRAj3MAJ9mIaKgd9bxDSbpMMr827VR1srmmgCeJmdW
-lz54f2T0Q8naUghmQk1yXhk=
-=QPMK
+iD8DBQFD2S3vAiZjviIA2XgRAtO2AKDKrWR9Mc1Sq6Eb79BdL01Q4jC1BgCdElc4
+mwR8tVElJMGoqEOAUav3zWw=
+=OwRp
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.2.4.ebuild b/media-sound/amarok/amarok-1.2.4.ebuild
deleted file mode 100644
index 341aca492801..000000000000
--- a/media-sound/amarok/amarok-1.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.2.4.ebuild,v 1.9 2005/12/05 23:18:37 zaheerm Exp $
-
-inherit kde eutils
-
-DESCRIPTION="amaroK - the audio player for KDE"
-HOMEPAGE="http://amarok.kde.org/"
-SRC_URI="mirror://sourceforge/amarok/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc -sparc x86"
-IUSE="arts flac gstreamer kde mad mysql noamazon opengl xine xmms visualization vorbis"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
-	 arts? ( kde-base/arts
-		 || ( ( kde-base/kdemultimedia-arts kde-base/akode )
-		 	kde-base/kdemultimedia ) )
-	 opengl? ( virtual/opengl )
-	 xmms? ( >=media-sound/xmms-1.2 )
-	 xine? ( >=media-libs/xine-lib-1_rc4 )
-	 >=media-libs/tunepimp-0.3.0
-	 >=media-libs/taglib-1.3.1
-	 gstreamer? ( =media-libs/gst-plugins-0.8*
-	 	      mad? ( =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* ) )
-	 mysql? ( >=dev-db/mysql-4.0.16 )
-	 visualization? ( media-libs/libsdl
-			  >=media-plugins/libvisual-plugins-0.2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9.0"
-
-need-kde 3.2
-
-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 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 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_unpack() {
-	kde_src_unpack
-	epatch ${FILESDIR}/amarok-gcc4.gz
-}
-
-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}"
-
-	myconf="$(use_with arts) $(use_with xine)
-		$(use_with gstreamer) $(use_enable mysql)
-		$(use_with opengl) $(use_enable !noamazon amazon)"
-
-	kde_src_compile
-}
diff --git a/media-sound/amarok/files/amarok-gcc4.gz b/media-sound/amarok/files/amarok-gcc4.gz
deleted file mode 100644
index 694925470ab4..000000000000
--- a/media-sound/amarok/files/amarok-gcc4.gz
+++ /dev/null
diff --git a/media-sound/amarok/files/digest-amarok-1.2.4 b/media-sound/amarok/files/digest-amarok-1.2.4
deleted file mode 100644
index d0052cf99917..000000000000
--- a/media-sound/amarok/files/digest-amarok-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a3bb2c043d1db169c6a370aff439e0f amarok-1.2.4.tar.bz2 6016470