Upstream fix to build with guile 1.8

Package-Manager: portage-2.1.2.2

diff --git a/media-sound/beast/ChangeLog b/media-sound/beast/ChangeLog
index 07ee29abaddebedeb53e0e0fc51c7f3f369b1a36..ec959c9cc4da37b7653cb569cbd7234c6c544279 100644 (file)
--- a/media-sound/beast/ChangeLog
+++ b/media-sound/beast/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/beast
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.24 2007/02/27 22:56:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.25 2007/03/25 12:19:37 aballier Exp $
+
+  25 Mar 2007; Alexis Ballier <aballier@gentoo.org> beast-0.7.1.ebuild:
+  Upstream fix to build with guile 1.8
 
   27 Feb 2007; Alexis Ballier <aballier@gentoo.org> +beast-0.7.1.ebuild:
   Bump under pmask, bug #163146

diff --git a/media-sound/beast/Manifest b/media-sound/beast/Manifest
index 367a3b101365f97d523901664744141e0823fe89..0f8027ce439dcddfd3c675d38f4906f5c3dd264b 100644 (file)
--- a/media-sound/beast/Manifest
+++ b/media-sound/beast/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 DIST beast-0.6.4.tar.gz 5772010 RMD160 bbba0c37c0df4368eeed6225eeb8420ab3380fd1 SHA1 3400ce088920396700c808e606cd36b4a74da14f SHA256 8436604914161a496ffd6c7996262061ce019e59372afa8e26ad9d0a1792a6ed
 DIST beast-0.6.5.tar.gz 5931240 RMD160 9e4286347fbda42438f51f7c90bf3d7721b68476 SHA1 b8f7ba3d95e65e3fa165754002ec808322c9bc6d SHA256 3325cedf9242331d7cd4d40d2229be8e1a7288678e86e892d1955d1ad570693a
 DIST beast-0.6.6.tar.gz 6098356 RMD160 b77b56a2485417ffca3f39d4761ee7d723c516cb SHA1 718af3df8c6e8f4e3e392e42845f3cd89d93071c SHA256 2fe95a55f668eb6f330099b728cee72b6449e7bd95683d6a124975410df0fc33
+DIST beast-0.7.1-guile-1.8.diff.bz2 5709 RMD160 8c47de83fd9e59b3dc3b4f5f3fa5e33de361f919 SHA1 37ae2db136c1319efc73a597710bd066025d33f0 SHA256 dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e
 DIST beast-0.7.1.tar.bz2 5806537 RMD160 45d928542573cdbc73791bae6b871bc59f5a6c8f SHA1 6dac7e6f3e36305f85e472bc6724d875ea22fc30 SHA256 b4bc1dfb3bba22f7fe1a5588d2d4a66c746e9c7607709304b13aa390420cd44b
 EBUILD beast-0.6.4.ebuild 1074 RMD160 40cc7313096c766bc6b62439a39942dcdb30743a SHA1 4ebc7cf4ca1d5ba4a7f80d3e52b87bc940fbf910 SHA256 20acaa222a637ee42c5d25ac3ce176fe1647a93a6632167961009bd52f405c4c
 MD5 8dc86b14c7ff89b2b2cc132d3d991fc8 beast-0.6.4.ebuild 1074
@@ -17,14 +18,14 @@ EBUILD beast-0.6.6.ebuild 1169 RMD160 dbbcab372d53a9e59c7fbb78560ddaf581311c0b S
 MD5 58624e57069972a78f84d4e898e113c0 beast-0.6.6.ebuild 1169
 RMD160 dbbcab372d53a9e59c7fbb78560ddaf581311c0b beast-0.6.6.ebuild 1169
 SHA256 3552fb19675265f127df705ad2f80b78655855a17f18e4476af9525d40ea15f9 beast-0.6.6.ebuild 1169
