multilib-strict fix; bug 155967; credit to Malcolm Lashley

Package-Manager: portage-2.1.2-r5

diff --git a/media-sound/hydrogen/ChangeLog b/media-sound/hydrogen/ChangeLog
index fbd739bbd31a41adec419b19c8928d6d5fc08e6d..bd92e9c62bc7c5757a1e7efcf374ec0b51f4adbf 100644 (file)
--- a/media-sound/hydrogen/ChangeLog
+++ b/media-sound/hydrogen/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/hydrogen
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.45 2006/10/07 15:41:01 eldad Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/ChangeLog,v 1.46 2007/02/02 14:33:42 blubb Exp $
+
+  02 Feb 2007; Simon Stelling <blubb@gentoo.org> hydrogen-0.9.3.ebuild:
+  multilib-strict fix; bug 155967; credit to Malcolm Lashley
 
   07 Oct 2006; Eldad Zack <eldad@gentoo.org> hydrogen-0.9.3.ebuild:
   fixed make problem with -j>2. closes bug #147297. Thanks to Christian Becke

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 4c54cf1062e9a954feec2c5b07d8457f7ffbe508..3b4033b6fc89804851aa59239ebb27494574a0ab 100644 (file)
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.1-OSS.patch 995 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b SHA1 53ece944023dbd26cfa7ec5ae9e21a634082daa8 SHA256 8647ea8d0510f69292bb320d1206d2738e4be02fb34bfe1914d133ebf1638fd0
 MD5 6b397bce8176411819610e6b92401be2 files/0.9.1-OSS.patch 995
 RMD160 ab6d47d723b3ca262e65225bd04bf0fb1938108b files/0.9.1-OSS.patch 995
@@ -17,9 +14,9 @@ AUX hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356 RMD160 0d45efab658cff07be032d36fc
 MD5 e43555677b71dcf988a5e85a2304c301 files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356
 RMD160 0d45efab658cff07be032d36fc1523f373d0ef54 files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356
 SHA256 cc653b60dce63e709e318935790bd0f292edb6afb4114352cbcedc8573f085a4 files/hydrogen-0.9.3-gcc-4.1-tinyxml.h.patch 356
-DIST hydrogen-0.9.0.tar.gz 2322401
-DIST hydrogen-0.9.1.tar.gz 2317184
-DIST hydrogen-0.9.2.tar.gz 2851868
+DIST hydrogen-0.9.0.tar.gz 2322401 RMD160 ae38d1d78fe34b138c05d714e6ad18131461f3c4 SHA1 3cf09482de76002a99aa1594c070bfca96f16fd0 SHA256 aeb68632e3629570f6083889dce98f1655dd9d1593768c264bc086c9b01eb239
+DIST hydrogen-0.9.1.tar.gz 2317184 RMD160 0f12092f3c3b04034e18662f4c4685cbd5ccda51 SHA1 3749d24e3f82c01e10dfa81c9282d255710422aa SHA256 c7769c867e56f6f3e492a3cc74ecbdf0db6905668b974a41fcc6d987ab8e063f
+DIST hydrogen-0.9.2.tar.gz 2851868 RMD160 8aa12c8ac136c3868ef61fe71436b85a736d7185 SHA1 85db447e81624a661646b50fdbbe4f937988ee25 SHA256 438aaaa296d4207a0227cd4c85c581512c7a669eb35f33b099058de1ed146016
 DIST hydrogen-0.9.3.tar.gz 2771792 RMD160 224e7c99208f7e9ae8c70a6bab1a7c3b20d1eb56 SHA1 4c07d3d250922421182f0dd527965628588bcb4a SHA256 b570568b32a0be9ad2ef90538e3156de6a9c50d8dd5f2863d6955290d98c841a
 EBUILD hydrogen-0.9.0.ebuild 1088 RMD160 a898aa320d72ab44a1df40bb8489489fb249395f SHA1 cb079b2a02d9427adb9516a3e0cd9e3a70df6b8c SHA256 eea3038fb86593566319e0486328294d588110d0086f27c822226ec7ad34e342
 MD5 9a065ff3208694116139dd87012578da hydrogen-0.9.0.ebuild 1088
@@ -33,34 +30,27 @@ EBUILD hydrogen-0.9.2.ebuild 2435 RMD160 7305937c5ba58005ef22b7e24669b62992a5cfe
 MD5 58f1119318c374684c40a69e44c6db26 hydrogen-0.9.2.ebuild 2435
 RMD160 7305937c5ba58005ef22b7e24669b62992a5cfeb hydrogen-0.9.2.ebuild 2435
 SHA256 20ef55a6cf30ceeac5552f47c9a194977e1cfdb31bfd4919265e90dc5cc91cb6 hydrogen-0.9.2.ebuild 2435
