Remove on-the-fly-crypt as the patch does not apply any more.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 17 insertions, 26 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index e8840dc7ff2f..25e17a7a5260 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.130 2006/03/11 15:10:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.131 2006/03/11 15:16:01 pylon Exp $
+
+  11 Mar 2006; Lars Weiler <pylon@gentoo.org>
+  cdrtools-2.01.01_alpha07.ebuild:
+  Remove on-the-fly-crypt as the patch does not apply any more.
 
 *cdrtools-2.01.01_alpha07 (11 Mar 2006)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 826e2ed803f3..7e56f1aa4a20 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,15 +1,15 @@
-MD5 f2c0fa08e818b07f37249a35d2d1afe9 ChangeLog 20093
-RMD160 79177ad991f5010ed39d070bae933cfdf178266d ChangeLog 20093
-SHA256 8d63801792c3b99dadabbb4b348d2154da2648db6ddc05708474d6753aa699a2 ChangeLog 20093
+MD5 4efb7c2ce9f06eb6328dde4574123730 ChangeLog 20239
+RMD160 f9d54a8c572388d1be48671cba04052c429c6c04 ChangeLog 20239
+SHA256 6ba927ee3e61f4b70595eaa15791a6d400fb8efb3b8c7dcb97d3ceb943fab10d ChangeLog 20239
 MD5 5a2a9ad0ab6a40d5ee27662bf265bc41 cdrtools-2.01-r1.ebuild 2830
 RMD160 e40b7f64ecbc7b18b2371004a81c3bef979260ed cdrtools-2.01-r1.ebuild 2830
 SHA256 e4216cc3aafd2189bfd9e80987368c9c9ca0b7d0874036e5320ed283b97780cd cdrtools-2.01-r1.ebuild 2830
 MD5 95614cdf93109df9859f145c7872efbb cdrtools-2.01-r3.ebuild 3635
 RMD160 0317e15079f8e920aac666e5168ae909df08bfc2 cdrtools-2.01-r3.ebuild 3635
 SHA256 ed93e40def27c710ecefbaa47b233e3c867ce9cad77c776839b2f760b28444dd cdrtools-2.01-r3.ebuild 3635
-MD5 cd50a86e339dc6832c39de9bf9f34cf9 cdrtools-2.01.01_alpha07.ebuild 3881
-RMD160 07822a597e18270cbbf7ae763dc8b0d0ba1dfc08 cdrtools-2.01.01_alpha07.ebuild 3881
-SHA256 538297597390b76a4d81aba6f6d07e0ad75513a4e5736d184c938fceda2b19bb cdrtools-2.01.01_alpha07.ebuild 3881
+MD5 41a514cbfae63937b5a34e9eba0e4206 cdrtools-2.01.01_alpha07.ebuild 3429
+RMD160 245600484f435190a44ad72a7a607fb17a724c25 cdrtools-2.01.01_alpha07.ebuild 3429
+SHA256 971c213b3c9e50698acc18078a99c76e57fd972701ffec5561dc282d0a802ece cdrtools-2.01.01_alpha07.ebuild 3429
 MD5 3b1ffea11e1653b7b16c2c89597d1c5a files/cdrtools-2.01-scsi-remote.patch 938
 RMD160 146ba7ddd5a0d987ea554bcf7e50aea5bf0690ff files/cdrtools-2.01-scsi-remote.patch 938
 SHA256 93719cbcbf594be14e0aa993b49157fc6be2885e94f4a92947ea73bd58ed2a62 files/cdrtools-2.01-scsi-remote.patch 938
@@ -31,9 +31,9 @@ SHA256 d9883585c53ad46dc178ba0712cb9f9284702cdf16a6094ddb4f83b46a86a89d files/di
 MD5 8165b59a7b14939c58a88ca1f272cad4 files/digest-cdrtools-2.01-r3 147
 RMD160 aaa829740855d592bd4799b732d859c0b259706e files/digest-cdrtools-2.01-r3 147
 SHA256 ca0d505c29fb72735649a526f8efcadbfdbac03c93900b7974d98b1e9f8be158 files/digest-cdrtools-2.01-r3 147