-EBUILD beast-0.7.1.ebuild 1343 RMD160 ac3255fe03161834c9ab858ad0d1a47c5e3e12fe SHA1 20be45a1f2b5ad0d03c96f0464243ad79f496780 SHA256 fd7a7096815b8aac7f3eca3dc65489f7bcf921061dbf12736908a46e26505d0c
-MD5 2b2fcfbdf5a6da170a22b458707be611 beast-0.7.1.ebuild 1343
-RMD160 ac3255fe03161834c9ab858ad0d1a47c5e3e12fe beast-0.7.1.ebuild 1343
-SHA256 fd7a7096815b8aac7f3eca3dc65489f7bcf921061dbf12736908a46e26505d0c beast-0.7.1.ebuild 1343
-MISC ChangeLog 3706 RMD160 05ec866071a2bd6f03c99562cb444e772f1b5fe2 SHA1 0cf2b6214cb0d09d02950dc93a1fd7f6d2d7790f SHA256 e857e207524ca3195f72ecde258d413617bb1b6629e08c871ceeb58605ab3f61
-MD5 85802632a0b7b71a67804a9c1d48ea34 ChangeLog 3706
-RMD160 05ec866071a2bd6f03c99562cb444e772f1b5fe2 ChangeLog 3706
-SHA256 e857e207524ca3195f72ecde258d413617bb1b6629e08c871ceeb58605ab3f61 ChangeLog 3706
+EBUILD beast-0.7.1.ebuild 1659 RMD160 413053b322941557c0d37b6c2c2004bc004ca8ec SHA1 b6b3da4d9d4163943d4cee58f25cb9a9469cfeb3 SHA256 8f5cf06da925c73127491da008815b848ba55ac2022bb19fd6d06b3ef9530afd
+MD5 1470715287e261da4a61cc6134861407 beast-0.7.1.ebuild 1659
+RMD160 413053b322941557c0d37b6c2c2004bc004ca8ec beast-0.7.1.ebuild 1659
+SHA256 8f5cf06da925c73127491da008815b848ba55ac2022bb19fd6d06b3ef9530afd beast-0.7.1.ebuild 1659
+MISC ChangeLog 3818 RMD160 6e20a7011d92b8259700cf56d38cefedef601564 SHA1 8ab1b3ac416446452186bfaeaa82b9258528985a SHA256 d396d338b69eaad3c6b8ac51eabb02a6efa12d0d57e20d18e92507d237969fe8
+MD5 82c0e651f819240bce46ae6335f1ee6c ChangeLog 3818
+RMD160 6e20a7011d92b8259700cf56d38cefedef601564 ChangeLog 3818
+SHA256 d396d338b69eaad3c6b8ac51eabb02a6efa12d0d57e20d18e92507d237969fe8 ChangeLog 3818
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 MD5 b263ff7675308d90b75a170acae3f5ff metadata.xml 177
 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 metadata.xml 177
@@ -38,13 +39,13 @@ SHA256 afed41dceaee63ded1a52bab0940d18d79742a84137bf36a59c3c31676172845 files/di
 MD5 1b1d2ea2e69adfa58b9f92c666fffae5 files/digest-beast-0.6.6 238
 RMD160 da3f8daeebaf998d74a708b8aab9d22c9703d889 files/digest-beast-0.6.6 238
 SHA256 88495ce58a227f9f9bbcd70799d156875712ae9f87be8f4a40f7cd05770a6491 files/digest-beast-0.6.6 238
