Add patch for kid3 to build with tunepimp 0.4.

Package-Manager: portage-2.1_rc1-r3

5 files changed, 105 insertions, 9 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 1d1fd5f4f767..0156492f5a49 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/kid3
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.17 2005/11/06 16:53:05 greg_g Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.18 2006/05/21 23:35:34 flameeyes Exp $
+
+  21 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kid3-0.6-tunepimp04.patch, kid3-0.6.ebuild:
+  Add patch for kid3 to build with tunepimp 0.4.
 
   06 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> kid3-0.6.ebuild:
   Forcing KDE support on, as kid3 cannot be configured without having the KDE
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index e25240b6788a..710cb7138e6a 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,7 +1,42 @@
-MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
-MD5 b62054eaf83f84b725f18f59dde0df8d kid3-0.6.ebuild 920
-MD5 6ca26f56ffac2eb93fce9bc9c0d14d7a ChangeLog 2306
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kid3-0.5-configure.patch 3567 RMD160 1874de8e9e450b77e4edb95f3a54a02075a57c11 SHA1 7a2034ed6a91d590d5922851899740a6b8c1241f SHA256 858ed5bc1134f9a506af85a548cd8e44063ce7b1af997c4956c761e3bdf435b0 size 3567
+MD5 a12901d96c0d25c91a53e560ad3b540c files/kid3-0.5-configure.patch 3567
+RMD160 1874de8e9e450b77e4edb95f3a54a02075a57c11 files/kid3-0.5-configure.patch 3567
+SHA256 858ed5bc1134f9a506af85a548cd8e44063ce7b1af997c4956c761e3bdf435b0 files/kid3-0.5-configure.patch 3567
+AUX kid3-0.6-tunepimp04.patch 1876 RMD160 dfa07d5113757d8e21a298430c94934d80643eaf SHA1 70ee50309bcd4cba1a060f04d701cb75cf3857d0 SHA256 ba55d5644fe6cb8efdd846b57ecc55342f4801c2aaa0cdb0a917958bc9270895 size 1876
+MD5 f2d1e37d6bb35b0866891215fd1adc59 files/kid3-0.6-tunepimp04.patch 1876
+RMD160 dfa07d5113757d8e21a298430c94934d80643eaf files/kid3-0.6-tunepimp04.patch 1876
+SHA256 ba55d5644fe6cb8efdd846b57ecc55342f4801c2aaa0cdb0a917958bc9270895 files/kid3-0.6-tunepimp04.patch 1876
+DIST kid3-0.5.tar.gz 743294 size 743294
+DIST kid3-0.6.tar.gz 863350 RMD160 8bcec5444a0fe6e6e0009836bfc0e6b90cf5c38a SHA256 b8d1b928f55444ad1f587a8afcf2566feefd52737acebeb91dee00fd39587265 size 863350
+EBUILD kid3-0.5.ebuild 587 RMD160 108d46d64b9b063ef946aaa68b487bdf3efe80e8 SHA1 ec6264995296a0ed3e1cb20e374cc74cd25a3b6d SHA256 68821d49af03b306fc3c7e8552d0c671d8991eca1987407992eb4b4b1448b725 size 587
 MD5 3544b5449cbb9584580e2ce00130e9e5 kid3-0.5.ebuild 587
+RMD160 108d46d64b9b063ef946aaa68b487bdf3efe80e8 kid3-0.5.ebuild 587
+SHA256 68821d49af03b306fc3c7e8552d0c671d8991eca1987407992eb4b4b1448b725 kid3-0.5.ebuild 587
+EBUILD kid3-0.6.ebuild 1059 RMD160 ffedfaa9f4f1d6f284a17b87e9873ae7e6a40100 SHA1 5e471f755bd9a9dc490289768b4a8851fa912204 SHA256 8415bc1e7b80264a98410fd31e4e30ca58ce64a5f8925b97f1efc1b66b474da4 size 1059
+MD5 ad7afa2b1ab05c89f48c234f5dfcbc39 kid3-0.6.ebuild 1059
+RMD160 ffedfaa9f4f1d6f284a17b87e9873ae7e6a40100 kid3-0.6.ebuild 1059
+SHA256 8415bc1e7b80264a98410fd31e4e30ca58ce64a5f8925b97f1efc1b66b474da4 kid3-0.6.ebuild 1059
+MISC ChangeLog 2465 RMD160 0ecdb11ae81080f993cd1e2d2f40d9bf7d835bf6 SHA1 1157d79337604d4a654db189213aeacd407d1001 SHA256 fc89b899c35da42386656dc6ba71af5c7577c08d06b1cca9d323ea7b192cdd98 size 2465
+MD5 a23239b3381c623879a3b5cf6ddcc16e ChangeLog 2465
+RMD160 0ecdb11ae81080f993cd1e2d2f40d9bf7d835bf6 ChangeLog 2465
+SHA256 fc89b899c35da42386656dc6ba71af5c7577c08d06b1cca9d323ea7b192cdd98 ChangeLog 2465
+MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 size 175
+MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
+RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
+SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata.xml 175
 MD5 3031e9d49aa3af808d9a046e281ab344 files/digest-kid3-0.5 60