-MD5 2e87b7e0d4c5c8629e4290f95d18ff1d files/digest-cdrtools-2.01.01_alpha07 551
-RMD160 7849cff07bb525bb71f4815a2fdf4bdad1c7cfeb files/digest-cdrtools-2.01.01_alpha07 551
-SHA256 0f5951e644e3805b69bdfa049bfd5d48fe1af4396a71ddeab56b735e254b4f95 files/digest-cdrtools-2.01.01_alpha07 551
+MD5 090f4a5367e86219d1b69fdbcef4e42a files/digest-cdrtools-2.01.01_alpha07 265
+RMD160 380b83497581f00eb470106153212c5c2022b77d files/digest-cdrtools-2.01.01_alpha07 265
+SHA256 04615914cb6a31e5706c963877c4c52197ddc9bd3acb67a8046cc1c341718a66 files/digest-cdrtools-2.01.01_alpha07 265
 MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
 RMD160 3a8ae83e0c5e4e04e0b55c4cd1089ea603a4b169 files/mkisofs-iconv-10.patch 16986
 SHA256 608868e8d5e7d0d4fd7469a7a1f7271e63590fb645fdbdf3d6251678aad41745 files/mkisofs-iconv-10.patch 16986
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha07.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha07.ebuild
index f630e56e93d7..c2e1e945bdd1 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha07.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha07.ebuild
@@ -1,24 +1,20 @@
 # Copyright 1999-2006 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_alpha07.ebuild,v 1.1 2006/03/11 15:10:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha07.ebuild,v 1.2 2006/03/11 15:16:01 pylon Exp $
 
 inherit eutils gnuconfig toolchain-funcs flag-o-matic
 
-MY_CRYPT_VERS="2.01-encrypt-1.0rc1"
-
 DESCRIPTION="A set of tools for CD recording, including cdrecord"
 HOMEPAGE="http://cdrecord.berlios.de/"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2
-	on-the-fly-crypt? ( http://burbon04.gmxhome.de/linux/files/${PN}-${MY_CRYPT_VERS}.diff.gz )"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
 
 LICENSE="GPL-2 freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sparc ~x86"
-IUSE="on-the-fly-crypt unicode"
+IUSE="unicode"
 
 DEPEND="virtual/libc
 	!app-cdr/dvdrtools"
-RDEPEND="on-the-fly-crypt? ( || ( sys-fs/cryptsetup sys-fs/cryptsetup-luks ) )"
 PROVIDE="virtual/cdrtools"
 
 S=${WORKDIR}/${PN}-2.01.01
@@ -34,12 +30,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.01.01a01-scanbus.patch
 	epatch ${FILESDIR}/${PN}-2.01.01a03-rezero.patch
 
-	# Add support for On-The-Fly AES encryption
-	# http://burbon04.gmxhome.de/linux/CDREncryption.html
-	if use on-the-fly-crypt; then
-		epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
-	fi
-
 	# ppc-macos support
 	cd ${S}/DEFAULTS
 	use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha07 b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha07
index a116a3bfb856..cd8c77516d31 100644
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha07
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha07
@@ -1,6 +1,3 @@
-MD5 785184b45952798c72b26e3da9db0e0f cdrtools-2.01-encrypt-1.0rc1.diff.gz 25384
-RMD160 68fbcf1e9c1f03efa1474cce03e2ba4d1865ded8 cdrtools-2.01-encrypt-1.0rc1.diff.gz 25384
-SHA256 1dd80e793538bd51effffc44a278c2efca56a7b318de204231e5afbb5d11b63e cdrtools-2.01-encrypt-1.0rc1.diff.gz 25384
 MD5 df3acee3505c1305e9f6de104d513460 cdrtools-2.01.01a07.tar.bz2 1441566
 RMD160 db9862bbcc452657127f9cef1526d43dc5d50c99 cdrtools-2.01.01a07.tar.bz2 1441566
 SHA256 cdc502320924c55ad884590844bb9b88bf60357fae8954bb7985777df552f8f5 cdrtools-2.01.01a07.tar.bz2 1441566