Rev bump for libmtp-0.3.0 compat. Bug #230885.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 169 insertions, 15 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 07f41435a00c..71001ce85f7c 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.265 2008/05/27 02:55:28 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.266 2008/07/05 23:34:18 loki_val Exp $
+
+*amarok-1.4.9.1-r1 (05 Jul 2008)
+
+  05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/amarok-1.4.9.1-libmtp-0.3.0-API.patch, amarok-1.4.9.1.ebuild,
+  +amarok-1.4.9.1-r1.ebuild:
+  Rev bump for libmtp-0.3.0 compat. Bug #230885.
 
   27 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   files/amarok-1.4.9.1-helix+gcc-4.3.patch:
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 895e30e9762b..a72966c66c81 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808 RMD160 fcf33e066734fdf14b5b25421093f19282b2f130 SHA1 bf38186111297dc9da5eb00be14ba9772d2ae134 SHA256 5c65d14d2aa8b6739a7a8493f7d4db808c25d56047ff00b7adcd8754ee97e4f2
 AUX amarok-1.4.7-svn148317.patch 538 RMD160 088c06869d98f2bc9de83a8e9e39d0026bc74db1 SHA1 f66e14a0273e68caf9ceb40b8475d35c32bc04e5 SHA256 f159099ec72687ad306c4d386336f0864b4510d5c5b09026cd31401c3ade23ae
 AUX amarok-1.4.9.1-helix+gcc-4.3.patch 435 RMD160 2ebf5155e052d90e027d207820bd4328b75014ea SHA1 af9169a7dd9df1598099acea2e84310d1ec9b1bb SHA256 b35b0c42d19d48fda2385962aeaa132b2cf659ddeebcadc5eae3f6dfe7e44894
+AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
 DIST amarok-1.4.8.tar.bz2 12699378 RMD160 b557f6f5f14c304ae82c8d5537263ecc1faa922e SHA1 8051efa40483271fe6b7d229da9b4d7af3142348 SHA256 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
 DIST amarok-1.4.9.1.tar.bz2 12707926 RMD160 9f6e59116292bd33e10c0245bfdbd3a2df319765 SHA1 5473c7d578a4bf2662f977d9239ff0066ee8f159 SHA256 c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
 EBUILD amarok-1.4.8.ebuild 3195 RMD160 ae0a14b0ab7ecaed2de15710bbb8ca7127e4cbc8 SHA1 25a2eb100c29203cb3713e66bf25e5bb2c6d2a4a SHA256 1d56cc2d878de0e7d9afd2c89163a0f221f3c56e3f9c3725d3fe8884a30c19c8
-EBUILD amarok-1.4.9.1.ebuild 3056 RMD160 d59534ce2c0426a8955615fc2bfaa310a36e5e72 SHA1 1e349a627f491fd19f99bc8310d8187a3440159c SHA256 2265d0c90d4d516c198cc3033f715480f7e5bcc966e8a804de1d7da59db8be06
+EBUILD amarok-1.4.9.1-r1.ebuild 3103 RMD160 7dec5a4ef4b59d34ea607f1d6d9da4825f7ccee0 SHA1 9ef2e4e2078ea7415ef3b5aea58537ba3966ed2b SHA256 b015097abe1af2ac16bfc0495645b10ce7a63210fe72991bd3bb7c37f20a1c8e
+EBUILD amarok-1.4.9.1.ebuild 3056 RMD160 f7c345b53265b18b49ffb50a60847583985c5ddf SHA1 d24a8c38c196fd6ef673ef6c3d92b98d6930662f SHA256 b593a704d63c4090d47fee5ee70802ad119de7dfed9e798e8dd31afccf9e5ebc
 EBUILD amarok-1.4.9999-r2.ebuild 2968 RMD160 ccdac64d981d96b28355906009cd37fb89ce36b0 SHA1 8530f914a80ac7d988981f996ebcb09055017995 SHA256 f3d3a1311d4614ce983e984fd6b589fcf5027fcb16b47234646b7eb2814e5941
