Add ~x86-fbsd keyword with a patch to build on FreeBSD.

Package-Manager: portage-2.1_pre10-r5

5 files changed, 75 insertions, 31 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index be4538cf6bfa..520ccacdb556 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.28 2006/04/18 17:46:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.29 2006/05/12 22:43:21 flameeyes Exp $
+
+  12 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/musepack-tools-1.15v-fbsd.patch, musepack-tools-1.15v.ebuild:
+  Add ~x86-fbsd keyword with a patch to build on FreeBSD.
 
   18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/musepack-tools-1.15v-execstack.patch, musepack-tools-1.15v.ebuild:
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index 69841de8ef3e..fb7533a30a54 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,67 +1,90 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 5e93902553b8348c5a876ce5f1fc0a8a ChangeLog 5391
-RMD160 0d98ca6689dc9eb5818b2fab9058daff70bb890a ChangeLog 5391
-SHA256 02f4de5569206e6716df9397dfea5549bfed94fc9891c1b9004da5d1b979374b ChangeLog 5391
-MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
-RMD160 732231111efb0ae8b80753df1c83fc0f57f9c41c files/digest-musepack-tools-1.15s-r2 68
-SHA256 9bc7062b9664f9f81a4188999a01405448a153eeace17db4fc7db7461808c439 files/digest-musepack-tools-1.15s-r2 68
-MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
-RMD160 404eb884ce9dd492da692590de6d9e73b5534124 files/digest-musepack-tools-1.15t 69
-SHA256 6657cd0f0f8f95104f9e71e0fde424c281ed725d33e802859831cf8dbb4080e7 files/digest-musepack-tools-1.15t 69
-MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
-RMD160 9387caf189d0846e35af280998e4ff8cfd9b6c9e files/digest-musepack-tools-1.15u 69
-SHA256 f0b2a69b2b0b26c64af9fdda6ce94a99ca7970cbbc9a48c9031099a4b0c7f7cd files/digest-musepack-tools-1.15u 69
-MD5 83959d8ebd21d40ec956ac942fa6b9f1 files/digest-musepack-tools-1.15v 69
-RMD160 35d7dc773621bf5ee0b728c8095e11bf8e5b84a4 files/digest-musepack-tools-1.15v 69
-SHA256 1171b190a3b328bfcc219bcefe16c69b0b16b1695bb68bccffbe3c55127719c9 files/digest-musepack-tools-1.15v 69
+AUX musepack-tools-1.15r-r1-Makefile.patch 3748 RMD160 b507a50b9c80376cfd92c2dc4bf6a2a00e060d89 SHA1 b77a657cb12c75637ef2c2dd21ee156d2f6e0c98 SHA256 0ef0546982088cc4b42cff05444fe56642cd12230a1a2bf115130c9896e39044 size 3748
 MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 RMD160 b507a50b9c80376cfd92c2dc4bf6a2a00e060d89 files/musepack-tools-1.15r-r1-Makefile.patch 3748
 SHA256 0ef0546982088cc4b42cff05444fe56642cd12230a1a2bf115130c9896e39044 files/musepack-tools-1.15r-r1-Makefile.patch 3748
+AUX musepack-tools-1.15s-Makefile.patch 2893 RMD160 19aa0f779c3dfa80a9a8e22cf962fe7430d3ea5b SHA1 1c79a9c3febdb0955e373d7de90eae9ef174f31d SHA256 3999d79c41a915d9d9ec6f80acd608ff1fc2db9b0066359d17c94f4de15f2047 size 2893
 MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893
 RMD160 19aa0f779c3dfa80a9a8e22cf962fe7430d3ea5b files/musepack-tools-1.15s-Makefile.patch 2893
 SHA256 3999d79c41a915d9d9ec6f80acd608ff1fc2db9b0066359d17c94f4de15f2047 files/musepack-tools-1.15s-Makefile.patch 2893
