old, quoting

(Portage version: 2.1.5.5)

3 files changed, 14 insertions, 102 deletions

diff --git a/app-cdr/cdrkit/cdrkit-1.1.6.ebuild b/app-cdr/cdrkit/cdrkit-1.1.6.ebuild
index 7191cdb31bff..1a14942f94b6 100644
--- a/app-cdr/cdrkit/cdrkit-1.1.6.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.6.ebuild,v 1.11 2007/11/07 16:37:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.6.ebuild,v 1.12 2008/06/15 11:43:09 drac Exp $
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A suite of programs for recording CDs and DVDs, blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD data, and more."
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
 HOMEPAGE="http://cdrkit.org/"
 SRC_URI="http://debburn.alioth.debian.org/${P}.tar.gz"
 
@@ -42,7 +42,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dosym /usr/bin/wodim /usr/bin/cdrecord
 	dosym /usr/bin/genisoimage /usr/bin/mkisofs
@@ -53,33 +53,33 @@ src_install() {
 	dosym /usr/share/man/man1/icedax.1.bz2 /usr/share/man/man1/cdda2wav.1.bz2
 	dosym /usr/share/man/man1/readom.1.bz2 /usr/share/man/man1/readcd.1.bz2
 
-	cd ${S}
+	cd "${S}"
 	dodoc ABOUT Changelog FAQ FORK START TODO VERSION
 
-	cd ${S}/doc/READMEs
+	cd "${S}"/doc/READMEs
 	dodoc README*
 
-	cd ${S}/doc/wodim
+	cd "${S}"/doc/wodim
 	dodoc README*
 
-	cd ${S}/doc/genisoimage
+	cd "${S}"/doc/genisoimage
 	docinto genisoimage
 	dodoc *
 
-	cd ${S}/doc/icedax
+	cd "${S}"/doc/icedax
 	docinto icedax
 	dodoc FAQ Frontends HOWTOUSE NEEDED README TODO
 
-	cd ${S}/doc/plattforms
+	cd "${S}"/doc/plattforms
 	docinto platforms
 	dodoc README.{linux,parallel}
 
-	cd ${S}
+	cd "${S}"
 	insinto /etc
 	newins wodim/wodim.dfl wodim.conf
 	newins netscsid/netscsid.dfl netscsid.conf
 
-	cd ${S}
+	cd "${S}"
 	insinto /usr/include/scsilib
 	doins include/*.h
 	insinto /usr/include/scsilib/usal
diff --git a/app-cdr/cdrkit/cdrkit-1.1.7.1.ebuild b/app-cdr/cdrkit/cdrkit-1.1.7.1.ebuild
deleted file mode 100644
index 30d82c99fca1..000000000000
--- a/app-cdr/cdrkit/cdrkit-1.1.7.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.7.1.ebuild,v 1.2 2008/04/18 14:42:10 beandog Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A suite of programs for recording CDs and DVDs, blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD data, and more."
-HOMEPAGE="http://cdrkit.org/"
-SRC_URI="http://cdrkit.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="hfs unicode kernel_linux kernel_FreeBSD"
-
-DEPEND=">=dev-util/cmake-2.4
-	!app-cdr/cdrtools
-	kernel_linux? ( sys-libs/libcap )
-	unicode? ( virtual/libiconv )
-	hfs? ( sys-apps/file )"
-RDEPEND="unicode? ( virtual/libiconv )
-	kernel_linux? ( sys-libs/libcap )"
-
-PROVIDE="virtual/cdrtools"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-}
-
-src_compile() {
-	cmake \
-		-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-		-DCMAKE_C_FLAGS="${CFLAGS}" \
-		-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		|| die "cmake failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dosym /usr/bin/wodim /usr/bin/cdrecord
-	dosym /usr/bin/genisoimage /usr/bin/mkisofs
-	dosym /usr/bin/icedax /usr/bin/cdda2wav
-	dosym /usr/bin/readom /usr/bin/readcd
-	dosym /usr/share/man/man1/wodim.1.bz2 /usr/share/man/man1/cdrecord.1.bz2
-	dosym /usr/share/man/man1/genisoimage.1.bz2 /usr/share/man/man1/mkisofs.1.bz2
-	dosym /usr/share/man/man1/icedax.1.bz2 /usr/share/man/man1/cdda2wav.1.bz2
-	dosym /usr/share/man/man1/readom.1.bz2 /usr/share/man/man1/readcd.1.bz2
-
-	cd "${S}"
-	dodoc ABOUT Changelog FAQ FORK START TODO VERSION
-
-	cd "${S}"/doc/READMEs
-	dodoc README*
-
-	cd "${S}"/doc/wodim
-	dodoc README*
-
-	cd "${S}"/doc/genisoimage
-	docinto genisoimage
-	dodoc *
-
-	cd "${S}"/doc/icedax
-	docinto icedax
-	dodoc FAQ Frontends HOWTOUSE NEEDED README TODO
-
-	cd "${S}"/doc/plattforms
-	docinto platforms
-	dodoc README.{linux,parallel}
-
-	cd "${S}"
-	insinto /etc
-	newins wodim/wodim.dfl wodim.conf
-	newins netscsid/netscsid.dfl netscsid.conf
-
-	cd "${S}"
-	insinto /usr/include/scsilib
-	doins include/*.h
-	insinto /usr/include/scsilib/usal
-	doins include/usal/*.h
-	dosym /usr/include/scsilib/usal /usr/include/scsilib/scg
-}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.8.ebuild b/app-cdr/cdrkit/cdrkit-1.1.8.ebuild
index f2144d09dbc3..01de4d51c2fd 100644
--- a/app-cdr/cdrkit/cdrkit-1.1.8.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.8.ebuild,v 1.1 2008/06/04 15:26:44 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.8.ebuild,v 1.2 2008/06/15 11:43:09 drac Exp $
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A suite of programs for recording CDs and DVDs, blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD data, and more."
+DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
 HOMEPAGE="http://cdrkit.org/"
 SRC_URI="http://cdrkit.org/releases/${P}.tar.gz"