Version bump.

(Portage version: 2.2_rc62/cvs/Linux x86_64)

11 files changed, 64 insertions, 349 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 373193b2ee54..570260e2f90f 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,11 @@
 # 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.145 2009/10/23 08:13:49 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.146 2010/02/18 13:52:39 ssuominen Exp $
+
+*cdrdao-1.2.3 (18 Feb 2010)
+
+  18 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> +cdrdao-1.2.3.ebuild:
+  Version bump.
 
   23 Oct 2009; Peter Alfredsen <loki_val@gentoo.org> cdrdao-1.2.2-r3.ebuild:
   Add die to install phase.
diff --git a/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild b/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild
deleted file mode 100644
index 88067237adde..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.2.2-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.12 2009/10/23 08:13:49 loki_val Exp $
-
-EAPI=2
-inherit 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 || die "Install failed"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README*
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3.ebuild
new file mode 100644
index 000000000000..69c1e247028a
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 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.ebuild,v 1.1 2010/02/18 13:52:39 ssuominen Exp $
+
+EAPI=2
+inherit autotools eutils toolchain-funcs
+
+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/${PN}/${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 mad vorbis"
+
+RDEPEND="virtual/cdrtools
+	encode? ( >=media-sound/lame-3.90 )
+	gcdmaster? ( dev-libs/libsigc++:2
+		>=dev-cpp/gtkmm-2.4
+		>=dev-cpp/libgnomeuimm-2.6
+		media-libs/libao )
+	mad? ( media-libs/libmad
+		media-libs/libao )
+	vorbis? ( media-libs/libvorbis
+		media-libs/libao )
+	!app-cdr/cue2toc"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	pccts? ( >=dev-util/pccts-1.33.24-r1 )"
+
+S=${WORKDIR}/${P/_}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.3-autoconf-update.patch \
+		"${FILESDIR}"/${PN}-1.2.3-k3b.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_with gcdmaster xdao) \
+		$(use_with vorbis ogg-support) \
+		$(use_with mad mp3-support) \
+		$(use_with encode lame)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog CREDITS NEWS README{,.PlexDAE}
+}
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch
deleted file mode 100644
index 680df685314f..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-cdtext.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#!/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
deleted file mode 100644
index 10f7cb3b2856..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-device.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#!/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-excl.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-excl.patch
deleted file mode 100644
index ffc6d99a40db..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-excl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -ur 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 12:07:11.000000000 +0300
-+++ cdrdao-1.2.2/dao/main.cc	2008-06-10 20:57:36.000000000 +0300
-@@ -2027,6 +2027,8 @@
-   }
- 
-   if (src == dst) {
-+    // unlock src to make swaping possible
-+    src->preventMediumRemoval(0);
-     message(0, "Please insert a recordable medium and hit enter.");
-     getc(stdin);
-   }
-diff -ur cdrdao-1.2.2.orig/scsilib/libscg/scsi-linux-sg.c cdrdao-1.2.2/scsilib/libscg/scsi-linux-sg.c
---- cdrdao-1.2.2.orig/scsilib/libscg/scsi-linux-sg.c	2006-09-20 13:51:11.000000000 +0300
-+++ cdrdao-1.2.2/scsilib/libscg/scsi-linux-sg.c	2008-06-10 20:57:36.000000000 +0300
-@@ -225,6 +225,27 @@
- #endif
- LOCAL	void	sg_settimeout	__PR((int f, int timeout));
- 
-+int    sg_open_excl    __PR((char *device, int mode));
-+
-+int
-+sg_open_excl(device, mode)
-+       char    *device;
-+       int     mode;
-+{
-+       int f;
-+       int i;
-+       f = open(device, mode|O_EXCL);
-+       for (i = 0; (i < 10) && (f == -1 && (errno == EACCES || errno == EBUSY)); i++) {
-+           fprintf(stderr, "Error trying to open %s exclusively (%s)... retrying in 1 second.\n", device, strerror(errno));
-+	   usleep(1000000 + 100000.0 * rand()/(RAND_MAX+1.0));
-+	   f = open(device, mode|O_EXCL);
-+       }
-+       if (f == -1 && errno != EACCES && errno != EBUSY) {
-+           f = open(device, mode);
-+       }
-+       return f;
-+}
-+
- /*
-  * Return version information for the low level SCSI transport code.
-  * This has been introduced to make it easier to trace down problems
-@@ -407,7 +428,7 @@
- 		
- 		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
- 			devname = globbuf.gl_pathv[i];
--			f = open(devname, O_RDWR | O_NONBLOCK);
-+			f = sg_open_excl(devname, O_RDWR | O_NONBLOCK);
- 			if (f < 0) {
- 				/*
- 				 * Set up error string but let us clear it later
-@@ -458,7 +479,7 @@
- 		for (i = 0; globbuf.gl_pathv && globbuf.gl_pathv[i] != NULL ; i++) {
- 			devname = globbuf.gl_pathv[i];
- 
--			f = open(devname, O_RDWR | O_NONBLOCK);
-+			f = sg_open_excl(devname, O_RDWR | O_NONBLOCK);
- 			if (f < 0) {
- 				/*
- 				 * Set up error string but let us clear it later
-@@ -511,7 +532,7 @@
- 			"Warning: Open by 'devname' is unintentional and not supported.\n");
- 		}
- 					/* O_NONBLOCK is dangerous */
--		f = open(device, O_RDWR | O_NONBLOCK);
-+		f = sg_open_excl(device, O_RDWR | O_NONBLOCK);
- /*		if (f < 0 && errno == ENOENT)*/
- /*			goto openpg;*/
- 
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
deleted file mode 100644
index f6707a965b9c..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 09-gcc-3.4.dpatch by Matthias Klose <doko@debian.org>
-##
-## DP: Fix build failures with g++-4.3 (Closes: #455309).
-
-@DPATCH@
-
-diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatConverter.cc cdrdao-1.2.2/trackdb/FormatConverter.cc
---- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc	2005-05-10 00:55:28.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/FormatConverter.cc	2008-03-07 11:14:07.000000000 +0000
-@@ -22,6 +22,7 @@
- #include <ao/ao.h>
- #endif
- #include <fstream>
-+#include <cstring>
- 
- #include "config.h"
- #include "util.h"
-diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOgg.cc
---- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc	2005-04-22 02:01:46.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/FormatOgg.cc	2008-03-07 11:14:07.000000000 +0000
-@@ -18,6 +18,7 @@
-  */
- 
- #include <stdio.h>
-+#include <cstring>
- 
- #include "util.h"
- #include "FormatOgg.h"
-diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp3.cc
---- cdrdao-1.2.2.orig/trackdb/FormatMp3.cc	2005-09-24 20:28:43.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/FormatMp3.cc		2008-03-07 11.14.07.000000000 +0000
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <cstring> 
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
-diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc
---- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc	2005-04-22 02:01:46.000000000 +0000
-+++ cdrdao-1.2.2/trackdb/TempFileManager.cc	2008-03-07 11:14:07.000000000 +0000
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <cstring>
- 
- #define DEFAULT_TEMP_PATH "/tmp/"
- 
-diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc
---- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc	2006-09-18 10:42:26.000000000 +0000
-+++ cdrdao-1.2.2/xdao/AudioCDProject.cc	2008-03-07 11:15:26.000000000 +0000
-@@ -18,6 +18,7 @@
-  */
- 
- #include <assert.h>
-+#include <cstring>
- #include <gtkmm.h>
- #include <libgnome/gnome-i18n.h>
- 
-diff -Naurp cdrdao-1.2.2.orig/xdao/TextEdit.cc cdrdao-1.2.2/xdao/TextEdit.cc
---- cdrdao-1.2.2.orig/xdao/TextEdit.cc	2004-02-12 01:13:32.000000000 +0000
-+++ cdrdao-1.2.2/xdao/TextEdit.cc	2008-03-07 11:14:07.000000000 +0000
-@@ -21,6 +21,7 @@
- 
- #include <stddef.h>
- #include <ctype.h>
-+#include <cstring>
- 
- TextEdit::TextEdit(const char *sample) : Gtk::Entry()
- {
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-nonlinux.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-nonlinux.patch
deleted file mode 100644
index a5800d37925d..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-nonlinux.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/dao/ScsiIf-lib.cc b/dao/ScsiIf-lib.cc
---- a/dao/ScsiIf-lib.cc	2007-08-22 12:21:11 +0100
-+++ b/dao/ScsiIf-lib.cc	2007-08-22 12:25:04 +0100
-@@ -430,7 +430,7 @@
- #include "ScsiIf-common.cc"
- //<<<<<<< ScsiIf-lib.cc
- 
--#ifndef linux
-+#ifdef wedontwantthis
- 
- /* Function for mapping any SCSI device to the corresponding SG device.
-  * Taken from D. Gilbert's example code.
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch
deleted file mode 100644
index 288f42fd6ca6..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-toc2cue.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 9554de51c942..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-tocparser.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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;
-
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-use-new-sigc++-API.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-use-new-sigc++-API.patch
deleted file mode 100644
index 12731c0777b0..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-use-new-sigc++-API.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://cdrdao.cvs.sourceforge.net/cdrdao/cdrdao/xdao/xcdrdao.cc?r1=1.30&r2=1.31&view=patch
---- xdao/xcdrdao.cc	2007/08/15 14:24:49	1.30
-+++ xdao/xcdrdao.cc	2007/09/11 08:58:42	1.31
-@@ -144,7 +144,7 @@
-   installSignalHandler(SIGCHLD, signalHandler);
- 
-   // setup periodic GUI updates
--  Glib::signal_timeout().connect(SigC::slot(&guiUpdatePeriodic), 2000);
-+  Glib::signal_timeout().connect(sigc::ptr_fun(&guiUpdatePeriodic), 2000);
- 
-   installSignalHandler(SIGPIPE, SIG_IGN);
-