Add a snapshot of amarok from SVN to avoid having to backport all the fixes.

Package-Manager: portage-2.1.2.9

4 files changed, 125 insertions, 8 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index f86888e1dc48..c032e549840f 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # 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.216 2007/06/07 19:59:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.217 2007/06/08 14:01:18 flameeyes Exp $
+
+*amarok-1.4.6_pre20070608 (08 Jun 2007)
+
+  08 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +amarok-1.4.6_pre20070608.ebuild:
+  Add a snapshot of amarok from SVN to avoid having to backport all the fixes.
 
 *amarok-1.4.5-r2 (07 Jun 2007)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 2cc9b23da53d..8caa0431e06c 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -14,6 +14,7 @@ MD5 7a108e4a750077b5bd606cb4dd6947ee files/amarok-1.4.5-magnatune.patch 873
 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b files/amarok-1.4.5-magnatune.patch 873
 SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9 files/amarok-1.4.5-magnatune.patch 873
 DIST amarok-1.4.5.tar.bz2 18034110 RMD160 c2bbfe06f3e613dfc7d3926d086024073390c712 SHA1 882dec8d30c10f609a1f5e21d2e91342e78304c5 SHA256 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8
+DIST amarok-1.4.6_pre20070608.tar.bz2 17956550 RMD160 06a9296d548fe0d97dafc657ecc39125e8b4654a SHA1 e4b83889d37f63da86a4caf386ce8bd4207b3ff8 SHA256 7dbf7c67936b232c0962e93c3de546559bb63ab1d02c70e42cb07ba064451030
 EBUILD amarok-1.4.5-r1.ebuild 2635 RMD160 1596fd3f4af7b1dd6bc0a19b21a9ee8a9a86fedd SHA1 d206461975e530c8802aa2ab62663fc055d60566 SHA256 b0dce117d925fe2551da8cfbcc27b92f60f210794c2476d396fdd7d07a890f19
 MD5 198ee7a8434a6d6ec28d80ace8103685 amarok-1.4.5-r1.ebuild 2635
 RMD160 1596fd3f4af7b1dd6bc0a19b21a9ee8a9a86fedd amarok-1.4.5-r1.ebuild 2635
@@ -22,14 +23,18 @@ EBUILD amarok-1.4.5-r2.ebuild 2841 RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce
 MD5 8fe3013afaf86cfa9af703a14d149728 amarok-1.4.5-r2.ebuild 2841
 RMD160 ef6f04be2d8d46d53cc4f6862c5b82ed3888ce9f amarok-1.4.5-r2.ebuild 2841
 SHA256 4d404a37233107074b951537020f50b92d457ba6f0424dbb93e7160d7a09b7a7 amarok-1.4.5-r2.ebuild 2841
+EBUILD amarok-1.4.6_pre20070608.ebuild 2883 RMD160 ff4a08be19282623c5c2a4ad889ff53613b2e528 SHA1 ade4ff18c3c3e531340987d18df9835e73e71ed4 SHA256 2e220403b5d4ffd064a4d497ad0bb3d4f57d3c2d742200c1e7cd208282bcdf3b
+MD5 fc514e75cf319d34748b282989e92e12 amarok-1.4.6_pre20070608.ebuild 2883
+RMD160 ff4a08be19282623c5c2a4ad889ff53613b2e528 amarok-1.4.6_pre20070608.ebuild 2883
+SHA256 2e220403b5d4ffd064a4d497ad0bb3d4f57d3c2d742200c1e7cd208282bcdf3b amarok-1.4.6_pre20070608.ebuild 2883
 EBUILD amarok-9999-r1.ebuild 2753 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b SHA1 89e35931ee077d1557618993d5c9f18cbed98a9b SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e
 MD5 c116c2eb572ee0f17dc0028e1f26598e amarok-9999-r1.ebuild 2753
 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b amarok-9999-r1.ebuild 2753
 SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e amarok-9999-r1.ebuild 2753