+AUX musepack-tools-1.15t-Makefile.patch 750 RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 SHA1 ab36cf5f814ba043dcc1bc85babf95907602800f SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 size 750
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750
 RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 files/musepack-tools-1.15t-Makefile.patch 750
 SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 files/musepack-tools-1.15t-Makefile.patch 750
+AUX musepack-tools-1.15t-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff size 288
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288
 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15t-gcc4.patch 288
 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15t-gcc4.patch 288
+AUX musepack-tools-1.15u-Makefile.patch 750 RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 SHA1 ab36cf5f814ba043dcc1bc85babf95907602800f SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 size 750
 MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750
 RMD160 5ae7181be4bbbcb8c3d5dc583cba6abd055ac1e7 files/musepack-tools-1.15u-Makefile.patch 750
 SHA256 ee48fca258816c72da23ea4b300e3f8f058accbcd5975f21d4a89ad232034c89 files/musepack-tools-1.15u-Makefile.patch 750
+AUX musepack-tools-1.15u-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff size 288
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288
 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15u-gcc4.patch 288
 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15u-gcc4.patch 288
+AUX musepack-tools-1.15v-Makefile.patch 572 RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 SHA1 87962aec7e82dbe7e06c897afe9c34f7999b0267 SHA256 12d9fe1a1980d3172128aae22f1c5919730e28925dd0aa12fceca4dfcb3db434 size 572
 MD5 22a0f1804346128859f9a99ff9305cf4 files/musepack-tools-1.15v-Makefile.patch 572
 RMD160 c8402ba8d07c2381759ecb2eda1a38b153b28d94 files/musepack-tools-1.15v-Makefile.patch 572
 SHA256 12d9fe1a1980d3172128aae22f1c5919730e28925dd0aa12fceca4dfcb3db434 files/musepack-tools-1.15v-Makefile.patch 572
+AUX musepack-tools-1.15v-execstack.patch 1256 RMD160 a4d15a6640db2dedf2790e398c2d5309eee1c416 SHA1 25de758e8982ac83aef017cfe1083985c7b3f4d2 SHA256 655b7945855d7e65bbaa5dee6be854c45c14e19036ab73ee207a939d3bd25277 size 1256
 MD5 f5c30e83239d2e30cb28e9a0d073a8fa files/musepack-tools-1.15v-execstack.patch 1256
 RMD160 a4d15a6640db2dedf2790e398c2d5309eee1c416 files/musepack-tools-1.15v-execstack.patch 1256
 SHA256 655b7945855d7e65bbaa5dee6be854c45c14e19036ab73ee207a939d3bd25277 files/musepack-tools-1.15v-execstack.patch 1256
+AUX musepack-tools-1.15v-fbsd.patch 469 RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 SHA1 0ce936e217d51a878450c7570905a8ca43324d72 SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3 size 469
+MD5 8b80571950b38b3a6e5804e803a811d3 files/musepack-tools-1.15v-fbsd.patch 469
+RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 files/musepack-tools-1.15v-fbsd.patch 469
+SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3 files/musepack-tools-1.15v-fbsd.patch 469
+AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff size 288
 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288
 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 files/musepack-tools-1.15v-gcc4.patch 288
 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff files/musepack-tools-1.15v-gcc4.patch 288
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+DIST mpcsv7-src-1.15s.tar.gz 501116 size 501116
+DIST mpcsv7-src-1.15t.tar.bz2 463474 size 463474
+DIST mpcsv7-src-1.15u.tar.bz2 465073 size 465073
+DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd size 416868
+EBUILD musepack-tools-1.15s-r2.ebuild 1588 RMD160 c6b1c88a345e73c87ea463e605811c31f96445b2 SHA1 f4e18ddf3d0e5bca0bfeb4dbd9ca3a4adcf9c9c0 SHA256 3e1973e6fddf320b0a44c5d6e7b6b4549429c53705c33f9207aee6db20fa66c4 size 1588
 MD5 1bae02184cdfee099296b98e4f09a0ba musepack-tools-1.15s-r2.ebuild 1588
 RMD160 c6b1c88a345e73c87ea463e605811c31f96445b2 musepack-tools-1.15s-r2.ebuild 1588
 SHA256 3e1973e6fddf320b0a44c5d6e7b6b4549429c53705c33f9207aee6db20fa66c4 musepack-tools-1.15s-r2.ebuild 1588
