Add a patch to not compile linux code for non linux machines. Keyworded ~x86-fbsd.

Package-Manager: portage-2.1.3.6

4 files changed, 40 insertions, 23 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index fa41d0da27d4..278004c8aa1d 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrdao
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.98 2006/11/04 15:46:40 metalgod Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.99 2007/08/22 11:50:24 uberlord Exp $
+
+  22 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/cdrdao-1.2.2-nonlinux.patch, cdrdao-1.2.2.ebuild:
+  Add a patch to not compile linux code for non linux machines.
+  Keyworded ~x86-fbsd.
 
 *cdrdao-1.2.2 (04 Nov 2006)
 
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 94cdb29d4445..a2894f407ac2 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cdrdao-1.2.0-gcc4.patch 869 RMD160 4b8baf7677640ff035705eef04bc0df27e0c07eb SHA1 d70d532a6e958744f5b98efc8ba156e895c75f55 SHA256 2b87b7c9b971d2a253caa76ae89b061c35394aacd004e5c0199c1a16fd821215
 MD5 aea0047a0dd9c6dcc02c997f6bbeee79 files/cdrdao-1.2.0-gcc4.patch 869
 RMD160 4b8baf7677640ff035705eef04bc0df27e0c07eb files/cdrdao-1.2.0-gcc4.patch 869
@@ -9,6 +6,10 @@ AUX cdrdao-1.2.1-gcc41.patch 421 RMD160 374d62319984001921f03d89ab22c736f874190e
 MD5 3af976d10a40bf6667b1d0e43a2165f1 files/cdrdao-1.2.1-gcc41.patch 421
 RMD160 374d62319984001921f03d89ab22c736f874190e files/cdrdao-1.2.1-gcc41.patch 421
 SHA256 bb546f4a8060a188afb346af0f34894d03afc29d4874f3b561a17211ffd4dbd5 files/cdrdao-1.2.1-gcc41.patch 421
+AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef SHA1 955a6e56e3264e773241d89ac0fd603ba5bcff31 SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3
+MD5 b3f963b26ec7832f9d8037c105cd3a39 files/cdrdao-1.2.2-nonlinux.patch 380
+RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef files/cdrdao-1.2.2-nonlinux.patch 380
+SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3 files/cdrdao-1.2.2-nonlinux.patch 380
 AUX gcdmaster.desktop 127 RMD160 565c477fb1e8b937b97ce4767c2343741e22a425 SHA1 9d8b154482860ca49686e47f850c64b0628633b2 SHA256 2cd560f369ae9b40e4c63c099c851290809493df8d8be50deec592dcecb5005d
 MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
 RMD160 565c477fb1e8b937b97ce4767c2343741e22a425 files/gcdmaster.desktop 127
@@ -23,14 +24,14 @@ EBUILD cdrdao-1.2.1.ebuild 1551 RMD160 267398a684c3acfd13a90ee5a676c3d6fcc060a2
 MD5 5ee16464e76dede4bbc9ce12a4d7452c cdrdao-1.2.1.ebuild 1551
 RMD160 267398a684c3acfd13a90ee5a676c3d6fcc060a2 cdrdao-1.2.1.ebuild 1551
 SHA256 8c908639ea692c83fad34671ee7d13355561290a86c4b09f0bde33a041423ef3 cdrdao-1.2.1.ebuild 1551
