Closing #27502

4 files changed, 20 insertions, 22 deletions

diff --git a/app-misc/cdcat/ChangeLog b/app-misc/cdcat/ChangeLog
index 711441c904fd..72bec39327d2 100644
--- a/app-misc/cdcat/ChangeLog
+++ b/app-misc/cdcat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/cdcat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcat/ChangeLog,v 1.5 2003/05/04 19:20:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcat/ChangeLog,v 1.6 2003/11/21 15:18:15 aliz Exp $
+
+  21 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> cdcat-0.2.ebuild, cdcat-0.3.ebuild:
+  Block app-cdr/cdbkup becuse it too installs /usr/bin/cdcat, closing #27502.
+  Also sed fix and amd64 keyword.
 
 *cdcat-0.3 (06 Apr 2003)
 
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index b3305f2a86c8..f20069190b89 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,5 +1,5 @@
-MD5 e03a8d07a9247d59ad644aae93bbd57d ChangeLog 657
-MD5 c1b44781bc012931410cb266859d26b8 cdcat-0.2.ebuild 1287
-MD5 469bd9b2a1ed4e04417ead08f4fe09c1 cdcat-0.3.ebuild 1274
-MD5 f6c631031edc8dd1dde9ab31d518cb4c files/digest-cdcat-0.3 119
+MD5 1c776a2adbfcc6f557d76ec3c1b76943 cdcat-0.2.ebuild 1184
+MD5 45e2f6e6e05d7f5e4133778dedeac75b cdcat-0.3.ebuild 1177
+MD5 ddfed4320ca4dc153e6dac22b408c1e0 ChangeLog 851
 MD5 e13ac4bbced4adf7df0d1e308ba8596d files/digest-cdcat-0.2 119
+MD5 f6c631031edc8dd1dde9ab31d518cb4c files/digest-cdcat-0.3 119
diff --git a/app-misc/cdcat/cdcat-0.2.ebuild b/app-misc/cdcat/cdcat-0.2.ebuild
index c59bd6cedf34..f93651267c10 100644
--- a/app-misc/cdcat/cdcat-0.2.ebuild
+++ b/app-misc/cdcat/cdcat-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcat/cdcat-0.2.ebuild,v 1.12 2003/04/23 14:31:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcat/cdcat-0.2.ebuild,v 1.13 2003/11/21 15:18:15 aliz Exp $
 
 DESCRIPTION="simple yet effective CD indexing program"
 SRC_URI="http://www.littledragon.f2s.com/unix/cdcat/${P}.tar.gz"
@@ -13,21 +13,18 @@ KEYWORDS="x86 ppc"
 DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-apps/grep-2.4.2
 	>=sys-apps/findutils-4.1
-	>=app-cdr/cdrtools-1.11"
+	>=app-cdr/cdrtools-1.11
+	!app-cdr/cdbkup"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	# workaround install.sh ignoring --man_prefix
-	t="install.sh"
-	cp $t $t.orig || die "Patch failed for $t"
-	sed 's:^MAN_PREFIX:#:' $t.orig > $t
+	sed -i 's:^MAN_PREFIX:#:' install.sh
 
 	# fix path to cd index files to be FHS-compliant
-	t="src/cdcat.pl"
-	cp $t $t.orig || die "Patch failed for $t"
-	sed 's:/mnt/ext/cd:/var/lib/cdcat:' $t.orig > $t
+	sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl
 }
 
 src_install() {
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
index 020c213f5608..a88eaf3d4c1c 100644
--- a/app-misc/cdcat/cdcat-0.3.ebuild
+++ b/app-misc/cdcat/cdcat-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcat/cdcat-0.3.ebuild,v 1.3 2003/05/04 19:20:51 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/cdcat/cdcat-0.3.ebuild,v 1.4 2003/11/21 15:18:15 aliz Exp $
 
 DESCRIPTION="simple yet effective CD indexing program"
 SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
@@ -8,26 +8,23 @@ HOMEPAGE="http://littledragon.home.ro/unix/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 
 DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-apps/grep-2.4.2
 	>=sys-apps/findutils-4.1
-	>=app-cdr/cdrtools-1.11"
+	>=app-cdr/cdrtools-1.11
+	!app-cdr/cdbkup"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	# workaround install.sh ignoring --man_prefix
-	t="install.sh"
-	cp $t $t.orig || die "Patch failed for $t"
-	sed 's:^MAN_PREFIX:#:' $t.orig > $t
+	sed -i 's:^MAN_PREFIX:#:' install.sh
 
 	# fix path to cd index files to be FHS-compliant
-	t="src/cdcat.pl"
-	cp $t $t.orig || die "Patch failed for $t"
-	sed 's:/mnt/ext/cd:/var/lib/cdcat:' $t.orig > $t
+	sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl
 }
 
 src_install() {