-EBUILD hydrogen-0.9.3.ebuild 2472 RMD160 ebcd6911c37d28c724d98b6e3ff88decf299a601 SHA1 3ddba37fc6daa40b439172e2a7ece6f9cf43ee24 SHA256 b9318610eb0b9466b0e871003d013a07e7c2ba54b185fa39432404e18674263a
-MD5 05fdf9648c8f00f8701ac52901e92b65 hydrogen-0.9.3.ebuild 2472
-RMD160 ebcd6911c37d28c724d98b6e3ff88decf299a601 hydrogen-0.9.3.ebuild 2472
-SHA256 b9318610eb0b9466b0e871003d013a07e7c2ba54b185fa39432404e18674263a hydrogen-0.9.3.ebuild 2472
-MISC ChangeLog 7374 RMD160 4dae433495acf9c3984a168332389c9af90db45f SHA1 7adcef340582800c6a39a6277e8be2953a98c37f SHA256 8a3416d8f7d249c1f44d85733ac275678426ec079c0dd9997a7a82cd60468194
-MD5 a5d20649daa82cbe2b04662ad5e5f3b8 ChangeLog 7374
-RMD160 4dae433495acf9c3984a168332389c9af90db45f ChangeLog 7374
-SHA256 8a3416d8f7d249c1f44d85733ac275678426ec079c0dd9997a7a82cd60468194 ChangeLog 7374
+EBUILD hydrogen-0.9.3.ebuild 2559 RMD160 709e8eac1f27f8360995fa7f5638aa9c26d43153 SHA1 043f220a75ae741895bce594fca33a6945fa9b8c SHA256 80e705b156284737d8f09f94fb95f699bca7572f01ede697ecb8d754a04d65ab
+MD5 259b6e85ccd304fc3ef028d37f57fd14 hydrogen-0.9.3.ebuild 2559
+RMD160 709e8eac1f27f8360995fa7f5638aa9c26d43153 hydrogen-0.9.3.ebuild 2559
+SHA256 80e705b156284737d8f09f94fb95f699bca7572f01ede697ecb8d754a04d65ab hydrogen-0.9.3.ebuild 2559
+MISC ChangeLog 7508 RMD160 f99e0aa9ffd6baf9af946131715d509bb43b8a6f SHA1 a699cacfe7e62915db3b8611f3a6f2e96941cf83 SHA256 8ec29ec9f8a5f4da7254d38d7c0062b73f0fc1058bf3a9f94f4359206249d5f5
+MD5 30dcfdb01f430857341324c56f0d4e71 ChangeLog 7508
+RMD160 f99e0aa9ffd6baf9af946131715d509bb43b8a6f ChangeLog 7508
+SHA256 8ec29ec9f8a5f4da7254d38d7c0062b73f0fc1058bf3a9f94f4359206249d5f5 ChangeLog 7508
 MISC metadata.xml 257 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe SHA1 97fa9c254875dfa462f68355cf8b5579a2d7b6df SHA256 c78b9281ef43dc8c1966c705dae4e1f1b713209322c56a20a9a0b71e8c28faa9
 MD5 958cdff6e2710ee30529dd9af63497de metadata.xml 257
 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe metadata.xml 257
 SHA256 c78b9281ef43dc8c1966c705dae4e1f1b713209322c56a20a9a0b71e8c28faa9 metadata.xml 257
-MD5 1755f7143c139eddaed591c6ea39e695 files/digest-hydrogen-0.9.0 67
-RMD160 628b745dc79bdff3a14ff03e8421966c325d20ec files/digest-hydrogen-0.9.0 67
-SHA256 6fdc3a0a822aa0c2752ebf417219a295353de6383b3f1c32e42f33a416771e11 files/digest-hydrogen-0.9.0 67
-MD5 c2de54ec169afbb90c9eaa6440bafed5 files/digest-hydrogen-0.9.1 67
-RMD160 394de292c437cd0243a1f194865b54687779145a files/digest-hydrogen-0.9.1 67
-SHA256 94d0eeedc355486e5e1e226bd96389a755f01048ab1eb18f01382cae9eb5f8f1 files/digest-hydrogen-0.9.1 67
-MD5 5b50926aa278f221e8c29bba87e450d2 files/digest-hydrogen-0.9.2 67
-RMD160 e98433f4877024ffe0949f3f24097cb9d7825157 files/digest-hydrogen-0.9.2 67
-SHA256 5f72212668739e4d78f1b6b2beb38f8e4407fe7793c29db9dd33f5d76b040161 files/digest-hydrogen-0.9.2 67
+MD5 c153e8d5fcd142c2880c28b8b92daac9 files/digest-hydrogen-0.9.0 247
+RMD160 2ded29c287cd2b251eb3b05128a18c26c8384f3f files/digest-hydrogen-0.9.0 247
+SHA256 b35cfa60c1bb382db077d0031255b6b73d010f201c436dbc6a562e575eca8452 files/digest-hydrogen-0.9.0 247
+MD5 0345a42eac7dc9431bf6df0ece05202b files/digest-hydrogen-0.9.1 247
+RMD160 d27f71ca7efa9ac6e80c0d52dd46551fe8176060 files/digest-hydrogen-0.9.1 247
+SHA256 2e7f1a783717f148948da980efc5432dd1fdcab615ef5ea6a858bcb7bffe3e90 files/digest-hydrogen-0.9.1 247
+MD5 01beeb9508c1ef8f9ef9a575ae943147 files/digest-hydrogen-0.9.2 247
+RMD160 9b427c5d4adbc41d496d19d990fd52c6622ed562 files/digest-hydrogen-0.9.2 247
+SHA256 a3d1f2d0024de1e7e4575a4ff19d7f327b9af9eb9c123d511be321addb45ce0e files/digest-hydrogen-0.9.2 247
 MD5 1a0871d2c47e8e3a837dc56ce9b1db6b files/digest-hydrogen-0.9.3 247
 RMD160 ebb239e261e5aad2c35b176c983fef7cce1827ab files/digest-hydrogen-0.9.3 247
 SHA256 85dd02bd475c60bde105e175bef2b0e8c7ef2519d003f2cbf2c6df1ebb793d65 files/digest-hydrogen-0.9.3 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJ8qYT+MN7JbqCpMRAu1TAKCIB/pwNeGi9endiGzm867dSyFcXwCeOyLX
