[Lunar-commits] <moonbase> cdrkit: removed cdrkit is just inferior fork of older cdrtools release with changed commands for some apps. Parameters remain the same so we go gentoo way and symlink commands in cdrtools to achieve compatibility without the need of maintaning cdrkit file conflicts between them. Google for cdrtools vs cdrkit to learn more.

[Zbigniew Luszpinski]

commit bb9c29a948c512e21e451d3425b20e8495325a23
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat May 15 14:51:10 2010 +0200

    cdrkit: removed
    cdrkit is just inferior fork of older cdrtools release with changed commands for some apps.
    Parameters remain the same so we go gentoo way and symlink commands in cdrtools to achieve compatibility without the need of maintaning cdrkit file conflicts between them. Google for cdrtools vs cdrkit to learn more.
---
 cd/cdrkit/BUILD                |    7 -------
 cd/cdrkit/DEPENDS              |    2 --
 cd/cdrkit/DETAILS              |   24 ------------------------
 cd/cdrtools/BUILD              |   10 +++++++++-
 cd/cdrtools/DEPENDS            |    1 +
 cd/tkdvd/DEPENDS               |    2 +-
 gnome2/apps/gnomebaker/DEPENDS |    1 -
 7 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/cd/cdrkit/BUILD b/cd/cdrkit/BUILD
deleted file mode 100644
index 938b7ee..0000000
--- a/cd/cdrkit/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  make  &&
-  prepare_install  &&
-  make install PREFIX=/usr
-
-) > $C_FIFO 2>&1
diff --git a/cd/cdrkit/DEPENDS b/cd/cdrkit/DEPENDS
deleted file mode 100644
index 4307526..0000000
--- a/cd/cdrkit/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  cmake
-depends  libcap
diff --git a/cd/cdrkit/DETAILS b/cd/cdrkit/DETAILS
deleted file mode 100644
index c89b457..0000000
--- a/cd/cdrkit/DETAILS
+++ /dev/null
@@ -1,24 +0,0 @@
-          MODULE=cdrkit
-         VERSION=1.1.10
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://cdrkit.org/releases
-     SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:37f35c0cb3180bbe56efc37bbf7bc82df39447c4
-        WEB_SITE=http://cdrkit.org
-         ENTERED=20070210
-         UPDATED=20100119
-           SHORT="CD and DVD media writing tools"
-
-cat << EOF
-Derived from the various programs distributed in the cdrtools suite, cdrkit
-aims to maintain interface compatibility with those tools. The cdrecord
-program has been renamed to wodim ("write optical disk media") so that users
-will not confuse it with the original cdrecord, which is still maintained by
-its author, Jorg Schilling. wodim, and the other programs distributed with
-cdrkit, will retain a user interface compatible with the corresponding
-programs from the cdrtools 2.01.01a08 release, at least for the near future.
-Thus, front-end programs, such as GUI-based CD writer applications, should be
-able to use cdrkit merely by substituting the name "wodim" for the name
-"cdrecord".
-EOF
diff --git a/cd/cdrtools/BUILD b/cd/cdrtools/BUILD
index 5d50458..6eb2370 100644
--- a/cd/cdrtools/BUILD
+++ b/cd/cdrtools/BUILD
@@ -15,6 +15,14 @@
             DEFINSGRP=root                           &&
   prepare_install                                    &&
   $THISMAKE INS_BASE=/usr DEFINSUSR=root              \
-            DEFINSGRP=root MANDIR=share/man install
+            DEFINSGRP=root MANDIR=share/man install  &&
+
+  # cdrkit compatibility:
+  install -m755 cdda2wav/{pitchplay,readmult} /usr/bin &&
+  ln -sf /usr/bin/mkisofs  /usr/bin/genisoimage &&
+  ln -sf /usr/bin/cdda2wav /usr/bin/icedax &&
+  ln -sf /usr/bin/readcd   /usr/bin/readom &&
+  ln -sf /usr/bin/cdrecord /usr/bin/wodim  &&
+  ln -sf /usr/sbin/rscsi /usr/sbin/netscsid
 
 ) > $C_FIFO 2>&1
diff --git a/cd/cdrtools/DEPENDS b/cd/cdrtools/DEPENDS
index f22d370..770f79b 100644
--- a/cd/cdrtools/DEPENDS
+++ b/cd/cdrtools/DEPENDS
@@ -1 +1,2 @@
 optional_depends  "smake"  ""  ""  "for Schilly makefiles"
+optional_depends "dirsplit" "" "" "for cdrkit compatibility and optimal file layout on discs"
diff --git a/cd/tkdvd/DEPENDS b/cd/tkdvd/DEPENDS
index 378c93c..c0443f9 100644
--- a/cd/tkdvd/DEPENDS
+++ b/cd/tkdvd/DEPENDS
@@ -1,3 +1,3 @@
 depends tk
-depends cdrkit
+depends cdrtools
 depends dvd+rw-tools
diff --git a/gnome2/apps/gnomebaker/DEPENDS b/gnome2/apps/gnomebaker/DEPENDS
index 7811d67..a77ccce 100644
--- a/gnome2/apps/gnomebaker/DEPENDS
+++ b/gnome2/apps/gnomebaker/DEPENDS
@@ -2,4 +2,3 @@ depends  libgnomeui
 depends  cdrtools
 depends  gst-plugins-bad
 optional_depends  dvd+rw-tools  ""  ""  "for DVD recording"
-optional_depends  cdrkit        ""  ""  "for additional burning support"