-EBUILD cdrdao-1.2.2.ebuild 1560 RMD160 3c82d41421660313fda6dea72d3d70d7ff32e5fc SHA1 ecb049b08695ec440a28f3fe753ab31e18236532 SHA256 a49f5e3997fea82e4c8907455983743e3793522c6c553ec3f06d47432f5031d9
-MD5 5ff67657a1f54b0c73601c223911e87b cdrdao-1.2.2.ebuild 1560
-RMD160 3c82d41421660313fda6dea72d3d70d7ff32e5fc cdrdao-1.2.2.ebuild 1560
-SHA256 a49f5e3997fea82e4c8907455983743e3793522c6c553ec3f06d47432f5031d9 cdrdao-1.2.2.ebuild 1560
-MISC ChangeLog 13380 RMD160 c4da8668e5201597a7cb3e0b67d397cc40792456 SHA1 ce6fab0c52e9fdbb2cbcf3b29f9774117b5e3e8f SHA256 e591292325f91753e1ba88635300839c4c300ea067918841e14e8be18babdea5
-MD5 d09af00ba9da838614e29e2a9b2625f4 ChangeLog 13380
-RMD160 c4da8668e5201597a7cb3e0b67d397cc40792456 ChangeLog 13380
-SHA256 e591292325f91753e1ba88635300839c4c300ea067918841e14e8be18babdea5 ChangeLog 13380
+EBUILD cdrdao-1.2.2.ebuild 1774 RMD160 5a73ff0159ee472f46bd2e0323dc970c32a27253 SHA1 12505390e05d22d17f750fdf1ea78e028a31967a SHA256 c2d2891a29d14e0433b111f67891d23a0c3c1309d358391c2da419d4a611b68a
+MD5 88d4e8873028c48cd7b958bed92d3284 cdrdao-1.2.2.ebuild 1774
+RMD160 5a73ff0159ee472f46bd2e0323dc970c32a27253 cdrdao-1.2.2.ebuild 1774
+SHA256 c2d2891a29d14e0433b111f67891d23a0c3c1309d358391c2da419d4a611b68a cdrdao-1.2.2.ebuild 1774
+MISC ChangeLog 13576 RMD160 f3a46d2cc1708c51c5c0ff2b78b280ecab500e01 SHA1 e715ac6ddcf2a868ef89efd4d9d79bae33fcf9e8 SHA256 21846b7b63ee15cb03fcf6794247fc9bf22dea5c7291a14a802edfcf52d30b9f
+MD5 af5d196032156d0c0058006c23e0545f ChangeLog 13576
+RMD160 f3a46d2cc1708c51c5c0ff2b78b280ecab500e01 ChangeLog 13576
+SHA256 21846b7b63ee15cb03fcf6794247fc9bf22dea5c7291a14a802edfcf52d30b9f ChangeLog 13576
 MISC metadata.xml 319 RMD160 54559b717de30245b4e3369d398d0d4b8786cb94 SHA1 37ad6871b8179ee4180b374c9a4693253aa0bdc0 SHA256 449cdb691234e9d248959657370e866690fa998b7652124e8af2065447b042ea
 MD5 dbe5456b02450a781ff76c4ffc65fcec metadata.xml 319
 RMD160 54559b717de30245b4e3369d398d0d4b8786cb94 metadata.xml 319
@@ -44,10 +45,3 @@ SHA256 8076c57503bbbb93ae654b25d4cb1ae1776f6063e0ad082b23b83cf7ce175b14 files/di
 MD5 fd5863cff348341560545177d706905e files/digest-cdrdao-1.2.2 244
 RMD160 0615c2a8c3b8ffa600eca726ec7930767118f502 files/digest-cdrdao-1.2.2 244
 SHA256 f1e4558a0428b88fba45b7031b7a370b72fe0b2761609cee6a4d1e30c523bccc files/digest-cdrdao-1.2.2 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFTLYXwUpWvClEHQoRAtqsAJ4hgdaHXLYIx8An5cvk2sNVeZY++gCeJS5U
-gjQJa/A+kO5JpAdWpQ6ubTA=
-=nCk7
------END PGP SIGNATURE-----
diff --git a/app-cdr/cdrdao/cdrdao-1.2.2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.2.ebuild
index df1ce1162bc6..cfb601d5f86b 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# 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/app-cdr/cdrdao/cdrdao-1.2.2.ebuild,v 1.2 2006/11/04 15:47:25 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.2.ebuild,v 1.3 2007/08/22 11:50:24 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gnome debug encode pccts"
 RESTRICT="strip"
 
@@ -29,6 +29,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# FreeBSD needs this patch
+	# I think the correct define should be linux, but this will maintain
+	# the status quo for the time being.
+	# Upstream bug #1596097
+	epatch "${FILESDIR}/${P}"-nonlinux.patch
+
 	# Display better SCSI messages (advise from Bug 43003)
 	cd scsilib/include
 	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-nonlinux.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-nonlinux.patch
new file mode 100644
index 000000000000..a5800d37925d
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-nonlinux.patch
@@ -0,0 +1,12 @@
+diff -ur a/dao/ScsiIf-lib.cc b/dao/ScsiIf-lib.cc
+--- a/dao/ScsiIf-lib.cc	2007-08-22 12:21:11 +0100
++++ b/dao/ScsiIf-lib.cc	2007-08-22 12:25:04 +0100
+@@ -430,7 +430,7 @@
+ #include "ScsiIf-common.cc"
+ //<<<<<<< ScsiIf-lib.cc
+ 
+-#ifndef linux
++#ifdef wedontwantthis
+ 
+ /* Function for mapping any SCSI device to the corresponding SG device.
+  * Taken from D. Gilbert's example code.