EAPI-2, fix bug 238891, CDTEXT and toc2cue problems. Import patches from Debian for a few issues. Remove RESTRICT=strip, which seems to be left-overs from a user-submitted ebuild in bug 43003.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 199 insertions, 3 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index c6a0c0bb554d..d24f54a2ea2e 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-cdr/cdrdao
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.121 2008/12/05 13:23:15 ssuominen Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.122 2009/02/01 01:42:56 loki_val Exp $
+
+*cdrdao-1.2.2-r3 (01 Feb 2009)
+
+  01 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +files/cdrdao-1.2.2-cdtext.patch, +files/cdrdao-1.2.2-device.patch,
+  +files/cdrdao-1.2.2-toc2cue.patch, +files/cdrdao-1.2.2-tocparser.patch,
+  +cdrdao-1.2.2-r3.ebuild:
+  EAPI-2, fix bug 238891, CDTEXT and toc2cue problems. Import patches from
+  Debian for a few issues. Remove RESTRICT=strip, which seems to be
+  left-overs from a user-submitted ebuild in bug 43003.
 
   05 Dec 2008; <ssuominen@gentoo.org> cdrdao-1.2.2-r2.ebuild:
   Block cue2toc because cdrdao also installs cue2toc application wrt
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index 595909cde87e..04ccad822a57 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,8 +1,13 @@
+AUX cdrdao-1.2.2-cdtext.patch 789 RMD160 8705b98f561ee698003bdecf9cd0739ce4a9fa7a SHA1 4b600e4cf8424f1922c01b6c69334f4567db82dc SHA256 f845fbb3870fe8a59471bf80f490a4859e5b1c23dcc8cffbbf8d82f3e9349def
+AUX cdrdao-1.2.2-device.patch 565 RMD160 e9989318abba5f9f290c0f80849ac3e3e231feea SHA1 dafb33325a9fd57e602135497c34e9cbcfd8e819 SHA256 8791ec4fc14196a7314932d95ed9119730480ea5cf1a8f94e65f986c25b9f0fa
 AUX cdrdao-1.2.2-excl.patch 2476 RMD160 71e1b06eea119141910798a3c44dddc4a0b6436c SHA1 285e1ebc2f571851c192da758a78b7614a7a3983 SHA256 c0790bfd26336427448bdd50026aad95c119a1ee23ab8c84750fba442ba8bff3
 AUX cdrdao-1.2.2-gcc43.patch 2450 RMD160 b59c8bdb0c4590cd21cefa4f2bdac059e1267122 SHA1 4dd068df0a6978e6dae8395dd07ba88b76455301 SHA256 695bc5da74689c6cc6269d73bc158835810b05b452fc55afd56e48627d596f16
 AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef SHA1 955a6e56e3264e773241d89ac0fd603ba5bcff31 SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3
+AUX cdrdao-1.2.2-toc2cue.patch 629 RMD160 b53522e02d545848b586303d95d94083ef20946b SHA1 15c2ff1a8e226f60050d5ac7bd7e37420087c1be SHA256 b3a4d3a88e4a53571480195d7167541b80c2142db1537d57c63522d9e1d39164
+AUX cdrdao-1.2.2-tocparser.patch 907 RMD160 90d1e2796d33f206e77e20be3a39693f04c2ff7d SHA1 41eaaac74873d554d4fc922c69e2b9e3999bb89f SHA256 bef2e99cf391ffe9724cee2e0849a880b44e53e0e98d48248da0205899a3a4b0
 AUX cdrdao-1.2.2-use-new-sigc++-API.patch 481 RMD160 48f39ef4b6f9db81a00b6fbbe6b44c0f0cd49a5b SHA1 092bd7a492026d5dd47e9c2ff9e2b2acf3f8a3bc SHA256 3d0159dfa815c92f82d16407977fe875f005224d28ccc00238a73df2474bba63
 DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e2 SHA1 2699e56e00342c1fa2a3815ed02418fe964b276b SHA256 de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
 EBUILD cdrdao-1.2.2-r2.ebuild 2099 RMD160 11a65ea4439b883339fa195ff135a415487aa2fe SHA1 bbdfc4f5160bc1ba3590559f438a6b58a6df3a9c SHA256 4ef6d4fc2323dd18fb7bdab6c340a0b4a746f75bdaece5d8af2c7ee637e3d81a
