Don't depend on timidity-shompatches, since that package has been masked for removal, bug 441640.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

6 files changed, 33 insertions, 24 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index b538ec70ee98..84e385fa5fea 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.156 2013/02/10 06:54:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.157 2013/05/03 12:03:50 ulm Exp $
+
+  03 May 2013; Ulrich Müller <ulm@gentoo.org> timidity++-2.13.2-r13.ebuild,
+  timidity++-2.13.2-r14.ebuild, timidity++-2.14.0.ebuild,
+  timidity++-2.14.0-r1.ebuild:
+  Don't depend on timidity-shompatches, since that package has been masked for
+  removal, bug 441640.
 
 *timidity++-2.14.0-r1 (10 Feb 2013)
 
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 90e9438d5964..531e9085d2d0 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -15,20 +15,23 @@ AUX timidity.xpm 1522 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8a
 DIST TiMidity++-2.13.2.tar.bz2 1581230 SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 SHA512 0e35ad4c8745878daf63932143e60dc4bda0f3ef5d6f046cad74c8c57edf39a7d1d3f0f36758d5b11ace72e2661fba1629d30d90202e9573c07d1ea2b66a6bc1 WHIRLPOOL 134a903ce7f943b538783ee610e074ff279103443bf0b2a9ff10822af376bd31d291197202913aba1325e55ee55b9d20c6087e13a79f135018ed945e8e8c8ff4
 DIST TiMidity++-2.14.0.tar.xz 1356476 SHA256 abf0c8367959e85c9e635b8fbd5183fc27bd380e0ef5e45de4158784538c86fc SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3 WHIRLPOOL 0031a0e6519ead34c73ed3383d1d74b91b3e25c257854bd3325d25ec9c00bb55c036936ef4ef162ad13c255fefc4e46b802173e93b7ed575c92cf076ab03929b
 DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc SHA512 5199a608518f0d92a5dc2d469babe922949b6dd7c07197af3eca167024b20e57466e99baf731abda58a4025fd842d7670dbc01130cdb6eebef11d04f4c2a32ea WHIRLPOOL 2d7281a13512090a22498d5198b4ef2d6b3e74ed23a351b8b187686fdcadea59565b924c5887b04bedf4d3ff289f73952f1bb026ff4e37c30df28d7437453462
