Bump. New version, uses native kernel SG interface when possible. Also fixes bug 270414, glibc-2.10 compat.

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

8 files changed, 184 insertions, 2 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 40ef7706453c..20fd1328d06a 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.129 2009/05/10 07:38:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.130 2009/05/22 05:07:43 loki_val Exp $
+
+*cdrdao-1.2.3_rc2 (22 May 2009)
+
+  22 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  +cdrdao-1.2.3_rc2.ebuild, +files/cdrdao-1.2.3-gcc44.patch,
+  +files/cdrdao-1.2.3-k3b.patch, +files/cdrdao-1.2.3-pkg-config.patch,
+  +files/cdrdao-1.2.3-toc2cue.patch, +files/cdrdao-1.2.3-tocparser.patch:
+  Bump. New version, uses native kernel SG interface when possible. Also
+  fixes bug 270414, glibc-2.10 compat.
 
   10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   cdrdao-1.2.2-r3.ebuild:
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index a1d604cf5c7d..885c015f54b5 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -6,8 +6,15 @@ AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d
 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
+AUX cdrdao-1.2.3-gcc44.patch 726 RMD160 7499c6b1f9549b2143744cefd0aa943b815e7be4 SHA1 da12a8a436d46ddd8c962e3954cca4ac25ed8b10 SHA256 cb98595d20dbd41ed8f9c71e02914fa5f94529e289b71433b126c36828b1411f
+AUX cdrdao-1.2.3-k3b.patch 380 RMD160 81115cf91fc8b9f63b0cdbc463329a350ba83c33 SHA1 e4f9fc95df1e1084791146e1dc0c040f6cdf873e SHA256 6eddd7c79f548b3ad1d8d4ce23367bcae3cd6dee74f0aeb6439758d6599090e0
+AUX cdrdao-1.2.3-pkg-config.patch 488 RMD160 8e01ba0009de4ff1a7509ea2529116cb68764e51 SHA1 3ba7170c1959086fa83280571eb92c1bb4ad0c19 SHA256 8627b0ada00732cac93dfad873890184ebc9df11794018b231e3641b428b541a
+AUX cdrdao-1.2.3-toc2cue.patch 633 RMD160 76a77e7bd24fdfa3f474ce0c9982702390d98cb9 SHA1 a323fac33deffb493d3b7f1b7dd2a63836f64de8 SHA256 b19a88b3c0e25d0fb8b3aa9ef71c5c0d7fb9482b70dd91639e712f3493b49965
+AUX cdrdao-1.2.3-tocparser.patch 566 RMD160 66e1a273dfb59c0d2900cd6b4ac0a6cb0eae5fc6 SHA1 12f5104362bcf83104cdd64b240e15ce4c098cf5 SHA256 ffdbb7e8c122caf0b571642716a8d62a35a09973ee4ca9b9015c4ced4163877f
 DIST cdrdao-1.2.2.tar.bz2 1408344 RMD160 c537c535a4106655f89f7cfa5895ffcb5b9464e2 SHA1 2699e56e00342c1fa2a3815ed02418fe964b276b SHA256 de180041e57f8e1c88c9b6f9b6c51b0abf0dc2744c4fa37a0248d48f40e58038
+DIST cdrdao-1.2.3rc2.tar.bz2 1435808 RMD160 60410652940fd271b272b74d4554986c86115787 SHA1 d23c756400f728cecbcc901ecadb1eea44c70e97 SHA256 2cd174111ed3de68d3b93333ae85cd376455598d6d355bcef94771bf047a5e08
 EBUILD cdrdao-1.2.2-r2.ebuild 2099 RMD160 11a65ea4439b883339fa195ff135a415487aa2fe SHA1 bbdfc4f5160bc1ba3590559f438a6b58a6df3a9c SHA256 4ef6d4fc2323dd18fb7bdab6c340a0b4a746f75bdaece5d8af2c7ee637e3d81a
 EBUILD cdrdao-1.2.2-r3.ebuild 2871 RMD160 59b32675dc9e3307734bce4cb422126104c744a8 SHA1 3fb2dee06ac774707c1440bf2878969b107e9c00 SHA256 7bce2f1a73405a7822e01a843cc56dac9bc00f7d82843ab2a5b25d3e3bc70e26