-MD5 ca598674409d4fdd5c48e17ef0d436f7 files/digest-kid3-0.6 60
-MD5 a12901d96c0d25c91a53e560ad3b540c files/kid3-0.5-configure.patch 3567
+RMD160 f50bc972765acc5b8a8e6ddbed755b69c7efcdee files/digest-kid3-0.5 60
+SHA256 a320149cfd25e02519920bfd31a5af56f6fe98c518194bd648e8a48efe2b3859 files/digest-kid3-0.5 60
+MD5 8e11cfafb407c63e0309b56c7694b00d files/digest-kid3-0.6 226
+RMD160 e74a04a54bb9ff6698337f8f0032ca2b50031517 files/digest-kid3-0.6 226
+SHA256 bc0bb7e9fba45a34f768e05684d39feecade747393f69ab68d7c697a1a37cac2 files/digest-kid3-0.6 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEcPlPAiZjviIA2XgRAmrJAJ97H4uHu28WtFV/zajRDiJl5KBJAQCbBu3j
+ykXwzq8yu5tsif+yh1Qnjmg=
+=M//h
+-----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/digest-kid3-0.6 b/media-sound/kid3/files/digest-kid3-0.6
index 1586cab29cc1..d80bd2ff9bcb 100644
--- a/media-sound/kid3/files/digest-kid3-0.6
+++ b/media-sound/kid3/files/digest-kid3-0.6
@@ -1 +1,3 @@
 MD5 945992608a29b692284db2c80e1217bd kid3-0.6.tar.gz 863350
+RMD160 8bcec5444a0fe6e6e0009836bfc0e6b90cf5c38a kid3-0.6.tar.gz 863350
+SHA256 b8d1b928f55444ad1f587a8afcf2566feefd52737acebeb91dee00fd39587265 kid3-0.6.tar.gz 863350
diff --git a/media-sound/kid3/files/kid3-0.6-tunepimp04.patch b/media-sound/kid3/files/kid3-0.6-tunepimp04.patch
new file mode 100644
index 000000000000..4a3f4b2bf4bf
--- /dev/null
+++ b/media-sound/kid3/files/kid3-0.6-tunepimp04.patch
@@ -0,0 +1,47 @@
+Index: kid3-0.6/kid3/musicbrainzclient.cpp
+===================================================================
+--- kid3-0.6.orig/kid3/musicbrainzclient.cpp
++++ kid3-0.6/kid3/musicbrainzclient.cpp
+@@ -30,7 +30,7 @@ MusicBrainzClient::MusicBrainzClient(Imp
+ 	m_trackDataVector(trackDataList), m_tp(0), m_ids(0), m_numFiles(0)
+ {
+ 	m_tp = tp_New("kid3", "0.6");
+-	tp_SetUseUTF8(m_tp, 1);
++	tp_SetID3Encoding(m_tp, eUTF8);
+ 	tp_SetAutoFileLookup(m_tp, 1);
+ 	tp_SetRenameFiles(m_tp, 0);
+ 	tp_SetMoveFiles(m_tp, 0);
+@@ -123,8 +123,9 @@ static const char* getFileStatusText(TPF
+ void MusicBrainzClient::pollStatus()
+ {
+ 	TPCallbackEnum type;
++	TPFileStatus status;
+ 	int id;
+-	while (tp_GetNotification(m_tp, &type, &id)) {
++	while (tp_GetNotification(m_tp, &type, &id, &status)) {
+ 		QString fn = getFilename(id);
+ 		int index = getIndexOfId(id);
+ 		switch (type) {
+@@ -211,7 +212,7 @@ void MusicBrainzClient::addFiles()
+ 			 it = m_trackDataVector.begin();
+ 			 it != m_trackDataVector.end();
+ 			 ++it) {
+-		m_ids[i++] = tp_AddFile(m_tp, QFile::encodeName((*it).getAbsFilename()));
++		m_ids[i++] = tp_AddFile(m_tp, QFile::encodeName((*it).getAbsFilename()), 1);
+ 	}
+ }
+ 
+@@ -290,10 +291,10 @@ bool MusicBrainzClient::getResults(int i
+ 					albumtrackresult_t* res = *albumTrackResults++;
+ 					ImportTrackData trackData;
+ 					trackData.title = QString::fromUtf8(res->name);
+-					trackData.artist = QString::fromUtf8(res->artist->name);
+-					trackData.album = QString::fromUtf8(res->album->name);
++					trackData.artist = QString::fromUtf8(res->artist.name);
++					trackData.album = QString::fromUtf8(res->album.name);
+ 					trackData.track = res->trackNum;
+-					trackData.year = res->album->releaseYear;
++					trackData.year = res->album.releaseYear;
+ 					// year does not seem to work, so at least we should not
+ 					// overwrite it with 0
+ 					if (trackData.year == 0) {
diff --git a/media-sound/kid3/kid3-0.6.ebuild b/media-sound/kid3/kid3-0.6.ebuild
index 5eca255c8c79..27173f6f07f8 100644
--- a/media-sound/kid3/kid3-0.6.ebuild
+++ b/media-sound/kid3/kid3-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.6.ebuild,v 1.2 2005/11/06 16:53:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.6.ebuild,v 1.3 2006/05/21 23:35:34 flameeyes Exp $
 
 inherit kde
 
@@ -24,6 +24,14 @@ need-kde 3
 # but the configure step that detects them
 # cannot be avoided. So KDE support is forced on.
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	has_version '>=media-libs/tunepimp-0.4.0' && \
+		epatch "${FILESDIR}/${P}-tunepimp04.patch"
+}
+
 src_compile() {
 	local myconf="--with-kde
 	              $(use_with vorbis)