Depend on one of the two patchsets, as per bug #109375. Thanks to Santtu Pajukanta...

Package-Manager: portage-2.1

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index b7eac5cd98dcec907272cb5bebcc2bd9848b9c11..956ad3217ff195fb1a9425f254f7db30871e4e83 100644 (file)
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.55 2006/03/15 16:33:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.56 2006/06/15 15:32:34 flameeyes Exp $
+
+  15 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  timidity++-2.13.2-r2.ebuild:
+  Depend on one of the two patchsets, as per bug #109375. Thanks to Santtu
+  Pajukanta for reporting.
 
   15 Mar 2006; Markus Rothe <corsair@gentoo.org>
   timidity++-2.13.2-r2.ebuild:

diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index a026bfd75a7bf72d49c6f4049b97f71c64b6269d..3cb39d82777664502dda162dd76e166f8855b4ad 100644 (file)
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,13 +1,62 @@
-MD5 30937fa925f086217a9883fd00ebe593 ChangeLog 9422
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
-MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
-MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r2 536
+RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a files/conf.d.timidity 912
+SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3 files/conf.d.timidity 912
+AUX gnuconfig_update.patch 477 RMD160 9c5ba3ec8b953f177110cc755a8bd1c5bed3042c SHA1 e4724ff72698bcb355294bb9fbf1eee361b957f4 SHA256 2906bd19277b08dbc3400708e568715298c54b904b12803c725ac72e08519447
 MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
+RMD160 9c5ba3ec8b953f177110cc755a8bd1c5bed3042c files/gnuconfig_update.patch 477
+SHA256 2906bd19277b08dbc3400708e568715298c54b904b12803c725ac72e08519447 files/gnuconfig_update.patch 477
+AUX init.d.timidity 457 RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 SHA1 50c7c2ce6aba6f2c0eb9612d93368cfd2b87cbd8 SHA256 8882137a10d5e858fa3c20f91d439192dca0759f43702180085d3514a12a59fd
 MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457
+RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 files/init.d.timidity 457
+SHA256 8882137a10d5e858fa3c20f91d439192dca0759f43702180085d3514a12a59fd files/init.d.timidity 457
+AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
 MD5 0868926c5290817cacb9a1849bc043c2 files/timidity++-2.13.2-gcc4.patch 1325
+RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 files/timidity++-2.13.2-gcc4.patch 1325
+SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee files/timidity++-2.13.2-gcc4.patch 1325
+AUX timidity++-2.13.2-gtk26.patch 588 RMD160 588eefcb0727af0162b24b17970df300ea5fdd64 SHA1 ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4 SHA256 fdb95708e353425fbc8f141d45f5b876fa85636f953200cdbc147834b4a31f56
 MD5 16a4adec164836d4390dc6b0f9a69ce9 files/timidity++-2.13.2-gtk26.patch 588
+RMD160 588eefcb0727af0162b24b17970df300ea5fdd64 files/timidity++-2.13.2-gtk26.patch 588
+SHA256 fdb95708e353425fbc8f141d45f5b876fa85636f953200cdbc147834b4a31f56 files/timidity++-2.13.2-gtk26.patch 588
+AUX timidity-update 2513 RMD160 d980dc303cc67b37ef63c66349376d947d1806cc SHA1 23dbba3f928032207a02e894e0086936d5fba173 SHA256 55e0067baebc73f87adbde61ce1669de27a72fd2db89519cbd0754f895d7d058
 MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
+RMD160 d980dc303cc67b37ef63c66349376d947d1806cc files/timidity-update 2513
+SHA256 55e0067baebc73f87adbde61ce1669de27a72fd2db89519cbd0754f895d7d058 files/timidity-update 2513
+AUX timidity.cfg-r1 669 RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 SHA1 a1aec57e46d953082d1e59cf80eb1cb15627bb4c SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce
 MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 e5b964ef65e19627d6c44d2036d95b73 timidity++-2.13.2-r2.ebuild 4143
+RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 files/timidity.cfg-r1 669
+SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce files/timidity.cfg-r1 669
+DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
+DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
+EBUILD timidity++-2.13.2-r2.ebuild 4229 RMD160 deb0dc22f7c907f55dcbfd63f34be5a8f1ba76b3 SHA1 4120a04d590970387c390f7eb94b32d11fc7edd8 SHA256 f8c7c4ef1cc2af610dc99a4fd20fad11934c7c55b5e0aa6023e5b8acbcb60dfa
+MD5 2e819a1e3d2cbf59074d464740cce0bf timidity++-2.13.2-r2.ebuild 4229
+RMD160 deb0dc22f7c907f55dcbfd63f34be5a8f1ba76b3 timidity++-2.13.2-r2.ebuild 4229
+SHA256 f8c7c4ef1cc2af610dc99a4fd20fad11934c7c55b5e0aa6023e5b8acbcb60dfa timidity++-2.13.2-r2.ebuild 4229
+EBUILD timidity++-2.13.2.ebuild 3804 RMD160 5d95982df19ac6640ce7f1744d5c24acbc6ad2ae SHA1 f621fc9da9b29a634a9372d59f736926f8ecc256 SHA256 e3a9d36f06627c9093e87ed0c7c8726573643ff7d86a1820bb4f76edcb3bcec3
 MD5 401447625c092dcc856e210a90965753 timidity++-2.13.2.ebuild 3804
+RMD160 5d95982df19ac6640ce7f1744d5c24acbc6ad2ae timidity++-2.13.2.ebuild 3804
+SHA256 e3a9d36f06627c9093e87ed0c7c8726573643ff7d86a1820bb4f76edcb3bcec3 timidity++-2.13.2.ebuild 3804
+MISC ChangeLog 9611 RMD160 ba51b192660ce97321e6bb7b9a1b4bd280fa38bf SHA1 4ec1346ac648de0fd0a478f57f06a190b6f84898 SHA256 4f767d7235bcb72bf55dc2619e913fa4c644f70f2416a000cc8643088381c9db
+MD5 14d900387dfaa70f0ab5b0432b74585a ChangeLog 9611
+RMD160 ba51b192660ce97321e6bb7b9a1b4bd280fa38bf ChangeLog 9611
+SHA256 4f767d7235bcb72bf55dc2619e913fa4c644f70f2416a000cc8643088381c9db ChangeLog 9611
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 43834d7600603dbb7421a145329d2acb files/digest-timidity++-2.13.2 259
+RMD160 2d92fb9772ca65163569c0ec5d5c590182828b84 files/digest-timidity++-2.13.2 259
+SHA256 706e64e0d9c3a5dc2c3407b65496cfac196de3a2787aeb234921deb177fcc1dc files/digest-timidity++-2.13.2 259
+MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r2 536
+RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r2 536
+SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r2 536
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEkX2gAiZjviIA2XgRAiEiAKCdIVOg+tLyPox6zgTLRFUUyLHDRACgzWez
+FUuxMxtr9ZIl2Ic2+Ng4R7E=
+=/YIV
+-----END PGP SIGNATURE-----

diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.2 b/media-sound/timidity++/files/digest-timidity++-2.13.2
index 95bd00b0521f383f8029b3b228f25b04bc2652d8..f7d90c2fafffdd3fc9ca6f383dcd6f1022e18fc6 100644 (file)
--- a/media-sound/timidity++/files/digest-timidity++-2.13.2
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.2
@@ -1 +1,3 @@
 MD5 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 1581230
+RMD160 0156221846a88abef9312700a050972d85084fd8 TiMidity++-2.13.2.tar.bz2 1581230
+SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 TiMidity++-2.13.2.tar.bz2 1581230

diff --git a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
index 716986bbd1f6e58642e01a006670a9d92fdd6b81..b1643d149138d4500e7324ce55ab30a1b83b1d24 100644 (file)
--- a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r2.ebuild,v 1.9 2006/03/15 16:33:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.10 2006/06/15 15:32:34 flameeyes Exp $
 
 inherit eutils
 
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}
 RDEPEND="${RDEPEND}
        emacs? ( virtual/emacs )"
 
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches )"
+
 src_unpack() {
        unpack ${MY_P}.tar.bz2
        cd ${S}