+EBUILD musepack-tools-1.15t.ebuild 1427 RMD160 f446999c9a691fcdb4d9573bf03bb50d739169e7 SHA1 579145c72f9c8f06e452a9c024c5cbb3f539e100 SHA256 72865c726b13ceb9244b3b614ceaa2b1987631bf6f90425ccd7bb9d4d26f51bf size 1427
 MD5 2c6f59eed8f1893c3be3699b0d7e19e9 musepack-tools-1.15t.ebuild 1427
 RMD160 f446999c9a691fcdb4d9573bf03bb50d739169e7 musepack-tools-1.15t.ebuild 1427
 SHA256 72865c726b13ceb9244b3b614ceaa2b1987631bf6f90425ccd7bb9d4d26f51bf musepack-tools-1.15t.ebuild 1427
+EBUILD musepack-tools-1.15u.ebuild 1506 RMD160 003d1b32f4c7c385adf9fa5f2672e7e717fcc7a8 SHA1 14099bd34b673d844153b8616148f0c3dc0daac7 SHA256 6f2fa46e61b27039648f8493094b43c56ccc8b3928a4bba6de61547b9bce594d size 1506
 MD5 c6772fd586092e9a311f2b643eafbf3f musepack-tools-1.15u.ebuild 1506
 RMD160 003d1b32f4c7c385adf9fa5f2672e7e717fcc7a8 musepack-tools-1.15u.ebuild 1506
 SHA256 6f2fa46e61b27039648f8493094b43c56ccc8b3928a4bba6de61547b9bce594d musepack-tools-1.15u.ebuild 1506
-MD5 88da761235fb638a3a685d826e70ff77 musepack-tools-1.15v.ebuild 1660
-RMD160 dca9611205a1b83a10f48469377250164c1bc95a musepack-tools-1.15v.ebuild 1660
-SHA256 54d3cb2fa60187f084b5ce7218a3f4e92d84d76a9ad4922f965987de9de85559 musepack-tools-1.15v.ebuild 1660
+EBUILD musepack-tools-1.15v.ebuild 1783 RMD160 5e171827441b2245c2185345784f3e50a873ba5d SHA1 b9f981180d4bb350bc3bdb5b10607719c4292d06 SHA256 d7bc2a5b0cb71f12d71aae2940dff770becae06233d13c04b95364a921803e40 size 1783
+MD5 e5fa744457f886a652c6b5daa33facd1 musepack-tools-1.15v.ebuild 1783
+RMD160 5e171827441b2245c2185345784f3e50a873ba5d musepack-tools-1.15v.ebuild 1783
+SHA256 d7bc2a5b0cb71f12d71aae2940dff770becae06233d13c04b95364a921803e40 musepack-tools-1.15v.ebuild 1783
+MISC ChangeLog 5574 RMD160 48ac8a0356d4b49bcee9becc92df2d7deedc89aa SHA1 47071c714d10f278f5f58357f4fc48c6fe34de7f SHA256 483bbe5496777a90e36a309cd0c614b56f1bb8934b56c498328df7b2db0afd6c size 5574
+MD5 314cc5904157f761fb539baa3d6e3a0d ChangeLog 5574
+RMD160 48ac8a0356d4b49bcee9becc92df2d7deedc89aa ChangeLog 5574
+SHA256 483bbe5496777a90e36a309cd0c614b56f1bb8934b56c498328df7b2db0afd6c ChangeLog 5574
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b size 158
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68
+RMD160 732231111efb0ae8b80753df1c83fc0f57f9c41c files/digest-musepack-tools-1.15s-r2 68
+SHA256 9bc7062b9664f9f81a4188999a01405448a153eeace17db4fc7db7461808c439 files/digest-musepack-tools-1.15s-r2 68
+MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69
+RMD160 404eb884ce9dd492da692590de6d9e73b5534124 files/digest-musepack-tools-1.15t 69
+SHA256 6657cd0f0f8f95104f9e71e0fde424c281ed725d33e802859831cf8dbb4080e7 files/digest-musepack-tools-1.15t 69
+MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69
+RMD160 9387caf189d0846e35af280998e4ff8cfd9b6c9e files/digest-musepack-tools-1.15u 69
+SHA256 f0b2a69b2b0b26c64af9fdda6ce94a99ca7970cbbc9a48c9031099a4b0c7f7cd files/digest-musepack-tools-1.15u 69
+MD5 a696d3da9a4f97f07e79448f2648b1ba files/digest-musepack-tools-1.15v 253
+RMD160 cdcbcca7b08c218ae8ea7ded3f44f15902d442b0 files/digest-musepack-tools-1.15v 253
+SHA256 12fb95ca0b94444034a2392cbf747ff40ec5c1da72445138e2d76430053fd2a4 files/digest-musepack-tools-1.15v 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFERSVZAiZjviIA2XgRAv1FAKCH/mzmjE7o4XBMoi36jm76oQmU6ACgkbBO
-OigQ1uFYVw02dRhlAJ3v40Y=
-=isuT
+iD8DBQFEZQ+QAiZjviIA2XgRAiVDAJ9uYknzezNKV/IAXINUoweuP8AgXgCgsLo1
++C0PWPPKh3D94pLMwM2wKLk=
+=bbUE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15v b/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
index f1d2d76373a6..57f53e19260c 100644
--- a/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
@@ -1 +1,3 @@
 MD5 eb3e6b64b1f7d68aaeb04e39936d87fb mpcsv7-src-1.15v.tar.bz2 416868
+RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 mpcsv7-src-1.15v.tar.bz2 416868
+SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd mpcsv7-src-1.15v.tar.bz2 416868
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
new file mode 100644
index 000000000000..1171b5785304
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
@@ -0,0 +1,13 @@
+Index: sv7/mppdec.h
+===================================================================
+--- sv7.orig/mppdec.h
++++ sv7/mppdec.h
+@@ -160,7 +160,7 @@
+ # include <sys/time.h>
+ # if   defined __linux__        // the standard is that this file is stored somewhere on the hard disk
+ #  include <linux/soundcard.h>
+-# elif defined __bsdi__
++# elif defined __bsdi__ || __FreeBSD__ >= 5
+ #  include <sys/soundcard.h>
+ # elif defined __FreeBSD__
+ #  include <machine/soundcard.h>
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index 3897f2377947..df7d070b9946 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.7 2006/04/18 17:46:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.8 2006/05/12 22:43:21 flameeyes Exp $
 
 IUSE="static 16bit esd"
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic flag-o-matic
 
 S="${WORKDIR}/sv7"
 
@@ -14,13 +14,14 @@ SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 x86 ~x86-fbsd"
 
 RDEPEND="esd? ( media-sound/esound )
 	 media-libs/id3lib"
 
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
+	x86-fbsd? ( dev-lang/nasm )
 	amd64? ( dev-lang/nasm )"
 
 src_unpack() {
@@ -39,7 +40,7 @@ src_unpack() {
 			Makefile
 	fi
 
-	if ! use x86 ; then
+	if [[ $(tc-arch) != "x86" ]] ; then
 		sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
 	fi
 
@@ -49,6 +50,7 @@ src_unpack() {
 	sed -i -e 's/$(LDADD) &> $(LOGFILE)/$(LDADD)/' Makefile
 
 	epatch "${FILESDIR}/${P}-execstack.patch"
+	epatch "${FILESDIR}/${P}-fbsd.patch"
 }
 
 src_compile() {
@@ -58,7 +60,7 @@ src_compile() {
 
 	append-flags -I${S}
 
-	ARCH= emake mppenc mppdec replaygain || die
+	ARCH= emake CC="$(tc-getCC)" mppenc mppdec replaygain || die
 }
 
 src_install() {