Resolve bug #81812, bug #85176.

Package-Manager: portage-2.0.51.19

12 files changed, 37 insertions, 816 deletions

diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index d56bbd4050e5..69992b1def95 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-cdr/cdrdao
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.60 2005/03/13 20:52:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.61 2005/03/30 00:48:59 pylon Exp $
+
+*cdrdao-1.1.9-r2 (30 Mar 2005)
+
+  30 Mar 2005; Lars Weiler <pylon@gentoo.org> -files/cdrdao-1.1.5-c++.patch,
+  -files/cdrdao-1.1.5-gentoo.diff, -files/cdrdao-1.1.8-cast.patch,
+  metadata.xml, -cdrdao-1.1.8.ebuild, -cdrdao-1.1.8-r1.ebuild,
+  -cdrdao-1.1.9-r1.ebuild, +cdrdao-1.1.9-r2.ebuild:
+  Major cleanup -> bug #81812
+  Change emake into make, so that MAKEOPTS are not used -> bug #85176
+  Add package to the media-optical herd
 
   13 Mar 2005; Markus Rothe <corsair@gentoo.org> metadata.xml:
   Fix typo in metadata.xml: copiing -> copying
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index f40085a6376a..6ed1a02fe52a 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,22 +1,15 @@
-MD5 43b78125308ea990c9026dc1ec39e0ae ChangeLog 8262
 MD5 eabea7c61116301e189d721177fe8a48 cdrdao-1.1.7-r3.ebuild 3011
-MD5 e6a5ac88f525203d18cebd6adb0d14c2 cdrdao-1.1.8-r1.ebuild 2214
-MD5 a9caa6ac8a1796446b0477b84dd7ee26 cdrdao-1.1.8.ebuild 1838
 MD5 4e6e7a3f51cecd9a59647998040741cc cdrdao-1.1.9.ebuild 1951
-MD5 194af37d3dc7ed61e3bd81d48b8e7c14 metadata.xml 417
-MD5 e8e8dd56cf9148de96b3bca33c19dbc6 cdrdao-1.1.9-r1.ebuild 2026
+MD5 8837cf1c4e05418fe924c9b58d02328e cdrdao-1.1.9-r2.ebuild 2088
+MD5 682de67a4d49d634eadcb022c280a0e1 metadata.xml 488
+MD5 e8e36d54bdfd03306573d97cac503660 ChangeLog 8692
+MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9 65
 MD5 6f398aabdbd1ed1aa966f460fdbac3d2 files/1.1.8-gcc34.patch 10476
-MD5 3ea011fa1308fc478529300a80443aab files/cdrdao-1.1.5-c++.patch 1622
-MD5 3a9cce439930ba175e84bf2b82c61df5 files/cdrdao-1.1.5-gentoo.diff 19479
-MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
-MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
-MD5 af6e60d9309156e8c64fafebfdd79e97 files/cdrdao-1.1.8-cast.patch 351
 MD5 1fd823e821f7407e5a49d410b1cf238a files/cdrdao-1.1.9-cast.patch 347
-MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
-MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8 65
-MD5 4982087a6a964cb6f399cef0b52ab638 files/digest-cdrdao-1.1.8-r1 65
-MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9 65
+MD5 a7dc4823c3a7d7582f9b87afdddb51e0 files/cdrdao-1.1.7-r2-mp32dao-gentoo.diff 779
 MD5 bfcab12a6211829eb71aa6ee3d0245be files/gcdmaster.desktop 127
+MD5 46fb619628173aa68a337e7d49dd25b6 files/cdrdao-1.1.7-gentoo-version.patch 753
+MD5 e21496bf5b1e2efcd09be0b16241b165 files/digest-cdrdao-1.1.7-r3 69
 MD5 26ca1675cea490f4807b4f365b923d51 files/cdrdao-Project.h-gcc3.4.patch 753
 MD5 91898eebd71b9a81fa6e7d61652f6152 files/cdrdao-1.1.9-ppc64.patch 5217
-MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9-r1 65
+MD5 2c45c0fc635b97b04317d564cb810c41 files/digest-cdrdao-1.1.9-r2 65
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
deleted file mode 100644
index e25e9969846e..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8-r1.ebuild,v 1.15 2005/01/01 12:10:26 eradicator Exp $
-
-inherit flag-o-matic eutils gcc
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE="gnome debug"
-RESTRICT="nostrip"
-
-RDEPEND=">=media-sound/lame-3.90
-	gnome? ( =dev-cpp/gtkmm-2.2*
-	=dev-cpp/libgnomemm-2.0*
-	=dev-cpp/gconfmm-2.0*
-	=dev-cpp/libgnomecanvasmm-2.0*
-	=dev-cpp/libgnomeuimm-2.0.0 )"
-DEPEND=">=dev-util/pccts-1.33.24-r1
-	virtual/cdrtools
-	${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	#apply patch to allow xdao to be compiled with gcc3.4
-	if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then
-		epatch ${FILESDIR}/cdrdao-Project.h-gcc3.4.patch
-	fi
-
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-
-	# Add gentoo to version
-	sed -i -e "s:^PACKAGE_STRING='cdrdao 1.1.8':PACKAGE_STRING='cdrdao 1.1.8 gentoo':" configure
-	# Only way to disable gcdmaster currently ...
-	use gnome || sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
-
-	# 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
-
-	if [ "${ARCH}" = "amd64" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${P}-cast.patch
-		cd scsilib/RULES
-		cp i686-linux-cc.rul x86_64-linux-cc.rul
-	fi
-}
-
-src_compile() {
-	# -funroll-loops do not work
-	filter-flags "-funroll-loops"
-
-	./configure --build="${CHOST}"\
-		--host="${CHOST}" \
-		--prefix=/usr \
-		`use_enable debug debug` \
-		`use_with gnome gnome` || die "configure failed"
-
-	emake || die
-}
-
-src_install() {
-	einstall || die "could not install"
-
-	cd ${S}
-
-	# Desktop Icon
-	if use gnome
-	then
-		insinto /usr/share/pixmaps
-		doins xdao/stock/gcdmaster.png
-		insinto /usr/share/gnome/apps/Applications
-		doins ${FILESDIR}/gcdmaster.desktop
-	fi
-
-	# Documentation
-	dodoc AUTHORS CREDITS ChangeLog NEWS README*
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.1.8.ebuild b/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
deleted file mode 100644
index 675658b000eb..000000000000
--- a/app-cdr/cdrdao/cdrdao-1.1.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.8.ebuild,v 1.13 2005/01/01 12:10:26 eradicator Exp $
-
-inherit flag-o-matic eutils gcc
-
-DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
-HOMEPAGE="http://cdrdao.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc hppa amd64"
-IUSE="gnome"
-
-RDEPEND="gnome? ( >=dev-cpp/gtkmm-2.0
-	              >=dev-cpp/libgnomeuimm-2.0 )
-	>=media-sound/lame-3.90"
-DEPEND=">=dev-util/pccts-1.33.24-r1
-	>=app-cdr/cdrtools-2.01_alpha20
-	${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gcc34.patch
-	if ([ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] && use gnome); then
-		eerror "xdao current will not compile using gcc 3.4. in order to compile"
-		eerror "and install cdrdao, you will have to USE="-gnome". a simple way"
-		eerror "to do this via portage is to:"
-		einfo "mkdir -p /etc/portage"
-		einfo "echo \"app-cdr/cdrdao -gnome\" >> /etc/portage/package.use"
-		die "xdao wont compile using gcc 3.4"
-	fi
-
-	# Only way to disable gcdmaster currently ...
-	use gnome || \
-		sed -i -e 's:^en_xdao=yes:en_xdao=no:g' configure
-}
-
-src_compile() {
-	# -funroll-loops do not work
-	filter-flags "-funroll-loops"
-
-	./configure --build="${CHOST}"\
-		--host="${CHOST}" \
-		--prefix=/usr \
-		`use_with gnome gnome` || die "configure failed"
-
-	emake || die
-}
-
-src_install() {
-	einstall
-
-	cd ${S}
-
-	# Desktop Icon
-	if use gnome
-	then
-		insinto /usr/share/pixmaps
-		doins xdao/stock/gcdmaster.png
-		insinto /usr/share/gnome/apps/Applications
-		doins ${FILESDIR}/gcdmaster.desktop
-	fi
-
-	# Documentation
-	dodoc AUTHORS CREDITS ChangeLog NEWS README*
-}
diff --git a/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.1.9-r2.ebuild
index 2600b68418b2..c9ef8f0f8aec 100644
--- a/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.1.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9-r1.ebuild,v 1.1 2005/03/13 20:51:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/cdrdao-1.1.9-r2.ebuild,v 1.1 2005/03/30 00:48:59 pylon Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/cdrdao/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gnome debug"
+IUSE="gnome debug encode"
 RESTRICT="nostrip"
 
-RDEPEND=">=media-sound/lame-3.90
+RDEPEND="encode? ( >=media-sound/lame-3.90 )
 	gnome? ( =dev-cpp/gtkmm-2.2*
 		=dev-cpp/libgnomemm-2.0*
 		=dev-cpp/libgnomecanvasmm-2.0*
@@ -56,13 +56,13 @@ src_compile() {
 	# -funroll-loops do not work
 	filter-flags "-funroll-loops"
 
-	./configure --build="${CHOST}"\
-		--host="${CHOST}" \
-		--prefix=/usr \
-		`use_enable debug debug` \
-		`use_with gnome xdao` || die "configure failed"
+	econf \
+		$(use_enable debug) \
+		$(use_with gnome xdao) \
+		$(use_with encode lame) \
+		--disable-dependency-tracking || die "configure failed"
 
-	emake || die
+	make || die "could not compile"
 }
 
 src_install() {
@@ -71,15 +71,12 @@ src_install() {
 	cd ${S}
 
 	# Desktop Icon
-	if use gnome
-	then
-		insinto /usr/share/pixmaps
-		doins xdao/stock/gcdmaster.png
-		insinto /usr/share/gnome/apps/Applications
-		doins ${FILESDIR}/gcdmaster.desktop
+	if use gnome; then
+		insinto /usr/share/icons/hicolor/48x48/apps
+		newins xdao/stock/gcdmaster.png gcdmaster.png
+		make_desktop_entry gcdmaster "Gnome CD Master" gcdmaster "AudioVideo;DiscBurning"
 	fi
 
 	# Documentation
 	dodoc AUTHORS CREDITS ChangeLog NEWS README*
 }
-
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch b/app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch
deleted file mode 100644
index 9577a9562c76..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.1.5-c++.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- cdrdao-1.1.5/trackdb/CdTextItem.cc.foo	Fri Dec 21 11:50:23 2001
-+++ cdrdao-1.1.5/trackdb/CdTextItem.cc	Fri Dec 21 12:09:16 2001
-@@ -21,6 +21,7 @@
- #include <assert.h>
- #include <string.h>
- #include <ctype.h>
-+#include <strstream>
- 
- #include "CdTextItem.h"
- 
-@@ -128,8 +129,19 @@
- 	out << "\\\"";
-       else if (isprint(data_[i]))
- 	out << data_[i];
--      else
--	out.form("\\%03o", (unsigned int)data_[i]);
-+      else {
-+	char s[4];
-+	char s1[4];
-+	std::strstream ss(s, 4);
-+	ss << std::oct << data_[i] << std::ends;
-+	strcpy(s1, s);
-+	int i=1;
-+	while(strlen(s1)<3) {
-+	  strcpy(s1+(i++), s);
-+	  *s1='0';
-+	}
-+	out << "\\" << s1;
-+      }
-     }
- 
-     out << "\"";
-@@ -140,7 +152,10 @@
-     out << " {";
-     for (i = 0; i < dataLen_; i++) {
-       if (i == 0) {
--	out.form("%2d", (unsigned int)data_[i]);
-+	if(data_[i]<10)
-+	  out << "0" << std::dec << data_[i];
-+	else
-+	  out << std::dec << data_[i];
-       }
-       else {
- 	if (i % 12 == 0) 
-@@ -148,7 +163,10 @@
- 	else
- 	  out << ", ";
- 
--	out.form("%2d", (unsigned int)data_[i]);
-+	if(data_[i]<10)
-+	  out << "0" << std::dec << (unsigned int)data_[i];
-+	else
-+	  out << std::dec << (unsigned int)data_[i];
-       }
-     }
- 
---- cdrdao-1.1.5/utils/toc2cue.cc.foo	Fri Dec 21 12:11:50 2001
-+++ cdrdao-1.1.5/utils/toc2cue.cc	Fri Dec 21 12:14:21 2001
-@@ -291,7 +291,10 @@
-        trun != NULL;
-        trun = titr.next(start, end), trackNr++) {
-     out << "  TRACK ";
--    out.form("%02d ", trackNr);
-+    if(trackNr < 10)
-+      out << "0" << trackNr << " ";
-+    else
-+      out << trackNr << " ";
- 
-     switch (trun->type()) {
-     case TrackData::AUDIO:
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff b/app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff
deleted file mode 100644
index bfb6cc4f1af1..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.1.5-gentoo.diff
+++ /dev/null
@@ -1,540 +0,0 @@
-diff -ur cdrdao-1.1.5.orig/Makefile.in cdrdao-1.1.5/Makefile.in
---- cdrdao-1.1.5.orig/Makefile.in	Sun Apr 29 15:42:08 2001
-+++ cdrdao-1.1.5/Makefile.in	Wed Aug  8 18:15:33 2001
-@@ -41,8 +41,8 @@
- #
- #
- #
--SUBDIRS = @scsilib_dir@ edc_ecc trackdb paranoia dao utils @xdao@
--SUBDIRSINST = trackdb dao utils @xdao@
-+SUBDIRS = @scsilib_dir@ edc_ecc trackdb paranoia dao utils 
-+SUBDIRSINST = trackdb dao utils 
- 
- all:
- 	for d in $(SUBDIRS) ; do  \
-diff -ur cdrdao-1.1.5.orig/configure cdrdao-1.1.5/configure
---- cdrdao-1.1.5.orig/configure	Sun Apr 29 15:42:08 2001
-+++ cdrdao-1.1.5/configure	Wed Aug  8 18:15:33 2001
-@@ -3202,502 +3202,8 @@
-   fi
- fi
- 
--xdao=xdao
--# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given.
--if test "${with_gtkmm_prefix+set}" = set; then
--  withval="$with_gtkmm_prefix"
--  gtkmm_config_prefix="$withval"
--else
--  gtkmm_config_prefix=""
--fi
--
--# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given.
--if test "${with_gtkmm_exec_prefix+set}" = set; then
--  withval="$with_gtkmm_exec_prefix"
--  gtkmm_config_exec_prefix="$withval"
--else
--  gtkmm_config_exec_prefix=""
--fi
--
--# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given.
--if test "${enable_gtkmmtest+set}" = set; then
--  enableval="$enable_gtkmmtest"
--  :
--else
--  enable_gtkmmtest=yes
--fi
--
--
--  if test x$gtkmm_config_exec_prefix != x ; then
--     gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix"
--     if test x${GTKMM_CONFIG+set} != xset ; then
--        GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config
--     fi
--  fi
--  if test x$gtkmm_config_prefix != x ; then
--     gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix"
--     if test x${GTKMM_CONFIG+set} != xset ; then
--        GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config
--     fi
--  fi
--
--  # Extract the first word of "gtkmm-config", so it can be a program name with args.
--set dummy gtkmm-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3248: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GTKMM_CONFIG'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  case "$GTKMM_CONFIG" in
--  /*)
--  ac_cv_path_GTKMM_CONFIG="$GTKMM_CONFIG" # Let the user override the test with a path.
--  ;;
--  ?:/*)			 
--  ac_cv_path_GTKMM_CONFIG="$GTKMM_CONFIG" # Let the user override the test with a dos path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do 
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_path_GTKMM_CONFIG="$ac_dir/$ac_word"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_GTKMM_CONFIG" && ac_cv_path_GTKMM_CONFIG="no"
--  ;;
--esac
--fi
--GTKMM_CONFIG="$ac_cv_path_GTKMM_CONFIG"
--if test -n "$GTKMM_CONFIG"; then
--  echo "$ac_t""$GTKMM_CONFIG" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--  min_gtkmm_version=1.2.5
--
--  echo $ac_n "checking for GTK-- - version >= $min_gtkmm_version""... $ac_c" 1>&6
--echo "configure:3284: checking for GTK-- - version >= $min_gtkmm_version" >&5
--  no_gtkmm=""
--  if test "$GTKMM_CONFIG" = "no" ; then
--    no_gtkmm=yes
--  else
--    
--    ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
--
--
--    GTKMM_CFLAGS=`$GTKMM_CONFIG --cflags`
--    GTKMM_LIBS=`$GTKMM_CONFIG --libs`
--    gtkmm_config_major_version=`$GTKMM_CONFIG --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    gtkmm_config_minor_version=`$GTKMM_CONFIG --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    gtkmm_config_micro_version=`$GTKMM_CONFIG --version | \
--           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--    if test "x$enable_gtkmmtest" = "xyes" ; then
--      ac_save_CXXFLAGS="$CXXFLAGS"
--      ac_save_LIBS="$LIBS"
--      CXXFLAGS="$CXXFLAGS $GTKMM_CFLAGS"
--      LIBS="$LIBS $GTKMM_LIBS"
--      rm -f conf.gtkmmtest
--      if test "$cross_compiling" = yes; then
--  echo $ac_n "cross compiling; assumed OK... $ac_c"
--else
--  cat > conftest.$ac_ext <<EOF
--#line 3316 "configure"
--#include "confdefs.h"
--#ifdef __cplusplus
--extern "C" void exit(int);
--#endif
--
--#include <gtk--.h>
--#include <stdio.h>
--#include <stdlib.h>
--
--int 
--main ()
--{
--  int major, minor, micro;
--  char *tmp_version;
--
--  system ("touch conf.gtkmmtest");
--
--  /* HP/UX 0 (%@#!) writes to sscanf strings */
--  tmp_version = g_strdup("$min_gtkmm_version");
--  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
--     printf("%s, bad version string\n", "$min_gtkmm_version");
--     exit(1);
--   }
--
--  if ((gtkmm_major_version != $gtkmm_config_major_version) ||
--      (gtkmm_minor_version != $gtkmm_config_minor_version) ||
--      (gtkmm_micro_version != $gtkmm_config_micro_version))
--    {
--      printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", 
--             $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version,
--             gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
--      printf ("*** was found! If gtkmm-config was correct, then it is best\n");
--      printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n");
--      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
--      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
--      printf("*** required on your system.\n");
--      printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n");
--      printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n");
--      printf("*** before re-running configure\n");
--    } 
--/* GTK-- does not have the GTKMM_*_VERSION constants */
--/* 
--  else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) ||
--	   (gtkmm_minor_version != GTKMM_MINOR_VERSION) ||
--           (gtkmm_micro_version != GTKMM_MICRO_VERSION))
--    {
--      printf("*** GTK-- header files (version %d.%d.%d) do not match\n",
--	     GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION);
--      printf("*** library (version %d.%d.%d)\n",
--	     gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
--    }
--*/
--  else
--    {
--      if ((gtkmm_major_version > major) ||
--        ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) ||
--        ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro)))
--      {
--        return 0;
--       }
--     else
--      {
--        printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n",
--               gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version);
--        printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n",
--	       major, minor, micro);
--        printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n");
--        printf("***\n");
--        printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n");
--        printf("*** being found. The easiest way to fix this is to remove the old version\n");
--        printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtkmm-config. (In this case, you will have to\n");
--        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
--        printf("*** so that the correct libraries are found at run-time))\n");
--      }
--    }
--  return 1;
--}
--
--EOF
--if { (eval echo configure:3398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
--then
--  :
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -fr conftest*
--  no_gtkmm=yes
--fi
--rm -fr conftest*
--fi
--
--       CXXFLAGS="$ac_save_CXXFLAGS"
--       LIBS="$ac_save_LIBS"
--     fi
--  fi
--  if test "x$no_gtkmm" = x ; then
--     echo "$ac_t""yes" 1>&6
--     :     
--  else
--     echo "$ac_t""no" 1>&6
--     if test "$GTKMM_CONFIG" = "no" ; then
--       echo "*** The gtkmm-config script installed by GTK-- could not be found"
--       echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the GTKMM_CONFIG environment variable to the"
--       echo "*** full path to gtkmm-config."
--       echo "*** The gtkmm-config script was not available in GTK-- versions"
--       echo "*** prior to 0.9.12. Perhaps you need to update your installed"
--       echo "*** version to 0.9.12 or later"
--     else
--       if test -f conf.gtkmmtest ; then
--        :
--       else
--          echo "*** Could not run GTK-- test program, checking why..."
--          CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS"
--          LIBS="$LIBS $GTKMM_LIBS"
--          cat > conftest.$ac_ext <<EOF
--#line 3435 "configure"
--#include "confdefs.h"
--
--#include <gtk--.h>
--#include <stdio.h>
--
--int main() {
-- return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); 
--; return 0; }
--EOF
--if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--   echo "*** The test program compiled, but did not run. This usually means"
--          echo "*** that the run-time linker is not finding GTK-- or finding the wrong"
--          echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your"
--          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
--          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
--          echo "*** is required on your system"
--	  echo "***"
--          echo "*** If you have an old version installed, it is best to remove it, although"
--          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" 
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--   echo "*** The test program failed to compile or link. See the file config.log for the"
--          echo "*** exact error that occured. This usually means GTK-- was incorrectly installed"
--          echo "*** or that you have moved GTK-- since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" 
--fi
--rm -f conftest*
--          CXXFLAGS="$ac_save_CXXFLAGS"
--          LIBS="$ac_save_LIBS"
--       fi
--     fi
--     GTKMM_CFLAGS=""
--     GTKMM_LIBS=""
--     xdao=no; echo Disabled building of xcdrdao.
--     ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--  fi
--  
--  
--  rm -f conf.gtkmmtest
--
--
--if test $xdao = xdao; then
--  # Check whether --with-gnome-prefix or --without-gnome-prefix was given.
--if test "${with_gnome_prefix+set}" = set; then
--  withval="$with_gnome_prefix"
--  gnome_config_prefix="$withval"
--else
--  gnome_config_prefix=""
--fi
--
--
--  if test x$gnome_config_prefix != x ; then
--     gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
--     if test x${GNOME_CONFIG+set} != xset ; then
--        GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
--     fi
--  fi
--
--  # Extract the first word of "gnome-config", so it can be a program name with args.
--set dummy gnome-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3506: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  case "$GNOME_CONFIG" in
--  /*)
--  ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path.
--  ;;
--  ?:/*)			 
--  ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do 
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
--  ;;
--esac
--fi
--GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG"
--if test -n "$GNOME_CONFIG"; then
--  echo "$ac_t""$GNOME_CONFIG" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--  min_gnome_version=1.2.3;
--
--  echo $ac_n "checking for Gnome - version >= $min_gnome_version""... $ac_c" 1>&6
--echo "configure:3542: checking for Gnome - version >= $min_gnome_version" >&5
--  no_gnome=""
--  if test "$GNOME_CONFIG" = "no" ; then
--    no_gnome=yes
--  else
--    gnome_config_major_version=`$GNOME_CONFIG --version | \
--           sed 's/.* \([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
--    gnome_config_minor_version=`$GNOME_CONFIG --version | \
--           sed 's/.* \([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
--    gnome_config_micro_version=`$GNOME_CONFIG --version | \
--           sed 's/.* \([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
--
--    GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
--    GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui`
--  fi
--  if test "x$no_gnome" = x ; then
--     echo "$ac_t""yes" 1>&6
--     :     
--  else
--     echo "$ac_t""no" 1>&6
--     if test "$GNOME_CONFIG" = "no" ; then
--       echo "*** The gnome-config script installed by Gnome could not be found"
--       echo "*** If Gnome was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the GNOME_CONFIG environment variable to the"
--       echo "*** full path to gnome-config."
--     fi
--     GNOME_CFLAGS=""
--     GNOME_LIBS=""
--     xdao=no; echo Disabled building of xcdrdao.
--  fi
--  
--  
--
--fi
--
--if test $xdao = xdao; then
--  # Check whether --with-gnome-prefix or --without-gnome-prefix was given.
--if test "${with_gnome_prefix+set}" = set; then
--  withval="$with_gnome_prefix"
--  gnome_config_prefix="$withval"
--else
--  gnome_config_prefix=""
--fi
--
--
--  min_gnome_module_major_version=`echo 1.1.17 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`;
--  min_gnome_module_minor_version=`echo 1.1.17 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`;
--  min_gnome_module_micro_version=`echo 1.1.17 | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`;
--
--  if test x$gnome_config_prefix != x ; then
--     gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
--     if test x${GNOME_CONFIG+set} != xset ; then
--        GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
--     fi
--  fi
--
--  # Extract the first word of "gnome-config", so it can be a program name with args.
--set dummy gnome-config; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:3601: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  case "$GNOME_CONFIG" in
--  /*)
--  ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path.
--  ;;
--  ?:/*)			 
--  ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path.
--  ;;
--  *)
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do 
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_path_GNOME_CONFIG" && ac_cv_path_GNOME_CONFIG="no"
--  ;;
--esac
--fi
--GNOME_CONFIG="$ac_cv_path_GNOME_CONFIG"
--if test -n "$GNOME_CONFIG"; then
--  echo "$ac_t""$GNOME_CONFIG" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--
--  echo $ac_n "checking for Gnome module gnomemm - version >= 1.1.17""... $ac_c" 1>&6
--echo "configure:3636: checking for Gnome module gnomemm - version >= 1.1.17" >&5
--
--  no_gnome=""
--  no_gnome_module=""
--
--  if test "$GNOME_CONFIG" = "no" ; then
--    no_gnome=yes
--  elif $GNOME_CONFIG --libs gnomemm > /dev/null 2>&1 ; then
--    gnome_module_major_version=`$GNOME_CONFIG --modversion gnomemm | \
--           sed "s/gnomemm-\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/"`
--    gnome_module_minor_version=`$GNOME_CONFIG --modversion gnomemm | \
--           sed "s/gnomemm-\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/"`
--    gnome_module_micro_version=`$GNOME_CONFIG --modversion gnomemm | \
--           sed "s/gnomemm-\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/"`
--  else
--     no_gnome_module=yes   
--  fi
--
--  GNOMEMM_CFLAGS=""
--  GNOMEMM_LIBS=""
--
--  if test "x$no_gnome_module" = xyes ; then
--    echo "$ac_t"""no - module gnomemm not found"" 1>&6
--    xdao=no; echo Disabled building of xcdrdao.
--  elif test "x$no_gnome" = x ; then
--     gnome_module_version_ok=no
--
--     if test $gnome_module_major_version -gt $min_gnome_module_major_version ; then
--       gnome_module_version_ok=yes
--     elif test $gnome_module_major_version -eq $min_gnome_module_major_version ; then
--       if test $gnome_module_minor_version -gt $min_gnome_module_minor_version ; then
--         gnome_module_version_ok=yes
--       elif test $gnome_module_minor_version -eq $min_gnome_module_minor_version ; then
--         if test $gnome_module_micro_version -ge $min_gnome_module_micro_version ; then
--           gnome_module_version_ok=yes
--         fi
--       fi
--     fi
--
--     if test $gnome_module_version_ok = yes ; then
--       echo "$ac_t""yes" 1>&6
--
--       GNOMEMM_CFLAGS=`$GNOME_CONFIG --cflags gnomemm`
--       GNOMEMM_LIBS=`$GNOME_CONFIG --libs gnomemm`
--
--       :
--     else
--       echo "$ac_t"""no - found version $gnome_module_major_version.$gnome_module_minor_version.$gnome_module_micro_version"" 1>&6
--       xdao=no; echo Disabled building of xcdrdao.
--     fi
--  else
--     echo "$ac_t""no" 1>&6
--     if test "$GNOME_CONFIG" = "no" ; then
--       echo "*** The gnome-config script installed by Gnome could not be found"
--       echo "*** If Gnome was installed in PREFIX, make sure PREFIX/bin is in"
--       echo "*** your path, or set the GNOME_CONFIG environment variable to the"
--       echo "*** full path to gnome-config."
--     fi
--     xdao=no; echo Disabled building of xcdrdao.
--  fi
--
--  
--  
--
--fi
--
-+# xdao stuff erased 
-+xdao=no
- if test $xdao != xdao; then
-   xdao=
- fi
-@@ -3910,7 +3416,7 @@
- ac_given_srcdir=$srcdir
- ac_given_INSTALL="$INSTALL"
- 
--trap 'rm -fr `echo "edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile xdao/Makefile Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+trap 'rm -fr `echo "edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
-@@ -4018,7 +3524,7 @@
- 
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile xdao/Makefile Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"edc_ecc/Makefile trackdb/Makefile dao/Makefile utils/Makefile Makefile"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch b/app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch
deleted file mode 100644
index 60d0deb63c44..000000000000
--- a/app-cdr/cdrdao/files/cdrdao-1.1.8-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdrdao-1.1.8/trackdb/lec.cc.cast	2004-02-20 10:56:53.505801360 +0100
-+++ cdrdao-1.1.8/trackdb/lec.cc	2004-02-20 11:00:26.328447400 +0100
-@@ -278,7 +278,7 @@
-   u_int32_t crc = 0;
- 
-   while (len--) {
--    crc = CRCTABLE[(crc ^ *data++) & 0xffL] ^ (crc >> 8);
-+    crc = CRCTABLE[(int)((crc ^ *data++) & 0xffL)] ^ (crc >> 8);
-   }
- 
-   return crc;
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.8 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.8
deleted file mode 100644
index b3569daf3106..000000000000
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f6a1c05c240b36f141bc06c47c50578 cdrdao-1.1.8.tar.gz 1535530
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.8-r1 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.8-r1
deleted file mode 100644
index b3569daf3106..000000000000
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f6a1c05c240b36f141bc06c47c50578 cdrdao-1.1.8.tar.gz 1535530
diff --git a/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r1 b/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r2
index 9a277d7315a4..9a277d7315a4 100644
--- a/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r1
+++ b/app-cdr/cdrdao/files/digest-cdrdao-1.1.9-r2
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
index 2196eec2ec45..3c28f442b7c2 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>media-optical</herd>
 <maintainer>
   <email>pylon@gentoo.org</email>
   <name>Lars Weiler</name>
   <description>Testing on x86 and ppc with SCSI and ATAPI writers.</description>
 </maintainer>
-<longdescription>CD command line recording, ripping and copying tool.</longdescription>
+<longdescription>
+  CD command line recording, ripping and copying tool.  Especially ISOs- and
+  bin/cue-files are handled very well.
+</longdescription>
 </pkgmetadata>