Bump, fix bug 253229. Also fix bug 198779, acl automagic dependency.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

5 files changed, 36 insertions, 378 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 9b0d73984980..014f69f44846 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdrtools
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.220 2008/11/15 13:54:35 gmsoft Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.221 2009/02/01 13:45:32 loki_val Exp $
+
+*cdrtools-2.01.01_alpha57 (01 Feb 2009)
+
+  01 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -cdrtools-2.01.01_alpha41.ebuild, -cdrtools-2.01.01_alpha42.ebuild,
+  -cdrtools-2.01.01_alpha50-r3.ebuild, -cdrtools-2.01.01_alpha52.ebuild,
+  +cdrtools-2.01.01_alpha57.ebuild:
+  Bump, fix bug 253229. Also fix bug 198779, acl automagic dependency.
 
   15 Nov 2008; Guy Martin <gmsoft@gentoo.org>
   cdrtools-2.01.01_alpha51.ebuild:
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha41.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha41.ebuild
deleted file mode 100644
index 10f9daa3a2fb..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha41.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha41.ebuild,v 1.1 2008/06/16 18:29:46 drac Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="unicode"
-
-DEPEND="virtual/libc
-	sys-apps/acl
-	!app-cdr/dvdrtools
-	!app-cdr/cdrkit"
-
-PROVIDE="virtual/cdrtools"
-
-S="${WORKDIR}/${PN}-2.01.01"
-
-src_unpack() {
-	unpack ${A}
-	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"
-
-	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
-	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
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			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
-}
-
-src_install() {
-	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/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
-
-	cd mkisofs/diag/OBJ/*-*-cc
-	dobin devdump isodump isoinfo isovfy || die "dobin"
-
-	cd "${S}"
-	insinto /etc/default
-	doins rscsi/rscsi.dfl
-	doins cdrecord/cdrecord.dfl
-
-	cd "${S}"/libs/*-*-cc
-	dolib.a *.a || die "dolib failed"
-
-	cd "${S}"/libs/*-*-cc/pic
-	dolib.so * || die "dolib.so failed"
-
-	cd "${S}"
-	insinto /usr/include/scsilib
-	doins include/schily/*.h
-	insinto /usr/include/scsilib/scg
-	doins include/scg/*.h
-
-	cd "${S}"
-	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux
-	doman */*.1
-	doman */*.8
-
-	cd "${S}"/cdrecord
-	docinto cdrecord
-	dodoc README*
-
-	cd "${S}"/mkisofs
-	docinto mkisofs
-	dodoc README*
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE README TODO
-
-	cd "${S}"/libparanoia
-	docinto libparanoia
-	dodoc README*
-
-	cd "${S}"/doc
-	docinto print
-	dodoc *.ps
-}
-
-pkg_postinst() {
-	echo
-	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
-	einfo "should be used for IDE CD writers.  And make sure that the permissions"
-	einfo "on this device are set properly and your user is in the correct group."
-}
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha42.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha42.ebuild
deleted file mode 100644
index d6dfc058e1fe..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha42.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha42.ebuild,v 1.1 2008/07/06 09:45:09 opfer Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="unicode"
-
-DEPEND="virtual/libc
-	sys-apps/acl
-	!app-cdr/dvdrtools
-	!app-cdr/cdrkit"
-
-PROVIDE="virtual/cdrtools"
-
-S="${WORKDIR}/${PN}-2.01.01"
-
-src_unpack() {
-	unpack ${A}
-	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"
-
-	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
-	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
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			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
-}
-
-src_install() {
-	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/*-*-cc/align.h incs/*-*-cc/avoffset.h incs/*-*-cc/xconfig.h || die "include"
-
-	cd mkisofs/diag/OBJ/*-*-cc
-	dobin devdump isodump isoinfo isovfy || die "dobin"
-
-	cd "${S}"
-	insinto /etc/default
-	doins rscsi/rscsi.dfl
-	doins cdrecord/cdrecord.dfl
-
-	cd "${S}"/libs/*-*-cc
-	dolib.a *.a || die "dolib failed"
-
-	cd "${S}"/libs/*-*-cc/pic
-	dolib.so * || die "dolib.so failed"
-
-	cd "${S}"
-	insinto /usr/include/scsilib
-	doins include/schily/*.h
-	insinto /usr/include/scsilib/scg
-	doins include/scg/*.h
-
-	cd "${S}"
-	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux
-	doman */*.1
-	doman */*.8
-
-	cd "${S}"/cdrecord
-	docinto cdrecord
-	dodoc README*
-
-	cd "${S}"/mkisofs
-	docinto mkisofs
-	dodoc README*
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE README TODO
-
-	cd "${S}"/libparanoia
-	docinto libparanoia
-	dodoc README*
-
-	cd "${S}"/doc
-	docinto print
-	dodoc *.ps
-}
-
-pkg_postinst() {
-	echo
-	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
-	einfo "should be used for IDE CD writers.  And make sure that the permissions"
-	einfo "on this device are set properly and your user is in the correct group."
-}
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha52.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha52.ebuild
deleted file mode 100644
index f643917c87d7..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha52.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha52.ebuild,v 1.1 2008/10/28 14:48:57 loki_val Exp $
-
-inherit multilib eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrecord.berlios.de/"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="unicode"
-
-DEPEND="virtual/libc
-	sys-apps/acl
-	!app-cdr/dvdrtools
-	!app-cdr/cdrkit"
-
-PROVIDE="virtual/cdrtools"
-
-S="${WORKDIR}/${PN}-2.01.01"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	#Adjust paths
-
-	sed -i -e 's:opt/schily:usr:' \
-		$(grep -l --include='*.1' --include='*.8' -r 'opt/schily' .) \
-		$(grep -l --include='*.c' --include='*.h' -r 'opt/schily' .) \
-		|| die "404 on opt-schily sed"
-
-	sed -i -e "s:\(^INSDIR=\t\tshare/doc/\):\1${PF}/:" \
-		$(grep -l -r 'INSDIR.\+doc' .) \
-		|| die "404 on doc sed"
-
-	sed -i -e "s:\(^INSDIR=\t\t\)lib:\1$(get_libdir):" \
-		$(grep -l -r '^INSDIR.\+lib\(/siconv\)\?$' .) \
-		|| die "404 on multilib-sed"
-
-	sed -i -e "s:\(^INSDIR=\t\t\)\(etc/default\):\1../\2:" \
-		$(grep -l -r '^INSDIR.\+default' .) \
-		|| die "404 on etc sed"
-
-	#Remove profiled make files
-	rm -f $(find . -name '*_p.mk')
-
-	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
-	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
-
-	#Schily make setup
-	cd "${S}"/DEFAULTS
-	local MYARCH="linux"
-
-	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}
-
-	# 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
-
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	#If not built with -j1, "sometimes" cdda2wav will not be built. Nasty bug.
-	emake -j1 CC="$(tc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
-}
-
-src_install() {
-	make MANDIR="share/man" INS_BASE="${D}/usr/" install
-
-	#These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog README README.linux-shm START READMEs/README.linux || die "dodoc cdrtools"
-
-	cd "${S}"/cdda2wav
-	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE TODO || die "dodoc cdda2wav"
-
-}
-
-pkg_postinst() {
-	echo
-	einfo "The command line option 'dev=/dev/hdX' (X is the name of your drive)"
-	einfo "should be used for IDE CD writers.  And make sure that the permissions"
-	einfo "on this device are set properly and your user is in the correct group."
-}
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild
index 915f010ca52f..4340387447af 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha50-r3.ebuild,v 1.1 2008/10/01 12:51:27 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha57.ebuild,v 1.1 2009/02/01 13:45:32 loki_val Exp $
+
+EAPI=2
 
 inherit multilib eutils toolchain-funcs flag-o-matic
 
@@ -11,21 +13,19 @@ SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="unicode"
+IUSE="unicode acl"
 
 DEPEND="virtual/libc
-	sys-apps/acl
+	acl? ( sys-apps/acl )
 	!app-cdr/dvdrtools
 	!app-cdr/cdrkit"
+RDEPEND="${DEPEND}"
 
 PROVIDE="virtual/cdrtools"
 
 S="${WORKDIR}/${PN}-2.01.01"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	#Adjust paths
 
 	sed -i -e 's:opt/schily:usr:' \
@@ -45,8 +45,11 @@ src_unpack() {
 		$(grep -l -r '^INSDIR.\+default' .) \
 		|| die "404 on etc sed"
 
+	sed -i -e 's:include\t\t.*rules.lib::' \
+		$(grep -l -r '^include.\+rules\.lib' .) \
+		|| die "404 on rules sed"
 	#Remove profiled make files
-	rm -f $(find . -name '*_p.mk')
+	rm -f $(find . -name '*_p.mk') || die "rm failed"
 
 	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
 	epatch "${FILESDIR}"/${PN}-2.01.01_alpha50-asneeded.patch
@@ -55,11 +58,12 @@ src_unpack() {
 	cd "${S}"/DEFAULTS
 	local MYARCH="linux"
 
-	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
-	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH} || die "sed schily-opt failed"
+	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH} || die "sed linux-include failed"
+	sed -i "/RUNPATH/ c\RUNPATH= " Defaults.${MYARCH} || die "sed RUNPATH failed"
 
 	# For dynamic linking:
-	sed -i "s:static:dynamic:" Defaults.${MYARCH}
+	sed -i "s:static:dynamic:" Defaults.${MYARCH} || die "sed static-remove failed"
 
 	# lame symlinks that all point to the same thing
 	cd "${S}"/RULES
@@ -68,10 +72,12 @@ src_unpack() {
 		ln -s i586-linux-cc.rul ${t}-linux-cc.rul || die
 		ln -s i586-linux-gcc.rul ${t}-linux-gcc.rul || die
 	done
-
 }
 
+src_configure() { : ; }
+
 src_compile() {
+	local ACL="-lacl"
 	if use unicode; then
 		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
 		if [[ -n ${flags} ]]; then
@@ -82,12 +88,17 @@ src_compile() {
 		fi
 	fi
 
+	if ! use acl
+	then
+		CFLAGS="${CFLAGS} -DNO_ACL"
+		ACL=""
+	fi
 	#If not built with -j1, "sometimes" cdda2wav will not be built. Nasty bug.
-	emake -j1 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}" LIB_ACL_TEST="${ACL}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	make MANDIR="share/man" INS_BASE="${D}/usr/" install
+	emake -j1 MANDIR="share/man" INS_BASE="${D}/usr/" INS_RBASE="${D}/etc/default" install
 
 	#These symlinks are for compat with cdrkit.
 	dosym schily /usr/include/scsilib