Remove musicbrainz support as per bug #140184.

Package-Manager: portage-2.1.1_pre3-r3

2 files changed, 17 insertions, 68 deletions

diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index 710cb7138e6a..52cbfd3b409e 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX kid3-0.5-configure.patch 3567 RMD160 1874de8e9e450b77e4edb95f3a54a02075a57c11 SHA1 7a2034ed6a91d590d5922851899740a6b8c1241f SHA256 858ed5bc1134f9a506af85a548cd8e44063ce7b1af997c4956c761e3bdf435b0 size 3567
+AUX kid3-0.5-configure.patch 3567 RMD160 1874de8e9e450b77e4edb95f3a54a02075a57c11 SHA1 7a2034ed6a91d590d5922851899740a6b8c1241f SHA256 858ed5bc1134f9a506af85a548cd8e44063ce7b1af997c4956c761e3bdf435b0
 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
+DIST kid3-0.5.tar.gz 743294
+DIST kid3-0.6.tar.gz 863350 RMD160 8bcec5444a0fe6e6e0009836bfc0e6b90cf5c38a SHA1 8459f90b49a6c18adea7db80a201f99747f39e23 SHA256 b8d1b928f55444ad1f587a8afcf2566feefd52737acebeb91dee00fd39587265
+EBUILD kid3-0.5.ebuild 587 RMD160 108d46d64b9b063ef946aaa68b487bdf3efe80e8 SHA1 ec6264995296a0ed3e1cb20e374cc74cd25a3b6d SHA256 68821d49af03b306fc3c7e8552d0c671d8991eca1987407992eb4b4b1448b725
 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
+EBUILD kid3-0.6.ebuild 844 RMD160 1b3272993658ac755ec87c93e4c0f735b6eecda9 SHA1 6a0a36a742ea20d46eba6cb203e9606fbbc2ad36 SHA256 7ad3da101349505336926759110030e5b7574315b2cca7f247df88b6623c8371
+MD5 c6e1e68aa62464c88ac65f36ff679736 kid3-0.6.ebuild 844
+RMD160 1b3272993658ac755ec87c93e4c0f735b6eecda9 kid3-0.6.ebuild 844
+SHA256 7ad3da101349505336926759110030e5b7574315b2cca7f247df88b6623c8371 kid3-0.6.ebuild 844
+MISC ChangeLog 2621 RMD160 04d5db2798073e51d969b0b15a020fb0a4532e7a SHA1 a6ed2ae24e3fd9d18f0719fc698ac326d4d7346b SHA256 f7e316e4f9c1691fa1a0365205e42f63c9fab2e868a6870cc3a986760ef0ced1
+MD5 7c23b74ce49c54e75460ed6f4eb841da ChangeLog 2621
+RMD160 04d5db2798073e51d969b0b15a020fb0a4532e7a ChangeLog 2621
+SHA256 f7e316e4f9c1691fa1a0365205e42f63c9fab2e868a6870cc3a986760ef0ced1 ChangeLog 2621
+MISC metadata.xml 175 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 SHA1 53b99ea5fccaad7ef2442059a91878a36714594b SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
 RMD160 b83c98cecf42dee70ceb6176e04d25bd0ca3bb47 metadata.xml 175
 SHA256 bef114df47e8714056f8ba499d57edbba26f1a7e0dbaca7dbfbe4beae4272729 metadata.xml 175
@@ -34,9 +30,9 @@ 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)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEcPlPAiZjviIA2XgRAmrJAJ97H4uHu28WtFV/zajRDiJl5KBJAQCbBu3j
-ykXwzq8yu5tsif+yh1Qnjmg=
-=M//h
+iD8DBQFExdAyAiZjviIA2XgRAgqPAKDD8X3MPU4J3ye01SCIv7zw18yAawCgjquM
+SYU/IxgW3tG6tdpecUIOZ5E=
+=bwXU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/kid3/files/kid3-0.6-tunepimp04.patch b/media-sound/kid3/files/kid3-0.6-tunepimp04.patch
deleted file mode 100644
index 4a3f4b2bf4bf..000000000000
--- a/media-sound/kid3/files/kid3-0.6-tunepimp04.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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) {