Add ~x86-fbsd keyword, with patch from bug #153680.

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 36 insertions, 14 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index 4995b186f99e..4c03d0c9935e 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.30 2006/09/13 17:53:51 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.31 2006/11/01 15:24:35 flameeyes Exp $
+
+  01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/libsidplay-2.1.1-fbsd.patch, libsidplay-2.1.1.ebuild:
+  Add ~x86-fbsd keyword, with patch from bug #153680.
 
   28 Aug 2006; Joshua Kinard <kumba@gentoo.org> libsidplay-2.1.1.ebuild:
   Marked stable on mips.
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 27c5e41c35a4..59e72021ba00 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libsidplay-2.1.1-fbsd.patch 494 RMD160 083c0d2b1a6cfe93f5b338250348fbfa62f47856 SHA1 fd232adb6b7b951fbdc10d646640db6293047a6b SHA256 91e4dafff5539527e8231f3e8c30fd7ad5afac4904d37c2e38199dfc09d6c419
+MD5 975e86cb83341fa96e0fb1ed46671633 files/libsidplay-2.1.1-fbsd.patch 494
+RMD160 083c0d2b1a6cfe93f5b338250348fbfa62f47856 files/libsidplay-2.1.1-fbsd.patch 494
+SHA256 91e4dafff5539527e8231f3e8c30fd7ad5afac4904d37c2e38199dfc09d6c419 files/libsidplay-2.1.1-fbsd.patch 494
 AUX libsidplay-gcc34.patch 907 RMD160 ede02b956fd59a498db70a1d992e318fc8d3683c SHA1 52333ba1d37e827d7228b79874e20d50f4a97bf0 SHA256 2d953dfb0f24c9fbaa61558423c22733ce64db56296ffcf4e7721b0f34696377
 MD5 58d9cec13cbd5be46ae7a38497e141f6 files/libsidplay-gcc34.patch 907
 RMD160 ede02b956fd59a498db70a1d992e318fc8d3683c files/libsidplay-gcc34.patch 907
@@ -15,14 +19,14 @@ EBUILD libsidplay-1.36.57.ebuild 737 RMD160 2956ea46883e6dc7c814e112d7f9ef58b994
 MD5 cd459bd1dea85feb6e45f79086c7e625 libsidplay-1.36.57.ebuild 737
 RMD160 2956ea46883e6dc7c814e112d7f9ef58b994b108 libsidplay-1.36.57.ebuild 737
 SHA256 3aee24b5a68f757ec66e7482da93e5435aed47080a1649118d8909a48620aadc libsidplay-1.36.57.ebuild 737
-EBUILD libsidplay-2.1.1.ebuild 1015 RMD160 637d002991f9e06ff2ab52da768a3e4a0548c620 SHA1 18931e8a46c3165fa140f4210960f60d3c2adda8 SHA256 79016b7a81234c908f502a07f1efa196a3c82fd29d21c7a5f78fbff7351ddf96
-MD5 4cd2ec41d07ac519c3c1963f48a3c52d libsidplay-2.1.1.ebuild 1015
-RMD160 637d002991f9e06ff2ab52da768a3e4a0548c620 libsidplay-2.1.1.ebuild 1015
-SHA256 79016b7a81234c908f502a07f1efa196a3c82fd29d21c7a5f78fbff7351ddf96 libsidplay-2.1.1.ebuild 1015
-MISC ChangeLog 3731 RMD160 7efa4379badd3f8da8c87fbcc2774802203dbc1d SHA1 a0ba8b2185adcb854d207fce28006afd4bac3a48 SHA256 7b16fba61b5f15733003859c90db024595bbf27f7f969f577ee6b1917fa29d24
-MD5 ea4f7cce27d88f6014b48fbf661e6708 ChangeLog 3731
-RMD160 7efa4379badd3f8da8c87fbcc2774802203dbc1d ChangeLog 3731
-SHA256 7b16fba61b5f15733003859c90db024595bbf27f7f969f577ee6b1917fa29d24 ChangeLog 3731
+EBUILD libsidplay-2.1.1.ebuild 1067 RMD160 1356345d62508bab85b465059b2a907cd0886a94 SHA1 355745a3b21bcc1aca3e6e97a87c74c91790a32d SHA256 91d0ebdf8979bc0b83cffe5daa3bb9a54dc0b969c405b5dc141a6f39c0d612a8
+MD5 f647afe20ae7c1a85b2db5ccf4a9649f libsidplay-2.1.1.ebuild 1067
+RMD160 1356345d62508bab85b465059b2a907cd0886a94 libsidplay-2.1.1.ebuild 1067
+SHA256 91d0ebdf8979bc0b83cffe5daa3bb9a54dc0b969c405b5dc141a6f39c0d612a8 libsidplay-2.1.1.ebuild 1067
+MISC ChangeLog 3907 RMD160 b7a40a62eee7ffbe4879d1d6f97b265719657210 SHA1 aed74c7d13d2bfbce9176cf59d88d464fbdfe275 SHA256 57a5dfc74dc9bc7d5c509cf7fdf63cbbdd55aad10f421448f4428591ed57bf97
+MD5 01ece865f6d01e52bc8cd71a6cd4805c ChangeLog 3907
+RMD160 b7a40a62eee7ffbe4879d1d6f97b265719657210 ChangeLog 3907
+SHA256 57a5dfc74dc9bc7d5c509cf7fdf63cbbdd55aad10f421448f4428591ed57bf97 ChangeLog 3907
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
@@ -36,7 +40,7 @@ SHA256 0619479c930abedd2119249755787c227d929e3b765663d5b78a99bb657c475e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCEWzV3J2n04EauwRAlF1AJ9cvveaX4MMgtg1Gnvx33U9EZ2hDACgqK9h
-bIdJStXtAZ3ITbOtXDtI3ZM=
-=o2Zp
+iD8DBQFFSLlIAiZjviIA2XgRApSpAJ98LE9s+6SK1y0UStQHjkmfF+M/DQCfdkhf
+O1wCsSeNq6BmvLRCRP7amcE=
+=lRxc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
new file mode 100644
index 000000000000..6533314d1cb6
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch
@@ -0,0 +1,13 @@
+Index: sidplay-libs-2.1.1/libsidutils/src/ini/ini.cpp
+===================================================================
+--- sidplay-libs-2.1.1.orig/libsidutils/src/ini/ini.cpp
++++ sidplay-libs-2.1.1/libsidutils/src/ini/ini.cpp
+@@ -100,7 +100,7 @@
+ //*******************************************************************************************************************
+ #include <assert.h>
+ #include <ctype.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
diff --git a/media-libs/libsidplay/libsidplay-2.1.1.ebuild b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
index 6f92de5cfbf1..f0a13145d3cd 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1.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-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.12 2006/08/28 02:02:57 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.13 2006/11/01 15:24:35 flameeyes Exp $
 
 inherit libtool eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -24,6 +24,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/libsidplay2-gcc41.patch
+	epatch "${FILESDIR}/${P}-fbsd.patch"
 
 	elibtoolize
 }