closes #23384

9 files changed, 225 insertions, 7 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 79e32f8162f2..460341fe21c8 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.18 2003/06/21 00:11:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.19 2003/06/29 14:28:03 aliz Exp $
+
+*cdrdao-1.1.7-r2 (29 Jun 2003)
+
+  29 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> cdrda-1.1.7-r2.ebuild :
+  Build against libs from cdrtools. Closes #23384.
 
   21 Jun 2003; Alastair Tse <liquidx@gentoo.org> cdrdao-1.1.5-r1.ebuild,
   cdrdao-1.1.7-r1.ebuild, cdrdao-1.1.7.ebuild:
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 8a7ad68506e4..72abbaa054d7 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -2,9 +2,11 @@ MD5 202991f416cfea7ebe9668bd83e63a35 ChangeLog 2483
 MD5 133ad0c265f6dc96238543f1e3689191 cdrdao-1.1.5-r1.ebuild 2551
 MD5 40cec3afc5b6744c474107760a3942cb cdrdao-1.1.7-r1.ebuild 3073
 MD5 3d2b616fe24d4be887c1ac891e12646a cdrdao-1.1.7.ebuild 1923
+MD5 55218b249d843c2d623108702f691add cdrdao-1.1.7-r2.ebuild 3172
 MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
 MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479
 MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r1-mp32dao-gentoo.diff 779
 MD5 229f6c96b696fe6251ce03abde9e3bbf files/digest-cdrdao-1.1.5-r1 68
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7 69
 MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r1 69
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r2 69
diff --git a/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
new file mode 100644
index 000000000000..ba7c993413d4
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.7-r2.ebuild,v 1.1 2003/06/29 14:28:03 aliz Exp $
+
+inherit flag-o-matic
+
+IUSE="gnome oggvorbis"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.src.tar.gz"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+SLOT="0"
+LICENSE="GPL-2"
+RDEPEND="gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
+        	>=dev-cpp/gnomemm-1.2.2 )
+        dev-perl/MP3-Info
+        dev-perl/Audio-Wav
+        dev-perl/Audio-Tools
+	>=app-cdr/cdrtools-2.01_alpha16
+	>=sys-apps/sed-4"
+
+DEPEND=">=dev-util/pccts-1.33.24-r1
+        ${RDEPEND}"
+
+KEYWORDS="~x86 ~ppc ~sparc alpha"
+
+src_unpack() {
+        unpack ${A}
+        cd ${S}
+
+        epatch ${FILESDIR}/${PF}-mp32dao-gentoo.diff
+
+        if [ ! "`use oggvorbis`" ]; then
+                cd ${S}/contrib/mp32dao
+                sed -i '22s/^/#/' MediaHandler.pm
+        fi
+}
+
+src_compile() {
+        local mygnome=""
+
+        if [ "`use gnome`" ] ; then
+                mygnome=" --with-gnome"
+		append-flags $( /usr/bin/gtkmm-config --cflags ) -fno-exceptions
+        fi
+
+        # -funroll-loops do not work
+        filter-flags "-funroll-loops"
+
+        ./configure "${mygnome}" \
+                --prefix=/usr \
+                --build="${CHOST}"\
+                --host="${CHOST}" \
+		--with-scglib-inc=/usr/include/scsilib \
+		--with-scglib-lib=/usr/lib
+
+        emake || die
+}
+
+src_install() {
+        # mp32dao.pl
+        dobin contrib/mp32dao/mp32dao.pl
+        insinto /usr/share/cdrdao/mp32dao
+        doins contrib/mp32dao/MediaHandler.pm contrib/mp32dao/mp3handler.pm \
+                contrib/mp32dao/BaseInfo.pm
+        use oggvorbis && doins contrib/mp32dao/ogghandler.pm
+
+        # cdrdao gets definitely installed
+        # binary
+        dobin dao/cdrdao
+
+        # data of cdrdao in /usr/share/cdrdao/
+        # (right now only driverlist)
+        insinto /usr/share/cdrdao
+        newins dao/cdrdao.drivers drivers
+
+        # man page
+        into /usr
+        newman dao/cdrdao.man cdrdao.1
+
+        # documentation
+        docinto ""
+        dodoc COPYING CREDITS INSTALL README* Release*
+
+
+        # and now the optional GNOME frontend
+        if [ "`use gnome`" ]
+        then
+
+                # binary
+                into /usr
+                dobin xdao/gcdmaster
+
+                # pixmaps for gcdmaster in /usr/share/pixmaps/gcdmaster
+                insinto /usr/share/pixmaps/gcdmaster
+                doins xdao/*.png xdao/*.xpm
+
+                # application links
+                # gcdmaster.desktop in /usr/share/gnome/apps/Applications
+                insinto /usr/share/gnome/apps/Applications
+                doins xdao/gcdmaster.desktop
+
+                # xcdrdao.1 renamed to gcdmaster.1 in /usr/share/man/man1/
+                into /usr
+                newman xdao/xcdrdao.man gcdmaster.1
+        fi
+}
+
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff b/app-cdr/cdrdao/files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff
new file mode 100644
index 000000000000..96d58beb6aa5
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff
@@ -0,0 +1,23 @@
+--- contrib/mp32dao/MediaHandler.pm        2002-10-30 11:29:05.000000000 +0100
++++ contrib/mp32dao/MediaHandler.pm     2002-10-30 11:45:28.000000000 +0100
+@@ -16,6 +16,7 @@
+ #Copyright 2001 Giuseppe Corbelli - cowo@lugbs.linux.it
+ #builds a list of handlers for all mediafiles in a directory
+
++use lib '/usr/share/cdrdao/mp32dao';
+ package MediaHandler;
+ require mp3handler;
+ require ogghandler;
+
+--- contrib/mp32dao/mp32dao.pl     2002-10-30 11:04:26.000000000 +0100
++++ contrib/mp32dao/mp32dao.pl 2002-10-30 11:47:07.000000000 +0100
+@@ -19,6 +19,7 @@
+ #Support for cdrecord: builds .inf files
+ #Giuseppe Corbelli <cowo@lugbs.linux.it>
+ #Original code by Joe Steward <mp32dao@httptech.com>
++use lib '/usr/share/cdrdao/mp32dao';
+ use FindBin;
+ use lib $FindBin::Bin;
+ use Cwd;
+
+
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r2 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r2
new file mode 100644
index 000000000000..3d4e147be05c
--- /dev/null
+++ b/app-cdr/cdrdao/files/digest-cdrdao-1.1.7-r2
@@ -0,0 +1 @@
+MD5 766a534137f2c6e99ab771e3178793f8 cdrdao-1.1.7.src.tar.gz 1433366
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 6ef52974c9ee..98f544ee8114 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.48 2003/05/17 12:26:57 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.49 2003/06/29 14:28:03 aliz Exp $
+
+*cdrtools-2.01_apha16 (28 Jun 2003)
+
+  28 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> cdrtools-2.01_alpha16.ebuild :
+  Version bump. Install includefiles from #23384.
 
 *cdrtools-1.1.33-r1 (17 May 2003)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 72b26b00c8fb..b855e5c2d3b0 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,15 +1,17 @@
-MD5 e949a1d39058a1c37757f4cedbb6125b ChangeLog 6714
+MD5 4eb2a6b79540c879d8018cc619093fd0 ChangeLog 6869
+MD5 6e647f9eedcb5b2dca597dbeb87d57ec cdrtools-2.01_alpha16.ebuild 1729
 MD5 ecdf1080f34ea4c5f8bbf71b44c43d4c cdrtools-1.11.33-r1.ebuild 1594
-MD5 4f8feb54475cce325ec5d76844044970 cdrtools-1.11.39-r1.ebuild 1583
 MD5 83df71c6f72e28dc1c2d7aa7f59578d0 cdrtools-1.11.40.ebuild 1477
 MD5 00d52dfeb9b08a321c518557359944c1 cdrtools-2.01_alpha05.ebuild 1610
+MD5 4f8feb54475cce325ec5d76844044970 cdrtools-1.11.39-r1.ebuild 1583
 MD5 9fbe2b2c8478e0647dabf5bb7a652c0b cdrtools-2.01_alpha08.ebuild 1616
 MD5 da3a375d45f83f69374dea48e411b0e8 cdrtools-2.01_alpha14.ebuild 1612
-MD5 4dc0a1f8df2b42d358365eeb526e867d files/cdrecord-scsiopen-format.patch 352
 MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
-MD5 71120b13fe80b201f1c762ee4cc9ff34 files/digest-cdrtools-1.11.33-r1 69
-MD5 2450e62730dcd41c5fe0c92844d92f1a files/digest-cdrtools-1.11.39-r1 70
+MD5 4dc0a1f8df2b42d358365eeb526e867d files/cdrecord-scsiopen-format.patch 352
+MD5 a5d2f2339b75bf4919653d91b83ec07d files/digest-cdrtools-2.01_alpha16 69
 MD5 5bf9f8da4dc6b60ac0c2dca1de9fd881 files/digest-cdrtools-1.11.40 70
 MD5 20b323d41d780421657576e0f1dc815e files/digest-cdrtools-2.01_alpha05 69
+MD5 71120b13fe80b201f1c762ee4cc9ff34 files/digest-cdrtools-1.11.33-r1 69
+MD5 2450e62730dcd41c5fe0c92844d92f1a files/digest-cdrtools-1.11.39-r1 70
 MD5 1df4969f41f043e8d2288b65562b50e3 files/digest-cdrtools-2.01_alpha08 69
 MD5 983f5f65e96f3381528cf89c733781d9 files/digest-cdrtools-2.01_alpha14 69
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
new file mode 100644
index 000000000000..b4123f321156
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild,v 1.1 2003/06/29 14:28:03 aliz Exp $
+
+inherit eutils
+
+DESCRIPTION="A set of tools for CDR drives, including cdrecord."
+HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa"
+
+DEPEND="virtual/glibc"
+PROVIDE="virtual/cdrtools"
+
+S="${WORKDIR}/${PN}-2.01"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Add support for 2.5 kernels
+	# <azarah@gentoo.org> (05 Feb 2003)
+	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch || die
+	
+	cd ${S}/DEFAULTS
+	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
+	mv Defaults.linux.hacked Defaults.linux
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin cdda2wav/OBJ/*-linux-cc/cdda2wav
+	dobin cdrecord/OBJ/*-linux-cc/cdrecord
+	cd ${S}
+	dobin mkisofs/OBJ/*-linux-cc/mkisofs
+	dobin readcd/OBJ/*-linux-cc/readcd
+	insinto /usr/include
+	doins incs/*-linux-cc/align.h incs/*-linux-cc/avoffset.h incs/*-linux-cc/xconfig.h
+
+	cd mkisofs/diag/OBJ/*-linux-cc
+	dobin devdump isodump isoinfo isovfy
+
+	cd ${S}/libs/*-linux-cc
+	dolib.a *.a
+
+	cd ${S}
+	insinto /usr/include/scsilib 
+	doins include/*.h 
+	insinto /usr/include/scsilib/scg 
+	doins include/scg/*.h 
+
+	cd  ${S}
+	dodoc Changelog COPYING PORTING README* START
+
+	cd ${S}/doc
+	dodoc cdrecord-1.8.1_de-doc_0.1.tar
+	docinto print
+	dodoc *.ps
+	newman cdda2wav.man cdda2wav.1
+	newman cdrecord.man cdrecord.1
+	newman readcd.man readcd.1
+	newman isoinfo.man isoinfo.8
+	newman mkisofs.man mkisofs.8
+}
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha16 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha16
new file mode 100644
index 000000000000..34d892b082e4
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha16
@@ -0,0 +1 @@
+MD5 79a5d6603c6b1c8f007e2634beb75c40 cdrtools-2.01a16.tar.gz 1640701