remove inherit || die

11 files changed, 58 insertions, 57 deletions

diff --git a/app-cdr/cdbakeoven/Manifest b/app-cdr/cdbakeoven/Manifest
index 0c2e1d35d127..a4b51195a8a8 100644
--- a/app-cdr/cdbakeoven/Manifest
+++ b/app-cdr/cdbakeoven/Manifest
@@ -1,8 +1,8 @@
-MD5 cad6167b7e4901399c18ae28a6ab919f cdbakeoven-2.0_beta2.ebuild 662
-MD5 bd5cdcc5ca1a3ff4dd850123cab4f8ec cdbakeoven-1.8.9.ebuild 607
-MD5 434b8f7331ce7af45302b44ace32cf35 ChangeLog 1763
-MD5 dcc37708ebac720312a5d89ba3804fe1 cdbakeoven-1.8.9-r1.ebuild 709
-MD5 8725876c2ae2d57eb096781fedbc5b7a files/digest-cdbakeoven-2.0_beta2 72
 MD5 acc871661c249571c0efc2e6f593a6cb files/cdbakeoven-1.8.9-gcc3-gentoo.patch 620
 MD5 97eee34a1ed98a2f41468df3b202b156 files/digest-cdbakeoven-1.8.9 69
 MD5 97eee34a1ed98a2f41468df3b202b156 files/digest-cdbakeoven-1.8.9-r1 69
+MD5 8725876c2ae2d57eb096781fedbc5b7a files/digest-cdbakeoven-2.0_beta2 72
+MD5 41d30431fc9e2958f2e4af4be2c260b8 cdbakeoven-1.8.9-r1.ebuild 684
+MD5 295e49e2e553633ee7aad41c17b63151 cdbakeoven-1.8.9.ebuild 582
+MD5 434b8f7331ce7af45302b44ace32cf35 ChangeLog 1763
+MD5 531ede344d66a45cfcf2b40306069974 cdbakeoven-2.0_beta2.ebuild 635
diff --git a/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild b/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild
index 47ad4821e626..6eae691f145d 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild,v 1.3 2003/02/13 05:59:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.8.9-r1.ebuild,v 1.4 2003/06/25 22:35:29 vapier Exp $
 
-inherit kde-base || die
+inherit kde-base
 
 need-kde 3
 
 DESCRIPTION="CDBakeOven, KDE CD Writing Software"
 SRC_URI="mirror://sourceforge/cdbakeoven/${P}.tar.bz2"
-HOMEPAGE="http://cdbakeoven.sourceforge.net"
-S=${WORKDIR}/${P}
+HOMEPAGE="http://cdbakeoven.sourceforge.net/"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 newdepend ">=media-libs/libogg-1.0_rc2
 	>=media-sound/mpg123-0.59
@@ -23,4 +23,3 @@ src_unpack() {
 	cd ${S}
 	patch -p0 <${FILESDIR}/cdbakeoven-1.8.9-gcc3-gentoo.patch
 }
-
diff --git a/app-cdr/cdbakeoven/cdbakeoven-1.8.9.ebuild b/app-cdr/cdbakeoven/cdbakeoven-1.8.9.ebuild
index af7e11e122a0..cbf9610c0d72 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-1.8.9.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-1.8.9.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.8.9.ebuild,v 1.8 2003/02/13 05:59:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-1.8.9.ebuild,v 1.9 2003/06/25 22:35:29 vapier Exp $
 
-inherit kde-base || die
+inherit kde-base
 
 need-kde 3
 
 DESCRIPTION="CDBakeOven, KDE CD Writing Software"
 SRC_URI="mirror://sourceforge/cdbakeoven/${P}.tar.bz2"
-HOMEPAGE="http://cdbakeoven.sourceforge.net"
-S=${WORKDIR}/${P}
+HOMEPAGE="http://cdbakeoven.sourceforge.net/"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 newdepend ">=media-libs/libogg-1.0_rc2
 	>=media-sound/mpg123-0.59
 	>=media-sound/cdparanoia-3.9.8
 	>=app-cdr/cdrtools-1.11"