-FNkWg70by2tZL6QHLMEaVFM=
-=Z3rg
------END PGP SIGNATURE-----

diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.0 b/media-sound/hydrogen/files/digest-hydrogen-0.9.0
index 1a8b819b0b77ff44baa5581c2c30ff82cb0f3f14..b8f9d159a806ba65e4b05559c8b6a1917b99b83b 100644 (file)
--- a/media-sound/hydrogen/files/digest-hydrogen-0.9.0
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.0
@@ -1 +1,3 @@
 MD5 a2f03ef688e7ac4eac983f05f7444c8f hydrogen-0.9.0.tar.gz 2322401
+RMD160 ae38d1d78fe34b138c05d714e6ad18131461f3c4 hydrogen-0.9.0.tar.gz 2322401
+SHA256 aeb68632e3629570f6083889dce98f1655dd9d1593768c264bc086c9b01eb239 hydrogen-0.9.0.tar.gz 2322401

diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.1 b/media-sound/hydrogen/files/digest-hydrogen-0.9.1
index 291790581427578ba13c0b35546985245225a755..d103211feae1ab62b6f1d2c01edfc06ccf422e77 100644 (file)
--- a/media-sound/hydrogen/files/digest-hydrogen-0.9.1
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.1
@@ -1 +1,3 @@
 MD5 3c2b1db257f126f6d6f97e75a3d18ace hydrogen-0.9.1.tar.gz 2317184
+RMD160 0f12092f3c3b04034e18662f4c4685cbd5ccda51 hydrogen-0.9.1.tar.gz 2317184
+SHA256 c7769c867e56f6f3e492a3cc74ecbdf0db6905668b974a41fcc6d987ab8e063f hydrogen-0.9.1.tar.gz 2317184

diff --git a/media-sound/hydrogen/files/digest-hydrogen-0.9.2 b/media-sound/hydrogen/files/digest-hydrogen-0.9.2
index bce73742b24ab2ef35be09acc1ef1a83f9d8f55d..c090b2dc48b0d1d1a5fb2ba230303779d187717f 100644 (file)
--- a/media-sound/hydrogen/files/digest-hydrogen-0.9.2
+++ b/media-sound/hydrogen/files/digest-hydrogen-0.9.2
@@ -1 +1,3 @@
 MD5 b14b45e22c790413d77e21a93e62eb47 hydrogen-0.9.2.tar.gz 2851868
+RMD160 8aa12c8ac136c3868ef61fe71436b85a736d7185 hydrogen-0.9.2.tar.gz 2851868
+SHA256 438aaaa296d4207a0227cd4c85c581512c7a669eb35f33b099058de1ed146016 hydrogen-0.9.2.tar.gz 2851868

diff --git a/media-sound/hydrogen/hydrogen-0.9.3.ebuild b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
index 6a9097a14f3d0ebb8579286b206fbb7a90789ba5..53284747700f21da50f2228f621ec3a2bcb86ec5 100644 (file)
--- a/media-sound/hydrogen/hydrogen-0.9.3.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.11 2006/10/07 15:41:01 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/hydrogen/hydrogen-0.9.3.ebuild,v 1.12 2007/02/02 14:33:42 blubb Exp $
 
-inherit eutils kde-functions autotools
+inherit eutils kde-functions autotools multilib
 
 DESCRIPTION="Linux Drum Machine"
 HOMEPAGE="http://hydrogen.sourceforge.net/"
@@ -39,6 +39,7 @@ src_unpack() {
        sed -e "s:pa_unix_oss:lib:g" -e "s:pa_common:include:g" \
                -e "s:pm_linux:lib:g" -e "s:pm_common:include:g" \
                -i configure.in
+       sed -e "s:lib/hydrogen:$(get_libdir)/hydrogen:g" -i plugins/wasp/Makefile.in
        make -f Makefile.cvs
 
        epatch ${FILESDIR}/hydrogen-0.9.2-configure.in.patch