-EBUILD timidity++-2.13.2-r13.ebuild 5005 SHA256 5fdcc167aa6d8c48302df3a8f79483cefc03d4231127c4b5c4b17bba730037d9 SHA512 79a6948b75a18c975ece79735ffbee2ac80d1b384bb790e9a5468c5bf6daf6f2f219078be1176b8b056e79f0b8e7161ff6286ddacdd7b00689b520e3a37c262d WHIRLPOOL aa06c415b582a141d644744872928f47f25fdfdb085678d2068ec1a8379b7e52d27621e4dd284ef4b3850eb1caf66b919a4bf769c5bd0d20143aae59c9ec62eb
-EBUILD timidity++-2.13.2-r14.ebuild 5022 SHA256 ab80eb1065457f912f91c9f06688a24ee92c86febf975067a4f0ece99ae96066 SHA512 94ede5ee34a841590b961655658da174514c0d79ad277baf88cd4a95400ae35ef291ffc7fdcffcf1c4c9e9b8f89df42c60ab37e4a9806a76978c9f95cb7363d0 WHIRLPOOL ac18fbd320268523b6682fef17190ce7a5b29a4703647cb662d1ca3b92580698cc61cbdffc13b6a499a84771a928564921cb06dd81b14d7d49cac5808aed130e
-EBUILD timidity++-2.14.0-r1.ebuild 5143 SHA256 4e3c4b8aa122d665d059a7100fb29d08c96c880da980dbbbb85503498a894ecd SHA512 7ea303555914d944b016044b3aacd05cd1ce047f6a1b83304910a794b8052fe33518d59c96b8c8e4566f024f4901cd0863587ab06af0ed510a6e5fc1e16eebb4 WHIRLPOOL 85f884870b44ef04a4fbde1ffba72c8d139d0ad61393a0d7a97bf8cf0db51a8019c6203acd9ff0e46692bed84db76ce7eb49e2e84b18fd785e319b0faafc2f7b
-EBUILD timidity++-2.14.0.ebuild 5095 SHA256 b07a294d06d9c1b8179da21bcbd51669ff2d05ecc0908516a012d579e23a2cbe SHA512 d63f4a2b084e1a89c990a2e5412f28358106474446d289fe4cf911922df2cf394dda6633bf634d79346e78316a8e28b61a82dd4375070b9fcb710f1c915f7151 WHIRLPOOL dc2c2223846c7464ff084f4c2c31bcdbcd4f58db0f18279f982b4aed6fea402069e434f27b5f313ff59ac2150b343306c5d5b16d2c2e4c737b68d63c6afa5a0e
-MISC ChangeLog 24700 SHA256 81e12bdc420569a6e93d9d39acdb5ebc21297d70b372d1aa9d2d597840090c74 SHA512 e58b2bd682d3056e3555f11b6012cbfed963c94328d8f1fd86423ae1bfa8c795d3c82fbee79b7b58413ef7a2c9cf1787c9d8b2048cc2726edfc96581b8b17565 WHIRLPOOL 5b8f31161e538b9091aa71b4e74f52b7f0c06f212de56a101184b822916f521ac0d24f82640d203659964413a12e8f919a1aecc35bba35313ce53e1dabd315dc
+EBUILD timidity++-2.13.2-r13.ebuild 4972 SHA256 b7ab9879ef4fe049caeb19b4f1b5671806976059e5fbf1ffac05a2a5b5bafb70 SHA512 a0db93b463cfd8a5e8bafe477e2c53c71d17520087061a7afe0b9135dc17ca6e8e19e76f3e4f16f915babc26cb1d507c56ce2f5377c36805fdf1a611d7f385aa WHIRLPOOL 1e0dd9a53b0d782ac0be31096acb57e36eaa907a2f3e40e8c5d72dd85b51d3a16244c5ea6f95a0d60a969e6da1cfd6dd7ddbb214843520b44b3be50fc5e6410e
+EBUILD timidity++-2.13.2-r14.ebuild 4989 SHA256 a074ed8e58cdf8c0ac14d52837f4049b13346b45ba2405308852b44d533b398d SHA512 10232197e306bb25d50ee0dfde9cac76008a388acf15153d7f15dbe679434ad358980f1d3fcbd42576bbcf87aa831e4582fcb5adb19449fb20a7c8daf1a47a6d WHIRLPOOL 12601bcd1c81c27a55121aaa6fa6d5a58808de0285b10a541545dc3c2d65e306cf76183ee16f12d3136681acde86c9f74a057d7228b5dd56b72a38fa666e07b1
+EBUILD timidity++-2.14.0-r1.ebuild 5104 SHA256 a811514a8c7154c7b2647694dfd370a8c131c984949ae52a35072d3c734baff6 SHA512 3f9b839a6eec18b34bf71091a57fbc79c109a23cda79b12b32838bd477992669d26a030a66b63b992ce1de97f74c0d83fc85eda2398dc94ed8723972f6fcb75a WHIRLPOOL 633cd35715afe69bf8a6dba17c5be5b9b7fd622d7cf7651f42039cf8b91b55a4cbd9bbb01ea669749d6b48b509409c39aa87773c2eb7d150c7e27dc81e710cb1
+EBUILD timidity++-2.14.0.ebuild 5063 SHA256 da011be8d0939143cb40e691197066fc4b59f9aee6c5d0de02303eb1cafe67ac SHA512 505bba4933fc5c0b4016301b71d212caf330084528d3fe7466ccb2a422f015e2ed3f6dab3e6ac326bc41e571e8a383713ebd5137ba82cca2acf1eb269fc4efb1 WHIRLPOOL 92f102c11202df54a153aa068e7d4cabd55d11cec2fbfafcd97ba2869ce4186ac6ba2bbd6aafa1d9845d42d081533fa7cf9737ad6d1bfd699ff43342437c9fcd
+MISC ChangeLog 24963 SHA256 2532c374e4be17ce3f41ce25cee21bafb4394139b10042b48c7012fcd929adb1 SHA512 9466f3b93ff1c80993cb7e8f27c21f4755aeef087fe9b00df2ed4cd7e5ae413a1f0a1934014909cfebbf58a354487e78df6c70134963a010382f322a3ba7cd4b WHIRLPOOL 2731e4033a78bc44226b2214e1dce3d27e1f28f2e3842e727044def6956c69b40b0a8821b41cfb17f441dcd2495d15cfb372121f4b6c67a45d3709bae8941043
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRF0P5AAoJEEdUh39IaPFNnjMH/13ohzpuLc+oT4YfgDjJ4TMn
-WcRnuhrbISrW5N6cXUt/1dKzrlOleVuOqlXS5ZTMjo5Ryd69PzMscB3F8zqEU3YH
-4CTvGIF8pabQPZyNTTA/HLtg+HSI5PYOYMCqHfZBtqyiRusr08Ysg3LcGFfPtOjF
-AeenWEPQIs+rxEjiGLQIR2PeVX3XBKFCIBmBymbMHC0GlEi+/LaEum6m7l942385
-DXq48MpPO8ZDO2voBAn4ze0K0O7YRl8cut0U/KPwyy3h9sL6xmaqzOZiWdHHKK8O
-gCTOnwUHiG871aNAJ/Cp967+wPC4d/XdXfgrZkQo8TN0Bc5n/e1wFEw+ZLu1WQQ=
-=tETt
+iQGcBAEBCAAGBQJRg6gEAAoJEJQzkH1pP7W4cVQL/2Z/Zaj4jUBNFBgvBParWgfk
+xmSVeJSUYxGfQ6Cc9VIb58BHGvjuKBq/Age91MDKR4AvSEdV12Z3omPRauraqaQD
+YsWv4i5jo0aNUrq+99WnJiZ/rrWh9BZJMA6naoLC+gZLnGfgl2wP9bQVyt+eZ70b
+waWPz1pV1w+23ef8A+WxIdbbKo1Gkh2dQCRLA6mjgDFiu1S6QoV9JW4EL8hh01G5
+imjBZ8GQ859QAweiKYh8X3Ovuc7lLs5vrCJISkajWD0JztiY7YhZICpgrXw98F+k
+PCNt3zAGhx2IDGoNwISpPjanpmZ/nDVczoRXYlvPd89Uy1MYthKJnUAsuCplTVip
+eA/dW3Oq5HkoM3xvJdQKosnm9ZJe4zlrSE1mWers9c15o9LOEi2Tft9joLQeoUgM
+g7/L6g2FJ133zKJLph2tTphOAMzQF2mGUQrdPTvSPvZMAqc3GqNXeuOJ2+YJiTgQ
+N/UTKLieeE4f31yEDwGfWTnVxpjUTJUyZWLOP7/e6A==
+=Xjkh
 -----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/timidity++-2.13.2-r13.ebuild b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