-MISC ChangeLog 43847 RMD160 3fcca415c8defaaf99f0d50b01842101a291fde6 SHA1 61e366165f2f4d5f5c1ed153e6dd86e3827df671 SHA256 c6cb049b74358f9071aa383a96da05beb8c0081c0dc7ca0675477ef0ef431406
+MISC ChangeLog 44086 RMD160 b9c101eaec6e05cca3f2120a746255d64f0143fe SHA1 2cd84f6b04555c3b53ce6904b732daa0471b5954 SHA256 9904adcda54d71342275698b1b5077b979dd0c226174b0494034e8b74516c1a1
 MISC metadata.xml 1637 RMD160 a096386a6b2e869b5318391a569c331175f37964 SHA1 bdc2853b3976d8e7e25991dc041ef3acd50a1ad7 SHA256 297e4f01b63287c80d57c5ca4604fd684bb593c688a59461496484af7e6ea848
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEUEARECAAYFAkg7d/AACgkQB18eXLOpYdkdfACfTBfys7GeDhdq4KffaXVeyvsv
-2aUAl289v/h8SzWgJ3txEq7gH11OZ6s=
-=Y5dG
------END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.9.1-r1.ebuild b/media-sound/amarok/amarok-1.4.9.1-r1.ebuild
new file mode 100644
index 000000000000..960323722a3a
--- /dev/null
+++ b/media-sound/amarok/amarok-1.4.9.1-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9.1-r1.ebuild,v 1.1 2008/07/05 23:34:18 loki_val 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 ne 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
+
+PKG_SUFFIX=""
+
+if [[ ${P/_pre} == ${P} ]]; then
+	MY_P="${P/_/-}"
+
+	if [[ ${P/_rc} == ${P} ]]; then
+		SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+		S="${WORKDIR}/${P/_rc*}"
+	fi
+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="mp4 kde mysql amazon opengl postgres
+visualization ipod ifp real njb mtp musicbrainz daap
+python"
+# kde: enables compilation of the konqueror sidebar plugin
+
+RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	>=media-libs/taglib-1.4
+	mysql? ( >=virtual/mysql-4.0 )
+	postgres? ( virtual/postgresql-base )
+	opengl? ( virtual/opengl )
+	visualization? ( media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4* )
+	ipod? ( >=media-libs/libgpod-0.5.2 )
+	mp4? ( media-libs/libmp4v2 )
+	ifp? ( media-libs/libifp )
+	real? (
+		media-video/realplayer
+		media-libs/alsa-lib )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	mtp? ( >=media-libs/libmtp-0.3.0 )
+	musicbrainz? ( media-libs/tunepimp )
+	=dev-lang/ruby-1.8*"
+
+DEPEND="${RDEPEND}"
+
+RDEPEND="${RDEPEND}
+	app-arch/unzip
+	python? ( dev-python/PyQt )
+	daap? ( www-servers/mongrel )"
+
+PATCHES=( 	"${FILESDIR}/${P}-helix+gcc-4.3.patch"
+		"${FILESDIR}/${P}-libmtp-0.3.0-API.patch" )
+
+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 amazon)
+				  $(use_with ipod libgpod)
+				  $(use_with mp4 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-1.4.9.1.ebuild b/media-sound/amarok/amarok-1.4.9.1.ebuild
index 5a8eb330f75e..cde122269057 100644
--- a/media-sound/amarok/amarok-1.4.9.1.ebuild
+++ b/media-sound/amarok/amarok-1.4.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9.1.ebuild,v 1.4 2008/05/19 20:07:28 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9.1.ebuild,v 1.5 2008/07/05 23:34:18 loki_val 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 ne nl nn pa
@@ -56,7 +56,7 @@ RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
 		media-video/realplayer
 		media-libs/alsa-lib )
 	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( >=media-libs/libmtp-0.1.1 )
+	mtp? ( <=media-libs/libmtp-0.3.0 )
 	musicbrainz? ( media-libs/tunepimp )
 	=dev-lang/ruby-1.8*"
 
diff --git a/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch b/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch
new file mode 100644
index 000000000000..a4500070b3b6
--- /dev/null
+++ b/media-sound/amarok/files/amarok-1.4.9.1-libmtp-0.3.0-API.patch
@@ -0,0 +1,44 @@
+--- amarok/src/mediadevice/mtp/mtpmediadevice.cpp
++++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+@@ -293,12 +293,13 @@
+         parent_id = getDefaultParentId();
+     }
+     debug() << "Parent id : " << parent_id << endl;
++    trackmeta->parent_id = parent_id;
+ 
+     m_critical_mutex.lock();
+     debug() << "Sending track... " << bundle.url().path().utf8() << endl;
+     int ret = LIBMTP_Send_Track_From_File(
+         m_device, bundle.url().path().utf8(), trackmeta,
+-        progressCallback, this, parent_id
++        progressCallback, this
+     );
+     m_critical_mutex.unlock();
+ 
+@@ -529,7 +530,7 @@
+         for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
+             album_object->tracks[i++] = it->track()->id();
+         album_object->no_tracks = items->count();
+-        ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
++        ret = LIBMTP_Create_New_Album( m_device, album_object );
+         if( ret != 0 )
+         {
+             debug() << "creating album failed : " << ret << endl;
+@@ -608,7 +609,7 @@
+ {
+     debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
+     char *name_copy = qstrdup( name );
+-    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
++    uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
+     delete(name_copy);
+     debug() << "New folder ID: " << new_folder_id << endl;
+     if( new_folder_id == 0 )
+@@ -913,7 +914,7 @@
+     if( item->playlist()->id() == 0 )
+     {
+         debug() << "creating new playlist : " << metadata->name << endl;
+-        int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
++        int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
+         if( ret == 0 )
+         {
+             item->playlist()->setId( metadata->playlist_id );