-MISC ChangeLog 16321 RMD160 5cb9c1d26e54799f0c464d37499e08818301c8df SHA1 b40d8097459df415525fb35ecd1aa93267e7b412 SHA256 9c8972e1918565da05158ed91c552e382e7e3e6aab5b9bed8f380545dfcba55d
+EBUILD cdrdao-1.2.2-r3.ebuild 2758 RMD160 5d0cf6b5bd4e51d572e681ec1da53cc17f9cbbed SHA1 5a837d76dcce80f64f9835763a170613a4c4dfb2 SHA256 c6ecc47dfb1afd46a031dc87222731e4061c60ed9b987abff948386ea117489e
+MISC ChangeLog 16776 RMD160 510866abeafdbec91bf2d6d5b01c1c038a5a1809 SHA1 0688b1ec59ec3551593d3361c564ae2ee464945f SHA256 b923b6958723f8f1770dc341653513245c62844ca7d58cee8c9e442c7baf2d74
 MISC metadata.xml 500 RMD160 79fdf7f14c4f6005c79b4f676e2f48490d7a7b1c SHA1 3f3774af0497ff0d9f6d36047dec11541b9f9f26 SHA256 fe82d0fc06eec0e484da4786b5829d5d17b84e2b7f39cc5d190d86a6e376e935
