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

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

5 files changed, 18 insertions, 12 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++/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