-
diff --git a/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild b/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild
index 659662df34c1..4e71401ef4db 100644
--- a/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild
+++ b/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild,v 1.4 2003/04/27 16:20:20 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdbakeoven/cdbakeoven-2.0_beta2.ebuild,v 1.5 2003/06/25 22:35:29 vapier Exp $
 
 inherit kde-base
 
 need-kde 3
 
-IUSE=""
 MY_P=${P/_/}
 DESCRIPTION="CDBakeOven, KDE CD Writing Software"
 SRC_URI="mirror://sourceforge/cdbakeoven/${MY_P}.tar.bz2"
-HOMEPAGE="http://cdbakeoven.sourceforge.net"
-S=${WORKDIR}/${MY_P}
+HOMEPAGE="http://cdbakeoven.sourceforge.net/"
+
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc"
 
diff --git a/app-cdr/koncd/Manifest b/app-cdr/koncd/Manifest
index e953f594e45c..4c49be7c8766 100644
--- a/app-cdr/koncd/Manifest
+++ b/app-cdr/koncd/Manifest
@@ -1,3 +1,3 @@
-MD5 f970f2f03748c9af17a00c5584bd1f42 ChangeLog 1237
-MD5 a720c663bae8e6de75f0ce60055d7948 koncd-1.0_rc1.ebuild 581
 MD5 0cc364a61e74a1d7ba6ea89e6a557d10 files/digest-koncd-1.0_rc1 65
+MD5 ebb96c3231a678b32d631a172df67235 koncd-1.0_rc1.ebuild 578
+MD5 f970f2f03748c9af17a00c5584bd1f42 ChangeLog 1237
diff --git a/app-cdr/koncd/koncd-1.0_rc1.ebuild b/app-cdr/koncd/koncd-1.0_rc1.ebuild
index 409c9a51ef29..c3dcb6c0c476 100644
--- a/app-cdr/koncd/koncd-1.0_rc1.ebuild
+++ b/app-cdr/koncd/koncd-1.0_rc1.ebuild
@@ -1,18 +1,21 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.20 2003/03/28 12:00:48 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/koncd/koncd-1.0_rc1.ebuild,v 1.21 2003/06/25 22:36:51 vapier Exp $
 
-inherit kde-base || die
+inherit kde-base
 
 need-kde 2.2
 
-S=${WORKDIR}/koncd-1.0rc1
+MY_P="${P/_/}"
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="A KDE frontend to cdr apps; very powerful"
-SRC_URI="http://www.koncd.org/download/koncd-1.0rc1.tar.gz"
+SRC_URI="http://www.koncd.org/download/${MY_P}.tar.gz"
 HOMEPAGE="http://www.koncd.org/"
+
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc ppc"
 
-newdepend "$DEPEND >=app-cdr/cdrtools-1.11 >=app-cdr/cdrdao-1.1.5 >=media-sound/mpg123-0.59r"
-
-
+DEPEND="${DEPEND}
+	>=app-cdr/cdrtools-1.11
+	>=app-cdr/cdrdao-1.1.5
+	>=media-sound/mpg123-0.59r"
diff --git a/app-cdr/kover/Manifest b/app-cdr/kover/Manifest
index 9c664c806a36..84f43a0ab2ed 100644
--- a/app-cdr/kover/Manifest
+++ b/app-cdr/kover/Manifest
@@ -1,5 +1,5 @@
-MD5 2628734b1f0dc5115f1f76e3e22066b3 ChangeLog 858
-MD5 9011459b439c075ac460d8e753414c71 kover-2.8.7.ebuild 465
-MD5 5531b353b5d324a56a830697893cc987 kover-2.9.3.ebuild 577
 MD5 eb73229fac3e9bcb51e0f89e06add9eb files/digest-kover-2.8.7 63
 MD5 c156b0ff95582eff8775a0dc67f1c311 files/digest-kover-2.9.3 63
+MD5 cb22e10103ddafef4f46b7bff6540713 kover-2.8.7.ebuild 450
+MD5 2628734b1f0dc5115f1f76e3e22066b3 ChangeLog 858
+MD5 567f35d5714a8fdb89e10df19f684e61 kover-2.9.3.ebuild 520
diff --git a/app-cdr/kover/kover-2.8.7.ebuild b/app-cdr/kover/kover-2.8.7.ebuild
index 176ff9ad9ce1..d244082725f5 100644
--- a/app-cdr/kover/kover-2.8.7.ebuild
+++ b/app-cdr/kover/kover-2.8.7.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kover/kover-2.8.7.ebuild,v 1.6 2003/06/09 13:35:17 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kover/kover-2.8.7.ebuild,v 1.7 2003/06/25 22:37:47 vapier Exp $
 