diff --git a/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild
new file mode 100644
index 000000000000..2bac570bc574
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild,v 1.1 2009/02/01 01:42:56 loki_val Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic eutils
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gcdmaster debug encode pccts"
+
+RDEPEND="virtual/cdrtools
+	encode? ( >=media-sound/lame-3.90 )
+	gcdmaster? ( >=dev-cpp/gtkmm-2.4
+		>=dev-cpp/libgnomemm-2.6
+		>=dev-cpp/libgnomecanvasmm-2.6
+		>=dev-cpp/gconfmm-2.6
+		>=dev-cpp/libgnomeuimm-2.6
+		media-libs/libao )"
+DEPEND="${RDEPEND}
+	pccts? ( >=dev-util/pccts-1.33.24-r1 )
+	!app-cdr/cue2toc"
+
+src_prepare() {
+	# Use O_EXCL to avoid conflict with HAL, bug 193603.
+	epatch "${FILESDIR}"/${PN}-1.2.2-excl.patch
+
+	# fixes bug #212530
+	epatch "${FILESDIR}"/${PN}-1.2.2-use-new-sigc++-API.patch
+
+	# FreeBSD needs this patch
+	# I think the correct define should be linux, but this will maintain
+	# the status quo for the time being.
+	# Upstream bug #1596097
+	epatch "${FILESDIR}"/${PN}-1.2.2-nonlinux.patch
+
+	# GCC 4.3 patch.  Should be fixed in next version.
+	epatch "${FILESDIR}"/${PN}-1.2.2-gcc43.patch
+
+	# Fix ERROR: CD/cdda.toc:36: Invalid CD-TEXT item for a track.
+	# Bug 238891
+	epatch "${FILESDIR}"/${PN}-1.2.2-toc2cue.patch
+
+	# Fix cdrdao: Track.cc:1415: void Track::addCdTextItem(CdTextItem*): Assertion
+	# `CdTextItem::isTrackPack(item->packType())' failed.
+	# Bug 238891
+	epatch "${FILESDIR}"/${PN}-1.2.2-cdtext.patch
+
+	# Let default device be /dev/cdrw
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=452123
+	epatch "${FILESDIR}"/${PN}-1.2.2-device.patch
+
+	# Undo upstream removal of automatic reading of the track lengths in TOC
+	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=440419
+	epatch "${FILESDIR}"/${PN}-1.2.2-tocparser.patch
+
+	# Display better SCSI messages (advise from Bug 43003)
+	cd scsilib/include
+	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' xmconfig.h
+	sed -i -e 's:HAVE_SCANSTACK:NO_FRIGGING_SCANSTACK:g' mconfig.h
+}
+
+src_configure() {
+	# A few CFLAGS do not work see bug #99998
+	strip-flags
+	append-flags "-fno-inline"
+
+	econf \
+		$(use_enable debug)			\
+		$(use_with gcdmaster xdao)		\
+		$(use_with encode lame)			\
+		$(use_with pccts pcctsbin /usr/bin) \
+		$(use_with pccts pcctsinc /usr/include/pccts) \
+		--disable-dependency-tracking || die "configure failed"
+}
+
+src_compile() {
+	emake -j1 || die "could not compile"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	dodoc AUTHORS CREDITS ChangeLog NEWS README*
+}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch
new file mode 100644
index 000000000000..680df685314f
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch
@@ -0,0 +1,28 @@
+
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 07-cdtext.dpatch by Anonymous
+##
+## DP: Adds missing entries to TOC output when using CdText (Closes: #458357).
+
+@DPATCH@
+
+diff -Naurp cdrdao-1.2.2.orig/trackdb/CdTextItem.cc cdrdao-1.2.2/trackdb/CdTextItem.cc
+--- cdrdao-1.2.2.orig/trackdb/CdTextItem.cc	2004-04-28 00:46:05.000000000 +0000
++++ cdrdao-1.2.2/trackdb/CdTextItem.cc	2007-12-30 16:35:40.000000000 +0000
+@@ -320,6 +320,15 @@ int CdTextItem::isTrackPack(PackType typ
+   int ret;
+   
+   switch (type) {
++  case CDTEXT_DISK_ID:
++  case CDTEXT_GENRE:
++  case CDTEXT_TOC_INFO1:
++  case CDTEXT_TOC_INFO2:
++  case CDTEXT_RES1:
++  case CDTEXT_RES2:
++  case CDTEXT_RES3:
++  case CDTEXT_RES4:
++  case CDTEXT_SIZE_INFO:
+   case CDTEXT_TITLE:
+   case CDTEXT_PERFORMER:
+   case CDTEXT_SONGWRITER:
+
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch
new file mode 100644
index 000000000000..10f7cb3b2856
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch
@@ -0,0 +1,21 @@
+
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 04-device.dpatch by Free Ekanayaka <free@64studio.com>
+##
+## DP: Change default device to /dev/cdrw (Closes: #452123).
+
+@DPATCH@
+
+diff -Naur cdrdao-1.2.2.orig/dao/main.cc cdrdao-1.2.2/dao/main.cc
+--- cdrdao-1.2.2.orig/dao/main.cc	2006-09-19 09:07:11.000000000 +0000
++++ cdrdao-1.2.2/dao/main.cc	2006-10-06 20:24:57.000000000 +0000
+@@ -140,7 +140,7 @@
+ 
+ #elif defined(__linux__)
+ 
+-static const char *SCSI_DEVICE = "/dev/cdrecorder";
++static const char *SCSI_DEVICE = "/dev/cdrw";
+ static int FIFO_BUFFERS = 32;
+ 
+ #else
+
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch
new file mode 100644
index 000000000000..288f42fd6ca6
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch
@@ -0,0 +1,12 @@
+diff -Naur cdrdao-1.2.2/trackdb/TocParser.g cdrdao-1.2.2-cclpatch/trackdb/TocParser.g
+--- cdrdao-1.2.2/trackdb/TocParser.g	2008-10-06 08:50:48.000000000 -0700
++++ cdrdao-1.2.2-cclpatch/trackdb/TocParser.g	2008-10-06 08:50:48.000000000 -0700
+@@ -774,7 +774,7 @@
+       << if (item != NULL) {
+            int type = item->packType();
+ 
+-           if (isTrack && ((type >= 0x86 && type <= 0x89) || type == 0x8f)) {
++           if (isTrack && ((type > 0x86 && type <= 0x89) || type == 0x8f)) {
+              message(-2, "%s:%d: Invalid CD-TEXT item for a track.",
+                      filename_, lineNr);
+              error_ = 1;
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch
new file mode 100644
index 000000000000..9554de51c942
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch
@@ -0,0 +1,30 @@
+Snatched from Debian
+
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 06-tocparser.dpatch by Florian Forster <octo@verplant.org>
+##
+## DP: Undo upstream removal of automatic reading of the track lengths in TOC
+## DP: files (Closes: #440419).
+
+@DPATCH@
+
+diff -Naurp cdrdao-1.2.2.orig/trackdb/TocParser.g cdrdao-1.2.2/trackdb/TocParser.g
+--- cdrdao-1.2.2.orig/trackdb/TocParser.g	2005-11-03 01:08:16.000000000 +0000
++++ cdrdao-1.2.2/trackdb/TocParser.g	2007-09-24 11:58:34.000000000 +0000
+@@ -496,6 +496,15 @@ subTrack < [ TrackData::Mode trackType, 
+ 	  }
+        >>
+     )
++    << if ($st != NULL && $st->length() == 0) {
++         // try to determine length 
++         if ($st->determineLength() != 0) {
++	   message(-2, "%s:%d: Cannot determine length of track data specification.",
++		   filename_, $lineNr);
++	   error_ = 1;
++	 }
++       }
++    >> 
+     ;
+     // fail action
+     << delete $st, $st = NULL;
+