-MD5 d043467e426f8e563470fce2183ab68b files/digest-beast-0.7.1 241
-RMD160 dba3927db3816de5686d78158ebcd367dff59382 files/digest-beast-0.7.1 241
-SHA256 a957a1aed997661a2651008d1a20395c2ebfcb521d895f7b09567ac4cdd0ea1f files/digest-beast-0.7.1 241
+MD5 c22087b6d894f2b67242bc439551dbc1 files/digest-beast-0.7.1 506
+RMD160 d4d9d9006d68c1513730012a7c15f12da5d85bca files/digest-beast-0.7.1 506
+SHA256 e6f9813df485d49951bd9954ac814597172c3be0e7945718cf0cb565c3fd8fa7 files/digest-beast-0.7.1 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF5LcTvFcC4BYPU0oRAv6FAJ9AWA7VlBkYEVok3JJG8+nJIU5JUgCgj+HM
-IHk/eDt4+1LKA2zDXu1+6Ng=
-=52SO
+iD8DBQFGBmjfvFcC4BYPU0oRAsOKAKCtPhBpzpjelJ1MyLQYY6ugM1KqwwCgsKHa
+QKebQhIc3cNM9oLiYsEWnlg=
+=/t5K
 -----END PGP SIGNATURE-----

diff --git a/media-sound/beast/beast-0.7.1.ebuild b/media-sound/beast/beast-0.7.1.ebuild
index 0d76731b724718a4b13038f10ce8920f2afb2770..b17bd08e8e99ecfd0a12eedbc8a25a30365e4782 100644 (file)
--- a/media-sound/beast/beast-0.7.1.ebuild
+++ b/media-sound/beast/beast-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.7.1.ebuild,v 1.1 2007/02/27 22:56:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.7.1.ebuild,v 1.2 2007/03/25 12:19:37 aballier Exp $
 
 inherit eutils flag-o-matic fdo-mime
 
@@ -8,7 +8,8 @@ IUSE="debug mad static"
 
 DESCRIPTION="BEAST - the Bedevilled Sound Engine"
 HOMEPAGE="http://beast.gtk.org"
-SRC_URI="ftp://beast.gtk.org/pub/beast/v${PV%.[0-9]}/${P}.tar.bz2"
+SRC_URI="ftp://beast.gtk.org/pub/beast/v${PV%.[0-9]}/${P}.tar.bz2
+       mirror://gentoo/${P}-guile-1.8.diff.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -17,7 +18,7 @@ SLOT="0"
 RDEPEND=">=dev-libs/glib-2.0
        >=x11-libs/gtk+-2.4.11
        >=sys-libs/zlib-1.1.3
-       =dev-scheme/guile-1.6*
+       dev-scheme/guile
        >=media-libs/libart_lgpl-2.3.8
        >=gnome-base/libgnomecanvas-2.0
        >=media-libs/libogg-1.0
@@ -29,6 +30,21 @@ DEPEND="dev-util/pkgconfig
        media-libs/ladspa-sdk
        ${RDEPEND}"
 