-MISC ChangeLog 35631 RMD160 1f6eeba48c6c53025a168421ad2eaceb887c20cb SHA1 cab316140e9a5ab09eeee4aa4126f0395af7a4d0 SHA256 fb361ab4f55978214cd91f2398b948676778e414a842e93f2cbfca9be4a3ef58
-MD5 2a58fbe800af40a627b7b5675c917167 ChangeLog 35631
-RMD160 1f6eeba48c6c53025a168421ad2eaceb887c20cb ChangeLog 35631
-SHA256 fb361ab4f55978214cd91f2398b948676778e414a842e93f2cbfca9be4a3ef58 ChangeLog 35631
+MISC ChangeLog 35841 RMD160 2d8e0c2aa9df625872bc6879a56fea36fc02b6fe SHA1 ca56b606f321f238cdc6925d5fbacc26b7ed418a SHA256 4282798cbe3a442f84f8fb6674172a75c841d0cf6f66c8e3695258d8c295ddfb
+MD5 e28b418ac71694373e3550ed1207d011 ChangeLog 35841
+RMD160 2d8e0c2aa9df625872bc6879a56fea36fc02b6fe ChangeLog 35841
+SHA256 4282798cbe3a442f84f8fb6674172a75c841d0cf6f66c8e3695258d8c295ddfb ChangeLog 35841
 MISC metadata.xml 278 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 SHA1 003ec39d3802862e92547cfd058de6a86a2696d4 SHA256 6ab2a5bf2864cdb1536513678c8f93fb81dc0c55c4ba26b585a97e281f5c4a75
 MD5 56c49c4a013438dddcf7405055d39ff8 metadata.xml 278
 RMD160 69d1ffb637c604d94508afaf7428a9483f6ee881 metadata.xml 278
@@ -40,13 +45,16 @@ SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/di
 MD5 800f0767daa0ef9fe4ab838f9417e389 files/digest-amarok-1.4.5-r2 247
 RMD160 193cf84cab415ad5adeed61993a76209cecd9f3c files/digest-amarok-1.4.5-r2 247
 SHA256 2588dc180c448a480698e60949cbecff302cbd3a56db2e98120ceca137759bbd files/digest-amarok-1.4.5-r2 247
+MD5 d45f064675d97c6fcebe17f808c71d3f files/digest-amarok-1.4.6_pre20070608 283
+RMD160 fabe8743c2bc3eae581e8b38e42164b2b2806c9e files/digest-amarok-1.4.6_pre20070608 283
+SHA256 46ced2cedc764a9a2d96cfe6f96c3f634b8e10399dffcfda54b344c8e31fdf4e files/digest-amarok-1.4.6_pre20070608 283
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-9999-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-9999-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-9999-r1 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGaGOTAiZjviIA2XgRAjO7AKCcVZ9VOfhcJuWyy4cl454UV/+qjQCfYPVl
-02xpaFlr3+uk3zTVgygrX+o=
-=dDmd
+iD8DBQFGaWFqAiZjviIA2XgRAg1hAKDOF5SQ/5I4xrtFTFmE8hWIH/jraQCfdyHr
+nEddgnUzxGyWJbBmxhev4HU=
+=8M9T
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.6_pre20070608.ebuild b/media-sound/amarok/amarok-1.4.6_pre20070608.ebuild
new file mode 100644
index 000000000000..f2d0266fcff3
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.6_pre20070608.ebuild
@@ -0,0 +1,100 @@
+# 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.6_pre20070608.ebuild,v 1.1 2007/06/08 14:01:18 flameeyes Exp $
+
+LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
+fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds nl nn pa pl
+pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz zh_CN
+zh_TW"
+LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
+
+USE_KEG_PACKAGING=1
+
+inherit kde eutils flag-o-matic
+
+PKG_SUFFIX=""
+
+if [[ ${P/_pre} == ${P} ]]; then
+	MY_P="${P/_/-}"
+	S="${WORKDIR}/${P/_/-}"
+
+	SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+fi
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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.4.2 )
+	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
+
+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.6_pre20070608 b/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608
new file mode 100644
index 000000000000..20f746a6fa76
--- /dev/null
+++ b/media-sound/amarok/files/digest-amarok-1.4.6_pre20070608
@@ -0,0 +1,3 @@
+MD5 4da98b7cfeeb7c34f76146e89f76f7c4 amarok-1.4.6_pre20070608.tar.bz2 17956550
+RMD160 06a9296d548fe0d97dafc657ecc39125e8b4654a amarok-1.4.6_pre20070608.tar.bz2 17956550
+SHA256 7dbf7c67936b232c0962e93c3de546559bb63ab1d02c70e42cb07ba064451030 amarok-1.4.6_pre20070608.tar.bz2 17956550