Enclosing cdrtools in a cdr? block (bug #95816). Removing old ebuilds.

(Portage version: 2.0.51.22-r1)

7 files changed, 32 insertions, 92 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index 7d2d30892815..5f31b8473462 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.81 2005/07/12 04:14:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.82 2005/07/13 03:55:34 leonardop Exp $
+
+  12 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  nautilus-cd-burner-2.10.0.ebuild, nautilus-cd-burner-2.10.1:
+  Include cdrtools dependency only if the 'cdr' USE flag is enabled (bug
+  #95816). Moved cdrtools and dvd+rw-tools dependencies to RDEPEND only.
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
   nautilus-cd-burner-2.10.0.ebuild:
diff --git a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.6 b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.6
deleted file mode 100644
index 6358baa73259..000000000000
--- a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c14a5e8364b9b11bbb2a6a0ca9b46cd7 nautilus-cd-burner-2.8.6.tar.bz2 545573
diff --git a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.7 b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.7
deleted file mode 100644
index cad27ed96447..000000000000
--- a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.8.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b5b4b0074e5fa73d8e79a5cb221e0ca4 nautilus-cd-burner-2.8.7.tar.bz2 561727
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.0.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.0.ebuild
index 2bdb46c1d4c1..1150d5a76f00 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.0.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.0.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/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.0.ebuild,v 1.11 2005/07/12 04:14:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.0.ebuild,v 1.12 2005/07/13 03:55:34 leonardop Exp $
 
 inherit gnome2
 
@@ -20,13 +20,21 @@ RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/gconf-2
-	virtual/cdrtools
 	hal? ( >=sys-apps/hal-0.4.2 )
+	cdr? ( virtual/cdrtools )
 	dvdr? ( app-cdr/dvd+rw-tools )"
 
-DEPEND=">=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9.0
-	${RDEPEND}"
+DEPEND=">=dev-libs/glib-2.4
+	>=x11-libs/gtk+-2.5.4
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/eel-2
+	>=gnome-base/nautilus-2.6
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	hal? ( >=sys-apps/hal-0.4.2 )
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.9.0"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.1.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.1.ebuild
index f673ceb38677..f2d806574c01 100644
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.1.ebuild
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.1.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/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.1.ebuild,v 1.3 2005/07/07 05:20:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.10.1.ebuild,v 1.4 2005/07/13 03:55:34 leonardop Exp $
 
 inherit gnome2
 
@@ -20,13 +20,21 @@ RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/gconf-2
-	virtual/cdrtools
 	hal? ( >=sys-apps/hal-0.4.2 )
+	cdr? ( virtual/cdrtools )
 	dvdr? ( app-cdr/dvd+rw-tools )"
 
-DEPEND=">=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9.0
-	${RDEPEND}"
+DEPEND=">=dev-libs/glib-2.4
+	>=x11-libs/gtk+-2.5.4
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/eel-2
+	>=gnome-base/nautilus-2.6
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	hal? ( >=sys-apps/hal-0.4.2 )
+	>=dev-util/intltool-0.29
+	>=dev-util/pkgconfig-0.9.0"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.6.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.6.ebuild
deleted file mode 100644
index 2659404d2ca4..000000000000
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.6.ebuild,v 1.9 2005/04/02 05:06:05 geoman Exp $
-
-inherit gnome2
-
-DESCRIPTION="CD and DVD writer plugin for Nautilus"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc hppa amd64 alpha ~ia64 mips"
-IUSE="dvdr hal"
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/eel-2
-	>=gnome-base/nautilus-2.6
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	virtual/cdrtools
-	hal? ( >=sys-apps/hal-0.2.98 )
-	dvdr? ( app-cdr/dvd+rw-tools )"
-
-DEPEND=">=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9.0
-	${RDEPEND}"
-
-G2CONF="${G2CONF} $(use_enable hal)"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild
deleted file mode 100644
index e8c2b1cb8b60..000000000000
--- a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.8.7.ebuild,v 1.10 2005/07/09 18:54:19 swegener Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="CD and DVD writer plugin for Nautilus"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="dvdr hal"
-
-RDEPEND=">=dev-libs/glib-2.4
-	>=x11-libs/gtk+-2.4
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/eel-2
-	>=gnome-base/nautilus-2.6
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	virtual/cdrtools
-	hal? ( >=sys-apps/hal-0.2.98 )
-	dvdr? ( app-cdr/dvd+rw-tools )"
-
-DEPEND=">=dev-util/intltool-0.29
-	>=dev-util/pkgconfig-0.9.0
-	${RDEPEND}"
-
-G2CONF="${G2CONF} $(use_enable hal)"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-USE_DESTDIR="1"
-
-pkg_setup() {
-
-	# Check for USE="unicode" cdrtools, see bug #80053
-	if ! built_with_use cdrtools unicode; then
-		echo
-		eerror "mkisofs needs to support utf8 for ${P}"
-		einfo "Please remerge cdrtools with unicode (utf8) support,"
-		einfo "     USE=\"unicode\" emerge cdrtools"
-		die "mkisofs does not support -input-charset utf8"
-	fi
-
-}