-inherit kde-base || die
+inherit kde-base
 
 need-kde 3
 
-IUSE=""
 DESCRIPTION="KDE program for CD Cover Creation"
-SRC_URI="http://lisas.de/${PN}/${P}.tar.gz"
-HOMEPAGE="http://lisas.de/kover"
+SRC_URI="http://lisas.de/kover/${P}.tar.gz"
+HOMEPAGE="http://lisas.de/kover/"
+
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 
 newdepend "media-libs/libvorbis"
-
diff --git a/app-cdr/kover/kover-2.9.3.ebuild b/app-cdr/kover/kover-2.9.3.ebuild
index 092fa5452a2d..e947f5d5a9e0 100644
--- a/app-cdr/kover/kover-2.9.3.ebuild
+++ b/app-cdr/kover/kover-2.9.3.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kover/kover-2.9.3.ebuild,v 1.1 2003/06/17 13:04:12 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kover/kover-2.9.3.ebuild,v 1.2 2003/06/25 22:37:47 vapier Exp $
 
-inherit kde-base || die
+inherit kde-base
 
 need-kde 3
 
-IUSE=""
 DESCRIPTION="KDE program for CD Cover Creation"
 SRC_URI="http://lisas.de/${PN}/${P}.tar.gz"
-HOMEPAGE="http://lisas.de/kover"
+HOMEPAGE="http://lisas.de/kover/"
+
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-newdepend "media-libs/libvorbis"
-newdepend "media-libs/tiff"
-newdepend "media-libs/jpeg"
-newdepend "media-libs/libpng"
-newdepend "sys-libs/zlib"
+newdepend "media-libs/libvorbis
+	media-libs/tiff
+	media-libs/jpeg
+	media-libs/libpng
+	sys-libs/zlib"
diff --git a/app-cdr/kreatecd/Manifest b/app-cdr/kreatecd/Manifest
index 8178f87d56ec..0e78c6052945 100644
--- a/app-cdr/kreatecd/Manifest
+++ b/app-cdr/kreatecd/Manifest
@@ -1,3 +1,3 @@
-MD5 05193ac412b2aea39c45f38d2a3a0f4d ChangeLog 757
-MD5 91ae708641d368d0897c00c32fd841f2 kreatecd-1.1.0.ebuild 536
 MD5 cf937243b787de1bcca01ca5dcd5335d files/digest-kreatecd-1.1.0 68
+MD5 fbd5d4b840fe1a9131d5f7da419f62bf kreatecd-1.1.0.ebuild 522
+MD5 05193ac412b2aea39c45f38d2a3a0f4d ChangeLog 757
diff --git a/app-cdr/kreatecd/kreatecd-1.1.0.ebuild b/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
index a67d067eefa0..643b5508dc9b 100644
--- a/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
+++ b/app-cdr/kreatecd/kreatecd-1.1.0.ebuild
@@ -1,17 +1,19 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/kreatecd/kreatecd-1.1.0.ebuild,v 1.16 2003/02/13 06:13:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/kreatecd/kreatecd-1.1.0.ebuild,v 1.17 2003/06/25 22:38:23 vapier Exp $
 
-inherit kde-base || die
+inherit kde-base
 
 need-kde 2.2
 
 DESCRIPTION="KreateCD 1.1.0"
 SRC_URI="mirror://sourceforge/kreatecd/${P}.tar.bz2"
-HOMEPAGE="http://www.kreatecd.de"
+HOMEPAGE="http://www.kreatecd.de/"
+
 LICENSE="GPL-2"
-DEPEND="$DEPEND
+KEYWORDS="x86 sparc"
+
+DEPEND="${DEPEND}
 	>=media-sound/mpg123-0.59
-	>=media-sound/cdparanoia-3.9.8"
-KEYWORDS="x86 sparc "
-newdepend ">=app-cdr/cdrtools-1.11"
+	>=media-sound/cdparanoia-3.9.8
+	>=app-cdr/cdrtools-1.11"