index 14ed98fee7bd..d9ff094da697 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r13.ebuild,v 1.14 2012/10/24 19:17:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r13.ebuild,v 1.15 2013/05/03 12:03:50 ulm Exp $
 
 EAPI=2
 inherit autotools eutils elisp-common user
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )
 	app-admin/eselect-timidity"
 
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
 
 SITEFILE=50${PN}-gentoo.el
 
diff --git a/media-sound/timidity++/timidity++-2.13.2-r14.ebuild b/media-sound/timidity++/timidity++-2.13.2-r14.ebuild
index ab9cc9327372..aa64ec2e44cb 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r14.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r14.ebuild,v 1.5 2012/10/24 19:17:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r14.ebuild,v 1.6 2013/05/03 12:03:50 ulm Exp $
 
 EAPI=4
 inherit autotools eutils elisp-common user
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )
 	app-admin/eselect-timidity"
 
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
 
 SITEFILE=50${PN}-gentoo.el
 
diff --git a/media-sound/timidity++/timidity++-2.14.0-r1.ebuild b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
index de2d3e0da49e..8b0aaf51424c 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r1.ebuild,v 1.1 2013/02/10 06:54:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r1.ebuild,v 1.2 2013/05/03 12:03:50 ulm Exp $
 
 EAPI=5
 inherit autotools eutils elisp-common user systemd
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )
 	app-admin/eselect-timidity"
 
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
 
 SITEFILE=50${PN}-gentoo.el
 
diff --git a/media-sound/timidity++/timidity++-2.14.0.ebuild b/media-sound/timidity++/timidity++-2.14.0.ebuild
index 5cf579d6debc..afd835d664cc 100644
--- a/media-sound/timidity++/timidity++-2.14.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0.ebuild,v 1.9 2012/10/24 19:17:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0.ebuild,v 1.10 2013/05/03 12:03:50 ulm Exp $
 
 EAPI=4
 inherit autotools eutils elisp-common user systemd
@@ -36,7 +36,7 @@ RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )
 	app-admin/eselect-timidity"
 
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )"
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
 
 SITEFILE=50${PN}-gentoo.el