[patch] cdrtools-2.01.01_alpha48.diff

cdrtools-2.01.01_alpha48.diff (text/plain), 4.14 KB, created by Daniel Pielmeier on 2008-09-15 16:14:23 UTC

--- ../../../portage/app-cdr/cdrtools/cdrtools-2.01.01_alpha42.ebuild	2008-07-06 11:45:09.000000000 +0200
+++ cdrtools-2.01.01_alpha48.ebuild	2008-09-15 17:58:25.000000000 +0200
@@ -27,29 +27,32 @@
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
-	epatch "${FILESDIR}"/${PN}-2.01.01_alpha34-asneeded.patch
 
-	cd "${S}"/DEFAULTS
 	local MYARCH="linux"
+	cd "${S}"/DEFAULTS || die "no such directory: DEFAULTS"
 
 	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
 	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
 	# For dynamic linking:
 	sed -i "s:static:dynamic:" Defaults.${MYARCH}
 
-	cd "${S}"/librscg
+	cd "${S}"/DEFAULTS_ENG || die "no such directory: DEFAULTS_ENG"
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+	# For dynamic linking:
+	sed -i "s:static:dynamic:" Defaults.${MYARCH}
+
+	cd "${S}"/librscg || die "no such directory: librscg"
 	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
 
-	# lame symlinks that all point to the same thing
-	cd "${S}"/RULES
-	local t
-	for t in ppc64 sh4 s390x ; do
-		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
-		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
-	done
+	cd "${S}"/libfind || die "no such directory: libfind"
+	sed -i "s:/opt/schily:/usr:g" find.c
+	sed -i "s:/opt/schily:/usr:g" find_main.c
 }
 
 src_compile() {
+	filter-flags -fomit-frame-pointer
+
 	if use unicode; then
 		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
 		if [[ -n ${flags} ]]; then
@@ -59,63 +62,71 @@
 			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
 		fi
 	fi
-	emake CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
+	emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die "emake"
 }
 
 src_install() {
+	dobin btcflash/OBJ/*-*-cc/btcflash || die "btcflash"
 	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"
+	dobin scgcheck/OBJ/*-*-cc/scgcheck || die "scgcheck"
+	dobin scgskeleton/OBJ/*-*-cc/scgskeleton || die "scgskeleton"
 	dosbin rscsi/OBJ/*-*-cc/rscsi || die "rscsi"
 
 	insinto /usr/include
-	doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
+	doins incs/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include arch specific headers"
 
 	cd mkisofs/diag/OBJ/*-*-cc
-	dobin devdump isodump isoinfo isovfy || die "dobin"
+	dobin devdump isodebug isodump isoinfo isovfy || die "dobin mkisofs tools"
 
 	cd "${S}"
 	insinto /etc/default
-	doins rscsi/rscsi.dfl
-	doins cdrecord/cdrecord.dfl
+	doins rscsi/rscsi.dfl || die "doins rscsi.dfl"
+	doins cdrecord/cdrecord.dfl || die "doins cdrecord.dfl"
 
 	cd "${S}"/libs/*-*-cc
-	dolib.a *.a || die "dolib failed"
+	dolib.a *.a || die "dolib"
 
 	cd "${S}"/libs/*-*-cc/pic
-	dolib.so * || die "dolib.so failed"
+	dolib.so * || die "dolib.so"
 
 	cd "${S}"
 	insinto /usr/include/scsilib
-	doins include/schily/*.h
+	doins include/schily/*.h || die "schily headers"
 	insinto /usr/include/scsilib/scg
-	doins include/scg/*.h
+	doins libscg/scg/*.h || die "scg headers"
 
 	cd "${S}"
-	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux
-	doman */*.1
-	doman */*.8
+	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc"
+	doman */*.1 || "doman"
+	doman */*.8 || "doman"
+	doman */*/*.8 || "doman"
 
 	cd "${S}"/cdrecord
 	docinto cdrecord
-	dodoc README*
+	dodoc README* || die "dodoc"
 
 	cd "${S}"/mkisofs
 	docinto mkisofs
-	dodoc README*
+	dodoc README* || die "dodoc"
 
 	cd "${S}"/cdda2wav
 	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE README TODO
+	dodoc FAQ Frontends HOWTOUSE README TODO || die "dodoc"
 
 	cd "${S}"/libparanoia
 	docinto libparanoia
-	dodoc README*
+	dodoc README* || die "dodoc"
+
+	cd "${S}"/rscsi
+	docinto rscsi
+	dodoc default-rscsi.sample || die "dodoc"
 
 	cd "${S}"/doc
 	docinto print
-	dodoc *.ps
+	dodoc *.ps || die "dodoc"
 }
 
 pkg_postinst() {