+pkg_setup() {
+       if has_version =dev-scheme/guile-1.8*; then
+               local flags="deprecated"
+               built_with_use dev-scheme/guile ${flags} \
+               || die "guile must be built with \"${flags}\" use flags"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${WORKDIR}/${P}-guile-1.8.diff"
+}
+
 src_compile() {
        # avoid suid related security issues.
        append-ldflags $(bindnow-flags)

diff --git a/media-sound/beast/files/digest-beast-0.7.1 b/media-sound/beast/files/digest-beast-0.7.1
index d3680c1d4d6e9da66683df541120d76d22328463..52633d86584bff7394808054caa72f951b0f8854 100644 (file)
--- a/media-sound/beast/files/digest-beast-0.7.1
+++ b/media-sound/beast/files/digest-beast-0.7.1
@@ -1,3 +1,6 @@
+MD5 d1ddf3ced8bb2022be015176e6ea364e beast-0.7.1-guile-1.8.diff.bz2 5709
+RMD160 8c47de83fd9e59b3dc3b4f5f3fa5e33de361f919 beast-0.7.1-guile-1.8.diff.bz2 5709
+SHA256 dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e beast-0.7.1-guile-1.8.diff.bz2 5709
 MD5 f8b54ca8e7936ac7c85583ade45d3be3 beast-0.7.1.tar.bz2 5806537
 RMD160 45d928542573cdbc73791bae6b871bc59f5a6c8f beast-0.7.1.tar.bz2 5806537
 SHA256 b4bc1dfb3bba22f7fe1a5588d2d4a66c746e9c7607709304b13aa390420cd44b beast-0.7.1.tar.bz2 5806537

diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 32e96b5975e18666ee2dbb8f37d2cc521d698d31..1ee84aa79fe9abcdd768f99943d68ba739278e08 100644 (file)
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -4,14 +4,14 @@ EBUILD solfege-2.0.6.ebuild 2316 RMD160 3f969fca7a6b3ea90a368bdbaccb7851748c7489
 MD5 6375e4eec0ac60c02c8900077b87e251 solfege-2.0.6.ebuild 2316
 RMD160 3f969fca7a6b3ea90a368bdbaccb7851748c7489 solfege-2.0.6.ebuild 2316
 SHA256 fc254d26089b1f89588487ed3ced249c25e1e954876c0ff6d10a1fd74a0f8a29 solfege-2.0.6.ebuild 2316
-EBUILD solfege-3.6.0.ebuild 1180 RMD160 f1aea6e6f7d9a7cd189585c67da02c38658fe240 SHA1 ca177c99fe8b19a178459e7ee54f5f39cad4bef7 SHA256 a0d0dfc16a26624fb1edce7480f60f7ef5d35ddf28ce23e234c04a558e775268
-MD5 52afcb8f86c6e7f0fbc67346fec5c4c6 solfege-3.6.0.ebuild 1180
-RMD160 f1aea6e6f7d9a7cd189585c67da02c38658fe240 solfege-3.6.0.ebuild 1180
-SHA256 a0d0dfc16a26624fb1edce7480f60f7ef5d35ddf28ce23e234c04a558e775268 solfege-3.6.0.ebuild 1180
-MISC ChangeLog 2644 RMD160 56496d1940f6a7251912efa481d40d01103e3abc SHA1 8d3877665a46837636cdddabc5ebdd2fe373cd96 SHA256 e903f01270a921f521b0bf1ad50da357925b6cd5f805c56825526939f4a9dc85
-MD5 f78f9c6fc1d1153ac183020b2002b64c ChangeLog 2644
-RMD160 56496d1940f6a7251912efa481d40d01103e3abc ChangeLog 2644
-SHA256 e903f01270a921f521b0bf1ad50da357925b6cd5f805c56825526939f4a9dc85 ChangeLog 2644
+EBUILD solfege-3.6.0.ebuild 1175 RMD160 f0ce0d79183d4ca6f420b7365592cd96f3c32165 SHA1 22d325118d211a084c58e86558badd1a41a9cc2e SHA256 e4cc30fbe1647c4b9904550b02296f6d40b353648e5c14c4b7ee18699de72d9e
+MD5 08cbe94a88ddf2b25649db86e313b4fe solfege-3.6.0.ebuild 1175
+RMD160 f0ce0d79183d4ca6f420b7365592cd96f3c32165 solfege-3.6.0.ebuild 1175
+SHA256 e4cc30fbe1647c4b9904550b02296f6d40b353648e5c14c4b7ee18699de72d9e solfege-3.6.0.ebuild 1175
+MISC ChangeLog 2742 RMD160 b9a44f1fa3a271879397b772b1ecb724ac6457b1 SHA1 1e6cf74e1bf163c11911eb4b1e146d2fcb25e5b7 SHA256 f3be9f824f7fc539fc0832ed03f27c4579b072fd40cdd73f81fe18d30623fc0d
+MD5 16deab3561f4d80704b17a935057e24c ChangeLog 2742
+RMD160 b9a44f1fa3a271879397b772b1ecb724ac6457b1 ChangeLog 2742
+SHA256 f3be9f824f7fc539fc0832ed03f27c4579b072fd40cdd73f81fe18d30623fc0d ChangeLog 2742
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158