Version bump.

(Portage version: 2.1.2.4)

5 files changed, 93 insertions, 70 deletions

diff --git a/app-cdr/cdrkit/ChangeLog b/app-cdr/cdrkit/ChangeLog
index da9a0f869d28..e2354f2dce9d 100644
--- a/app-cdr/cdrkit/ChangeLog
+++ b/app-cdr/cdrkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdrkit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.34 2007/04/16 15:15:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/ChangeLog,v 1.35 2007/04/21 12:00:14 pylon Exp $
+
+*cdrkit-1.1.5.1 (21 Apr 2007)
+
+  21 Apr 2007; Lars Weiler <pylon@gentoo.org> -cdrkit-1.0.ebuild,
+  +cdrkit-1.1.5.1.ebuild:
+  Version bump.
 
   16 Apr 2007; Raúl Porcel <armin76@gentoo.org> cdrkit-1.1.2.ebuild:
   ia64 stable wrt bug 170482
diff --git a/app-cdr/cdrkit/cdrkit-1.0.ebuild b/app-cdr/cdrkit/cdrkit-1.0.ebuild
deleted file mode 100644
index fd834cf44943..000000000000
--- a/app-cdr/cdrkit/cdrkit-1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.0.ebuild,v 1.8 2007/03/16 15:29:12 pylon 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="amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=dev-util/cmake-2.4
-	!app-cdr/cdrtools
-	sys-libs/libcap"
-
-PROVIDE="virtual/cdrtools"
-
-src_compile() {
-	cmake \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_C_COMPILER=$(type -p $(tc-getCC))
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dosym /usr/bin/wodim /usr/bin/cdrecord
-
-	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/cdda2wav
-	docinto cdda2wav
-	dodoc FAQ Frontends HOWTOUSE README TODO
-
-	cd ${S}/doc/mkisofs
-	docinto mkisofs
-	dodoc *
-
-	cd ${S}/doc/plattforms/
-	docinto platforms
-	dodoc README.{linux,parallel}
-
-	cd ${S}
-	insinto /etc
-	newins cdrecord/wodim.dfl wodim.conf
-
-	cd ${S}
-	insinto /usr/include/scsilib
-	doins include/*.h
-	insinto /usr/include/scsilib/scg
-	doins include/scg/*.h
-}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.5.1.ebuild b/app-cdr/cdrkit/cdrkit-1.1.5.1.ebuild
new file mode 100644
index 000000000000..58f438d9c289
--- /dev/null
+++ b/app-cdr/cdrkit/cdrkit-1.1.5.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.5.1.ebuild,v 1.1 2007/04/21 12:00:14 pylon 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://debburn.alioth.debian.org/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~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 )"
+
+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
+
+	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/files/digest-cdrkit-1.0 b/app-cdr/cdrkit/files/digest-cdrkit-1.0
deleted file mode 100644
index cae9449b9de9..000000000000
--- a/app-cdr/cdrkit/files/digest-cdrkit-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3aefa50d0c933c2030b465a0b044b78 cdrkit-1.0.tar.gz 1469722
-RMD160 f8076505999461f7e7a36451e0291e2d1a15994f cdrkit-1.0.tar.gz 1469722
-SHA256 233391d10176f6c1ed12db536b62c9ca3ec009032af360a2b43ef3436470d6a6 cdrkit-1.0.tar.gz 1469722
diff --git a/app-cdr/cdrkit/files/digest-cdrkit-1.1.5.1 b/app-cdr/cdrkit/files/digest-cdrkit-1.1.5.1
new file mode 100644
index 000000000000..b3b41599c0e9
--- /dev/null
+++ b/app-cdr/cdrkit/files/digest-cdrkit-1.1.5.1
@@ -0,0 +1,3 @@
+MD5 36fdf0207d6c3f67b1c8b04931830666 cdrkit-1.1.5.1.tar.gz 1407891
+RMD160 b4fe35ed946a78e94e9c13e907fe6fe54f86bc79 cdrkit-1.1.5.1.tar.gz 1407891
+SHA256 eca211898db1bedf625f34c58e418c469e67a19bfec7ae32a9316a7b630a1b2e cdrkit-1.1.5.1.tar.gz 1407891