summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Weiler <pylon@gentoo.org>2005-03-01 20:04:52 +0000
committerLars Weiler <pylon@gentoo.org>2005-03-01 20:04:52 +0000
commit8049435a09bb51756ec8a9b5e7a66e322d4a7d55 (patch)
tree288fcd91d857ec9ee5b41be9bca8ef2bfed86474 /app-cdr
parentAdded upgrade einfo (diff)
downloadgentoo-2-8049435a09bb51756ec8a9b5e7a66e322d4a7d55.tar.gz
gentoo-2-8049435a09bb51756ec8a9b5e7a66e322d4a7d55.tar.bz2
gentoo-2-8049435a09bb51756ec8a9b5e7a66e322d4a7d55.zip
Fixed bug #83700
(Portage version: 2.0.51.18)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/cdrtools/Manifest4
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01-r2.ebuild12
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r1.ebuild10
3 files changed, 17 insertions, 9 deletions
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 9610e8d7ed13..7bce3dc85ff0 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,8 +1,8 @@
MD5 26c673d1c0824a9d9639d68f36c833c2 cdrtools-2.01.ebuild 2871
MD5 d1f4cb5ced5c966950071739e9d14038 ChangeLog 15958
MD5 fb7c98c4ada508b4870303b6cf6f327c metadata.xml 450
-MD5 7145ea99530f2317e416995db3bd6c39 cdrtools-2.01-r2.ebuild 3426
-MD5 03c61166bd02fe38e827a2a588cd66d4 cdrtools-2.01.01_alpha01-r1.ebuild 3373
+MD5 7daf045a2fb3b349f661eba0377ac12d cdrtools-2.01.01_alpha01-r1.ebuild 3430
+MD5 8ea11151285a9e76ab5b006e5211282c cdrtools-2.01-r2.ebuild 3487
MD5 245b4ec3f9e91750df712bee416f6481 files/cdrtools-2.01-scsi-remote.patch 540
MD5 c848b3b9b6921469483a22caa0fd40c3 files/digest-cdrtools-2.01 67
MD5 1a596f5cae257e97c559716336b30e5b files/mkisofs-iconv-10.patch 16986
diff --git a/app-cdr/cdrtools/cdrtools-2.01-r2.ebuild b/app-cdr/cdrtools/cdrtools-2.01-r2.ebuild
index 2998e547b7a3..65d7087261db 100644
--- a/app-cdr/cdrtools/cdrtools-2.01-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01-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-r2.ebuild,v 1.1 2005/03/01 14:59:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01-r2.ebuild,v 1.2 2005/03/01 20:04:52 pylon Exp $
inherit eutils gcc gnuconfig versionator
@@ -31,14 +31,18 @@ src_unpack() {
epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch || die "Can't apply SCSI-remote patch"
# UTF-8 support, see Bug #28369
- use unicode && epatch ${FILESDIR}/mkisofs-iconv-10.patch
+ if use unicode; then
+ epatch ${FILESDIR}/mkisofs-iconv-10.patch || die "Can't apply utf-8 patch"
+ fi
# Add support for On-The-Fly AES encryption
# http://burbon04.gmxhome.de/linux/CDREncryption.html
- use crypt && epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+ if use crypt; then
+ epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+ fi
cd ${S}/DEFAULTS
- use ppc-macos && MYARCH="mac-os10" || MYARCH="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}
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r1.ebuild
index 4bd9a90d7d95..05c0293cda2f 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r1.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-r1.ebuild,v 1.1 2005/03/01 14:59:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha01-r1.ebuild,v 1.2 2005/03/01 20:04:52 pylon Exp $
inherit eutils gcc gnuconfig
@@ -31,11 +31,15 @@ src_unpack() {
epatch ${FILESDIR}/${PN}-2.01-scsi-remote.patch
# UTF-8 support, see Bug #28369
- use unicode && epatch ${FILESDIR}/mkisofs-iconv-10.patch
+ if use unicode; then
+ epatch ${FILESDIR}/mkisofs-iconv-10.patch || die "Can't apply utf-8 patch"
+ fi
# Add support for On-The-Fly AES encryption
# http://burbon04.gmxhome.de/linux/CDREncryption.html
- use crypt && epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+ if use crypt; then
+ epatch ${DISTDIR}/${PN}-${MY_CRYPT_VERS}.diff.gz || die "Can't apply encryption patch"
+ fi
cd ${S}/DEFAULTS
use ppc-macos && MYARCH="mac-os10" || MYARCH="linux"