4 files changed, 28 insertions, 16 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 5ba302aaf0fe..996dc83a4b13 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.120 2005/05/31 10:48:19 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.121 2005/06/06 14:59:16 pylon Exp $
+
+  06 Jun 2005; Lars Weiler <pylon@gentoo.org> cdrtools-2.01-r3.ebuild,
+  cdrtools-2.01.01_alpha01-r2.ebuild:
+  Renamed the ‘crypt’ USE-flag into ‘on-the-fly-crypt’ so that livecds
+  with catalyst could be built, even when crypt is enabled. Otherwise it would
+  fail with an unconfigured kernel error. Now the remaining architectures,
+  which can't build the dependent cryptsetup can mask that single USE-flag and
+  step forward with a newer version.
 
   31 May 2005; Lars Weiler <pylon@gentoo.org>
   cdrtools-2.01.01_alpha01-r2.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 1f6babd914da..b69c83352cd8 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,8 +1,8 @@
 MD5 fb7c98c4ada508b4870303b6cf6f327c metadata.xml 450
-MD5 ba1b11db1056608c08650aa6b5201f28 ChangeLog 17530
+MD5 cd96f70c6f237b7bf3f734f09ea48f0f ChangeLog 17989
 MD5 853cca56f3ab873ead9021624552937a cdrtools-2.01-r1.ebuild 2842
-MD5 6ad1acc6bc71ecce4241cc0f0bd5b2d9 cdrtools-2.01-r3.ebuild 3412
-MD5 7b4e2af12d9901ee26e9a0285853c454 cdrtools-2.01.01_alpha01-r2.ebuild 3334
+MD5 b89add2f28286c13852b9fd198bcaf92 cdrtools-2.01.01_alpha01-r2.ebuild 3536
+MD5 601cb95cb9fff005d25c011ba23e393b cdrtools-2.01-r3.ebuild 3614
 MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
 MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
 MD5 c848b3b9b6921469483a22caa0fd40c3 files/digest-cdrtools-2.01-r1 67
diff --git a/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild b/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild
index a3d3342f4248..29b7379bcaaa 100644
--- a/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild,v 1.1 2005/05/30 21:00:00 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01-r3.ebuild,v 1.2 2005/06/06 14:59:16 pylon Exp $
 
 inherit eutils gnuconfig versionator toolchain-funcs
 
@@ -9,15 +9,15 @@ MY_CRYPT_VERS="$(get_version_component_range 1-2 )-encrypt-1.0rc1"
 DESCRIPTION="A set of tools for CD recording, including cdrecord"
 HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/${P}.tar.bz2
-	crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
+	on-the-fly-crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
 
 LICENSE="GPL-2 freedist"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 m68k ppc s390 sh sparc x86"
-IUSE="crypt unicode"
+IUSE="on-the-fly-crypt unicode"
 
 DEPEND="!app-cdr/dvdrtools"
-RDEPEND="crypt? ( sys-fs/cryptsetup )"
+RDEPEND="on-the-fly-crypt? ( sys-fs/cryptsetup )"
 PROVIDE="virtual/cdrtools"
 
 S=${WORKDIR}/${PN}-2.01
@@ -36,7 +36,7 @@ src_unpack() {
 
 	# Add support for On-The-Fly AES encryption
 	# http://burbon04.gmxhome.de/linux/CDREncryption.html
-	if use crypt; then
+	if use on-the-fly-crypt; then
 		epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
 	fi
 
@@ -113,6 +113,8 @@ pkg_postinst() {
 		einfo ""
 	else
 	echo
-	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	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 groups."
 	fi
 }
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
index c655b4572ff9..9a11e57956bb 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_alpha01-r2.ebuild,v 1.2 2005/05/31 10:48:19 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r2.ebuild,v 1.3 2005/06/06 14:59:16 pylon Exp $
 
 inherit eutils gnuconfig toolchain-funcs
 
@@ -9,16 +9,16 @@ MY_CRYPT_VERS="2.01-encrypt-1.0rc1"
 DESCRIPTION="A set of tools for CD recording, including cdrecord"
 HOMEPAGE="http://cdrecord.berlios.de/old/private/cdrecord.html"
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2
-	crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
+	on-the-fly-crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
 
 LICENSE="GPL-2 freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="crypt unicode"
+IUSE="on-the-fly-crypt unicode"
 
 DEPEND="virtual/libc
 	!app-cdr/dvdrtools"
-RDEPEND="crypt? ( sys-fs/cryptsetup )"
+RDEPEND="on-the-fly-crypt? ( sys-fs/cryptsetup )"
 PROVIDE="virtual/cdrtools"
 
 S=${WORKDIR}/${PN}-2.01.01
@@ -37,7 +37,7 @@ src_unpack() {
 
 	# Add support for On-The-Fly AES encryption
 	# http://burbon04.gmxhome.de/linux/CDREncryption.html
-	if use crypt; then
+	if use on-the-fly-crypt; then
 		epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
 	fi
 
@@ -113,6 +113,8 @@ pkg_postinst() {
 		einfo ""
 	else
 	echo
-	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	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 groups."
 	fi
 }