added ~ppc-macos closes bug 58717

3 files changed, 32 insertions, 16 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 83464ee1bebd..b9a12bb66bf0 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.102 2004/10/26 01:21:03 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.103 2004/10/27 20:35:44 kito Exp $
+
+  27 Oct 2004; Kito <kito@gentoo.org> cdrtools-2.01.ebuild:
+  added ~ppc-macos closes bug 58717
 
   13 Oct 2004; Lars Weiler <pylon@gentoo.org>
   -files/cdrtools-2.01-kernel25-support.patch,
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 620c8a5aa6c2..5d5d20e29af2 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
-MD5 f5f6f3d8e22a5c09fcc927aacf583fa0 cdrtools-2.01.ebuild 2494
+MD5 21886d961f3fa4ab8bb35983b5e08c40 ChangeLog 15043
+MD5 8178cf9b77d8d15f41808c821e4cbc22 cdrtools-2.01.ebuild 2819
 MD5 fb7c98c4ada508b4870303b6cf6f327c metadata.xml 450
-MD5 77f8d181bdf4f47dd7f0064f64aebc0b ChangeLog 14947
 MD5 245b4ec3f9e91750df712bee416f6481 files/cdrtools-2.01-scsi-remote.patch 540
 MD5 c848b3b9b6921469483a22caa0fd40c3 files/digest-cdrtools-2.01 67
diff --git a/app-cdr/cdrtools/cdrtools-2.01.ebuild b/app-cdr/cdrtools/cdrtools-2.01.ebuild
index 5c029e76a2a1..043a88f767b3 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.ebuild,v 1.12 2004/10/19 18:06:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.ebuild,v 1.13 2004/10/27 20:35:44 kito Exp $
 
 inherit eutils gcc gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2"
 
 LICENSE="GPL-2 freedist"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86 ~ppc-macos"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -27,8 +27,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch
 
 	cd ${S}/DEFAULTS
-	sed -i "s:/opt/schily:/usr:g" Defaults.linux
-	sed -i "s:/usr/src/linux/include::g" Defaults.linux
+	use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
 
 	cd ${S}/librscg
 	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
@@ -47,15 +48,17 @@ src_compile() {
 
 src_install() {
 	cd ${S}
-	dobin cdda2wav/OBJ/*-linux-cc/cdda2wav || die "cdda2wav"
-	dobin cdrecord/OBJ/*-linux-cc/cdrecord || die "cdrecord"
-	dobin mkisofs/OBJ/*-linux-cc/mkisofs || die "mkisofs"
-	dobin readcd/OBJ/*-linux-cc/readcd || die "readcd"
-	dosbin rscsi/OBJ/*-linux-cc/rscsi || die "rscsi"
+
+	dobin cdda2wav/OBJ/*-*-cc/cdda2wav || die "cdda2wav"
+	dobin cdrecord/OBJ/*-*-cc/cdrecord  || die "cdrecord"
+	dobin mkisofs/OBJ/*-*-cc/mkisofs || die "mkisofs"
+	dobin readcd/OBJ/*-*-cc/readcd || die "readcd"
+	dosbin rscsi/OBJ/*-*-cc/rscsi || die "rscsi"
+
 	insinto /usr/include
-	doins incs/*-linux-cc/align.h incs/*-linux-cc/avoffset.h incs/*-linux-cc/xconfig.h || die "include"
+	doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
 
-	cd mkisofs/diag/OBJ/*-linux-cc
+	cd mkisofs/diag/OBJ/*-*-cc
 	dobin devdump isodump isoinfo isovfy || die "dobin"
 
 	cd ${S}
@@ -63,8 +66,8 @@ src_install() {
 	doins rscsi/rscsi.dfl
 	doins cdrecord/cdrecord.dfl
 
-	cd ${S}/libs/*-linux-cc
-	dolib.a *.a
+	cd ${S}/libs/*-*-cc
+	dolib.a *.a || die "dolib failed"
 
 	cd ${S}
 	insinto /usr/include/scsilib
@@ -85,6 +88,16 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Note the special license on cdrecord/cdrecord.c starting from line 4648."
+	if use ppc-macos ; then
+		einfo ""
+		einfo "Darwin/OS X use the following device names: "
+		einfo ""
+		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices "
+		einfo ""
+		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices "
+		einfo ""
+	else
 	echo
 	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	fi
 }