-MISC ChangeLog 17547 RMD160 60f0317d7a699313664869d55413bff022abd0e5 SHA1 1d3935634c50495b8e606c80b03f705cb37530dd SHA256 520451a4c5e465abb2c47ce4065eb2aeacb60b03a23568220b21f3a0a7523beb
+EBUILD cdrdao-1.2.3_rc2.ebuild 2183 RMD160 5a4857e37d865e010934791ea88ae0edeb41c39d SHA1 e454297364cbc2dee0724e30846a864efb0e9be8 SHA256 faf872e32d9ac57fdd0e23f096487b96a3495c8fa5097d5ee18696e75f815cfd
+MISC ChangeLog 17951 RMD160 4a08c72e7d699ce188715d87312dccd23e9c67e0 SHA1 9a02aed85604ad2c2342b23a974965471d601bd9 SHA256 012f32bc922e37b4165698bcd4d5818baed172144d8c79196e02d2c63af0b95b
 MISC metadata.xml 500 RMD160 79fdf7f14c4f6005c79b4f676e2f48490d7a7b1c SHA1 3f3774af0497ff0d9f6d36047dec11541b9f9f26 SHA256 fe82d0fc06eec0e484da4786b5829d5d17b84e2b7f39cc5d190d86a6e376e935
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
new file mode 100644
index 000000000000..b515cc78677f
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.3_rc2.ebuild
@@ -0,0 +1,88 @@
+# 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.3_rc2.ebuild,v 1.1 2009/05/22 05:07:43 loki_val Exp $
+
+EAPI=2
+inherit eutils flag-o-matic eutils autotools
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+if [[ ${PV/*_rc*} ]]
+then
+	SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.bz2"
+else
+	SRC_URI="http://www.poolshark.org/src/${P/_}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gcdmaster encode pccts mp3 ogg"
+
+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
+	)
+	mp3? (
+		media-libs/libmad
+		media-libs/libao
+	)
+	ogg? (
+		media-libs/libvorbis
+		media-libs/libao
+	)
+	"
+DEPEND="${RDEPEND}
+	pccts? ( >=dev-util/pccts-1.33.24-r1 )
+	!app-cdr/cue2toc"
+
+S="${WORKDIR}/${P/_}"
+
+pkg_setup() {
+	if hasq distcc ${FEATURES}; then
+		die "Please emerge without distcc in FEATURES, see bug #264170."
+	fi
+}
+
+src_prepare() {
+	# Fix ERROR: CD/cdda.toc:36: Invalid CD-TEXT item for a track.
+	# Bug 238891
+	epatch "${FILESDIR}"/${PN}-1.2.3-toc2cue.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.3-tocparser.patch
+
+	epatch "${FILESDIR}"/${PN}-1.2.3-gcc44.patch
+	epatch "${FILESDIR}"/${PN}-1.2.3-pkg-config.patch
+
+	epatch "${FILESDIR}"/${PN}-1.2.3-k3b.patch
+	eautoreconf
+}
+
+src_configure() {
+	# A few CFLAGS do not work see bug #99998
+	#strip-flags
+	#append-flags "-fno-inline"
+
+	econf \
+		$(use_with gcdmaster xdao)		\
+		$(use_with encode lame)			\
+		$(use_with mp3 mp3-support)		\
+		$(use_with ogg ogg-support)		\
+		--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.3-gcc44.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-gcc44.patch
new file mode 100644
index 000000000000..b7483147d9d5
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-gcc44.patch
@@ -0,0 +1,23 @@
+--- cdrdao-1.2.3rc2/trackdb/TempFileManager.cc~	2008-02-17 14:05:05.000000000 +0100
++++ cdrdao-1.2.3rc2/trackdb/TempFileManager.cc	2009-04-07 09:05:41.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include "TempFileManager.h"
+ #include "log.h"
+ 
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- cdrdao-1.2.3rc2/dao/CdrDriver.cc~	2009-02-21 11:01:32.000000000 +0100
++++ cdrdao-1.2.3rc2/dao/CdrDriver.cc	2009-04-07 09:07:14.000000000 +0200
+@@ -2114,8 +2114,8 @@
+ 	ret = 1;
+     }
+     else {
+-      if ((caps & CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW) != 0)
+-	ret = 1;
++      if ((caps & (CDR_READ_CAP_DATA_RW_RAW|CDR_READ_CAP_DATA_PW_RAW)) != 0)
++        ret = 1;
+     }
+     break;
+ 
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-k3b.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-k3b.patch
new file mode 100644
index 000000000000..3de655d54d52
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-k3b.patch
@@ -0,0 +1,11 @@
+--- cdrdao/dao/main.cc~	2009-04-16 15:34:27.000000000 +0200
++++ cdrdao/dao/main.cc	2009-04-16 15:34:38.000000000 +0200
+@@ -207,7 +207,7 @@
+ 
+ static void printVersion()
+ {
+-  log_message(2, "Cdrdao version %s - (C) Andreas Mueller <andreas@daneb.de>",
++  log_message(0, "Cdrdao version %s - (C) Andreas Mueller <andreas@daneb.de>",
+ 	  VERSION);
+ 
+   std::list<std::string> list;
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch
new file mode 100644
index 000000000000..51bb6adc9545
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-pkg-config.patch
@@ -0,0 +1,15 @@
+diff -NrU5 cdrdao-1.2.3rc2.orig/configure.ac cdrdao-1.2.3rc2/configure.ac
+--- cdrdao-1.2.3rc2.orig/configure.ac	2009-05-19 16:03:03.616292795 +0200
++++ cdrdao-1.2.3rc2/configure.ac	2009-05-19 16:04:55.826318499 +0200
+@@ -32,10 +32,11 @@
+ AC_PROG_CPP
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_CHECK_PROG(AR,ar,ar)
+ AC_PROG_MAKE_SET
++PKG_PROG_PKG_CONFIG
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h getopt.h malloc.h unistd.h sys/mman.h sched.h)
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.3-toc2cue.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-toc2cue.patch
new file mode 100644
index 000000000000..076b55f90f43
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-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)) {
+              log_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.3-tocparser.patch b/app-cdr/cdrdao/files/cdrdao-1.2.3-tocparser.patch
new file mode 100644
index 000000000000..d5fb9b7760be
--- /dev/null
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.3-tocparser.patch
@@ -0,0 +1,17 @@
+--- cdrdao-1.2.3.orig/trackdb/TocParser.g	2009/02/21 21:40:56	1.14
++++ cdrdao-1.2.3/trackdb/TocParser.g		2009/05/04 15:49:52	1.15
+@@ -511,8 +511,12 @@
+        >>
+     )
+     << if ($st != NULL && $st->length() == 0) {
+-          // try to determine length 
+-          $st->determineLength();
++         // try to determine length 
++         if ($st->determineLength() != 0) {
++	         log_message(-2, "%s:%d: Cannot determine length of track data specification.",
++		                 filename_, $lineNr);
++	         error_ = 1;
++      	 }
+        }
+     >> 
+     ;